Skip to content

GitLab

Commit c5ab0718 authored by 우지원's avatar 우지원
Browse files

퇴장완료!예예~~~

parent d8d3d203
Hide whitespace changes
Inline Side-by-side
client/src/apis/room.api.js
View file @ c5ab0718
...@@ -5,6 +5,11 @@ const getRoom = async (id) => { ...@@ -5,6 +5,11 @@ const getRoom = async (id) => {
return data; return data;
}; };
const exitRoom = async (ID) => {
const { data } = await axios.delete(`/api/room/exitRoom/${ID.id}/${ID.roomId}`);
return data;
};
const create = async (formData) => { const create = async (formData) => {
const { data } = await axios.post("/api/room/create", formData); const { data } = await axios.post("/api/room/create", formData);
return data; return data;
...@@ -15,6 +20,6 @@ const join = async (payload) => { ...@@ -15,6 +20,6 @@ const join = async (payload) => {
return data; return data;
}; };
const roomApi = { getRoom, create, join }; const roomApi = { getRoom, exitRoom, create, join };
export default roomApi; export default roomApi;
client/src/components/Home/RoomSingle.js
View file @ c5ab0718
...@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError"; ...@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError";
const id = localStorage.getItem("user"); const id = localStorage.getItem("user");
const INIT_ROOM = { const INIT_ROOM = {
roomId:"", roomId: "",
name: "", name: "",
profileimg: "", profileimg: "",
member: "", member: "",
...@@ -15,7 +15,7 @@ const RoomSingle = () => { ...@@ -15,7 +15,7 @@ const RoomSingle = () => {
const [room, setRoom] = useState([INIT_ROOM]); const [room, setRoom] = useState([INIT_ROOM]);
const [error, setError] = useState(""); const [error, setError] = useState("");
const channelId = 'main'; const channelId = 'main';
const {roomId}=useParams(room.roomId); const { roomId } = useParams(room.roomId);
async function getJoinRoom(Id) { async function getJoinRoom(Id) {
try { try {
const User = await userApi.getUser(Id); const User = await userApi.getUser(Id);
...@@ -24,7 +24,7 @@ const RoomSingle = () => { ...@@ -24,7 +24,7 @@ const RoomSingle = () => {
let roomlist = []; let roomlist = [];
for (let prop in Room) { for (let prop in Room) {
roomlist.push({ roomlist.push({
roomId:Room[prop].id, roomId: Room[prop].id,
name: Room[prop].name, name: Room[prop].name,
profileimg: Room[prop].profileimg, profileimg: Room[prop].profileimg,
member: Room[prop].member.length, member: Room[prop].member.length,
...@@ -38,41 +38,45 @@ const RoomSingle = () => { ...@@ -38,41 +38,45 @@ const RoomSingle = () => {
useEffect(() => { useEffect(() => {
getJoinRoom(id); getJoinRoom(id);
}, [id]); }, [id]);
console.log(room)
const { profileimg } = room; const { profileimg } = room;
return ( return (
<div> <div>
{room && {room &&
room.map((el) => ( room.map((el) => (
<Link <div>
to={`/room/${el.roomId}/${channelId}`} {room === INIT_ROOM ? (<div></div>): (
className="text-decoration-none text-dark" <Link
> to={`/room/${el.roomId}/${channelId}`}
<div className="text-decoration-none text-dark"
className="d-flex mx-4 my-2 p-2"
style={{ backgroundColor: "#C4C4C4" }}
> >
<div style={{ width: "37px", height: "37px" }}>
<img
src={`/roomUploads/${el.profileimg}`}
className="rounded-circle"
style={{ width: "37px", height: "37px" }}
/>
</div>
<div <div
className="mx-3 mt-2" className="d-flex mx-4 my-2 p-2"
style={{ style={{ backgroundColor: "#C4C4C4" }}
width: "250px",
overflow: "scroll",
whiteSpace: "nowrap",
msOverflowStyle: "none",
}}
> >
{el.name} <div style={{ width: "37px", height: "37px" }}>
<img
src={`/roomUploads/${el.profileimg}`}
className="rounded-circle"
style={{ width: "37px", height: "37px" }}
/>
</div>
<div
className="mx-3 mt-2"
style={{
width: "250px",
overflow: "scroll",
whiteSpace: "nowrap",
msOverflowStyle: "none",
}}
>
{el.name}
</div>
<div className="ms-auto mt-2"> {el.member}/100 </div>
</div> </div>
<div className="ms-auto mt-2"> {el.member}/100 </div> </Link>)}
</div> </div>
</Link>
))} ))}
</div> </div>
); );
......
client/src/components/Room/ChannelSingle.js
View file @ c5ab0718
import { Link, Route, Switch, useParams } from "react-router-dom"; import { Link, useParams } from 'react-router-dom'
const ChannelSingle = (props) => { const ChannelSingle = (props) => {
const { roomId } = useParams(); const { roomId, channelId } = useParams()
console.log("props", props.channel); console.log('props', props.channel)
console.log('hi', channelId)
return ( return (
<div> <div>
<div className="overflow-auto" style={{ height: "610px" }}> <div className="overflow-auto" style={{ height: '610px' }}>
{props.channel.map((el) => ( {props.channel.map((el) => (
<div className="mb-3"> <div className="mb-3">
<Link to={`${roomId}/${el.channelName}`}> <Link to={`/room/${roomId}/${el.channelName}`}>
<div <div
className="m-3 p-1 row" className="m-3 p-1 row"
style={{ backgroundColor: "#E0CEE8" }} style={{ backgroundColor: '#E0CEE8' }}
> >
<img {el.channelName === channelId ? (
className="col-auto mt-2" <img
src="/fullSpeaker.png" className="col-auto mt-2"
width="25px" src="/fullSpeaker.png"
height="25px" width="25px"
/> height="25px"
<h5 className="col mt-2" style={{ color: "black" }}> />
) : (
<img
className="col-auto mt-2"
src="/emptySpeaker.png"
width="25px"
height="25px"
/>
)}
<h5 className="col mt-2" style={{ color: 'black' }}>
{el.channelName} {el.channelName}
</h5> </h5>
</div>{" "} </div>
</Link> </Link>
{el.joinName && {el.joinName &&
el.joinName.map((e) => ( el.joinName.map((e) => (
<div> <div>
<ul className="mx-5" style={{ color: "#76D079" }}> <ul className="mx-5" style={{ color: '#76D079' }}>
<li> <li>
<p style={{ color: "black" }}>{e}</p> <p style={{ color: 'black' }}>{e}</p>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -39,7 +49,7 @@ const ChannelSingle = (props) => { ...@@ -39,7 +49,7 @@ const ChannelSingle = (props) => {
))} ))}
</div> </div>
</div> </div>
); )
}; }
export default ChannelSingle; export default ChannelSingle
\ No newline at end of file
client/src/components/Room/RightHamburger.js
View file @ c5ab0718
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { useParams } from "react-router-dom"; import { Link, useParams } from "react-router-dom";
import ChannelSingle from "./ChannelSingle"; import ChannelSingle from "./ChannelSingle";
import Rightimg from "../../images/RightHamburgerImg.png"; import Rightimg from "../../images/RightHamburgerImg.png";
import RoomApi from "../../apis/room.api"; import RoomApi from "../../apis/room.api";
...@@ -7,206 +7,126 @@ import roomApi from "../../apis/room.api"; ...@@ -7,206 +7,126 @@ import roomApi from "../../apis/room.api";
import catchErrors from "../../context/catchError"; import catchErrors from "../../context/catchError";
const INIT_CHANNEL = { const INIT_CHANNEL = {
channelName: "", channelName: "",
joinName: [], joinName: [],
};
const INIT_ROOM = {
name: "",
}; };
const RightHamburger = () => { const RightHamburger = () => {
const [channel, setChannel] = useState([INIT_CHANNEL]); const [channel, setChannel] = useState([INIT_CHANNEL]);
const [room, setRoom] = useState([INIT_ROOM]); const { roomId } = useParams();
const { roomId } = useParams(); const [error, setError] = useState("");
const [error, setError] = useState(""); const id = localStorage.getItem('user');
async function exitRoom() {
console.log('id, roomid정보', id, roomId)
try {
const data = await roomApi.exitRoom({ id, roomId })
console.log(data)
} catch (error) {
catchErrors(error, setError);
}
async function getroom(Id) {
try {
const Room = await roomApi.getRoom([Id]);
setRoom({...room, name:Room[0].name})
} catch (error) {
catchErrors(error, setError);
} }
}
async function getChannel(roomId) { async function getChannel(roomId) {
// console.log('roomId', roomId) // console.log('roomId', roomId)
const ID = roomId; const ID = roomId
try { try {
const data = await roomApi.getRoom([ID]); const data = await roomApi.getRoom([ID]);
const Channel = data[0].channel; const Channel = data[0].channel
// console.log('방데이터:', Channel) console.log('방데이터:', Channel)
const channelList = []; const channelList = [];
for (const prop in Channel) { for (const prop in Channel) { // Channel의 항목(prop)으로 작업을 실행합니다
// Channel의 항목(prop)으로 작업을 실행합니다 for (const key in Channel[prop]) {
for (const key in Channel[prop]) { console.log(key)
// console.log(key) console.log(prop)
// console.log(prop) console.log(Channel[prop][key])
// console.log(Channel[prop][key]) channelList.push({
channelList.push({ channelName: key,
channelName: key, joinName: Channel[prop][key]
joinName: Channel[prop][key], });
}); }
}
setChannel(channelList);
} catch (error) {
catchErrors(error, setError);
} }
}
setChannel(channelList);
} catch (error) {
catchErrors(error, setError);
} }
} // console.log(channel)
// console.log(channel)
useEffect(() => {
getChannel(roomId);
getroom(roomId)
}, [roomId]);
function roomIdCopy() {
const t = document.querySelector("#roomId").innerText;
console.log(t);
navigator.clipboard.writeText(t);
document.execCommand("copy");
}
return (
<div>
<div>
<button
className="navbar-toggler"
type="button"
data-bs-toggle="offcanvas"
data-bs-target="#right-hamburger"
aria-controls="right-hamburger"
aria-expanded="false"
aria-label="Toggle navigation"
style={{ border: "#f4c1f2" }}
>
<img src={Rightimg} width="50px" height="30px" />
</button>
</div>
<div
className="offcanvas offcanvas-end"
style={{ width: "330px" }}
tabIndex="-1"
id="right-hamburger"
aria-labelledby="hamburgerLabel"
>
<div className="offcanvas-header">
<p
className="col-6 offcanvas-title"
id="offcanvasExampleLabel"
style={{
fontWeight: "bold",
fontSize: "15px",
overflow: "hidden",
whiteSpace: "nowrap",
width: "150px",
color: "#000000",
}}
>
{room.name}
</p>
<h6 className="mt-2" id="roomId">
{" "}
{`${roomId}`}{" "}
</h6>
<button
type="button"
className="btn-close text-reset"
data-bs-dismiss="offcanvas"
aria-label="Close"
></button>
</div>
<ChannelSingle channel={channel} /> useEffect(() => {
// console.log('roomId', roomId)
getChannel(roomId);
}, [roomId]);
return (
<div> <div>
<div className="d-flex flex-row-reverse"> <div>
<button <button
type="button" className="navbar-toggler"
className="m-3 rounded" type="button"
data-bs-toggle="modal" data-bs-toggle="offcanvas"
data-bs-target="#inviteRoom" data-bs-target="#right-hamburger"
style={{ aria-controls="right-hamburger"
height: "30px", aria-expanded="false"
fontWeight: "bold", aria-label="Toggle navigation"
backgroundColor: "#E0CEE8", style={{ border: "#f4c1f2" }}
color: "black", >
border: "1px #D64D61", <img src={Rightimg} width="50px" height="30px" />
}} </button>
> </div>
초대
</button>
<div <div
className="modal fade" className="offcanvas offcanvas-end"
id="inviteRoom" style={{ width: "330px" }}
tabIndex="-1" tabIndex="-1"
aria-labelledby="exitRoomLabel" id="right-hamburger"
aria-hidden="true" aria-labelledby="hamburgerLabel"
> >
<div className="modal-dialog"> <div className="offcanvas-header">
<div className="modal-content"> <p
<div className="modal-header"> className="col-6 offcanvas-title"
id="offcanvasExampleLabel"
style={{
fontWeight: "bold",
fontSize: "15px",
overflow: "hidden",
whiteSpace: "nowrap",
width: "150px",
color: "#000000",
}}
>
방 이름{/*Room.name*/}
</p>
<h6 className="mt-2" id="roomId">
{" "}
{`${roomId}`}{" "}
</h6>
<button <button
type="button" type="button"
className="btn-close" className="btn-close text-reset"
data-bs-dismiss="modal" data-bs-dismiss="offcanvas"
aria-label="Close" aria-label="Close"
></button> ></button>
</div>
<div className="modal-body d-flex justify-content-center">
어떤 방식으로 초대하시겠습니까?
</div>
<div className="row mb-3">
<div className="d-flex justify-content-evenly">
<button
type="submit"
className="col-2 p-1 btn btn-primary"
style={{ width: "120px" }}
>
카카오로 초대
</button>
{/*
<button
type="submit"
className="col-2 p-1 btn btn-primary"
data-bs-toggle="modal"
data-bs-target="#copyRoomId"
onClick={roomIdCopy}
style={{ width: "120px" }}
>
방 Id 복사
</button> */}
<button
type="submit"
className="col-2 p-1 btn btn-primary"
data-bs-dismiss="modal"
style={{ width: "120px" }}
onClick={roomIdCopy}
>
방 Id 복사
</button>
</div>
</div>
</div> </div>
</div>
</div> <ChannelSingle channel={channel} />
<div> <div>
<div> <div className="d-flex flex-row-reverse">
<button <button
type="button" type="button"
className="m-3 rounded text-white" className="m-3 rounded text-white"
data-bs-toggle="modal" data-bs-toggle="modal"
data-bs-target="#exitRoom" data-bs-target="#exitRoom"
style={{ style={{
height: "30px", height: "30px",
fontWeight: "bold", fontWeight: "bold",
backgroundColor: "#d86da6", backgroundColor: "#d86da6",
color: "black", color: "black",
border: "1px #d86da6", border: "1px #d86da6",
}} }}
> >
퇴장 퇴장
</button> </button>
{/* {admin ? ( {/* {admin ? (
<button <button
type="button" type="button"
className="m-3 rounded" className="m-3 rounded"
...@@ -222,56 +142,57 @@ const RightHamburger = () => { ...@@ -222,56 +142,57 @@ const RightHamburger = () => {
</button> </button>
) : null} */} ) : null} */}
<div <div
className="modal fade" className="modal fade"
id="exitRoom" id="exitRoom"
tabIndex="-1" tabIndex="-1"
aria-labelledby="exitRoomLabel" aria-labelledby="exitRoomLabel"
aria-hidden="true" aria-hidden="true"
> >
<div className="modal-dialog"> <div className="modal-dialog">
<div className="modal-content"> <div className="modal-content">
<div className="modal-header"> <div className="modal-header">
<button <button
type="button" type="button"
className="btn-close" className="btn-close"
data-bs-dismiss="modal" data-bs-dismiss="modal"
aria-label="Close" aria-label="Close"
></button> ></button>
</div> </div>
<div className="modal-body d-flex justify-content-center"> <div className="modal-body d-flex justify-content-center">
이방에서 퇴장하시겠습니까? 이방에서 퇴장하시겠습니까?
</div> </div>
<div className="row mb-3"> <div className="row mb-3">
<div className="d-flex justify-content-evenly"> <div className="d-flex justify-content-evenly">
{/* <Link to="/user/:id"> */} <Link to={`/user/${id}`} className="col-2 p-1 btn btn-primary">
<button {/* <div onSubmit={exitSubmit}> */}
type="submit" <button
className="col-2 p-1 btn btn-primary" type="button"
data-bs-dismiss="modal" onClick={exitRoom}
> className="btn btn-primary"
예 data-bs-dismiss="modal"
</button> >
{/* </Link> */} 예
<button </button>
type="submit" {/* </div> */}
className="col-2 p-1 btn btn-primary" </Link>
data-bs-dismiss="modal" <button
> type="submit"
아니요 className="btn btn-primary"
</button> data-bs-dismiss="modal"
>
아니요
</button>
</div>
</div>
</div>
</div>
</div> </div>
</div>
</div> </div>
</div>
</div> </div>
</div>
</div> </div>
</div>
</div> </div>
</div> );
</div>
);
}; };
export default RightHamburger; export default RightHamburger;
\ No newline at end of file
server/controllers/room.controller.js
View file @ c5ab0718
...@@ -2,7 +2,6 @@ import { Room, User } from "../models/index.js"; ...@@ -2,7 +2,6 @@ import { Room, User } from "../models/index.js";
import { customAlphabet } from "nanoid"; import { customAlphabet } from "nanoid";
import isLength from "validator/lib/isLength.js"; import isLength from "validator/lib/isLength.js";
import RoomModel from "../models/room.model.js"; import RoomModel from "../models/room.model.js";
import multer from "multer";
const nanoid = customAlphabet("1234567890abcdef", 10); const nanoid = customAlphabet("1234567890abcdef", 10);
...@@ -44,6 +43,7 @@ const joinRoom = async (req, res) => { ...@@ -44,6 +43,7 @@ const joinRoom = async (req, res) => {
} }
}; };
const multer = require("multer");
const upLoadRoomImg = multer({ dest: "roomUploads/" }); const upLoadRoomImg = multer({ dest: "roomUploads/" });
const roomImgUpload = upLoadRoomImg.fields([{ name: "profileimg", maxCount: 1 }]); const roomImgUpload = upLoadRoomImg.fields([{ name: "profileimg", maxCount: 1 }]);
...@@ -91,10 +91,10 @@ const createRoom = async (req, res) => { ...@@ -91,10 +91,10 @@ const createRoom = async (req, res) => {
}; };
const getRoom = async (req, res) => { const getRoom = async (req, res) => {
console.log("fhgfghdgfdgf:", req.body); // console.log("fhgfghdgfdgf:", req.body);
try { try {
const roomlist = await Room.findAll({ where: { id: req.body} }); const roomlist = await Room.findAll({ where: { id: req.body } });
console.log(roomlist); // console.log(roomlist);
res.json(roomlist) res.json(roomlist)
} catch (error) { } catch (error) {
console.log(error); console.log(error);
...@@ -102,6 +102,24 @@ const getRoom = async (req, res) => { ...@@ -102,6 +102,24 @@ const getRoom = async (req, res) => {
} }
}; };
const exitRoom = async (req, res) => {
const { id, roomId } = req.params
console.log(id, roomId)
const room = await Room.findOne({ where: { id: roomId } });
console.log(room.member)
const index = room.member.indexOf(id)
console.log('index',index)
room.member.splice(index,1)
await Room.update({ member: room.member }, { where: { id: roomId } });
const user = await User.findOne({ where: { id: id } });
console.log(user.roomNumber)
const index2 = user.roomNumber.indexOf(id)
console.log('index',index2)
user.roomNumber.splice(index2,1)
await User.update({ roomNumber: user.roomNumber }, { where: { id: id } });
}
export default { export default {
joinRoom, roomImgUpload, createRoom, getRoom joinRoom, roomImgUpload, createRoom, getRoom, exitRoom,
}; };
server/index.js
View file @ c5ab0718
...@@ -27,7 +27,7 @@ sequelize ...@@ -27,7 +27,7 @@ sequelize
id: "1234567abc", id: "1234567abc",
name: "room", name: "room",
owner: 8888, owner: 8888,
member: [8888], member: ['8888', '9999'],
profileimg: "defaultimg", profileimg: "defaultimg",
}); });
...@@ -35,7 +35,7 @@ sequelize ...@@ -35,7 +35,7 @@ sequelize
id: "abc7654321", id: "abc7654321",
name: "room1", name: "room1",
owner: 9999, owner: 9999,
member: [9999], member: ['9999'],
profileimg: "defaultimg", profileimg: "defaultimg",
}); });
......
server/models/room.model.js
View file @ c5ab0718
import pkg from 'sequelize'; import { DataTypes } from "sequelize";
const { DataTypes } = pkg;
const RoomModel = (sequelize) => { const RoomModel = (sequelize) => {
const Room = sequelize.define( const Room = sequelize.define(
...@@ -16,7 +15,7 @@ const RoomModel = (sequelize) => { ...@@ -16,7 +15,7 @@ const RoomModel = (sequelize) => {
type: DataTypes.INTEGER, type: DataTypes.INTEGER,
}, },
member: { member: {
type: DataTypes.ARRAY(DataTypes.INTEGER), type: DataTypes.ARRAY(DataTypes.STRING),
//type: DataTypes.STRING, //type: DataTypes.STRING,
}, },
profileimg: { profileimg: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment