master
taha12322 3 years ago
parent 0b8ab1fd8d
commit e87203301d
  1. 3
      profile/package.json
  2. 4
      profile/src/Profile.js
  3. 2
      profile/src/components/about-doctor/About.js
  4. 14
      profile/src/components/comments/Comments.js
  5. 8
      profile/src/components/comments/comments.scss
  6. 31
      profile/src/components/modal/Modal.js
  7. 39
      profile/src/components/modal/Modal.scss
  8. 16
      profile/src/components/present/Presents.js
  9. 82
      profile/src/components/present/WeekDayList/WeekdayList.js
  10. 17
      profile/src/components/present/WeekDayList/WeekdayList.scss
  11. 1
      profile/src/components/request/Request.scss
  12. 26
      profile/yarn.lock

@ -3,6 +3,9 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.15",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",

@ -3,15 +3,17 @@ import Request from "./components/request/Request";
import About from "./components/about-doctor/About"; import About from "./components/about-doctor/About";
import Comments from "./components/comments/Comments"; import Comments from "./components/comments/Comments";
import Presents from "./components/present/Presents"; import Presents from "./components/present/Presents";
import CommentModal from "./components/modal/Modal";
const Profile = () => { const Profile = () => {
return ( return (
<> <>
<div className='container'> <div className="container">
<Request /> <Request />
<About /> <About />
<Comments /> <Comments />
<Presents /> <Presents />
<CommentModal />
</div> </div>
</> </>
); );

@ -3,7 +3,7 @@ import './About.scss'
const About = () => { const About = () => {
return ( return (
<div> <div className='mb-4'>
<h6 className='title'>درباره پزشک</h6> <h6 className='title'>درباره پزشک</h6>
<p className='discription'> <p className='discription'>
لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ، و با استفاده

@ -1,13 +1,14 @@
import React from "react"; import React , {useState} from "react";
import Component from "./Comment/Comment"; import Component from "./Comment/Comment";
import star from "../../assets/star.svg"; import star from "../../assets/star.svg";
import avatar1 from "../../assets/man1.svg"; import avatar1 from "../../assets/man1.svg";
import avatar2 from "../../assets/man2.svg"; import avatar2 from "../../assets/man2.svg";
import plus from "../../assets/plus.svg"; import plus from "../../assets/plus.svg";
import CommentModal from "../modal/Modal";
import "./comments.scss"; import "./comments.scss";
const comments = () => { const Comments = () => {
const comments = [ const comments = [
{ {
name: "محسن محمدی", name: "محسن محمدی",
@ -36,6 +37,10 @@ const comments = () => {
}, },
]; ];
//modal comment
const [modal, setModal] = useState(false);
const toggle = () => setModal(!modal);
return ( return (
<> <>
<header> <header>
@ -62,14 +67,15 @@ const comments = () => {
</> </>
))} ))}
</div> </div>
<button className='insertCommentBtn'> <button className='insertCommentBtn' onClick={toggle}>
<nav className="circleNav"> <nav className="circleNav">
<img alt="مثبت" src={plus} /> <img alt="مثبت" src={plus} />
</nav> </nav>
افزودن نظر افزودن نظر
</button> </button>
<CommentModal modal={modal} toggle={toggle} />
</> </>
); );
}; };
export default comments; export default Comments;

@ -20,12 +20,16 @@
} }
.insertCommentBtn{ .insertCommentBtn{
font-size: 13px;
display: flex; display: flex;
border-radius: 50px; border-radius: 50px;
box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px; box-shadow: rgba(0, 0, 0, 0.1) 0px 6px 12px;
border: none; border: none;
align-items: center;
background-color: #fff; background-color: #fff;
padding: 8px 0.75rem; justify-content: space-between;
padding: 4px 0.5rem;
margin-bottom: 2rem;
} }
.circleNav{ .circleNav{

@ -0,0 +1,31 @@
import React from "react";
import { Modal, ModalBody, ModalHeader } from "reactstrap";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faTimes } from "@fortawesome/free-solid-svg-icons";
import "./Modal.scss";
const CommentModal = ({ modal, toggle }) => {
return (
<div>
<Modal isOpen={modal} toggle={toggle} style={{top: '10rem',}}>
<ModalHeader className='modalHeader'>
<button className="btn" onClick={toggle}>
<FontAwesomeIcon icon={faTimes} />
</button>
</ModalHeader>
<ModalBody className='modalBody'>
<textarea
className="InputGetComment"
placeholder="نظر خود را بنویسید..."
></textarea>
<button className="sendComment" onClick={toggle}>
ارسال
</button>
</ModalBody>
</Modal>
</div>
);
};
export default CommentModal;

@ -0,0 +1,39 @@
.modal-content {
border: none !important;
border-radius: 15px !important;
.modalHeader {
display: flex;
justify-content: flex-end !important;
border: none !important;
padding: 0 !important;
}
.modalBody {
display: flex;
flex-wrap: wrap;
justify-content: center;
padding-top: 0 !important;
.InputGetComment {
background-color: #f5f5f5;
border: none;
border-radius: 15px;
color: #000;
font-size: 13px;
width: 100%;
resize: none;
padding: 8px 1rem;
height: 155px;
margin-bottom: 8px;
outline: none;
}
.sendComment {
text-align: center;
background-color: #634dce;
color: #fff;
border: none;
border-radius: 10px;
width: 100%;
padding: 6px;
}
}
}

@ -1,13 +1,17 @@
import React from 'react' import React from "react";
import WeekdayList from "./WeekDayList/WeekdayList";
const Presents = () => { const Presents = () => {
return ( return (
<> <>
<header> <header className='mt-4 mb-2'>
ساعات حضور <h6>ساعات حضور</h6>
</header> </header>
<nav className='row p-0'>
<WeekdayList />
</nav>
</> </>
) );
} };
export default Presents export default Presents;

@ -0,0 +1,82 @@
import React from "react";
import "./WeekdayList.scss";
const WeekdayList = () => {
const Weekdaylist = [
{
color: "#A8E03D",
bgcolor: "#A8E03D20",
title: "شنبه",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#F11BE2",
bgcolor: "##F11BE230",
title: "یک شنبه ",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#76C4F5",
bgcolor: "#76C4F520",
title: "دو شنبه",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#FC8539",
bgcolor: "#FC853920",
title: "سه شنبه ",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#F87674",
bgcolor: "#F8767420",
title: "چهار شنبه ",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#08E3E4",
bgcolor: "#08E3E420",
title: "چنج شنبه",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
{
color: "#9C9C9C",
bgcolor: "#9C9C9C20",
title: "جمعه",
time1: "۲۲:۰۰",
time2: "۱۸:۳۰",
},
];
return (
<>
{Weekdaylist.map((item) => (
<>
<nav className="mainNav col-6">
<nav className="navDay" style={{ backgroundColor: item.bgcolor }}>
<nav className="navTitle" style={{ backgroundColor: item.color }}>
<p className="title">{item.title}</p>
</nav>
<nav>
<p>
{item.time1} تا {item.time2}
</p>
<p>
{item.time1} تا {item.time2}
</p>
</nav>
</nav>
</nav>
</>
))}
</>
);
};
export default WeekdayList;

@ -0,0 +1,17 @@
.mainNav {
display: flex;
margin-bottom: 1rem;
.navDay {
width: 180px;
box-shadow: rgba(0, 0, 0, 0.1) 0px 6px 12px;
border-radius: 10px;
text-align: center;
padding-top: 8px;
.navTitle {
width: 80px;
border-radius: 20px;
margin: auto;
}
}
}

@ -5,7 +5,6 @@
text-align: center; text-align: center;
margin: 0 auto 1.5rem auto; margin: 0 auto 1.5rem auto;
.navItems { .navItems {
// border: gray solid 1.5px;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;

@ -1177,6 +1177,32 @@
minimatch "^3.0.4" minimatch "^3.0.4"
strip-json-comments "^3.1.1" strip-json-comments "^3.1.1"
"@fortawesome/fontawesome-common-types@^0.2.36":
version "0.2.36"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903"
integrity sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==
"@fortawesome/fontawesome-svg-core@^1.2.36":
version "1.2.36"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz#4f2ea6f778298e0c47c6524ce2e7fd58eb6930e3"
integrity sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.36"
"@fortawesome/free-solid-svg-icons@^5.15.4":
version "5.15.4"
resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz#2a68f3fc3ddda12e52645654142b9e4e8fbb6cc5"
integrity sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==
dependencies:
"@fortawesome/fontawesome-common-types" "^0.2.36"
"@fortawesome/react-fontawesome@^0.1.15":
version "0.1.15"
resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.15.tgz#1450b838f905981d721bf07e14e3b52c0e9a91ed"
integrity sha512-/HFHdcoLESxxMkqZAcZ6RXDJ69pVApwdwRos/B2kiMWxDSAX2dFK8Er2/+rG+RsrzWB/dsAyjefLmemgmfE18g==
dependencies:
prop-types "^15.7.2"
"@hapi/address@2.x.x": "@hapi/address@2.x.x":
version "2.1.4" version "2.1.4"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"

Loading…
Cancel
Save