Merge pull request #3 from PassiDel/feature/compare

Feature/compare
PassiDel · Jun 13, 2024 · 575048c · 575048c · vercel · Jun 13, 2024
2 parents 49f50f2 + 45fdfb1
commit 575048c
Show file tree

Hide file tree

Showing 34 changed files with 93,934 additions and 229 deletions.
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="de">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,8 +15,10 @@
     "check-all": "run-p check type-check lint --"
   },
   "dependencies": {
+    "@fontsource/zilla-slab": "^5.0.13",
     "@vuestic/tailwind": "^0.1.5",
     "chart.js": "^4.4.2",
+    "chartjs-plugin-annotation": "^3.0.1",
     "pinia": "^2.1.7",
     "vue": "^3.4.21",
     "vue-chartjs": "^5.3.1",

diff --git a/src/App.vue b/src/App.vue
@@ -1,20 +1,37 @@
 <script setup lang="ts">
 import { RouterLink, RouterView } from 'vue-router';
+import logo from '@/assets/logo_hsb_startseite.svg';
 </script>
 
 <template>
-  <VaLayout :top="{ fixed: true, order: 2 }">
+  <VaLayout :top="{ fixed: true, order: 2 }" class="h-dvh">
     <template #top>
-      <VaNavbar color="secondary">
-        <template #left>
-          <img alt="HSB logo" src="@/assets/hsb.png" class="m-[-20px] h-32" />
-        </template>
+      <VaNavbar class="test">
+        <template #left
+          ><RouterLink to="/" class="flex flex-row text-white"
+            ><img :src="logo" class="h-10" alt="Logo HSB" /><span
+              class="my-auto"
+              >Die Hochschule in Zahlen!</span
+            ></RouterLink
+          ></template
+        >
         <template #right>
-          <div class="flex gap-4">
-            <RouterLink to="/">Home</RouterLink>
-            <RouterLink to="/compare">Vergleich</RouterLink>
-            <RouterLink to="/faculty">Fakultäten</RouterLink>
-            <RouterLink to="/university">Ganze Hochschule</RouterLink>
+          <div class="flex flex-col gap-2 text-white md:flex-row md:gap-4">
+            <RouterLink to="/" activeClass="font-bold" class="hover:underline"
+              >Start</RouterLink
+            >
+            <RouterLink
+              to="/compare"
+              activeClass="font-bold"
+              class="hover:underline"
+              >Vergleich</RouterLink
+            >
+            <RouterLink
+              to="/graph"
+              activeClass="font-bold"
+              class="hover:underline"
+              >Alles</RouterLink
+            >
           </div>
         </template>
       </VaNavbar>
@@ -25,4 +42,8 @@ import { RouterLink, RouterView } from 'vue-router';
   </VaLayout>
 </template>
 
-<style scoped></style>
+<style scoped>
+.test {
+  background: linear-gradient(to right, rgb(10, 85, 140), rgb(50, 180, 200));
+}
+</style>