Merge pull request #95 from JimTheCat/CU-8696pcz16_Create-matching-pa…

…ge_Patryk-Kosiski Cu 8696pcz16 create matching page patryk kosiski
JimTheCat · Jan 5, 2025 · 7102085 · 7102085
2 parents 0af0695 + 6613c36
commit 7102085
Show file tree

Hide file tree

Showing 35 changed files with 1,079 additions and 75 deletions.
diff --git a/frontend/index.html b/frontend/index.html
@@ -5,6 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MeowHub</title>
+    <script async defer
+            src="https://maps.googleapis.com/maps/api/js?key=%VITE_GOOGLE_PLACES_API_KEY%&libraries=places"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -11,13 +11,14 @@
     "test": "jest"
   },
   "dependencies": {
-    "@mantine/core": "^7.15.1",
-    "@mantine/dates": "^7.15.1",
-    "@mantine/form": "^7.15.1",
-    "@mantine/hooks": "^7.15.1",
-    "@mantine/modals": "^7.15.1",
-    "@mantine/notifications": "^7.15.1",
-    "@mantine/tiptap": "^7.15.1",
+    "@mantine/carousel": "^7.15.2",
+    "@mantine/core": "^7.15.2",
+    "@mantine/dates": "^7.15.2",
+    "@mantine/form": "^7.15.2",
+    "@mantine/hooks": "^7.15.2",
+    "@mantine/modals": "^7.15.2",
+    "@mantine/notifications": "^7.15.2",
+    "@mantine/tiptap": "^7.15.2",
     "@tabler/icons-react": "^3.23.0",
     "@tiptap/extension-highlight": "^2.10.0",
     "@tiptap/extension-link": "^2.10.0",
@@ -31,6 +32,7 @@
     "@tiptap/starter-kit": "^2.10.0",
     "axios": "^1.7.9",
     "dayjs": "^1.11.13",
+    "embla-carousel-react": "^7.1.0",
     "i18next": "^23.16.1",
     "jwt-decode": "^4.0.0",
     "react": "^18.3.1",

diff --git a/frontend/src/Features/CreatePost/CreatePost.tsx b/frontend/src/Features/CreatePost/CreatePost.tsx
@@ -20,7 +20,12 @@ export const CreatePost = () => {
     const contentToSave = contentRef.current;
     console.log('Create post: ', contentToSave);
     if (!contentToSave) {
-      alert.showError('Post is empty!');
+      alert.showError({
+        title: 'Error',
+        message: 'Content is empty',
+        level: 'WARNING',
+        timestamp: new Date().toISOString()
+      });
       return;
     }
 

diff --git a/frontend/src/Features/Matching/Matching.tsx b/frontend/src/Features/Matching/Matching.tsx
@@ -0,0 +1,26 @@
+import {AppShell} from "@mantine/core";
+import {Aside} from "./components/Aside";
+import React from "react";
+import {Main} from "./components/Main";
+
+type MatchingProps = {
+  component?: React.ReactNode;
+}
+
+export const Matching = (props: MatchingProps) => {
+  return (
+    <AppShell
+      aside={{
+        breakpoint: 0,
+        width: 300
+      }}
+    >
+      <AppShell.Aside withBorder={false}>
+        <Aside/>
+      </AppShell.Aside>
+      <AppShell.Main p={0}>
+        {props.component ? props.component : <Main/>}
+      </AppShell.Main>
+    </AppShell>
+  );
+}
diff --git a/frontend/src/Features/Matching/components/Aside/Aside.tsx b/frontend/src/Features/Matching/components/Aside/Aside.tsx
@@ -0,0 +1,23 @@
+import {AppShell, Card, ScrollArea, Title} from "@mantine/core";
+import {MenuButton} from "../../../shared/components/MenuButton";
+import {IconFilterHeart, IconHeartHandshake, IconNotes, IconSettingsHeart, IconUserHeart} from "@tabler/icons-react";
+
+export const Aside = () => {
+  const iconStroke = 1.5;
+  const base = '/matching';
+
+  return (
+    <Card radius={'md'} mt={"lg"} p={"sm"} w={'90%'} withBorder>
+      <Title order={2} mb={'xs'}>
+        Matching
+      </Title>
+      <AppShell.Section component={ScrollArea}>
+        <MenuButton icon={<IconHeartHandshake stroke={iconStroke}/>} text={'Meowknij'} href={base}/>
+        <MenuButton icon={<IconUserHeart stroke={iconStroke}/>} text={'Profil'} href={base + '/profile'}/>
+        <MenuButton icon={<IconFilterHeart stroke={iconStroke}/>} text={'Filtry'} href={base + '/filters'}/>
+        <MenuButton icon={<IconNotes stroke={iconStroke}/>} text={'Moje testy'} href={base + '/tests'}/>
+        <MenuButton icon={<IconSettingsHeart stroke={iconStroke}/>} text={'Ustawienia'} href={base + '/settings'}/>
+      </AppShell.Section>
+    </Card>
+  );
+}
diff --git a/frontend/src/Features/Matching/components/Aside/index.tsx b/frontend/src/Features/Matching/components/Aside/index.tsx
@@ -0,0 +1 @@
+export {Aside} from './Aside';