Merge branch 'main' into jeremy-wip

lost-university · Mar 7, 2024 · f663336 · f663336
2 parents 91e9605 + feac4bd
commit f663336
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/src/components/Focus.vue b/src/components/Focus.vue
@@ -2,38 +2,42 @@
   <div
     class="hover:cursor-pointer border border-gray-300 hover:border-gray-600 flex items-center space-x-2 p-2"
     :aria-expanded="isOpen"
-    :class="{ 'bg-green-200': !filteredModuleNames.length }"
+    :class="{ 'bg-green-200': !filteredModules.length }"
     type="button"
     @click="toggleFocus()"
   >
     <span class="grow">{{ name }}</span>
     <span
-      v-if="filteredModuleNames.length"
+      v-if="filteredModules.length"
       class="shrink-0 text-xs py-1 px-2 rounded bg-blue-50"
     >
-      {{ filteredModuleNames.length }} Module werden noch benötigt
+      {{ filteredModules.length }} Module werden noch benötigt
     </span>
     <span
-      v-if="!filteredModuleNames.length"
+      v-if="!filteredModules.length"
       class="shrink-0 text-xs py-1 px-2 rounded bg-green-100"
     >
       Vertiefung geplant
     </span>
     <font-awesome-icon :icon="isOpen ? openIconClass : closedIconClass" />
   </div>
   <div v-show="isOpen" class="p-4 shadow-lg mb-4">
-    <p v-if="!filteredModuleNames.length">
+    <p v-if="!filteredModules.length">
       Alle benötigten Module sind bestanden/geplant.
     </p>
-    <p v-if="filteredModuleNames.length">
+    <p v-if="filteredModules.length">
       Für die Vertiefung müssen folgende Module noch geplant werden:
     </p>
     <ul class="list-disc list-inside text-sm mt-1">
       <li
-        v-for="filteredModuleName in filteredModuleNames"
-        :key="filteredModuleName"
+        v-for="module in filteredModules"
+        :key="module.id"
       >
-        {{ filteredModuleName }}
+        <a
+          target="_blank"
+          :href="'https://studien.rj.ost.ch/' + module.url.replace('.json', '.html')"
+        >{{ module.name }}
+        </a>
       </li>
     </ul>
   </div>
@@ -56,9 +60,9 @@ export default defineComponent({
       type: Array<Module>,
       default: () => [],
     },
-    filteredModuleNames: {
+    filteredModules: {
       required: true,
-      type: Array<string>,
+      type: Array<Module>,
       default: () => [],
     },
   },

diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
@@ -76,7 +76,7 @@ export default defineComponent({
             { title: 'Freie Modulwahl', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-KommIng2-PmQm_SEP1_ExEv-SEProj_SEP2_DigBusI-SAI21_WI2-BAI21_PhAI' },
             { title: 'Software Engineering', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-ParProg_SecSoW_Bsys2_AIAp_DatEng_KommIng2-PmQm_CoBau_MsTe_CPl_SEP1_ExEv-CPlA_DSy_SEProj_SEP2_DigBusI-PF_AppArch_SAI21_WI2-CldSol_BAI21_PhAI' },
             { title: 'Frontend Engineering', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-WE2_SecSoW_Bsys2_AIAp_DatEng_KommIng2-PmQm_WE3_MsTe_MGE_SEP1_ExEv-UX_DSy_SEProj_SEP2_DigBusI-ComGra_AppArch_SAI21_WI2-CldSol_BAI21_PhAI' },
-            { title: 'Cybersecurity', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-WE2_SecSoW_Bsys2_CN2_KommIng2-PmQm_PFSec_CldInf_NioSec_SEP1_ExEv-CldOp_HackL_DSy_SEProj_SEP2_DigBusI-CyDef_AppArch_SAI21_WI2-IncResp_BAI21_PhAI' },
+            { title: 'Cybersecurity', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-WE2_SecSoW_Bsys2_CN2_KommIng2-PmQm_PFSec_CldInf_NIoSec_SEP1_ExEv-CldOp_HackL_DSy_SEProj_SEP2_DigBusI-CyDef_AppArch_SAI21_WI2-IncResp_BAI21_PhAI' },
             { title: 'Network and Cloud Infrastructure', path:
             'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-WE2_SModSim_DatAna_NetAut_CN2_KommIng2-PmQm_CldInf_NIoSec_SEP1_ExEv-CldOp_IBN_DSy_SEProj_SEP2_DigBusI-CyDef_AppArch_SAI21_WI2-CldSol_BAI21_PhAI' },
             { title: 'Data Engineering and Machine Intelligence', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I-FP_OOP2_DigCod_CySec_AutoSpr_An2I-WE1_AlgDat_Bsys1_AIFo_Dbs1_EnglScience-WE2_MathFML_DatAna_AIAp_DatEng_KommIng2-PmQm_ML_MsTe_MGE_SEP1_ExEv-DL_DSy_SEProj_SEP2_DigBusI-BlCh_AppArch_SAI21_WI2-CldSol_BAI21_PhAI' },
@@ -88,7 +88,7 @@ export default defineComponent({
             { title: 'Freie Modulwahl', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_KommIng2-WE1_AlgDat_Bsys1_AIFo_SEP1_ExEv-SEProj_SEP2_DigBusI-PmQm_SAI21_WI2-BAI21_PhAI' },
             { title: 'Software Engineering', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_DatEng_KommIng2-WE1_AlgDat_Bsys1_AIFo_MsTe_CPl_SEP1_ExEv-ParProg_SecSoW_Bsys2_AIAp_DSy_SEProj_SEP2_DigBusI-PmQm_CoBau_PF_AppArch_SAI21_WI2-CPlA_CldSol_BAI21_PhAI' },
             { title: 'Frontend Engineering', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_DatEng_KommIng2-WE1_AlgDat_Bsys1_AIFo_MsTe_MGE_SEP1_ExEv-WE2_SecSoW_Bsys2_AIAp_DSy_SEProj_SEP2_DigBusI-PmQm_WE3_ComGra_AppArch_SAI21_WI2-UX_CldSol_BAI21_PhAI' },
-            { title: 'Cybersecurity', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_CN2-WE1_AlgDat_Bsys1_AIFo_CldInf_NioSec_SEP1_ExEv-WE2_SecSoW_Bsys2_DSy_SEProj_SEP2_DigBusI-PmQm_PFSec_CyDef_AppArch_SAI21_WI2-CldOp_HackL_KommIng2_IncResp_BAI21_PhAI' },
+            { title: 'Cybersecurity', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_CN2-WE1_AlgDat_Bsys1_AIFo_CldInf_NIoSec_SEP1_ExEv-WE2_SecSoW_Bsys2_DSy_SEProj_SEP2_DigBusI-PmQm_PFSec_CyDef_AppArch_SAI21_WI2-CldOp_HackL_KommIng2_IncResp_BAI21_PhAI' },
             { title: 'Network and Cloud Infrastructure', path:
             'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_CN2-WE1_AlgDat_Bsys1_AIFo_CldInf_NIoSec_SEP1_ExEv-WE2_SModSim_DatAna_NetAut_DSy_SEProj_SEP2_DigBusI-PmQm_CyDef_AppArch_SAI21_WI2-CldOp_IBN_KommIng2_CldSol_BAI21_PhAI' },
             { title: 'Data Engineering and Machine Intelligence', path: 'RheKoI_OOP1_AutPy_CN1_DMI_An1I_Dbs1_EnglScience-FP_OOP2_DigCod_CySec_AutoSpr_An2I_DatEng_KommIng2-WE1_AlgDat_Bsys1_AIFo_MsTe_MGE_SEP1_ExEv-WE2_MathFML_DatAna_AIAp_DSy_SEProj_SEP2_DigBusI-PmQm_ML_AppArch_BlCh_SAI21_WI2-DL_CldSol_BAI21_PhAI' },

diff --git a/src/components/PageFooter.vue b/src/components/PageFooter.vue
@@ -2,7 +2,7 @@
   <hr>
   <footer class="flex items-center p-4 justify-between">
     <div class="text-sm">
-      <span>© 2023 </span>
+      <span>© 2024 </span>
       <span
         v-for="(contributor, index) in contributors"
         :key="contributor.githubHandle"

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -125,7 +125,7 @@
           <FocusComponent
             :name="focus.name"
             :all-modules="focus.modules"
-            :filtered-module-names="focus.filteredModuleNames"
+            :filtered-modules="focus.filteredModules"
           />
         </div>
       </div>
@@ -184,9 +184,8 @@ export default defineComponent({
       const plannedModuleIds = this.plannedModules.map((module) => module.id);
       return this.focuses.map((focus) => ({
         ...focus,
-        filteredModuleNames: focus.modules
-          .filter((module) => !plannedModuleIds.includes(module.id))
-          .map((module) => module.name),
+        filteredModules: focus.modules
+          .filter((module) => !plannedModuleIds.includes(module.id)),
       }));
     },
     totalPlannedEcts() {

diff --git a/styles/main.scss b/styles/main.scss
@@ -86,8 +86,14 @@
   color: white;
 }
 
-.module a:hover {
-  text-decoration: underline;
+.focus-missing-modules-list a {
+  color: inherit;
+}
+
+.module, .focus-missing-modules-list {
+  a:hover {
+    text-decoration: underline;
+  }
 }
 
 @include desktop {