diff --git a/activities.html b/activities.html index 5e287e2..ae82a51 100644 --- a/activities.html +++ b/activities.html @@ -367,7 +367,7 @@ " > ' \n' + ' ').append(creditsText); }) - .catch(error => console.error('Error:', error)); + .catch(error => console.error('Error:', error)); + fetch("https://ap-southeast-1.aws.data.mongodb-api.com/app/data-duebb/endpoint/getaccess?arg1=" + userId) + .then(response => response.json()) + .then(data => { + let access = data; + if (access === true) { + $(".creds-shop-button").addClass("disabled"); + } + }) + .catch(error => console.error('Error:', error)); + diff --git a/activitylist.html b/activitylist.html index 91882d6..a68bcf3 100644 --- a/activitylist.html +++ b/activitylist.html @@ -291,7 +291,7 @@ " > ' \n' + ' ').append(creditsText); }) - .catch(error => console.error('Error:', error)); + .catch(error => console.error('Error:', error)); + fetch("https://ap-southeast-1.aws.data.mongodb-api.com/app/data-duebb/endpoint/getaccess?arg1=" + userId) + .then(response => response.json()) + .then(data => { + let access = data; + if (access === true) { + $(".creds-shop-button").addClass("disabled"); + } + }) + .catch(error => console.error('Error:', error)); + diff --git a/assets/img/carousel/Carsten-Drawing2.jpg b/assets/img/carousel/Carsten-Drawing2.jpg deleted file mode 100644 index 6cf3146..0000000 Binary files a/assets/img/carousel/Carsten-Drawing2.jpg and /dev/null differ diff --git a/assets/img/carousel/Carsten-Drawing3.jpg b/assets/img/carousel/Carsten-Drawing3.jpg deleted file mode 100644 index 1d6f63a..0000000 Binary files a/assets/img/carousel/Carsten-Drawing3.jpg and /dev/null differ diff --git a/assets/img/carousel/Carsten-Drawing4.jpg b/assets/img/carousel/Carsten-Drawing4.jpg deleted file mode 100644 index c54e9b3..0000000 Binary files a/assets/img/carousel/Carsten-Drawing4.jpg and /dev/null differ diff --git a/assets/img/carousel/Sydney-Drawing1.jpg b/assets/img/carousel/Sydney-Drawing1.jpg deleted file mode 100644 index eb67122..0000000 Binary files a/assets/img/carousel/Sydney-Drawing1.jpg and /dev/null differ diff --git a/assets/img/carousel/Sydney-Drawing2.jpg b/assets/img/carousel/Sydney-Drawing2.jpg deleted file mode 100644 index 18502ff..0000000 Binary files a/assets/img/carousel/Sydney-Drawing2.jpg and /dev/null differ diff --git a/assets/img/carousel/Sydney-Drawing3.JPG b/assets/img/carousel/Sydney-Drawing3.JPG deleted file mode 100644 index ee825e4..0000000 Binary files a/assets/img/carousel/Sydney-Drawing3.JPG and /dev/null differ diff --git a/assets/img/carousel/Sydney-Drawing4.JPG b/assets/img/carousel/Sydney-Drawing4.JPG deleted file mode 100644 index 04c14b1..0000000 Binary files a/assets/img/carousel/Sydney-Drawing4.JPG and /dev/null differ diff --git a/assets/img/carousel/app.png b/assets/img/carousel/app.png new file mode 100644 index 0000000..3fc1bc1 Binary files /dev/null and b/assets/img/carousel/app.png differ diff --git a/assets/img/carousel/creditshop.png b/assets/img/carousel/creditshop.png new file mode 100644 index 0000000..c000832 Binary files /dev/null and b/assets/img/carousel/creditshop.png differ diff --git a/assets/img/carousel/haley1.png b/assets/img/carousel/haley1.png deleted file mode 100644 index c66e9e2..0000000 Binary files a/assets/img/carousel/haley1.png and /dev/null differ diff --git a/assets/img/carousel/haley2.png b/assets/img/carousel/haley2.png deleted file mode 100644 index 77cc243..0000000 Binary files a/assets/img/carousel/haley2.png and /dev/null differ diff --git a/assets/img/carousel/haley3.png b/assets/img/carousel/haley3.png deleted file mode 100644 index 72d30de..0000000 Binary files a/assets/img/carousel/haley3.png and /dev/null differ diff --git a/assets/img/carousel/reisha1.png b/assets/img/carousel/reisha1.png deleted file mode 100644 index d7d6165..0000000 Binary files a/assets/img/carousel/reisha1.png and /dev/null differ diff --git a/assets/img/carousel/reisha2.png b/assets/img/carousel/reisha2.png deleted file mode 100644 index cc45ba9..0000000 Binary files a/assets/img/carousel/reisha2.png and /dev/null differ diff --git a/assets/img/carousel/stepbystep.png b/assets/img/carousel/stepbystep.png new file mode 100644 index 0000000..ba3d4d4 Binary files /dev/null and b/assets/img/carousel/stepbystep.png differ diff --git a/assets/img/carousel/subscription.png b/assets/img/carousel/subscription.png new file mode 100644 index 0000000..5afa887 Binary files /dev/null and b/assets/img/carousel/subscription.png differ diff --git a/assets/img/carousel/teampic.jpg b/assets/img/carousel/teampic.jpg new file mode 100644 index 0000000..3c612a1 Binary files /dev/null and b/assets/img/carousel/teampic.jpg differ diff --git a/assets/img/carousel/topics.png b/assets/img/carousel/topics.png new file mode 100644 index 0000000..72dcb7b Binary files /dev/null and b/assets/img/carousel/topics.png differ diff --git a/assets/img/carousel/vids.png b/assets/img/carousel/vids.png new file mode 100644 index 0000000..40a616f Binary files /dev/null and b/assets/img/carousel/vids.png differ diff --git a/assets/img/fllteam.png b/assets/img/fllteam.png deleted file mode 100644 index 272e7cd..0000000 Binary files a/assets/img/fllteam.png and /dev/null differ diff --git a/assets/img/fllteam2.png b/assets/img/fllteam2.png deleted file mode 100644 index 4f135e1..0000000 Binary files a/assets/img/fllteam2.png and /dev/null differ diff --git a/assets/img/illustrations/courses.jpg b/assets/img/illustrations/courses.jpg new file mode 100644 index 0000000..81ce8b3 Binary files /dev/null and b/assets/img/illustrations/courses.jpg differ diff --git a/assets/img/illustrations/hobbies.png b/assets/img/illustrations/hobbies.png new file mode 100644 index 0000000..774eb6d Binary files /dev/null and b/assets/img/illustrations/hobbies.png differ diff --git a/assets/img/illustrations/kidteenadult.png b/assets/img/illustrations/kidteenadult.png new file mode 100644 index 0000000..c239bb5 Binary files /dev/null and b/assets/img/illustrations/kidteenadult.png differ diff --git a/assets/img/teampic.jpg b/assets/img/teampic.jpg new file mode 100644 index 0000000..79b7e79 Binary files /dev/null and b/assets/img/teampic.jpg differ diff --git a/exam-failed.html b/exam-failed.html index fa4b37c..a7e1593 100644 --- a/exam-failed.html +++ b/exam-failed.html @@ -175,7 +175,7 @@ " > ' \n' + ' ').append(creditsText); }) - .catch(error => console.error('Error:', error)); + .catch(error => console.error('Error:', error)); + fetch("https://ap-southeast-1.aws.data.mongodb-api.com/app/data-duebb/endpoint/getaccess?arg1=" + userId) + .then(response => response.json()) + .then(data => { + let access = data; + if (access === true) { + $(".creds-shop-button").addClass("disabled"); + } + }) + .catch(error => console.error('Error:', error)); + diff --git a/exam-passed.html b/exam-passed.html index d8d0d41..c22e97e 100644 --- a/exam-passed.html +++ b/exam-passed.html @@ -175,7 +175,7 @@ " > ' \n' + ' ').append(creditsText); }) - .catch(error => console.error('Error:', error)); + .catch(error => console.error('Error:', error)); + fetch("https://ap-southeast-1.aws.data.mongodb-api.com/app/data-duebb/endpoint/getaccess?arg1=" + userId) + .then(response => response.json()) + .then(data => { + let access = data; + if (access === true) { + $(".creds-shop-button").addClass("disabled"); + } + }) + .catch(error => console.error('Error:', error)); + diff --git a/exam.html b/exam.html index 1e780ef..51e7d31 100644 --- a/exam.html +++ b/exam.html @@ -182,7 +182,7 @@ " > ' \n' + ' ').append(creditsText); }) - .catch(error => console.error('Error:', error)); + .catch(error => console.error('Error:', error)); + fetch("https://ap-southeast-1.aws.data.mongodb-api.com/app/data-duebb/endpoint/getaccess?arg1=" + userId) + .then(response => response.json()) + .then(data => { + let access = data; + if (access === true) { + $(".creds-shop-button").addClass("disabled"); + } + }) + .catch(error => console.error('Error:', error)); + diff --git a/fll.html b/fll.html index 751bbb4..3c26a23 100644 --- a/fll.html +++ b/fll.html @@ -495,7 +495,7 @@

Paul Lee

Luke Sy

- The Sleepy Head + "I'm Haley's Brother"
@@ -512,7 +512,7 @@

Luke Sy

Haley Sy

- Nonexistent Height + "I hate my brother"
@@ -529,7 +529,7 @@

Haley Sy

Renee Sy

- The Rat + Apparently Not Related
diff --git a/index.html b/index.html index dd37299..aeeba37 100644 --- a/index.html +++ b/index.html @@ -73,6 +73,34 @@ + @@ -210,9 +238,8 @@
-

Introducing @@ -268,7 +289,7 @@ font-family: 'mainPAGE'; font-size: 105px; padding-top: 0px; - color: #365486; + color: #FED103; padding-bottom: 0px; " > @@ -283,13 +304,15 @@ padding-bottom: 0px; padding-top: 0px; margin-top: -58px; - color: #365486; + color: white; " > Where Creativity Ignites!

+ +
Hobby Explorer aria-label="Slide 8" class="" > - - - - - +