Merge pull request #355 from bounswe/FE/design/nav-emergency

Emergency button added, navbar color changed
bounswe · Oct 19, 2023 · 757f194 · 757f194
2 parents 8086810 + 4cc1235
commit 757f194
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/Disaster-Response-Platform/frontend/.gitignore b/Disaster-Response-Platform/frontend/.gitignore
@@ -30,3 +30,4 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+**/yarn.lock
diff --git a/Disaster-Response-Platform/frontend/layouts/MainLayout.js b/Disaster-Response-Platform/frontend/layouts/MainLayout.js
@@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
 import styles from "./MainLayout.module.scss";
 import {FaMapMarkedAlt} from "react-icons/fa";
 import {BsSearch} from "react-icons/bs";
+import {Button} from "@nextui-org/react";
 import {CgProfile} from "react-icons/cg";
 function MainLayout({ children }) {
     const router = useRouter();
@@ -38,6 +39,11 @@ function MainLayout({ children }) {
                       <CgProfile size={30} />
                     </Link>
                 </nav>
+                <nav>
+                <Button color="primary" className={styles.button}>
+                    Acil Durum
+                  </Button>
+                </nav>
               </div>
 
             </div>

diff --git a/Disaster-Response-Platform/frontend/layouts/MainLayout.module.scss b/Disaster-Response-Platform/frontend/layouts/MainLayout.module.scss
@@ -11,7 +11,7 @@
 
 .navbar {
     border-bottom: 1px solid #3C4043;
-    background-color: #1C9BEF;
+    //background-color: #1C9BEF;
     min-width: 100vw;
     display: flex;
     flex-direction: row;
@@ -61,3 +61,18 @@
 }
 
 
+.button {
+    overflow:hidden;
+    border-radius: 1em;
+    white-space: nowrap;
+    border-style: none;
+    outline-offset: 0;
+    margin:0;
+    height:100%;
+    padding-left: 3em;
+    padding-right: 3em;
+    padding-top: 1em;
+    padding-bottom: 1em;
+    background-color: #e00000;
+}
+
diff --git a/Disaster-Response-Platform/frontend/package.json b/Disaster-Response-Platform/frontend/package.json
@@ -9,6 +9,8 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@nextui-org/react": "^2.1.13",
+    "framer-motion": "^10.16.4",
     "next": "13.5.4",
     "react": "18.2.0",
     "react-dom": "18.2.0",