Commit 6aeb3ac5 authored by seoyeon's avatar seoyeon
Browse files

Merge remote-tracking branch 'origin/jaeyeon' into seoyeon3

parents 65c7735b d7cf7826
......@@ -38,7 +38,6 @@ const RoomSingle = () => {
useEffect(() => {
getJoinRoom(id);
}, [id]);
console.log(room)
const { profileimg } = room;
return (
......@@ -46,7 +45,7 @@ const RoomSingle = () => {
{room &&
room.map((el) => (
<div>
{room === INIT_ROOM ? (<div></div>): (
{room[0] === INIT_ROOM ? (<div></div>): (
<Link
to={`/room/${el.roomId}/${channelId}`}
className="text-decoration-none text-dark"
......
......@@ -19,6 +19,7 @@ const InitRoom = () => {
const data = await roomApi.getRoom([roomId]);
console.log(data)
setRoom({...room, id:data[0].id, name:data[0].name, profileimg: data[0].profileimg})
console.log(room.profileimg)
} catch (error) {
catchErrors(error, setError);
}
......
......@@ -6,7 +6,7 @@ import catchErrors from "../../context/catchError";
const INIT_ROOM = {
name: "",
};
};
const INIT_CHANNEL = {
channelName: "",
......@@ -14,47 +14,46 @@ const INIT_CHANNEL = {
};
const RightHamburger = () => {
const [channel, setChannel] = useState([INIT_CHANNEL]);
const [room, setRoom] = useState([INIT_ROOM])
const [room, setRoom] = useState([INIT_ROOM]);
const { roomId } = useParams();
const [error, setError] = useState("");
const id = localStorage.getItem('user');
const id = localStorage.getItem("user");
async function getRoom(roomId) {
try {
const data = await RoomApi.getRoom([roomId]);
setRoom({...room, name:data[0].name});
setRoom({ ...room, name: data[0].name });
} catch (error) {
catchErrors(error, setError);
}
}
async function exitRoom() {
console.log('id, roomid정보', id, roomId)
console.log("id, roomid정보", id, roomId);
try {
const data = await RoomApi.exitRoom({ id, roomId })
console.log(data)
const data = await RoomApi.exitRoom({ id, roomId });
console.log(data);
} catch (error) {
catchErrors(error, setError);
}
}
async function getChannel(roomId) {
const ID = roomId
const ID = roomId;
try {
const data = await RoomApi.getRoom([ID]);
const Channel = data[0].channel
console.log('방데이터:', Channel)
const Channel = data[0].channel;
console.log("방데이터:", Channel);
const channelList = [];
for (const prop in Channel) { // Channel의 항목(prop)으로 작업을 실행합니다
for (const prop in Channel) {
// Channel의 항목(prop)으로 작업을 실행합니다
for (const key in Channel[prop]) {
console.log(key)
console.log(prop)
console.log(Channel[prop][key])
console.log(key);
console.log(prop);
console.log(Channel[prop][key]);
channelList.push({
channelName: key,
joinName: Channel[prop][key]
joinName: Channel[prop][key],
});
}
}
......@@ -68,7 +67,7 @@ const RightHamburger = () => {
useEffect(() => {
getChannel(roomId);
getRoom(roomId)
getRoom(roomId);
}, [roomId]);
function roomIdCopy() {
......@@ -187,9 +186,6 @@ const RightHamburger = () => {
</div>
</div>
</div>
</div>
</div>
<div>
<div className="d-flex flex-row-reverse">
<button
type="button"
......@@ -244,7 +240,10 @@ const RightHamburger = () => {
</div>
<div className="row mb-3">
<div className="d-flex justify-content-evenly">
<Link to={`/user/${id}`} className="col-2 p-1 btn btn-primary">
<Link
to={`/user/${id}`}
className="col-2 p-1 btn btn-primary"
>
<button
type="button"
onClick={exitRoom}
......@@ -270,7 +269,8 @@ const RightHamburger = () => {
</div>
</div>
</div>
</div>
);
};
};
export default RightHamburger;
......@@ -19,6 +19,10 @@ const io = new Server(server, {
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
app.use(cookieParser());
app.use('/uploads', express.static('uploads'))
app.use('/roomUploads', express.static('roomUploads'))
app.use("/api", mainRouter);
......
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