Skip to content

GitLab

Commit bdb9b490 authored by seoyeon's avatar seoyeon
Browse files

0804

parent d8d3d203
Hide whitespace changes
Inline Side-by-side
client/src/components/Login.js
View file @ bdb9b490
......@@ -45,22 +45,33 @@ const Login = () => {
}
}
if (success) {
alert('로그인 되었습니다');
alert('로그인 되었습니다')
window.location.href = `/user/${id}`
}
const { email, password } = user
return (
<div className="container">
<form onSubmit={handleSubmit}>
<div className="m-3 d-flex justify-content-center">
<Link to="/">
<img src="/BORA.png" style={{ width: '160px' }} />
</Link>
</div>
<div>
<div>
<form
style={{ backgroundColor: '#FCF4FF' }}
className="flex-column align-items-center justify-content-center p-2"
>
<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">
<h2 style={{ textAlign: 'center' }}>로그인</h2>
<h5 style={{ textAlign: 'center' }}>로그인</h5>
{error && <div className="alert alert-danger">{error}</div>}
<div className="form-group">
<div className="mt-5">
......@@ -99,6 +110,7 @@ const Login = () => {
</div>
</div>
</form>
</div>
</div>
)
}
......
client/src/components/Room/ChannelSingle.js
View file @ bdb9b490
import { Link, Route, Switch, useParams } from "react-router-dom";
import { Link, Route, Switch, useParams } from 'react-router-dom'
const ChannelSingle = (props) => {
const { roomId } = useParams();
console.log("props", props.channel);
const { roomId, channelId } = useParams()
console.log('props', props.channel)
console.log('hi', channelId)
return (
<div>
<div className="overflow-auto" style={{ height: "610px" }}>
<div className="overflow-auto" style={{ height: '610px' }}>
{props.channel.map((el) => (
<div className="mb-3">
<Link to={`${roomId}/${el.channelName}`}>
<Link to={`/room/${roomId}/${el.channelName}`}>
<div
className="m-3 p-1 row"
style={{ backgroundColor: "#E0CEE8" }}
style={{ backgroundColor: '#E0CEE8' }}
>
<img
className="col-auto mt-2"
src="/fullSpeaker.png"
width="25px"
height="25px"
/>
<h5 className="col mt-2" style={{ color: "black" }}>
{el.channelName === channelId ? (
<img
className="col-auto mt-2"
src="/fullSpeaker.png"
width="25px"
height="25px"
/>
) : (
<img
className="col-auto mt-2"
src="/emptySpeaker.png"
width="25px"
height="25px"
/>
)}
<h5 className="col mt-2" style={{ color: 'black' }}>
{el.channelName}
</h5>
</div>{" "}
</div>
</Link>
{el.joinName &&
el.joinName.map((e) => (
<div>
<ul className="mx-5" style={{ color: "#76D079" }}>
<ul className="mx-5" style={{ color: '#76D079' }}>
<li>
<p style={{ color: "black" }}>{e}</p>
<p style={{ color: 'black' }}>{e}</p>
</li>
</ul>
</div>
......@@ -39,7 +49,7 @@ const ChannelSingle = (props) => {
))}
</div>
</div>
);
};
)
}
export default ChannelSingle;
export default ChannelSingle
\ No newline at end of file
client/src/components/SignUp.js
View file @ bdb9b490
......@@ -66,91 +66,103 @@ const Signup = () => {
const { name, id, password, checkpw, phone } = user
return (
<div className="container">
{error && <div className="alert alert-danger">{error}</div>}
<form onSubmit={handleSubmit}>
<div className="m-3 d-flex justify-content-center">
<Link to="/">
<img src="/BORA.png" style={{ width: '160px' }} />
</Link>
</div>
<div className="row mt-4">
<h5 style={{ textAlign: 'center' }}>회원가입</h5>
</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>
<form
style={{ backgroundColor: '#FCF4FF' }}
className="flex-column align-items-center justify-content-center p-2"
>
<div className="d-flex justify-content-center">
<Link to="/">
<img src="/BORA.png" style={{ width: '160px' }} />
</Link>
</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}
/>
</form>
</div>
<div
style={{ backgroundColor: '#262626', width: 'auto', height: '2px' }}
></div>
<div className="container">
<form onSubmit={handleSubmit}>
<div className="row mt-4">
<h5 style={{ textAlign: 'center' }}>회원가입</h5>
</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}
/>
{error && <div className="alert alert-danger">{error}</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 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 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>
</form>
</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