diff --git a/client/src/apis/room.api.js b/client/src/apis/room.api.js index 1ed7a59dfd7f5ce96a06d916267e90d5c10a4a9c..8c243143dc9daa6f35bcc14ae57a7b0652b4ad83 100644 --- a/client/src/apis/room.api.js +++ b/client/src/apis/room.api.js @@ -37,6 +37,13 @@ const doubleJoin = async (payload) => { return data; }; +const removeRoom = async (ID)=>{ + const { data } = await axios.delete( + `/api/room/removeRoom/${ID.roomId}` + ); + return data; +} + // const makeChannel = async (payload) => { // const { data } = await axios.post("/api/room/makeChannel", payload); // return data; @@ -50,6 +57,7 @@ const roomApi = { changename, joinChannel, doubleJoin, + removeRoom }; export default roomApi; diff --git a/client/src/components/Header.js b/client/src/components/Header.js index 75d35c6ed956fb1a2d2abf8f67fca4c8663debaf..52e4e69f81421021a7cccef3d808e03181f6c2b7 100644 --- a/client/src/components/Header.js +++ b/client/src/components/Header.js @@ -2,7 +2,7 @@ import { Link } from 'react-router-dom' import { handleLogout } from '../context/auth' const Header = () => { - const id = localStorage.getItem('user'); + const id = sessionStorage.getItem('user'); return (
{ const [roomId, setRoomId] = useState(""); diff --git a/client/src/components/Home/RoomSingle.js b/client/src/components/Home/RoomSingle.js index 1737dba4c834e12c54ca8f277ea64958c9c991ac..9c0b69a17a3bdafcbf6698d2dbe8953941c3a905 100644 --- a/client/src/components/Home/RoomSingle.js +++ b/client/src/components/Home/RoomSingle.js @@ -4,7 +4,7 @@ import roomApi from "../../apis/room.api"; import userApi from "../../apis/user.api"; import catchErrors from "../../context/catchError"; -const id = localStorage.getItem("user"); +const id = sessionStorage.getItem("user"); const INIT_ROOM = { roomId: "", name: "", diff --git a/client/src/components/KakaoShareButton.js b/client/src/components/KakaoShareButton.js index c941312d962e32d6568acea5760d52db445ea746..42469b0e80fb1e97b2f3fc84b208ee9ed395f042 100644 --- a/client/src/components/KakaoShareButton.js +++ b/client/src/components/KakaoShareButton.js @@ -13,7 +13,7 @@ const KakaoShareButton = (porps) => { const [inviteperson, setProfile] = useState(INIT_invite); const [error, setError] = useState(""); const { roomId } = useParams(); - const invitepersonId = localStorage.getItem("user"); + const invitepersonId = sessionStorage.getItem("user"); async function getProfile(userID) { try { diff --git a/client/src/components/Login.js b/client/src/components/Login.js index 3d07a3299845e82accf888e6ef787fd6d338b7ea..53f598c457405c5b1f514fd08a56e016f8fc02e5 100644 --- a/client/src/components/Login.js +++ b/client/src/components/Login.js @@ -46,7 +46,7 @@ const Login = () => { } if (success) { alert('로그인 되었습니다') - return ; + window.location.href=`/user/${id}` } const { email, password } = user diff --git a/client/src/components/Profile/Info.js b/client/src/components/Profile/Info.js index ed54fce8c750bba6c595642e12edf2b31373e779..a89d3df3517d3ac5cbce2cd656475f3277ba7621 100644 --- a/client/src/components/Profile/Info.js +++ b/client/src/components/Profile/Info.js @@ -2,7 +2,7 @@ import userApi from "../../apis/user.api"; import { useEffect, useState } from "react"; import catchErrors from "../../context/catchError"; -const userprofile = localStorage.getItem("user"); +const userprofile = sessionStorage.getItem("user"); const INIT_PROFILE = { name: "", email: "a", diff --git a/client/src/components/Profile/InfoUpdate.js b/client/src/components/Profile/InfoUpdate.js index b0637080e62e3ac5fbf57323e21376af96956b45..cebe222ffc719a7fa259a7de1df157d429ca85ab 100644 --- a/client/src/components/Profile/InfoUpdate.js +++ b/client/src/components/Profile/InfoUpdate.js @@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react"; import userApi from "../../apis/user.api"; import catchErrors from "../../context/catchError"; -const userprofile = localStorage.getItem("user"); +const userprofile = sessionStorage.getItem("user"); const INIT_PROFILE = { id: userprofile, name:"", diff --git a/client/src/components/Profile/Profile.js b/client/src/components/Profile/Profile.js index 47cf831d1f37df53925ba339fb179b30ac7a5a42..eff76fc073d353f578f2c53bb829adc159415262 100644 --- a/client/src/components/Profile/Profile.js +++ b/client/src/components/Profile/Profile.js @@ -3,7 +3,7 @@ import { useState, useEffect } from "react"; import userApi from "../../apis/user.api"; import catchErrors from "../../context/catchError"; -const userprofile = localStorage.getItem("user"); +const userprofile = sessionStorage.getItem("user"); const INIT_PROFILE = { img:"", }; diff --git a/client/src/components/Room/ChannelList.js b/client/src/components/Room/ChannelList.js index 5b575293797454221a8a75347bc3b0057ef7a1a4..c7a4329460d1606a127536c0b4e0fdd8cc130923 100644 --- a/client/src/components/Room/ChannelList.js +++ b/client/src/components/Room/ChannelList.js @@ -15,7 +15,7 @@ const ChannelList = () => { const { roomId } = useParams(); const [error, setError] = useState(""); const [channel, setChannel] = useState([INIT_CHANNEL]); - const id = localStorage.getItem('user'); + const id = sessionStorage.getItem('user'); async function getChannel(roomId) { try { diff --git a/client/src/components/Room/ChannelSingle.js b/client/src/components/Room/ChannelSingle.js index 79874dd9eae57ddfccd08b8160b19e1156cb5df6..ae1926727c698774233a8bf5e067a6467f37e09f 100644 --- a/client/src/components/Room/ChannelSingle.js +++ b/client/src/components/Room/ChannelSingle.js @@ -9,7 +9,7 @@ const ChannelSingle = (props) => { const [success, setSuccess] = useState(false); const [roomName, setRoomName] = useState(''); const { roomId, channelId } = useParams(); - const userId = localStorage.getItem('user') + const userId = sessionStorage.getItem('user') async function joinChannel(e) { diff --git a/client/src/components/Room/RightHamburger.js b/client/src/components/Room/RightHamburger.js index 59bc76bf6317a033a5521bc0280f30d168eca48b..b98a6c6228a4a5e31897ba5ac88875fc6a0b080f 100644 --- a/client/src/components/Room/RightHamburger.js +++ b/client/src/components/Room/RightHamburger.js @@ -5,6 +5,8 @@ import RoomApi from "../../apis/room.api"; import catchErrors from "../../context/catchError"; import KakaoShareButton from "../KakaoShareButton"; import Roomnamechange from "./Roomnamechange"; +import userApi from "../../apis/user.api"; +import roomApi from "../../apis/room.api"; const INIT_ROOM = { name: "", @@ -20,7 +22,7 @@ const RightHamburger = () => { const [room, setRoom] = useState([INIT_ROOM]); const { roomId } = useParams(); const [error, setError] = useState(""); - const id = localStorage.getItem("user"); + const id = sessionStorage.getItem("user"); async function getRoom(roomId) { try { @@ -30,7 +32,6 @@ const RightHamburger = () => { name: data[0].name, owner: data[0].owner, }); - console.log(roomdata); setRoom(roomdata); } catch (error) { catchErrors(error, setError); @@ -38,9 +39,12 @@ const RightHamburger = () => { } async function exitRoom() { - console.log("id, roomid정보", id, roomId); try { const data = await RoomApi.exitRoom({ id, roomId }); + if (data.owner === Number(id)){ + const room = await RoomApi.removeRoom({roomId : roomId}) + console.log(room) + } } catch (error) { catchErrors(error, setError); } @@ -65,6 +69,38 @@ const RightHamburger = () => { catchErrors(error, setError); } } + async function exitChannel() { + try { + const data = await userApi.getUser(id); + const A = doubleJoinCheck(data.name); + if (A) { + await roomApi.doubleJoin({ + roomId: roomId, + index1: A.index1, + index2: A.index2, + joinChName: A.joinChName, + }); + } + } catch (error) { + catchErrors(error, setError); + } + } + + function doubleJoinCheck(e) { + for (const index in channel) { + for (const el in channel[index].joinUser) { + if (channel[index].joinUser[el] === e) { + const doublejoinCh = channel[index].channelName; + const A = { + index1: index, + index2: el, + joinChName: doublejoinCh, + }; + return A; + } + } + } + } // console.log(channel) @@ -289,6 +325,7 @@ const RightHamburger = () => {