Skip to content

GitLab

Commit bbc945b7 authored by 이재연's avatar 이재연
Browse files

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

parents 8ec958be 951e6ee8
Hide whitespace changes
Inline Side-by-side
client/src/components/Login.js
View file @ bbc945b7
...@@ -45,22 +45,33 @@ const Login = () => { ...@@ -45,22 +45,33 @@ const Login = () => {
} }
} }
if (success) { if (success) {
alert('로그인 되었습니다'); alert('로그인 되었습니다')
window.location.href = `/user/${id}` window.location.href = `/user/${id}`
} }
const { email, password } = user const { email, password } = user
return ( return (
<div className="container"> <div>
<form onSubmit={handleSubmit}> <div>
<div className="m-3 d-flex justify-content-center"> <form
<Link to="/"> style={{ backgroundColor: '#FCF4FF' }}
<img src="/BORA.png" style={{ width: '160px' }} /> className="flex-column align-items-center justify-content-center p-2"
</Link> >
</div> <div className="d-flex justify-content-center">
<Link to="/">
<img src="/BORA.png" style={{ width: '160px' }} />
</Link>
</div>
</form>
</div>
<div
style={{ backgroundColor: '#262626', width: 'auto', height: '2px' }}
></div>
<div className="container">
<form onSubmit={handleSubmit}>
<div className="row mt-5 d-flex align-items-center"> <div className="row mt-5 d-flex align-items-center">
<h2 style={{ textAlign: 'center' }}>로그인</h2> <h5 style={{ textAlign: 'center' }}>로그인</h5>
{error && <div className="alert alert-danger">{error}</div>} {error && <div className="alert alert-danger">{error}</div>}
<div className="form-group"> <div className="form-group">
<div className="mt-5"> <div className="mt-5">
...@@ -99,6 +110,7 @@ const Login = () => { ...@@ -99,6 +110,7 @@ const Login = () => {
</div> </div>
</div> </div>
</form> </form>
</div>
</div> </div>
) )
} }
......
client/src/components/Room/ChannelSingle.js
View file @ bbc945b7
import { Link, Route, Switch, useParams } from "react-router-dom"; import { Link, Route, Switch, 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={`/room/${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 @ bbc945b7
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import ChannelSingle from "./ChannelSingle"; import ChannelSingle from "./ChannelSingle";
import Rightimg from "../../images/RightHamburgerImg.png";
import RoomApi from "../../apis/room.api"; import RoomApi from "../../apis/room.api";
import roomApi from "../../apis/room.api"; import roomApi from "../../apis/room.api";
import catchErrors from "../../context/catchError"; import catchErrors from "../../context/catchError";
...@@ -80,7 +79,7 @@ const RightHamburger = () => { ...@@ -80,7 +79,7 @@ const RightHamburger = () => {
aria-label="Toggle navigation" aria-label="Toggle navigation"
style={{ border: "#f4c1f2" }} style={{ border: "#f4c1f2" }}
> >
<img src={Rightimg} width="50px" height="30px" /> <img src="/RightHamburgerImg.png" width="50px" height="30px" />
</button> </button>
</div> </div>
<div <div
......
client/src/components/SignUp.js
View file @ bbc945b7
...@@ -66,91 +66,103 @@ const Signup = () => { ...@@ -66,91 +66,103 @@ const Signup = () => {
const { name, id, password, checkpw, phone } = user const { name, id, password, checkpw, phone } = user
return ( return (
<div className="container"> <div>
{error && <div className="alert alert-danger">{error}</div>} <div>
<form onSubmit={handleSubmit}> <form
<div className="m-3 d-flex justify-content-center"> style={{ backgroundColor: '#FCF4FF' }}
<Link to="/"> className="flex-column align-items-center justify-content-center p-2"
<img src="/BORA.png" style={{ width: '160px' }} /> >
</Link> <div className="d-flex justify-content-center">
</div> <Link to="/">
<div className="row mt-4"> <img src="/BORA.png" style={{ width: '160px' }} />
<h5 style={{ textAlign: 'center' }}>회원가입</h5> </Link>
</div>
<div className="form-group">
<div className="p-2">
<label className="p-1">이름</label>
<input
className="form-control"
id="name"
type="text"
name="name"
placeholder="이름을 입력하세요"
value={name}
onChange={handleChange}
/>
</div> </div>
<div className="p-2"> </form>
<label className="p-1">아이디</label> </div>
<input <div
className="form-control" style={{ backgroundColor: '#262626', width: 'auto', height: '2px' }}
id="text" ></div>
type="text" <div className="container">
name="email" <form onSubmit={handleSubmit}>
placeholder="아이디를 입력하세요" <div className="row mt-4">
value={id} <h5 style={{ textAlign: 'center' }}>회원가입</h5>
onChange={handleChange}
/>
</div> </div>
<div className="p-2"> {error && <div className="alert alert-danger">{error}</div>}
<label className="p-1">비밀번호</label> <div className="form-group">
<input <div className="p-2">
className="form-control" <label className="p-1">이름</label>
id="password" <input
type="password" className="form-control"
name="password" id="name"
placeholder="비밀번호를 입력하세요" type="text"
value={password} name="name"
onChange={handleChange} placeholder="이름을 입력하세요"
/> value={name}
onChange={handleChange}
/>
</div>
<div className="p-2">
<label className="p-1">아이디</label>
<input
className="form-control"
id="text"
type="text"
name="email"
placeholder="아이디를 입력하세요"
value={id}
onChange={handleChange}
/>
</div>
<div className="p-2">
<label className="p-1">비밀번호</label>
<input
className="form-control"
id="password"
type="password"
name="password"
placeholder="비밀번호를 입력하세요"
value={password}
onChange={handleChange}
/>
</div>
<div className="p-2">
<label className="p-1">비밀번호확인</label>
<input
className="form-control"
id="checkpw"
type="password"
name="checkpw"
placeholder="비밀번호를 다시 입력하세요"
value={checkpw}
onChange={handleChange}
/>
</div>
<div className="p-2">
<label className="p-1">전화번호</label>
<input
className="form-control"
id="phone"
type="text"
name="phone"
placeholder="'-'을 제외하고 입력하세요"
value={phone}
onChange={handleChange}
/>
</div>
{/* {console.log(disabled)} */}
<div className="mt-3 d-flex justify-content-center">
<button
type="submit"
className="btn btn-primary"
onClick={handleSubmit}
disabled={disabled}
>
회원가입
</button>
</div>
</div> </div>
<div className="p-2"> </form>
<label className="p-1">비밀번호확인</label> </div>
<input
className="form-control"
id="checkpw"
type="password"
name="checkpw"
placeholder="비밀번호를 다시 입력하세요"
value={checkpw}
onChange={handleChange}
/>
</div>
<div className="p-2">
<label className="p-1">전화번호</label>
<input
className="form-control"
id="phone"
type="text"
name="phone"
placeholder="'-'을 제외하고 입력하세요"
value={phone}
onChange={handleChange}
/>
</div>
{/* {console.log(disabled)} */}
<div className="mt-3 d-flex justify-content-center">
<button
type="submit"
className="btn btn-primary"
onClick={handleSubmit}
disabled={disabled}
>
회원가입
</button>
</div>
</div>
</form>
</div> </div>
) )
} }
......
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