Merge remote-tracking branch 'origin/master' into seoyeon2

client/src/apis/endpoints.js

-const endpoints = {
-  API_BASE_URL: "https://localhost:8080/api",
-  HOME_API: "",
-  ROOM_API: "room",
-  PROFILE_API: "profile",
-};
-
-export default endpoints;

client/src/apis/profile.api.js

+import axios from "axios";
+
+const login = async (payload) => {
+  const { data } = await axios.post("/api/login", payload);
+  return data;
+};
+
+const signup = async (payload) => {
+  const { data } = await axios.post("/api/signup", payload);
+  return data;
+};
+
+const profileApi = { login, signup };
+
+export default profileApi;

client/src/apis/room.api.js

+import axios from "axios";
+
+const login = async (payload) => {
+  const { data } = await axios.post("/api/login", payload);
+  return data;
+};
+
+const signup = async (payload) => {
+  const { data } = await axios.post("/api/signup", payload);
+  return data;
+};
+
+const roomApi = { login, signup };
+
+export default roomApi;

client/src/apis/user.api.js

 import axios from "axios";
-import endpoints  from "./endpoints";
 
-const login = async (email, password) => {
-  const payload = { email, password };
-  const { data } = await axios.post(`${endpoints.API_BASE_URL}/`, payload);
+const login = async (payload) => {
+  const { data } = await axios.post("/api/login", payload);
   return data;
 };
 

client/src/components/Header.js

@@ -7,7 +7,7 @@ const Header = () => {
         className="flex-column align-items-center justify-content-center p-2"
       >
         <div className="d-flex justify-content-center">
-          <Link to="/user">
+          <Link to="/">
             <img src="/BORA.png" style={{ width: '160px' }} />
           </Link>
         </div>

client/src/components/Login.js

 import { useEffect, useState } from "react";
-import login from "../apis/user.api";
+import { Redirect } from "react-router-dom";
+import userApi from "../apis/user.api";
 const INIT_USER = {
   email: "",
   password: "",
@@ -20,22 +21,25 @@ const Login = () => {
   function handleChange(event) {
     const { name, value } = event.target;
     setUser({ ...user, [name]: value });
-    console.log(user);
   }
 
-  async function handleSubmit() {
+  async function handleSubmit(e) {
+    e.preventDefault();
     try {
       // setLoading(true);
       // setError("");
-      const success = await login(user.email, user.password);
-      console.log(user);
-      setSuccess(success);
+      const data = await userApi.login(user);
+      console.log(data);
+      setSuccess(true);
     } catch (error) {
       // catchErrors(error, setError);
     } finally {
       // setLoading(false);
     }
   }
+  if (success) {
+    return <Redirect to="/user" />;
+  }
 
   if (success) {
     alert('로그인 되었습니다')

client/src/components/Room/ChannelList.js

@@ -4,13 +4,6 @@ import LeftHamberger from './LeftHamberger';
 import RightHamberger from './RightHamberger';
 
 const ChannelList = () => {
-  const [admin, setAdmin] = useState('true')
-
-  // function copytoClipboard() {
-  //   const [code, setCode] = useState()
-  //   const roomcode = document.getElementById("textarea")
-  //   alert("코드를 복사하였습니다.")
-  // }
   return (
     <div>
       <nav className="navbar navbar-light d-flex justify-content-between">

client/src/components/Room/LeftHamberger.js

-import backward from '../../backward.png'
-import ChannelSingle from './ChannelSingle'
+import backward from "../../backward.png";
+import ChannelSingle from "./ChannelSingle";
 
 const LeftHamberger = () => {
   function roomIdCopy() {
-        const t = document.querySelector('#roomId').innerText;
-        console.log(t)
+    const t = document.querySelector("#roomId").innerText;
+    console.log(t);
     navigator.clipboard.writeText(t);
-        document.execCommand('copy');
+    //document.execCommand("copy");
   }
   return (
     <div>
@@ -19,16 +19,15 @@ const LeftHamberger = () => {
           aria-controls="left-hamburger"
           aria-expanded="false"
           aria-label="Toggle navigation"
-                    style={{ border: '#f4c1f2' }}
+          style={{ border: "#f4c1f2" }}
         >
           <span className="navbar-toggler-icon"></span>
         </button>
       </div>
 
-
       <div
         className="offcanvas offcanvas-start"
-                style={{ width: '330px' }}
+        style={{ width: "330px" }}
         tabIndex="-1"
         id="left-hamburger"
         aria-labelledby="hamburgerLabel"
@@ -38,15 +37,18 @@ const LeftHamberger = () => {
             className="col-6 offcanvas-title"
             id="offcanvasExampleLabel"
             style={{
-                            fontWeight: 'bold',
-                            fontSize: '15px',
-                            width: '150px',
-                            color: '#000000',
+              fontWeight: "bold",
+              fontSize: "15px",
+              width: "150px",
+              color: "#000000",
             }}
           >
             온/오프라인 사용자
           </p>
-                    <h6 className="mt-2" id="roomId" > #ASV2AE985 </h6>
+          <h6 className="mt-2" id="roomId">
+            {" "}
+            #ASV2AE985{" "}
+          </h6>
           <button
             type="button"
             className="btn-close text-reset"
@@ -54,26 +56,26 @@ const LeftHamberger = () => {
             aria-label="Close"
           ></button>
         </div>
-                <div className="overflow-auto" style={{ height: '610px' }}>
+        <div className="overflow-auto" style={{ height: "610px" }}>
           <div className="mb-3">
             <div className="m-3 p-1 row" style={{ backgroundColor: "#E0CEE8" }}>
               <h5 className="col mt-2">온라인 사용자</h5>
             </div>
-                        <ul className="mx-5" style={{ marker: "#2e873a" }}>
-                            <li className="marker: #2e873a" style={{ markerColor: "2px #2e873a" }}>
-                                CHERRY
+            <ul className="mx-5" style={{ color: "#76D079" }}>
+              <li>
+                <p style={{ color: "black" }}>CHERRY</p>
               </li>
               <li>
-                                JAEYEON
+                <p style={{ color: "black" }}>JAEYEON</p>
               </li>
               <li>
-                                SEOYEON
+                <p style={{ color: "black" }}>SEOYEON</p>
               </li>
               <li>
-                                JIWEON
+                <p style={{ color: "black" }}>JIWEON</p>
               </li>
               <li>
-                                BYOUNGYUN
+                <p style={{ color: "black" }}>BYOUNGYUN</p>
               </li>
             </ul>
           </div>
@@ -83,21 +85,11 @@ const LeftHamberger = () => {
               <h5 className="col mt-2">오프라인 사용자</h5>
             </div>
             <ul className="mx-5">
-                            <li>
-                                CHERRY
-                            </li>
-                            <li>
-                                JAEYEON
-                            </li>
-                            <li>
-                                SEOYEON
-                            </li>
-                            <li>
-                                JIWEON
-                            </li>
-                            <li>
-                                BYOUNGYUN
-                            </li>
+              <li>CHERRY</li>
+              <li>JAEYEON</li>
+              <li>SEOYEON</li>
+              <li>JIWEON</li>
+              <li>BYOUNGYUN</li>
             </ul>
           </div>
         </div>
@@ -110,11 +102,11 @@ const LeftHamberger = () => {
               data-bs-toggle="modal"
               data-bs-target="#exitRoom"
               style={{
-                                height: '30px',
-                                fontWeight: 'bold',
-                                backgroundColor: '#E0CEE8',
-                                color: 'black',
-                                border: '1px #D64D61',
+                height: "30px",
+                fontWeight: "bold",
+                backgroundColor: "#E0CEE8",
+                color: "black",
+                border: "1px #D64D61",
               }}
             >
               초대
@@ -164,10 +156,9 @@ const LeftHamberger = () => {
             </div>
           </div>
         </div>
-
       </div>
-        </div >
-    )
-}
+    </div>
+  );
+};
 
-export default LeftHamberger
+export default LeftHamberger;
\ No newline at end of file

client/src/components/SignUp.js

+import axios from "axios";
 import { useEffect, useState } from "react";
 
 const INIT_USER = {
   name: "",
   idNumber1: "",
   idNumber2: "",
-  id: "",
+  email: "",
   password: "",
   checkpw: "",
   phone: "",
@@ -22,7 +23,7 @@ const Signup = () => {
         user.name &&
         user.idNumber1 &&
         user.idNumber2 &&
-        user.id &&
+        user.email &&
         user.password &&
         user.checkpw
       )
@@ -37,10 +38,11 @@ const Signup = () => {
 
   async function handleSubmit() {
     try {
+      const data = await axios.post("https://localhost:8080/api/room/1/1",user)
       // setLoading(true);
       // setError("");
       //   const success = await login(user.email, user.password);
-      console.log(user);
+      console.log(data);
       setSuccess(success);
     } catch (error) {
       // catchErrors(error, setError);
@@ -118,9 +120,9 @@ const Signup = () => {
             <label className="p-1">아이디</label>
             <input
               className="form-control"
-              id="id"
+              id="text"
               type="text"
-              name="id"
+              name="email"
               placeholder="아이디를 입력하세요"
               value={id}
               onChange={handleChange}

controllers/room.controller.js

 import { Room } from "../models/index.js";
-import config from "../config/app.config.js";
 
-const login = async (req, res) => {
+const test = async (req, res) => {
   try {
-    console.log("login= ", req.body);
+    console.log("room= ", req.body);
     res.json("안녕");
   } catch (error) {
     console.log(error);
@@ -12,5 +11,5 @@ const login = async (req, res) => {
 };
 
 export default {
-  login,
+  test,
 };

controllers/user.controller.js

 import { User } from "../models/index.js";
+import jwt from "jsonwebtoken";
 import config from "../config/app.config.js";
 import isLength from 'validator/lib/isLength.js'
 import bcrypt from "bcryptjs";
 
+const test = async (req, res) => {
+  try {
+    console.log(req);
+    res.json("안녕");
+  } catch (error) {
+    console.log(error);
+    return res.status(500).send("test 중 에러");
+  }
+};
+
 const login = async (req, res) => {
   try {
     console.log("login= ", req.body);
     const { email, password } = req.body;
-    const user = await User.scope("password").findOne({ where: email });
+    const user = await User.findOne({ where: { email: email } });
     if (!user)
       return res.status(422).send(`${email} 사용자가 존재하지 않습니다.`);
 
@@ -33,6 +44,7 @@ const login = async (req, res) => {
 
 const signup = async (req, res) => {
   try {
+<<<<<<< HEAD
     console.log('signup= ', req.body);
     const { name, password, id } = req.body; 
     if (!isLength(name, {min: 3, max: 10})) {
@@ -59,7 +71,23 @@ const signup = async (req, res) => {
     return res.status(500).send("회원가입 중 에러")
   }
 }
+=======
+    console.log("sign up= ", req.body);
+    const { id, name, email, password, gender, phone } = req.body;
+    const user = User.create({ id, name, email, password, gender, phone });
+  } catch (error) {
+    console.log(error);
+    return res.status(500).send("회원가입 중 에러");
+  }
+};
+
+>>>>>>> origin/master
 export default {
+  test,
   login,
+<<<<<<< HEAD
   signup
+=======
+  signup,
+>>>>>>> origin/master
 };

index.js

@@ -14,13 +14,13 @@ sequelize
   .sync({ force: true })
   .then(async () => {
     console.log(" DB 연결 성공");
-    // await User.create({
-    //   id: 0,
-    //   name: "admin",
-    //   email: "admin",
-    //   password: "admin!",
-    //   gender: 0,
-    // });
+    await User.create({
+      id: 9999,
+      name: "admin",
+      email: "admin",
+      password: "admin!",
+      gender: 0,
+    });
 
     app.listen(appConfig.port, () => {
       console.log(`Server is running on port ${appConfig.port}`);

models/index.js

@@ -16,4 +16,6 @@ const sequelize = new Sequelize(
 const User = UserModel(sequelize);
 const Room = RoomModel(sequelize);
 
+User.hasMany(Room);
+
 export { sequelize, User, Room };

routes/room.route.js

@@ -3,6 +3,6 @@ import roomCrtl from "../controllers/room.controller.js";
 
 const router = express.Router();
 
-router.route("/").get(roomCrtl.login);
+router.route("/").post(roomCrtl.test);
 
 export default router;

routes/user.route.js

@@ -3,7 +3,8 @@ import userCtrl from "../controllers/user.controller.js";
 
 const router = express.Router();
 
-router.route("/").post(userCtrl.login);
+router.route("/login").post(userCtrl.login);
+router.route("/signup").post(userCtrl.signup);
 
 router.route("/").post(userCtrl.signup);
 export default router;