Merge branch 'main' into neue-msp

lost-university · Jun 21, 2024 · ff52521 · ff52521
2 parents 3146e39 + 5f49164
commit ff52521
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: CI
-on: push
+on: [push, pull_request]
 jobs:
 
   build:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "postcss": "^8.4.33",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.1.6",
-    "vite": "^4.5.2",
+    "vite": "^4.5.3",
     "vue-tsc": "^1.8.3"
   },
   "browserslist": [

diff --git a/src/components/Focus.vue b/src/components/Focus.vue
@@ -39,7 +39,7 @@
         <a
           class="hover:underline"
           target="_blank"
-          :href="'https://studien.rj.ost.ch/' + module.url.replace('.json', '.html')"
+          :href="'https://studien.ost.ch/' + module.url.replace('.json', '.html')"
         >{{ module.name }}
         </a>
       </li>

diff --git a/src/components/Module.vue b/src/components/Module.vue
@@ -18,7 +18,7 @@
     <a
       class="font-bold hover:underline"
       target="_blank"
-      :href="'https://studien.rj.ost.ch/' + module.url.replace('.json', '.html')"
+      :href="'https://studien.ost.ch/' + module.url.replace('.json', '.html')"
     >{{ module.name }}
     </a>
     <p>{{ module.ects }} ECTS</p>

diff --git a/src/components/PageFooter.vue b/src/components/PageFooter.vue
@@ -46,6 +46,7 @@ export default defineComponent({
         { name: "Stefanie Jäger", githubHandle: "StefanieJaeger" },
         { name: "Vina Zahnd", githubHandle: "Venyla" },
         { name: "Linus Flury", githubHandle: "CHLinusch" },
+        { name: "Marco Schneider", githubHandle: "marcoschneider" },
       ],
     },
   },

diff --git a/src/helpers/color-helper.ts b/src/helpers/color-helper.ts
@@ -1,7 +1,7 @@
 import type { Module } from '../helpers/types';
 
 const CATEGORY_COLOR_MAP: { [key: string]: string } = {
-  Auf: '#f368e0',
+  Auf: '#737373',
   MaPh: '#ee5253',
   KomEng: '#0abde3',
   gwr: '#10ac84',
@@ -10,7 +10,7 @@ const CATEGORY_COLOR_MAP: { [key: string]: string } = {
   SaBa: '#222f3e',
   EP: '#222f3e',
   RA: '#ff9f43',
-  Fallback: '#737373',
+  Fallback: '#f368e0',
 };
 
 type ColorCategoryKey = keyof typeof CATEGORY_COLOR_MAP;

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -132,7 +132,7 @@ import type {Category, Focus, Module, Semester, UnknownModule} from '../helpers/
 import {parseQuery} from "vue-router";
 import {SemesterInfo} from "../helpers/semester-info";
 
-const BASE_URL = 'https://raw.githubusercontent.com/lost-university/data/4.0/data';
+const BASE_URL = 'https://raw.githubusercontent.com/lost-university/data/4.2/data';
 const ROUTE_MODULES = '/modules.json';
 const ROUTE_CATEGORIES = '/categories.json';
 const ROUTE_FOCUSES = '/focuses.json';
@@ -283,7 +283,8 @@ export default defineComponent({
           .replace('SE1', 'SEP1')
           .replace('SE2', 'SEP2')
           .replace('NISec', 'NIoSec')
-          .replace('PFSec', 'PlFSec');
+          .replace('PFSec', 'PlFSec')
+          .replace('WIoT', 'WsoT');
 
         const [ hash, query ] = newPath.split('?');