From e01e7ec22e9f89d46dc82b79f8aee528888b2fa3 Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Sun, 27 Oct 2024 18:29:42 +0100 Subject: [PATCH 01/11] Creating module --- components/user/Tasks.vue | 3 +++ pages/profile/index.vue | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 components/user/Tasks.vue diff --git a/components/user/Tasks.vue b/components/user/Tasks.vue new file mode 100644 index 00000000..08455c92 --- /dev/null +++ b/components/user/Tasks.vue @@ -0,0 +1,3 @@ + diff --git a/pages/profile/index.vue b/pages/profile/index.vue index ec9fb3e1..fd3571b5 100644 --- a/pages/profile/index.vue +++ b/pages/profile/index.vue @@ -26,6 +26,8 @@ class="midXl:row-span-4 midXl:sticky midXl:top-container midXl:self-start" /> + + From afd469c286a2cae2d126273f5b34e916d0906d7f Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Mon, 28 Oct 2024 11:34:52 +0100 Subject: [PATCH 02/11] renamed from tasks to quests --- components/user/{Tasks.vue => Quests.vue} | 0 pages/profile/index.vue | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename components/user/{Tasks.vue => Quests.vue} (100%) diff --git a/components/user/Tasks.vue b/components/user/Quests.vue similarity index 100% rename from components/user/Tasks.vue rename to components/user/Quests.vue diff --git a/pages/profile/index.vue b/pages/profile/index.vue index fd3571b5..b657d8d1 100644 --- a/pages/profile/index.vue +++ b/pages/profile/index.vue @@ -5,9 +5,9 @@ ❌ Animation ✅ middleware -✅ Tested on chrome -✅ Tested on firefox -✅ Tested on safari +❌ Tested on chrome +❌ Tested on firefox +❌ Tested on safari ❌ Tested on android mobile ❌ Tested on apple mobile @@ -26,7 +26,7 @@ class="midXl:row-span-4 midXl:sticky midXl:top-container midXl:self-start" /> - + From 956b398e2746e99f7a4542ddfa3719a850049d58 Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Mon, 28 Oct 2024 11:36:37 +0100 Subject: [PATCH 03/11] fix --- pages/profile/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/profile/index.vue b/pages/profile/index.vue index b657d8d1..5f196295 100644 --- a/pages/profile/index.vue +++ b/pages/profile/index.vue @@ -26,7 +26,7 @@ class="midXl:row-span-4 midXl:sticky midXl:top-container midXl:self-start" /> - + From 27afd2577e44db681cc408741ac5d5c221830dc7 Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Mon, 28 Oct 2024 15:01:17 +0100 Subject: [PATCH 04/11] working on quests 01 --- components/user/Quests.vue | 54 +++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/components/user/Quests.vue b/components/user/Quests.vue index 08455c92..98c4bebb 100644 --- a/components/user/Quests.vue +++ b/components/user/Quests.vue @@ -1,3 +1,55 @@ + + + + From 8c464cfc875d11b41fe73d2ca92b7dcb96299421 Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Mon, 28 Oct 2024 18:08:30 +0100 Subject: [PATCH 05/11] working on quests 02 --- .vscode/settings.json | 3 ++- components/user/Quests.vue | 51 +++++++++++++++++++++++++++----------- locales/de.json | 6 ++++- locales/en-US.json | 6 ++++- 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 97d57e61..2f25c460 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "cSpell.words": ["coachings", "Morphcoin", "morphcoins", "Recaptcha", "TOTP"], - "vue.codeActions.enabled": false + "vue.codeActions.enabled": false, + "vue3snippets.enable-compile-vue-file-on-did-save-code": true } diff --git a/components/user/Quests.vue b/components/user/Quests.vue index 98c4bebb..ea82e9e2 100644 --- a/components/user/Quests.vue +++ b/components/user/Quests.vue @@ -1,11 +1,33 @@ @@ -15,26 +37,25 @@ import { useI18n } from "vue-i18n"; export default defineComponent({ setup() { + const { t } = useI18n(); const header = reactive({ - heading: "Tägliche Quests", + heading: "Headings.DailyQuests", body: "", }); - enum value { - null = 1, - eins = 20, - zwei = 40, - drei = 60, - vier = 80, - fuenf = 100, + var lecturesDone = 4; + var progressbar_progress = 0; + + if (lecturesDone === 0) { + progressbar_progress = 1; } - var newValue = value.zwei; - function calcValue(event: any) { - newValue = value.drei; - console.log(newValue); + if (lecturesDone > 0) { + progressbar_progress = lecturesDone * 20; } - return { newValue, calcValue, header }; + + return { progressbar_progress, header, lecturesDone, t }; }, + //TODO: change backgroundcolor of progressbar to gold if lecturesDone = 5 using watch! }); diff --git a/locales/de.json b/locales/de.json index aeb2c2aa..ddb5c159 100644 --- a/locales/de.json +++ b/locales/de.json @@ -225,6 +225,7 @@ "VerifyAccount": "Konto verifizieren", "EditProfile": "Profil bearbeiten", "SkillPoints": "Skillpunkte", + "DailyQuests":"Tägliche Quests", "Nodes": "Knoten", "WatchedCourses": "Gesehene Kurse", "MyJobsOffers": "Meine Jobangebote", @@ -510,7 +511,10 @@ "IncreasedSecurity": "Erhöhte Sicherheit", "NoMoreIncreaseSecurity": "Keine erhöhte Sicherheit mehr", "ExcitingUpdates": "spannende Neuigkeiten und Updates", - "NoMoreExcitingUpdates": "keine spannende Neuigkeiten und Updates mehr" + "NoMoreExcitingUpdates": "keine spannende Neuigkeiten und Updates mehr", + "SolvedFiveQuests": "Herzlichen Glückwunsch! Du hast 5 Quests gemacht und dafür 5 MC bekommen.", + "SolveFiveQuests": "Löse 5 Quests um 5 MC zu bekommen.", + "SeeYouTomorrow": "Bis Morgen!" }, "AltAttributes": { "BootstrapAcademyLogo": "Bootstrap Academy Logo", diff --git a/locales/en-US.json b/locales/en-US.json index 508e67c6..fadac934 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -223,6 +223,7 @@ "VerifyAccount": "Verify Account", "EditProfile": "Edit Profile", "SkillPoints": "Skill Points", + "DailyQuests":"Daily Quests", "Nodes": "Nodes", "WatchedCourses": "Watched Courses", "MyJobsOffers": "My Job Offers", @@ -508,7 +509,10 @@ "IncreasedSecurity": "Increased security", "NoMoreIncreaseSecurity": "No more increased security", "ExcitingUpdates": "Exciting news and updates", - "NoMoreExcitingUpdates": "No more exciting news and updates" + "NoMoreExcitingUpdates": "No more exciting news and updates", + "SolvedFiveQuests": "Congratulations! You solved 5 Quests and recieved 5 MC.", + "SolveFiveQuests": "Solve 5 Quests to earn 5 MC.", + "SeeYouTomorrow": "See you tomorrow!" }, "AltAttributes": { "BootstrapAcademyLogo": "Bootstrap Academy logo", From 1b5a658d0a68c56fd945f51955559deec9dafd35 Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Mon, 28 Oct 2024 22:19:10 +0100 Subject: [PATCH 06/11] added morphcoin box --- components/user/Quests.vue | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/components/user/Quests.vue b/components/user/Quests.vue index ea82e9e2..7a89f370 100644 --- a/components/user/Quests.vue +++ b/components/user/Quests.vue @@ -1,16 +1,6 @@ @@ -43,7 +43,7 @@ export default defineComponent({ body: "", }); - var lecturesDone = 4; + var lecturesDone = 0; var progressbar_progress = 0; if (lecturesDone === 0) { From 494a1051e76608015177397109c8dbce35663d8a Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Wed, 30 Oct 2024 21:13:56 +0100 Subject: [PATCH 07/11] added translations & +5MC-box --- components/user/Quests.vue | 155 +++++++++++++++++++++++++++++++++---- locales/de.json | 5 +- locales/en-US.json | 5 +- 3 files changed, 147 insertions(+), 18 deletions(-) diff --git a/components/user/Quests.vue b/components/user/Quests.vue index 7a89f370..f78479dc 100644 --- a/components/user/Quests.vue +++ b/components/user/Quests.vue @@ -1,5 +1,19 @@ @@ -73,4 +167,37 @@ export default defineComponent({ background-color: #3f51b5; transition: width 2s ease; } +.questsolved { + color: rgb(47, 225, 86); +} +.questnotsolved::marker { + color: rgb(60, 184, 159); + content: "○ - "; +} +.questsolved::marker { + color: rgb(47, 225, 86); + content: "● - "; +} +hr { + color: #3f51b5; + padding-top: 1%; + padding-bottom: 1%; + margin-top: 1%; +} +.videoquest { + padding-top: 1%; + padding-bottom: 1%; + list-style: inside; +} +.taskquest { + list-style: inside; +} +.VideoOfVideoquest { + border: 2px solid #3f51b5; +} +.videoQuestWrapper { + display: flex; + flex-wrap: nowrap; + border: 2px solid #3f51b5; +} diff --git a/locales/de.json b/locales/de.json index ddb5c159..bba596f2 100644 --- a/locales/de.json +++ b/locales/de.json @@ -513,8 +513,9 @@ "ExcitingUpdates": "spannende Neuigkeiten und Updates", "NoMoreExcitingUpdates": "keine spannende Neuigkeiten und Updates mehr", "SolvedFiveQuests": "Herzlichen Glückwunsch! Du hast 5 Quests gemacht und dafür 5 MC bekommen.", - "SolveFiveQuests": "Löse 5 Quests um 5 MC zu bekommen.", - "SeeYouTomorrow": "Bis Morgen!" + "SolveFiveQuests": "Löse 5 Quests um 5 MorphCoin zu bekommen.", + "SeeYouTomorrow": "Bis Morgen!", + "Watch":"Siehe" }, "AltAttributes": { "BootstrapAcademyLogo": "Bootstrap Academy Logo", diff --git a/locales/en-US.json b/locales/en-US.json index fadac934..0a8f86c9 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -511,8 +511,9 @@ "ExcitingUpdates": "Exciting news and updates", "NoMoreExcitingUpdates": "No more exciting news and updates", "SolvedFiveQuests": "Congratulations! You solved 5 Quests and recieved 5 MC.", - "SolveFiveQuests": "Solve 5 Quests to earn 5 MC.", - "SeeYouTomorrow": "See you tomorrow!" + "SolveFiveQuests": "Solve 5 Quests to earn 5 MorphCoin.", + "SeeYouTomorrow": "See you tomorrow!", + "Watch":"Watch" }, "AltAttributes": { "BootstrapAcademyLogo": "Bootstrap Academy logo", From 9c09693039b9d4c0be58ae7b06f33805aa7e48fb Mon Sep 17 00:00:00 2001 From: BugsSindFeatures Date: Thu, 31 Oct 2024 16:20:11 +0100 Subject: [PATCH 08/11] styling + additional information --- components/user/Quests.vue | 102 ++++++++++++++++++++----------------- locales/de.json | 3 +- locales/en-US.json | 3 +- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/components/user/Quests.vue b/components/user/Quests.vue index f78479dc..b3c7188e 100644 --- a/components/user/Quests.vue +++ b/components/user/Quests.vue @@ -5,7 +5,7 @@ style="width: fit-content; position: absolute; left: 85%" class="flex items-center p-2 bg-warning-light text-warning rounded-md md:rounded-lg" > -

+ 5

+

+5

-

+

{{ t("Body.SolveFiveQuests") }}

-

+

{{ t("Body.SolvedFiveQuests") }}

@@ -27,31 +27,32 @@
-
    - -
    - -
    -
  • + +
    + {{ t("Body.Watch") }} {{ videotitel }}! -
    • -
+ + + {{ t("Body.AlreadyWatched") }} {{ videotitel }} + +
+

{{ t("Body.SeeYouTomorrow") }}

    @@ -65,8 +66,6 @@
- -

{{ t("Body.SeeYouTomorrow") }}

@@ -74,9 +73,11 @@ import { defineComponent, watch } from "vue"; import { useI18n } from "vue-i18n"; import type { Course, GetUnseenLectureResponse, Section } from "~/types/courseTypes"; +import { PlayIcon } from "@heroicons/vue/24/outline"; export default defineComponent({ setup() { + console.log("help"); const loading = ref(true); const { t } = useI18n(); const router = useRouter(); @@ -84,6 +85,12 @@ export default defineComponent({ heading: "Headings.DailyQuests", body: "", }); + const VideoIcon = computed(() => { + return { + icon: PlayIcon, + text: "", + }; + }); const myCourses = useMyCourses(); @@ -97,17 +104,23 @@ export default defineComponent({ "What's special about