Skip to content

Commit f10008e

Browse files
authored
Merge pull request #62 from JimTheCat/CU-8696pcytb_Create-settings_Patryk-Kosiski
Cu 8696pcytb create settings patryk kosiski
2 parents b4f9a82 + a051933 commit f10008e

File tree

31 files changed

+470
-16
lines changed

31 files changed

+470
-16
lines changed

frontend/package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@mantine/form": "^7.14.1",
1717
"@mantine/hooks": "^7.14.1",
1818
"@mantine/tiptap": "^7.14.1",
19-
"@tabler/icons-react": "^3.22.0",
19+
"@tabler/icons-react": "^3.23.0",
2020
"@tiptap/extension-highlight": "^2.10.0",
2121
"@tiptap/extension-link": "^2.10.0",
2222
"@tiptap/extension-placeholder": "^2.10.2",
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import {ActionIcon, Box, Stack, Text} from "@mantine/core";
2+
import {IconX} from "@tabler/icons-react";
3+
4+
export const Escape = () => {
5+
return (
6+
<Box pos={"absolute"} top={20} right={30}>
7+
<Stack align={"center"} justify={"center"} gap={2}>
8+
<ActionIcon
9+
p={"xs"}
10+
variant={"outline"}
11+
size={"xl"}
12+
aria-label={"Close"}
13+
color={"gray"}
14+
radius={"xl"}
15+
// Back to previous page
16+
onClick={() => window.history.back()}
17+
>
18+
<IconX stroke={1}/>
19+
</ActionIcon>
20+
<Text>Esc</Text>
21+
</Stack>
22+
</Box>
23+
);
24+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './Escape';

frontend/src/Components/Navbar/Navbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const Navbar = () => {
6868
<MenuButton icon={<IconMail/>} text={"Wiadomości"} href={"placeholder6"}/>
6969
</Box>
7070
<Box>
71-
<MenuButton icon={<IconSettings/>} text={"Ustawienia"}/>
71+
<MenuButton icon={<IconSettings/>} text={"Ustawienia"} href={"/settings"}/>
7272
<MenuButton icon={<IconLogout/>} text={"Wyloguj się"}/>
7373
</Box>
7474
</Stack>

frontend/src/Pages/Root/Root.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,23 @@ import {Recovery} from "../Recovery";
88
import {Profile} from "../Profile";
99
import {Search} from "../Search";
1010
import {Post} from "../Post";
11+
import {Settings} from "../Settings";
1112

1213
export const Root = () => {
13-
return(
14+
return (
1415
<Routes>
15-
<Route path="/" element={ <Login/> }/>
16-
<Route path="/register" element={ <Register/>} />
17-
<Route path="/passwordrecovery" element={ <Recovery/>} />
16+
<Route path="/" element={<Login/>}/>
17+
<Route path="/register" element={<Register/>}/>
18+
<Route path="/passwordrecovery" element={<Recovery/>}/>
1819
<Route element={<Layout/>}>
19-
<Route path="/mainpage" element={ <MainPage/> }/>
20+
<Route path="/mainpage" element={<MainPage/>}/>
2021
<Route path="/search" element={<Search/>}/>
2122
<Route path="/profile/:userTag" element={<Profile/>}/>
2223
<Route path="/createpost" element={<Post/>}/>
2324
</Route>
24-
<Route path="*" element={ <NotFound/> }/>
25+
<Route path="/settings" element={<Settings/>}/>
26+
27+
<Route path="*" element={<NotFound/>}/>
2528
</Routes>
2629
);
2730
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export const About = () => {
2+
return (
3+
<div>
4+
{/* About */}
5+
<p>About content goes here</p>
6+
</div>
7+
);
8+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './About';
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export const Accessibility = () => {
2+
return (
3+
<div>
4+
{/* Accessibility */}
5+
<p>Accessibility content goes here</p>
6+
</div>
7+
);
8+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './Accessibility';

0 commit comments

Comments
 (0)