Skip to content

Commit a83a59a

Browse files
stampaaaronstampaaaron
committed
chore: rebrand quassel to LEMON
1 parent cc02acd commit a83a59a

File tree

12 files changed

+102
-55
lines changed

12 files changed

+102
-55
lines changed

‎apps/backend/db/seeds/DatabaseSeeder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ export class DatabaseSeeder extends Seeder {
1818
{
1919
role: UserRole.ADMIN,
2020
email: "admin@example.com",
21-
password: await getPasswordHash("Quassel*1234"),
21+
password: await getPasswordHash("Lemon*1234"),
2222
},
2323
{
2424
role: UserRole.ASSISTANT,
2525
email: "assistant@example.com",
26-
password: await getPasswordHash("Quassel*1234"),
26+
password: await getPasswordHash("Lemon*1234"),
2727
},
2828
];
2929

‎apps/frontend/index.html

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Quassel</title>
7-
<link rel="icon" href="/favicon.ico" />
8-
<style>
9-
html {
10-
height: 100%;
11-
}
123

13-
body {
14-
margin: 0;
15-
padding: 0;
16-
min-height: 100%;
17-
}
4+
<head>
5+
<meta charset="UTF-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<title>Lemon</title>
8+
<link rel="icon" href="/favicon.ico" />
9+
<style>
10+
html {
11+
height: 100%;
12+
}
1813

19-
#root {
20-
min-height: 100%;
21-
}
22-
</style>
23-
<script type="text/javascript">
24-
window.env = {
25-
apiUrl: '//REPLACE_WITH_API_URL'
26-
};
27-
</script>
28-
</head>
29-
<body>
30-
<div id="root"></div>
31-
<script type="module" src="/src/main.tsx"></script>
32-
</body>
33-
</html>
14+
body {
15+
margin: 0;
16+
padding: 0;
17+
min-height: 100%;
18+
}
19+
20+
#root {
21+
min-height: 100%;
22+
}
23+
</style>
24+
<script type="text/javascript">
25+
window.env = {
26+
apiUrl: '//REPLACE_WITH_API_URL'
27+
};
28+
</script>
29+
</head>
30+
31+
<body>
32+
<div id="root"></div>
33+
<script type="module" src="/src/main.tsx"></script>
34+
</body>
35+
36+
</html>

‎apps/frontend/src/routes/__root.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
IconCalendarWeek,
1616
IconMapSearch,
1717
Divider,
18+
FooterLogos,
1819
} from "@quassel/ui";
1920
import { createRootRouteWithContext, Link, Outlet, useNavigate } from "@tanstack/react-router";
2021
import { TanStackRouterDevtools } from "@tanstack/router-devtools";
@@ -49,7 +50,7 @@ function Root() {
4950
return (
5051
<>
5152
<AppShell
52-
header={{ height: 118 }}
53+
header={{ height: 104 }}
5354
footer={{ height: 84 }}
5455
navbar={{ width: 300, breakpoint: "sm", collapsed: { desktop: !layoutStore.admin } }}
5556
padding="xl"
@@ -63,7 +64,7 @@ function Root() {
6364
{sessionStore.email && (
6465
<Group>
6566
<Text>{sessionStore.email}</Text>
66-
<Button leftSection={<IconLogout />} onClick={handleSignOut}>
67+
<Button variant="outline" leftSection={<IconLogout />} onClick={handleSignOut}>
6768
Sign out
6869
</Button>
6970
</Group>
@@ -91,10 +92,16 @@ function Root() {
9192
<NavLink component={Link} to="/administration/users" leftSection={<IconUsers />} label="Users" />
9293
</AppShell.Navbar>
9394
)}
95+
9496
<AppShell.Main>
9597
<Outlet />
9698
</AppShell.Main>
97-
<AppShell.Footer>Version {version}</AppShell.Footer>
99+
<AppShell.Footer>
100+
<Group justify="space-between">
101+
<FooterLogos />
102+
Version {version}
103+
</Group>
104+
</AppShell.Footer>
98105
</AppShell>
99106
<TanStackRouterDevtools position="top-left" />
100107
</>

‎apps/frontend/src/sections/HeroSection.module.css

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818

1919
}
2020

21-
.control {
22-
}
23-
2421
.highlight {
2522
position: relative;
26-
background-color: var(--mantine-color-blue-light);
23+
background-color: var(--mantine-primary-color-light);
2724
border-radius: var(--mantine-radius-sm);
2825
padding: rem(4px) rem(12px);
29-
}
26+
}

‎apps/frontend/src/sections/HeroSection.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useStore } from "@nanostores/react";
66
import { Link } from "@tanstack/react-router";
77

88
const messages = i18n("heroSection", {
9-
title: "Quassel",
9+
title: "LEMON",
1010
subtitle: "Gather language exposure",
1111
toFormAction: "Questionnaire",
1212
toAdminAction: "Administration",
@@ -22,7 +22,7 @@ export function HeroSection() {
2222
<span className={classes.highlight}>{t.title}</span>
2323
</Title>
2424
<Text c="dimmed" mt="md">
25-
{t.subtitle}
25+
<b>L</b>anguage <b>E</b>xposure questionnaire for <b>M</b>ultilinguals <b>On</b>line
2626
</Text>
2727

2828
<Group mt={30}>
@@ -34,7 +34,7 @@ export function HeroSection() {
3434
</Button>
3535
</Group>
3636
</div>
37-
<img src={image} alt="Quassel family" className={classes.image} />
37+
<img src={image} alt="Lemon family" className={classes.image} />
3838
</div>
3939
</Container>
4040
);

‎libs/ui/src/assets/KleineWeltentdeckerLogo.png

180 KB
Loading

‎libs/ui/src/assets/Logo.svg

Lines changed: 12 additions & 0 deletions
Loading

‎libs/ui/src/components/Logo.svg renamed to ‎libs/ui/src/assets/UZHLogo.svg

File renamed without changes.

‎libs/ui/src/components/Brand.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { Divider, Group, Text } from "@mantine/core";
2-
import Logo from "./Logo.svg?react";
1+
import { Group, Stack, Title } from "@mantine/core";
2+
import Logo from "../assets/Logo.svg?react";
33

44
export function Brand() {
55
return (
6-
<Group gap={30}>
6+
<Group className="quassel-Brand" gap="md">
77
<Logo className="quassel-Logo" />
8-
<Divider orientation="vertical" />
9-
<Text size="xl" fw={600} c="black">
10-
Quassel
11-
</Text>
8+
<Stack gap={0}>
9+
<Title order={2} c="black">
10+
LEMON
11+
</Title>
12+
</Stack>
1213
</Group>
1314
);
1415
}

‎libs/ui/src/components/FooterLogos.tsx

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { Group } from "@mantine/core";
2+
import UZHLogo from "../assets/UZHLogo.svg?react";
3+
import KleineWeltentdeckerLogo from "../assets/KleineWeltentdeckerLogo.png";
4+
5+
export function FooterLogos() {
6+
return (
7+
<Group>
8+
<a href="https://uzh.ch">
9+
<UZHLogo />
10+
</a>
11+
<a href="https://www.psychologie.uzh.ch/de/bereiche/dev/devpsy/Weltentdecker.html">
12+
<img src={KleineWeltentdeckerLogo} height={50} />
13+
</a>
14+
</Group>
15+
);
16+
}

0 commit comments

Comments
 (0)