Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/compare #3

Merged
merged 29 commits into from
Jun 13, 2024
Merged

Feature/compare #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7a4798f
Replace the data type of query from string to number
PassiDel May 23, 2024
9769096
Add download buttons to chart
PassiDel May 23, 2024
886bffd
Add some stats and first graph for degree compare
PassiDel May 23, 2024
daf45f7
Quick'n'Dirty responsiveness
PassiDel May 23, 2024
2091dff
Add mapping for keys
PassiDel May 29, 2024
84144bf
Rework useQuery to accept more options
PassiDel May 29, 2024
21d3652
Add main compare graph
PassiDel May 29, 2024
6f7eef8
Add real data (incl transformation)
PassiDel May 29, 2024
ec7f8e7
Add radar graph for degrees
PassiDel May 29, 2024
4daa96c
Minor text fixes
PassiDel May 29, 2024
0f34917
Apply first feedback after presentation
PassiDel May 30, 2024
afbe84a
Fix Feedback
PassiDel Jun 4, 2024
791bd82
Fix Feedback
PassiDel Jun 4, 2024
7d24b8d
Fix Feedback
PassiDel Jun 4, 2024
fb49f9b
Fix Feedback
PassiDel Jun 4, 2024
c57fb1d
Add HSB Font
PassiDel Jun 4, 2024
1f7c59c
Add HSB Colors as Chart.js Plugin
PassiDel Jun 4, 2024
fa18060
Start landing page
PassiDel Jun 4, 2024
1214ed4
Fix landing dpt
PassiDel Jun 4, 2024
cf0ba29
Add landing compare animation
PassiDel Jun 4, 2024
15f4388
Fix wording
PassiDel Jun 5, 2024
94f6c48
Add icon for new and old degrees
PassiDel Jun 5, 2024
09ae5db
Add playbar
PassiDel Jun 5, 2024
a04c9dd
Update stats for degrees based on selected year
PassiDel Jun 5, 2024
021fced
Responsive fixes
PassiDel Jun 5, 2024
0d4dea2
Logo
PassiDel Jun 6, 2024
cd7f484
Add degree history for gender
PassiDel Jun 6, 2024
91cef0c
Add degree history for foreign/german
PassiDel Jun 6, 2024
45fdfb1
Add HSB as comparison
PassiDel Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="de">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
Expand Down
15 changes: 15 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
43 changes: 32 additions & 11 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Loading