diff --git a/src/components/modalLarge.js b/src/components/modalLarge.js index 8dbbe29..c04c720 100644 --- a/src/components/modalLarge.js +++ b/src/components/modalLarge.js @@ -7,9 +7,49 @@ const ModalLarge = (props) => {
{open ? (
-
- {header} + {/*
*/} + {header} + {/* + + + */} + {/* */} + {/*
*/} +
{ fill="#bababa" /> - {/* */} -
-
{props.children}
+ {props.children} +
) : null}
diff --git a/src/pages/Meetingrooms.js b/src/pages/Meetingrooms.js index 7af44fb..f3123a3 100644 --- a/src/pages/Meetingrooms.js +++ b/src/pages/Meetingrooms.js @@ -1,16 +1,14 @@ -import { Container, Col, Row, Card } from "react-bootstrap"; import { useEffect, useState } from "react"; import { Link, useNavigate } from "react-router-dom"; import axios from "axios"; -import ApplicationModal from "../components/applicationModal"; import CategorySelect from "../components/categorySelect"; import Paginator from "../components/paginator"; import "../statics/css/studyRecruit.css"; import isLogin from "../utils/isLogin"; +import ModalLarge from "../components/modalLarge"; const MeetingroomCard = ({ meeting, openModal, setMeetingSeq }) => { - console.log(meeting); const [imgSelected, setImgSelected] = useState(""); const images = [ "meetingroom01.jpg", @@ -28,6 +26,7 @@ const MeetingroomCard = ({ meeting, openModal, setMeetingSeq }) => { useEffect(() => { setImgSelected(images[Math.floor(Math.random() * images.length)]); }, [meeting]); + const meetingroomImg = "https://i6a301.p.ssafy.io:8080/images/" + meeting.meetingImg; const defaultImg = `images/${imgSelected}`; @@ -134,68 +133,6 @@ const MeetingroomCard = ({ meeting, openModal, setMeetingSeq }) => {
{meeting.meetingTitle}
- // { - // openModal(); - // sendMeetingSeq(); - // localStorage.setItem("meetingSeq", meeting.meetingSeq); - // }} - // > - // - //
- // - - //
- //
{meeting.meetingHeadcount} / 12
- //
- //
- // {bookmark ? ( - // { - // e.stopPropagation(); - // changeBookmark(); - // }} - // alt="" - // /> - // ) : ( - // { - // e.stopPropagation(); - // changeBookmark(); - // }} - // alt="" - // /> - // )} - //
- //
- //
- // - // {meeting.meetingTitle} - // - // ); }; @@ -209,6 +146,29 @@ export default function Meetingrooms() { const [modalOpen, setModalOpen] = useState(false); const [meetingSeq, setMeetingSeq] = useState(""); const [selectedMeeting, setSelectedMeeting] = useState(""); + const [imgSelected, setImgSelected] = useState(""); + + const images = [ + "meetingroom01.jpg", + "meetingroom02.jpg", + "meetingroom03.jpg", + "meetingroom04.jpg", + "meetingroom05.jpg", + "meetingroom06.jpg", + "meetingroom07.jpg", + "meetingroom08.jpg", + "meetingroom09.jpg", + "meetingroom10.jpg", + "meetingroom11.jpg", + ]; + useEffect(() => { + setImgSelected(images[Math.floor(Math.random() * images.length)]); + }, [meetingSeq]); + + console.log(selectedMeeting); + const meetingroomImg = + "https://i6a301.p.ssafy.io:8080/images/" + selectedMeeting.meetingImg; + const defaultImg = `images/${imgSelected}`; useEffect(() => { getMeetingDetails(); @@ -221,6 +181,10 @@ export default function Meetingrooms() { setModalOpen(false); }; + const CamRule = (num) => { + const rule = ["카메라 필수"]; + }; + const onChangeSearch = (event) => { setSearchInput(event.target.value); }; @@ -290,108 +254,128 @@ export default function Meetingrooms() { localStorage.setItem("studySeq", meetingSeq); }, [meetingSeq]); return ( -
-
-
- 자유열람실 - - 나와 맞는 자유열람실을 찾아보세요 - -
-
-
- -
- +
+ 자유열람실 + + 나와 맞는 자유열람실을 찾아보세요 + +
+
+
+ +
+ + + - - - -
+
- -
- {/* - */} -
- {postData.data && - postData.data.map((meeting) => ( - <> - - - ))}
- {/*
-
*/} + +
+
+ {postData.data && + postData.data.map((meeting) => ( + + ))}
- - -
- 카테고리: {selectedMeeting.categoryName} -
-
- 호스트 이름: {selectedMeeting.hostName} -
-
- 카메라 규칙: {selectedMeeting.meetingCamType} -
-
- 현재 인원: {selectedMeeting.meetingHeadcount} / 12 -
-
- 미팅룸 이름: {selectedMeeting.meetingTitle} -
-
- 미팅룸 설명: {selectedMeeting.meetingDesc} + +
+
+ +
+
+
+ + {selectedMeeting.categoryName} + + + {selectedMeeting.meetingTitle} + +
+
+
+ + + + {selectedMeeting.hostName} +
+
+ + + + {selectedMeeting.meetingHeadcount} +
+
+
+ {selectedMeeting.meetingDesc} +
+
- - - - - -
+ + + + + ); } diff --git a/src/statics/css/meetingroom.css b/src/statics/css/meetingroom.css index 0f70cb1..9b3b45d 100644 --- a/src/statics/css/meetingroom.css +++ b/src/statics/css/meetingroom.css @@ -688,6 +688,7 @@ } .meetingroom-list { + padding-top: 1.5rem; display: grid; width: 100%; grid-template-columns: repeat(auto-fill, minmax(192px, auto)); @@ -696,7 +697,7 @@ .meetingroom-card { cursor: pointer; - padding: 0.8rem 0; + padding: 0.6rem 0; width: 100%; } @@ -723,7 +724,7 @@ left: 0.5rem; background-color: rgba(252, 252, 252, 0.6); border-radius: 3px; - color: var(--textColor); + color: #444444; font-size: 12px; } @@ -734,4 +735,83 @@ padding: 0.2rem 0.4rem; } +.meeting-detail-modal__img { + position: relative; + width: 100%; + height: 0; + overflow: hidden; + padding-bottom: 75%; +} +.meeting-detail-modal__img img { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 10px; + opacity: 0.8; +} + +.meeting-detail-modal__contents { + position: relative; + top: -20px; +} + +.meeting-detail-modal__contents-header { + width: 70%; + background-color: var(--borderColor); + padding: 0.5rem; + border-radius: 0 4px 4px 0; +} + +.meeting-detail-modal__category { + font-size: 12px; + color: #6667ab; + padding-right: 10px; +} + +.meeting-detail-modal__title { + color: var(--textColor); + font-weight: 500; + font-size: 16px; +} + +.meeting-detail-modal__contents-body { + display: flex; + align-items: center; + padding: 0.8rem 1.2rem; +} + +.meetingroom__crown { + cursor: default; + margin-right: 5px; + margin-bottom: 4px; +} + +.meetingroom__person { + margin-right: 5px; + margin-bottom: 3px; +} + +.meeting-detail-modal__hostname { + font-size: 14px; + color: var(--textColor); + padding-right: 10px; +} + +.meeting-detail-modal__desc { + padding: 0 1.2rem; + font-size: 15px; + color: var(--textColor); +} + +.meeting-modal-in-btn { + border: none; + margin: 2rem 1rem; + background-color: #6667ab; + color: #eeeeee; + font-size: 15px; + padding: 0.3rem 1rem; + border-radius: 5px; +} + /*# sourceMappingURL=meetingroom.css.map */ diff --git a/src/statics/css/meetingroom.css.map b/src/statics/css/meetingroom.css.map index 25a2a9a..cc1ce10 100644 --- a/src/statics/css/meetingroom.css.map +++ b/src/statics/css/meetingroom.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/meetingroom.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;AACA;AACA;EACA;AACA;EACA;EACA;AACA;AACA;;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aD5CM;;AC+CR;EACE;EACA;EACA;EACA,YDhDI;ECiDJ,ODhDI;ECiDJ,aDrDM;ECsDN;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aD/EM;ECgFN;EAEA;EAGA;;AAIF;EACE;EACA;EAEA;EACA;EACA,OD3FI;EC4FJ,aDhGM;ECiGN;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;;AAGF;EACE;EAEA;EACA;EACA;EACA;;AAOJ;AACE;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;AACA;AACA;AACA;EACA;EACA;EACA;AACA;EAEA;EACA;EACA;EACA,ODvJE;ECwJF;;AAEA;EACE;EACA;EAEA;EACA;EAEA,aDrKE;ECsKF;;AAEA;EAEE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;;AAEA;EAEE;EACA,aD/LA;ECgMA;EACA;;AAEF;EAEE;EACA,aDtMA;ECuMA;EACA;;AAIJ;EAEE;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA,aDvNA;ECwNA;EACA,ODtNF;;AC0NF;EAEE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA,ODpOF;ECqOE;EACA;;AAGF;EACE;EACA,OD1OF;EC2OE;EACA;;AAGF;EACE,ODjPF;ECkPE;EACA;;AAGF;EACE,ODtPF;ECuPE;EACA;;AAMR;EAGE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EAEA;EACA;EACA;AACA;EACA;EACA;EACA;AACA;AACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aDtSA;ECuSA,ODnSF;ECoSE;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA,aD5TF;EC6TE;EACA;;AAGF;EAEE;EACA;EAIA;EACA;EACA;EACA;;AAIJ;EAEE;EACA;EACA,aDnVA;ECoVA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA,aDzWF;EC0WE;EACA;;AAGF;EACE;EACA;EACA,OD7WJ;EC8WI,YDlXF;;ACqXA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAcF;EACE;EACA,aD7YF;EC8YE;EACA;;AAGF;EACE;EACA;EACA;EACA,ODlZJ;ECmZI,YDvZF;;AC0ZA;EACE;EACA;EACA,ODzZJ;EC0ZI,YD9ZF;;ACiaA;EACE;;AAGF;EACE;EACA,aDvaF;ECwaE;EACA,ODraJ;ECsaI;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA,ODjbJ;ECkbI;EACA;EACA,aDxbF;ECybE;EACA;;AASF;EACE;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA,aDhdF;ECidE;EACA;;AAUJ;EACE;;AAGF;EACE;EACA;EAEA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aD/fF;ECggBE;EAEA;;AAOV;EAGE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EAEA;EACA;EACA;AACA;EACA;EACA;EACA;AACA;AACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aD7iBA;EC8iBA,OD1iBF;EC2iBE;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA,aDnkBF;ECokBE;EACA;;AAIJ;EAEE;EACA;EACA,aD7kBA;EC8kBA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE,ODnlBN;EColBM,aDxlBJ;ECylBI;EACA;EACA;;AAEF;EACE,OD3lBN;EC4lBM,aD/lBJ;ECgmBI;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAUhB;AACE;EACA;EACA;EACA;EACA;AACA;EACA;AACA;EACA;AACA;EACA;EACA;AACA;AACA;AACA;AACA;AACA;AACA;EACA;EACA;;AAEA;EAME;EACA;AACA;;AAGF;EACE;EACA;EAGA;EAOA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA,aD7qBM;EC8qBN;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA,ODrrBE;ECsrBF;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA,ODjsBE;ECksBF;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA,OD7sBE;EC8sBF;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAOV;EACE;EACA;EACA;;;AAGF;EACE,kBD9vBU;EC+vBV;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA","file":"meetingroom.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/meetingroom.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;AACA;AACA;EACA;AACA;EACA;EACA;AACA;AACA;;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aD5CM;;AC+CR;EACE;EACA;EACA;EACA,YDhDI;ECiDJ,ODhDI;ECiDJ,aDrDM;ECsDN;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,aD/EM;ECgFN;EAEA;EAGA;;AAIF;EACE;EACA;EAEA;EACA;EACA,OD3FI;EC4FJ,aDhGM;ECiGN;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;;AAGF;EACE;EAEA;EACA;EACA;EACA;;AAOJ;AACE;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;AACA;AACA;AACA;EACA;EACA;EACA;AACA;EAEA;EACA;EACA;EACA,ODvJE;ECwJF;;AAEA;EACE;EACA;EAEA;EACA;EAEA,aDrKE;ECsKF;;AAEA;EAEE;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;;AAEA;EAEE;EACA,aD/LA;ECgMA;EACA;;AAEF;EAEE;EACA,aDtMA;ECuMA;EACA;;AAIJ;EAEE;EACA;EAEA;EACA;EACA;;AAEA;EACE;EACA,aDvNA;ECwNA;EACA,ODtNF;;AC0NF;EAEE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA,ODpOF;ECqOE;EACA;;AAGF;EACE;EACA,OD1OF;EC2OE;EACA;;AAGF;EACE,ODjPF;ECkPE;EACA;;AAGF;EACE,ODtPF;ECuPE;EACA;;AAMR;EAGE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EAEA;EACA;EACA;AACA;EACA;EACA;EACA;AACA;AACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aDtSA;ECuSA,ODnSF;ECoSE;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA,aD5TF;EC6TE;EACA;;AAGF;EAEE;EACA;EAIA;EACA;EACA;EACA;;AAIJ;EAEE;EACA;EACA,aDnVA;ECoVA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA,aDzWF;EC0WE;EACA;;AAGF;EACE;EACA;EACA,OD7WJ;EC8WI,YDlXF;;ACqXA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAcF;EACE;EACA,aD7YF;EC8YE;EACA;;AAGF;EACE;EACA;EACA;EACA,ODlZJ;ECmZI,YDvZF;;AC0ZA;EACE;EACA;EACA,ODzZJ;EC0ZI,YD9ZF;;ACiaA;EACE;;AAGF;EACE;EACA,aDvaF;ECwaE;EACA,ODraJ;ECsaI;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA,ODjbJ;ECkbI;EACA;EACA,aDxbF;ECybE;EACA;;AASF;EACE;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA,aDhdF;ECidE;EACA;;AAUJ;EACE;;AAGF;EACE;EACA;EAEA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aD/fF;ECggBE;EAEA;;AAOV;EAGE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EAEA;EACA;EACA;AACA;EACA;EACA;EACA;AACA;AACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA,aD7iBA;EC8iBA,OD1iBF;EC2iBE;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA,aDnkBF;ECokBE;EACA;;AAIJ;EAEE;EACA;EACA,aD7kBA;EC8kBA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE,ODnlBN;EColBM,aDxlBJ;ECylBI;EACA;EACA;;AAEF;EACE,OD3lBN;EC4lBM,aD/lBJ;ECgmBI;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAUhB;AACE;EACA;EACA;EACA;EACA;AACA;EACA;AACA;EACA;AACA;EACA;EACA;AACA;AACA;AACA;AACA;AACA;AACA;EACA;EACA;;AAEA;EAME;EACA;AACA;;AAGF;EACE;EACA;EAGA;EAOA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA,aD7qBM;EC8qBN;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA,ODrrBE;ECsrBF;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA,ODjsBE;ECksBF;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA,OD7sBE;EC8sBF;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAOV;EACE;EACA;EACA;;;AAGF;EACE,kBD9vBU;EC+vBV;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAMF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;;;AAEF;EAKE;EAEA;EACA;EACA;;;AAEF;EACE;EACA,ODj2BU;ECk2BV;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA,kBDp4BU;ECq4BV;EACA;EACA;EACA","file":"meetingroom.css"} \ No newline at end of file diff --git a/src/statics/css/modalLarge.css b/src/statics/css/modalLarge.css index e064652..0ff41d8 100644 --- a/src/statics/css/modalLarge.css +++ b/src/statics/css/modalLarge.css @@ -58,10 +58,6 @@ z-index: 99; background-color: rgba(0, 0, 0, 0.6); } -.modalLarge svg { - cursor: pointer; - height: 15px; -} .modalLarge > section { width: 80%; max-width: 400px; @@ -79,10 +75,6 @@ background-color: var(--htmlbgColor); font-weight: 700; } -.modalLarge > section > main { - padding: 5px 16px 30px 16px; - text-align: center; -} .modalLarge > section > main .main-heading { font-size: 14px; color: var(--textColor); diff --git a/src/statics/css/modalLarge.css.map b/src/statics/css/modalLarge.css.map index bfa8dba..86bd640 100644 --- a/src/statics/css/modalLarge.css.map +++ b/src/statics/css/modalLarge.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/modalLarge.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,kBDlEI;ECmEJ;;AAGJ;EACE;EACA;;;AAIN;EACE;EACA;EACA","file":"modalLarge.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/modalLarge.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAKA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,kBDlEI;ECmEJ;;AAGJ;EACE;EACA;;;AAIN;EACE;EACA;EACA","file":"modalLarge.css"} \ No newline at end of file diff --git a/src/statics/css/settingsAdmin.css b/src/statics/css/settingsAdmin.css index 294c1bf..54f2365 100644 --- a/src/statics/css/settingsAdmin.css +++ b/src/statics/css/settingsAdmin.css @@ -128,6 +128,9 @@ cursor: default; background-color: #808080; } +.settings-admin .settings-admin-input-pwd { + text-align: center; +} .settings-admin .settings-admin-input-pwd .settings-admin-input-heading { font-size: 14px; text-align: left; @@ -174,6 +177,7 @@ height: 28px; border-radius: 5px; margin-top: 20px; + margin-bottom: 40px; } .settings-admin .settings-admin-input-pwd button:disabled { cursor: default; diff --git a/src/statics/css/settingsAdmin.css.map b/src/statics/css/settingsAdmin.css.map index f71ba88..01fc3c2 100644 --- a/src/statics/css/settingsAdmin.css.map +++ b/src/statics/css/settingsAdmin.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/settingsAdmin.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIE;EACE;;AAGJ;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE,OD3DI;;AC6DN;EACE;;AAGJ;EACE;EACA;EACA,kBDpEM;ECqEN;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAMJ;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE;;AAEF;EACE,ODlHI;;ACoHN;EACE;;AAGJ;EACE;EACA;EACA,kBD3HM;EC4HN;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA","file":"settingsAdmin.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/main.scss","../scss/settingsAdmin.scss"],"names":[],"mappings":"AAAQ;AAUR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EAEA;EACA;EACA;EAEA;EAEA;EACA;;;AAQF;EACE;;;ACrEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIE;EACE;;AAGJ;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE,OD3DI;;AC6DN;EACE;;AAGJ;EACE;EACA;EACA,kBDpEM;ECqEN;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAIN;EAEE;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEA;EACE;;AAEF;EACE,ODnHI;;ACqHN;EACE;;AAGJ;EACE;EACA;EACA,kBD5HM;EC6HN;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA","file":"settingsAdmin.css"} \ No newline at end of file diff --git a/src/statics/scss/meetingroom.scss b/src/statics/scss/meetingroom.scss index 89337be..2b56268 100644 --- a/src/statics/scss/meetingroom.scss +++ b/src/statics/scss/meetingroom.scss @@ -791,6 +791,7 @@ } .meetingroom-list { + padding-top: 1.5rem; display: grid; width: 100%; grid-template-columns: repeat(auto-fill, minmax(192px, auto)); @@ -798,7 +799,7 @@ } .meetingroom-card { cursor: pointer; - padding: 0.8rem 0; + padding: 0.6rem 0; width: 100%; } .meetingroom-card__img { @@ -823,7 +824,7 @@ left: 0.5rem; background-color: rgba(252, 252, 252, 0.6); border-radius: 3px; - color: var(--textColor); + color: #444444; font-size: 12px; } .meetingroom-card__title { @@ -832,3 +833,80 @@ font-weight: 500; padding: 0.2rem 0.4rem; } + +// .meeting-detail-modal { +// width: 100%; +// } +.meeting-detail-modal__img { + position: relative; + width: 100%; + height: 0; + overflow: hidden; + padding-bottom: 75%; + & img { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 10px; + opacity: 0.8; + } +} +.meeting-detail-modal__contents { + position: relative; + top: -20px; +} +.meeting-detail-modal__contents-header { + // position: relative; + // top: -20px; + // display: flex; + // align-items: center; + width: 70%; + // margin-right: 25%; + background-color: var(--borderColor); + padding: 0.5rem; + border-radius: 0 4px 4px 0; +} +.meeting-detail-modal__category { + font-size: 12px; + color: $mainColor; + padding-right: 10px; +} +.meeting-detail-modal__title { + color: var(--textColor); + font-weight: 500; + font-size: 16px; +} +.meeting-detail-modal__contents-body { + display: flex; + align-items: center; + padding: 0.8rem 1.2rem; +} +.meetingroom__crown { + cursor: default; + margin-right: 5px; + margin-bottom: 4px; +} +.meetingroom__person { + margin-right: 5px; + margin-bottom: 3px; +} +.meeting-detail-modal__hostname { + font-size: 14px; + color: var(--textColor); + padding-right: 10px; +} +.meeting-detail-modal__desc { + padding: 0 1.2rem; + font-size: 15px; + color: var(--textColor); +} +.meeting-modal-in-btn { + border: none; + margin: 2rem 1rem; + background-color: $mainColor; + color: #eeeeee; + font-size: 15px; + padding: 0.3rem 1rem; + border-radius: 5px; +} diff --git a/src/statics/scss/modalLarge.scss b/src/statics/scss/modalLarge.scss index e779cd4..cdb5bdc 100644 --- a/src/statics/scss/modalLarge.scss +++ b/src/statics/scss/modalLarge.scss @@ -10,10 +10,10 @@ left: 0; z-index: 99; background-color: rgba(0, 0, 0, 0.6); - & svg { - cursor: pointer; - height: 15px; - } + // & svg { + // cursor: pointer; + // height: 15px; + // } > section { width: 80%; max-width: 400px; @@ -31,8 +31,8 @@ font-weight: 700; } > main { - padding: 5px 16px 30px 16px; - text-align: center; + // padding: 5px 16px 30px 16px; + // text-align: center; & .main-heading { font-size: 14px; color: var(--textColor); diff --git a/src/statics/scss/settingsAdmin.scss b/src/statics/scss/settingsAdmin.scss index a23292f..39a6516 100644 --- a/src/statics/scss/settingsAdmin.scss +++ b/src/statics/scss/settingsAdmin.scss @@ -87,6 +87,7 @@ } .settings-admin-input-pwd { // width: 30rem; + text-align: center; .settings-admin-input-heading { font-size: 14px; text-align: left; @@ -134,6 +135,7 @@ height: 28px; border-radius: 5px; margin-top: 20px; + margin-bottom: 40px; &:disabled { cursor: default; background-color: #808080;