Skip to content

GitLab

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

Merge remote-tracking branch 'origin/jiweon827' into jaeyeon2

parents a2b5f222 c81b3fdc
Show whitespace changes
Inline Side-by-side
client/src/components/Room/LeftHamberger.js
View file @ d0c68e25
import backward from "../../backward.png"; import backward from '../../backward.png'
import ChannelSingle from "./ChannelSingle"; import ChannelSingle from './ChannelSingle'
const LeftHamberger = () => { const LeftHamberger = () => {
function roomIdCopy() {
const t = document.querySelector('#roomId').innerText;
console.log(t)
navigator.clipboard.writeText(t);
document.execCommand('copy');
}
return ( return (
<div> <div>
<div> <div>
...@@ -13,31 +19,34 @@ const LeftHamberger = () => { ...@@ -13,31 +19,34 @@ const LeftHamberger = () => {
aria-controls="left-hamburger" aria-controls="left-hamburger"
aria-expanded="false" aria-expanded="false"
aria-label="Toggle navigation" aria-label="Toggle navigation"
style={{ border: "#f4c1f2" }} style={{ border: '#f4c1f2' }}
> >
<span className="navbar-toggler-icon"></span> <span className="navbar-toggler-icon"></span>
</button> </button>
</div> </div>
<div <div
className="offcanvas offcanvas-start" className="offcanvas offcanvas-start"
style={{ width: "330px" }} style={{ width: '330px' }}
tabIndex="-1" tabIndex="-1"
id="left-hamburger" id="left-hamburger"
aria-labelledby="hamburgerLabel" aria-labelledby="hamburgerLabel"
> >
<div className="d-flex justify-content-between offcanvas-header"> <div className="offcanvas-header">
<p <p
className="col-6 offcanvas-title" className="col-6 offcanvas-title"
id="offcanvasExampleLabel" id="offcanvasExampleLabel"
style={{ style={{
fontWeight: "bold", fontWeight: 'bold',
fontSize: "20px", fontSize: '15px',
width: "200px", width: '150px',
color: '#000000',
}} }}
> >
온/오프라인 사용자 온/오프라인 사용자
</p> </p>
<h6 className="mt-2" id="roomId" > #ASV2AE985 </h6>
<button <button
type="button" type="button"
className="btn-close text-reset" className="btn-close text-reset"
...@@ -45,27 +54,26 @@ const LeftHamberger = () => { ...@@ -45,27 +54,26 @@ const LeftHamberger = () => {
aria-label="Close" aria-label="Close"
></button> ></button>
</div> </div>
<div className="overflow-auto" style={{ height: "610px" }}> <div className="overflow-auto" style={{ height: '610px' }}>
<div className="mb-3"> <div className="mb-3">
<div className="m-3 p-1 row" style={{ backgroundColor: "#E0CEE8" }}> <div className="m-3 p-1 row" style={{ backgroundColor: "#E0CEE8" }}>
<h5 className="col mt-2">온라인 사용자</h5> <h5 className="col mt-2">온라인 사용자</h5>
</div> </div>
<ul className="mx-5" style={{ marker: "#2e873a" }}>
<ul className="mx-5" style={{ color: "#76D079" }}> <li className="marker: #2e873a" style={{ markerColor: "2px #2e873a" }}>
<li> CHERRY
<p style={{ color: "black" }}>CHERRY</p>
</li> </li>
<li> <li>
<p style={{ color: "black" }}>JAEYEON</p> JAEYEON
</li> </li>
<li> <li>
<p style={{ color: "black" }}>SEOYEON</p> SEOYEON
</li> </li>
<li> <li>
<p style={{ color: "black" }}>JIWEON</p> JIWEON
</li> </li>
<li> <li>
<p style={{ color: "black" }}>BYOUNGYUN</p> BYOUNGYUN
</li> </li>
</ul> </ul>
</div> </div>
...@@ -75,17 +83,91 @@ const LeftHamberger = () => { ...@@ -75,17 +83,91 @@ const LeftHamberger = () => {
<h5 className="col mt-2">오프라인 사용자</h5> <h5 className="col mt-2">오프라인 사용자</h5>
</div> </div>
<ul className="mx-5"> <ul className="mx-5">
<li>CHERRY</li> <li>
<li>JAEYEON</li> CHERRY
<li>SEOYEON</li> </li>
<li>JIWEON</li> <li>
<li>BYOUNGYUN</li> JAEYEON
</li>
<li>
SEOYEON
</li>
<li>
JIWEON
</li>
<li>
BYOUNGYUN
</li>
</ul> </ul>
</div> </div>
</div> </div>
<div>
<div className="d-flex flex-row-reverse">
<button
type="button"
className="m-3 rounded"
data-bs-toggle="modal"
data-bs-target="#exitRoom"
style={{
height: '30px',
fontWeight: 'bold',
backgroundColor: '#E0CEE8',
color: 'black',
border: '1px #D64D61',
}}
>
초대
</button>
<div
className="modal fade"
id="exitRoom"
tabIndex="-1"
aria-labelledby="exitRoomLabel"
aria-hidden="true"
>
<div className="modal-dialog">
<div className="modal-content">
<div className="modal-header">
<button
type="button"
className="btn-close"
data-bs-dismiss="modal"
aria-label="Close"
></button>
</div> </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-dismiss="modal"
style={{ width: "120px" }}
onClick={roomIdCopy}
>
방 Id 복사
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
); </div >
}; )
}
export default LeftHamberger; export default LeftHamberger
\ No newline at end of file
client/src/components/Room/RightHamberger.js
View file @ d0c68e25
...@@ -49,7 +49,6 @@ const RightHamberger = () => { ...@@ -49,7 +49,6 @@ const RightHamberger = () => {
데계데계데계데계데계데계데계데계데계데계 재밌는 수학과 데계데계데계데계데계데계데계데계데계데계 재밌는 수학과
</p> </p>
<h6 className="mt-2" id="roomId" > #ASV2AE985 </h6> <h6 className="mt-2" id="roomId" > #ASV2AE985 </h6>
<button onClick={copyInput} >초대</button>
<button <button
type="button" type="button"
className="btn-close text-reset" className="btn-close text-reset"
......
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