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.

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

vinvoor: frontend version #116

Merged
merged 3 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions vinvoor/dev.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
VITE_APP_VERSION=$npm_package_version

VITE_BACKEND_URL="http://localhost:4000/api"

VITE_DEFAULT_THEME_MODE="light"
2 changes: 1 addition & 1 deletion vinvoor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vinvoor",
"type": "module",
"version": "0.1.0",
"version": "0.2.7",
"private": true,
"scripts": {
"dev": "vite",
Expand Down
2 changes: 2 additions & 0 deletions vinvoor/production.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
VITE_APP_VERSION=$npm_package_version

VITE_BACKEND_URL="https://zess.zeus.gent/api"

VITE_DEFAULT_THEME_MODE="light"
47 changes: 47 additions & 0 deletions vinvoor/public/ferris.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions vinvoor/public/react.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 34 additions & 4 deletions vinvoor/src/footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Box, Icon, Link } from "@mui/material";
import { Box, Icon, Link, Tooltip } from "@mui/material";
import { TypographyG } from "../components/TypographyG";
import { useVersion } from "../hooks/useVersion";
import FerrisIcon from "/ferris.svg";
import ReactIcon from "/react.svg";
import ZeusIcon from "/zeus.svg";

export function Footer() {
Expand All @@ -14,9 +16,37 @@ export function Footer() {
alignItems: "center",
}}
>
<TypographyG>
v
{version?.version ?? ""}
<TypographyG sx={{ display: "flex" }}>
<Tooltip title="Backend version" arrow>
<Link href="https://github.com/ZeusWPI/ZeSS/tree/main/vingo" style={{ color: "inherit" }} underline="hover">
<Icon sx={{
pr: "4px",
pl: "5px",
alignItems: "center",
overflow: "visible",
}}
>
<img src={FerrisIcon} />
</Icon>
v
{version?.version ?? ""}
</Link>
</Tooltip>
<Tooltip title="Frontend version" arrow>
<Link href="https://github.com/ZeusWPI/ZeSS/tree/main/vinvoor" style={{ color: "inherit" }} underline="hover">
<Icon sx={{
pr: "4px",
pl: "5px",
alignItems: "center",
overflow: "visible",
}}
>
<img src={ReactIcon} />
</Icon>
v
{import.meta.env.VITE_APP_VERSION}
</Link>
</Tooltip>
</TypographyG>
<TypographyG
sx={{
Expand Down
2 changes: 2 additions & 0 deletions vinvoor/template.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
VITE_APP_VERSION=$npm_package_version

VITE_BACKEND_URL=

VITE_DEFAULT_THEME_MODE=
Loading