Merge remote-tracking branch 'origin/mk6' into develop

frontend/src/Pages/posting.tsx

@@ -4,11 +4,20 @@ export default function Posting() {
     return(
         <div className="flex flex-col border-3">
             <form className="w-full items-center" >
+                <div className="flex flex-row relative">
+                    <p className="basis-4/12 place-self-center">Id</p>
+                    <p className="basis-8/12 invisible">empty</p>
+                    
+                    <button data-dropdown-toggle="dropdownId"className="basis-1/12">Theme</button>
+                    <p className="basis-1/12">city</p>
+                    <button className="basis-1/12 ">글쓰기</button>
+                    
+                </div>
                 <div className="flex border-4">
-                    <textarea placeholder="title" className="w-3/4 h-8"></textarea>
+                    <textarea placeholder="title" className="w-full h-8"></textarea>
                 </div>
                 <div className="flex border-2">
-                    <textarea placeholder="body" className="w-3/4 h-96"></textarea>
+                    <textarea placeholder="body" className="w-full h-96"></textarea>
                 </div>
             </form>
         </div>

frontend/src/pages/board.tsx

@@ -3,7 +3,6 @@ import { Link } from "react-router-dom";
 import { PostType } from "./typesrc";
 import Post from "./post";
 
-
 function range(start: number, end: number) {
     return (new Array(end - start + 1)).fill(undefined).map((_, i) => i + start);
 }

frontend/src/pages/login.tsx

 import { Link, } from "react-router-dom";
-import React from "react";
+import React, { useState } from "react";
 
+interface login {
+    id : string;
+    password : string;
 
+}
 
-export default function Login () {
+const fake = {id : "asdf", password : "qwer"}
+
+function Logindata(fake :login){
+    const [id, setId] = useState("");
+    const [password, setPassword] = useState("");
+
+
+   return( <div className="flex flex-col md:w-2/3 md:gap-2">
+
+        <input className="placeholder:text-slate-300
+            bg-white border border-slate-500 rounded-2xl
+            py-2 pl-9 pr-3 
+            focus:border-black
+            " placeholder="Id" type="text" name="Id" 
+            onChange={(e) => setId(e.target.value)} />
+        <input className="placeholder:italic placeholder:text-slate-300
+            bg-white border border-slate-500 rounded-2xl
+            py-2 pl-9 pr-3 
+            focus:border-black
+            " placeholder="Password" type="text" name="Password"
+            onChange={(e) => setPassword(e.target.value)} />
+
+    </div>
+    
+    )
+}
+
+export default function Login() {
     return (
-        
-    <div>
-        <div className="flex flex-row grid grid-rows-2">
-        
-            <div className=" p-12 w-1/2 h-1/2 md:w-40 md:h-40 bg-red-400 place-self-center rounded-2xl">
-            <Link to="/">Travel Report</Link>
-            </div>
-
-            <div className=" flex-row w-auto h-60 md:w-1/2 bg-white border-2 border-black grid place-items-center rounded-xl place-self-center">
-                
-                <div className="flex flex-col w-full  md:flex-row md:p-20 md:gap-10">
-
-                    <div className="flex flex-col md:w-2/3 md:gap-2">
-
-                        <input className="placeholder:text-slate-300
-                        bg-white border border-slate-500 rounded-2xl
-                        py-2 pl-9 pr-3 
-                        focus:border-black
-                        " placeholder="Id" type="text" name="Id"/>
-                        <input className="placeholder:italic placeholder:text-slate-300
-                        bg-white border border-slate-500 rounded-2xl
-                        py-2 pl-9 pr-3 
-                        focus:border-black
-                        " placeholder="Password" type="text" name="Password"/>
 
+        <div>
+            {/* <form onSubmit={loginsubmit}> */}
+                <div className="flex flex-row grid grid-rows-2">
+
+                    <div className=" p-12 w-1/2 h-1/2 md:w-40 md:h-40 bg-red-400 place-self-center rounded-2xl">
+                        <Link to="/">Travel Report</Link>
                     </div>
 
-                    <button className="md:w-1/3 bg-sky-600 hover:bg-sky-700 rounded-xl">
-                    login
-                    </button>
-                </div>
-                <div className="flex-row grid grid-cols-3">
-                    <button className="bg-white bottom-0 right-0">
-                        <Link to="/signup">회원가입</Link>
-                    </button>
-                    <div></div>
-                    <button className="bg-white inset-x-0">
-                        <Link to="/forgot">비밀번호 찾기</Link>
-                    </button>
+                    <div className=" flex-row w-auto h-60 md:w-1/2 bg-white border-2 border-black grid place-items-center rounded-xl place-self-center">
+
+                        <div className="flex flex-col w-full  md:flex-row md:p-20 md:gap-10">
+
+                            <Logindata id={""} password={""} />
+
+                            <button type="submit" className="md:w-1/3 bg-sky-600 hover:bg-sky-700 rounded-xl">
+                                login
+                            </button>
+                        </div>
+                        <div className="flex-row grid grid-cols-3">
+                            <button className="bg-white bottom-0 right-0">
+                                <Link to="/signup">회원가입</Link>
+                            </button>
+                            <div></div>
+                            <button className="bg-white inset-x-0">
+                                <Link to="/forgot">비밀번호 찾기</Link>
+                            </button>
+                        </div>
+                    </div>
+
+
                 </div>
-            </div>
-        
-        
-        </div>
-        
-    </div> // Login Page
+            {/* </form> */}
+        </div> // Login Page
     );
-  }
+}
\ No newline at end of file