Skip to content

GitLab

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

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

parents dbcad0d7 0dbdbcb5
Show whitespace changes
Inline Side-by-side
client/src/components/Room/ChannelList.js
View file @ 98480063
...@@ -4,13 +4,6 @@ import LeftHamburger from './LeftHamburger'; ...@@ -4,13 +4,6 @@ import LeftHamburger from './LeftHamburger';
import RightHamburger from './RightHamburger'; import RightHamburger from './RightHamburger';
const ChannelList = () => { const ChannelList = () => {
const [admin, setAdmin] = useState('true')
// function copytoClipboard() {
// const [code, setCode] = useState()
// const roomcode = document.getElementById("textarea")
// alert("코드를 복사하였습니다.")
// }
return ( return (
<div> <div>
<nav className="navbar navbar-light d-flex justify-content-between"> <nav className="navbar navbar-light d-flex justify-content-between">
......
client/src/components/Room/LeftHamburger.js
View file @ 98480063
import backward from '../../backward.png' import backward from "../../backward.png";
import ChannelSingle from './ChannelSingle' import ChannelSingle from "./ChannelSingle";
const LeftHamberger = () => { const LeftHamberger = () => {
function roomIdCopy() { function roomIdCopy() {
const t = document.querySelector('#roomId').innerText; const t = document.querySelector("#roomId").innerText;
console.log(t) console.log(t);
navigator.clipboard.writeText(t); navigator.clipboard.writeText(t);
document.execCommand('copy'); document.execCommand("copy");
} }
return ( return (
<div> <div>
...@@ -19,16 +19,15 @@ const LeftHamberger = () => { ...@@ -19,16 +19,15 @@ 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"
...@@ -38,15 +37,18 @@ const LeftHamberger = () => { ...@@ -38,15 +37,18 @@ const LeftHamberger = () => {
className="col-6 offcanvas-title" className="col-6 offcanvas-title"
id="offcanvasExampleLabel" id="offcanvasExampleLabel"
style={{ style={{
fontWeight: 'bold', fontWeight: "bold",
fontSize: '15px', fontSize: "15px",
width: '150px', width: "150px",
color: '#000000', color: "#000000",
}} }}
> >
온/오프라인 사용자 온/오프라인 사용자
</p> </p>
<h6 className="mt-2" id="roomId" > #ASV2AE985 </h6> <h6 className="mt-2" id="roomId">
{" "}
#ASV2AE985{" "}
</h6>
<button <button
type="button" type="button"
className="btn-close text-reset" className="btn-close text-reset"
...@@ -54,26 +56,26 @@ const LeftHamberger = () => { ...@@ -54,26 +56,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>
JAEYEON <p style={{ color: "black" }}>JAEYEON</p>
</li> </li>
<li> <li>
SEOYEON <p style={{ color: "black" }}>SEOYEON</p>
</li> </li>
<li> <li>
JIWEON <p style={{ color: "black" }}>JIWEON</p>
</li> </li>
<li> <li>
BYOUNGYUN <p style={{ color: "black" }}>BYOUNGYUN</p>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -83,21 +85,11 @@ const LeftHamberger = () => { ...@@ -83,21 +85,11 @@ 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> <li>CHERRY</li>
CHERRY <li>JAEYEON</li>
</li> <li>SEOYEON</li>
<li> <li>JIWEON</li>
JAEYEON <li>BYOUNGYUN</li>
</li>
<li>
SEOYEON
</li>
<li>
JIWEON
</li>
<li>
BYOUNGYUN
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -110,11 +102,11 @@ const LeftHamberger = () => { ...@@ -110,11 +102,11 @@ const LeftHamberger = () => {
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: '#E0CEE8', backgroundColor: "#E0CEE8",
color: 'black', color: "black",
border: '1px #D64D61', border: "1px #D64D61",
}} }}
> >
초대 초대
...@@ -164,10 +156,9 @@ const LeftHamberger = () => { ...@@ -164,10 +156,9 @@ const LeftHamberger = () => {
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div > </div>
) );
} };
export default LeftHamberger export default LeftHamberger;
\ No newline at end of file
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