Merge pull request #33 from yukikamome316/feat/design

feat/ヘッダー仮
saitamau-maximum · Dec 2, 2024 · 76a09d1 · 76a09d1
2 parents 4c2809e + 0e2dd15
commit 76a09d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/client/src/App.css b/client/src/App.css
@@ -5,6 +5,22 @@
   text-align: center;
 }
 
+header {
+  width: 100%;
+  height: 10%;
+  background: #ffffff;
+  padding: 20px 50px;
+  box-sizing: border-box;
+  position: fixed;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+  z-index: 10;
+}
+
 .logo {
   height: 6em;
   padding: 1.5em;

diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -9,9 +9,11 @@ function App() {
   return (
     <div className="App">
       <BrowserRouter>
-        <Link to="/signup">Signup</Link> | <Link to="/signin">Signin</Link> |{" "}
-        <Link to="/dashboard">Dashboard</Link> |{" "}
-        <Link to="/Register">Register</Link>
+        <header>
+          <Link to="/signup">Signup</Link> | <Link to="/signin">Signin</Link> |{" "}
+          <Link to="/dashboard">Dashboard</Link> |{" "}
+          <Link to="/Register">Register</Link>
+        </header>
         <Routes>
           <Route path="/" element={<Dashboard />} />
           <Route path="/dashboard" element={<Dashboard />} />

diff --git a/server/database.db b/server/database.db