Finishing Changes

SiddheshShinde-tech · Nov 27, 2020 · 0044062 · 0044062
1 parent 5aa76b9
commit 0044062
Show file tree

Hide file tree

Showing 23 changed files with 105 additions and 49 deletions.
diff --git a/public/index.html b/public/index.html
@@ -12,6 +12,8 @@
  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
  <!-- Google Fonts -->
  <link rel="preconnect" href="https://fonts.gstatic.com">
+<link href="https://fonts.googleapis.com/css2?family=Texturina:wght@900&display=swap" rel="stylesheet"> 
+ <link rel="preconnect" href="https://fonts.gstatic.com">
 <link href="https://fonts.googleapis.com/css2?family=Lobster+Two&family=Qwigley&display=swap" rel="stylesheet"> 
  <link rel="preconnect" href="https://fonts.gstatic.com">
 <link href="https://fonts.googleapis.com/css2?family=Lobster&family=Qwigley&display=swap" rel="stylesheet">

diff --git a/public/logo5.png b/public/logo5.png
diff --git a/src/Components/Navbar/MenuItems.js b/src/Components/Navbar/MenuItems.js
@@ -4,16 +4,16 @@ export const MenuItems = [
  url: '#',
  cName: 'nav-links'
  },
- {
- title: 'Feature 1',
- url: '#',
- cName: 'nav-links'
- },
- {
- title: 'Feature 2',
- url: '#',
- cName: 'nav-links'
- },
+ // {
+ //  title: 'Feature 1',
+ //  url: '#',
+ //  cName: 'nav-links'
+ // },
+ // {
+ //  title: 'Feature 2',
+ //  url: '#',
+ //  cName: 'nav-links'
+ // },
  {
  title: 'Contact Us',
  url: '#',

diff --git a/src/Components/Navbar/Navbar.css b/src/Components/Navbar/Navbar.css
@@ -42,7 +42,16 @@
  text-align: center;
  width: 70vw;
  justify-content: end;
- margin-right: 2rem;
+ /* margin-right: 0rem; */
+ /* margin-left: 7rem;
+ margin-right: -2rem; */
+ margin-right: -35rem;
+ padding: 0px;
+ margin-left: 0px;
+ /* padding-left: 7rem; */
+
+ margin-left: 4.0rem;
+
 }
 
 .nav-links {
@@ -52,7 +61,7 @@
 }
 
 .nav-links:hover {
- background-color: #5d73c9;
+ background-color: #fed0d0;
  border-radius: 4px;
  transition: all 0.2s ease-out;
 }
@@ -69,7 +78,12 @@
  display: none;
 }
 .signup-nav {
- padding-left: 68rem;
+ padding-left: 0rem;
+ padding-right: 0px;
+
+ margin-left: 35rem;
+ /* padding: 0px; */
+ /* margin-right: -7rem; */
 }
 .signin-nav {
  padding-left: 55rem;
@@ -89,6 +103,7 @@
  left: -100%;
  opacity: 1;
  transition: all 0.5s ease;
+ /* margin-left: 9rem; */
  }
 
  .nav-menu.active {

diff --git a/src/Components/Navbar/Navbar.js b/src/Components/Navbar/Navbar.js
@@ -21,7 +21,7 @@ class Navbar extends Component {
  className={this.state.clicked ? "fas fa-times" : "fas fa-bars"}
  ></i>
  </div>
- {/* <ul className={this.state.clicked ? 'nav-menu active' : 'nav-menu'}>
+ <ul className={this.state.clicked ? 'nav-menu active' : 'nav-menu'}>
  {MenuItems.map((item, index) => {
  return (
  <li className="navba-links" key={index}>
@@ -31,7 +31,7 @@ class Navbar extends Component {
  </li>
  )
  })}
- </ul> */}
+ </ul>
  {/* 
  <div className="signin-nav">
  <Link to="/signup">

diff --git a/src/Components/login/logIn.js b/src/Components/login/logIn.js
@@ -34,7 +34,7 @@ const useStyles = makeStyles((theme) => ({
  },
 // backgroundImage: 'url(https://source.unsplash.com/random)',
  image: {
- backgroundImage: 'url(https://ibb.co/B24c7rV)',
+ backgroundImage: 'url(https://i.ibb.co/SwQ51dX/temp-log.jpg)',
  backgroundRepeat: 'no-repeat',
  backgroundColor: theme.palette.type === 'light' ? theme.palette.grey[50] : theme.palette.grey[900],
  backgroundSize: 'cover',

diff --git a/src/Homepage/HomepageComponents/Assignment/assessmentstyle.css b/src/Homepage/HomepageComponents/Assignment/assessmentstyle.css
@@ -11,6 +11,7 @@
  margin-bottom:0px;
  padding-top: 30px;
  padding-bottom: 20px;
+ margin-top: -2.5rem;
 }
 .Assignmentbtn{
  display: flex;
@@ -31,12 +32,12 @@
 .cardHeader2{
  text-transform: capitalize;
  font-size: 22px;
- padding-right: 595px;
+ padding-right: 490px;
  box-sizing: border-box;
  letter-spacing: 2px;
  color: #333;
  text-align: right;
-
+ /* margin-bottom: 1.5rem; */
 }
 
 .AssignmentDescriptionContent{
@@ -84,4 +85,13 @@
  transform: scale(1.05); 
 
 
+}
+
+.siddheshfontheading
+{
+ font-family: 'Texturina', serif;
+ margin-bottom: 1.3rem;
+ font-size: 2.1rem;
+ /* padding-right: -6rem; */
+ /* padding-left: 2rem; */
 }
diff --git a/src/Homepage/HomepageComponents/Assignment/index.js b/src/Homepage/HomepageComponents/Assignment/index.js
@@ -8,7 +8,7 @@ const Assignment = props => {
  <div className="AssignmentMainContainer">
  <div className="AssignmentContainer" style={{boxSizing: 'border-box'}}> 
  <div className="cardHeader2">
- <h2>Assessment</h2>
+ <h2 className="siddheshfontheading">Assessment</h2>
  </div>
  <div className="AssignmentCardContent">
  <div className="AssignmentImageContainer">

diff --git a/src/Homepage/HomepageComponents/Blogss/Blogss.js b/src/Homepage/HomepageComponents/Blogss/Blogss.js
@@ -8,7 +8,7 @@ class Blogss extends Component {
  <div className="BlogssMainContainer">
  <div className="BlogssContainer" style={{boxSizing: "border-box"}}>
  <div className="cardHeader4">
- <h2>Blogs</h2>
+ <h2 className="siddheshfontheading">Blogs</h2>
  </div>
  <div className="BlogssCardContent">
  <div className="Description">

diff --git a/src/Homepage/HomepageComponents/Doctors/Doctors.js b/src/Homepage/HomepageComponents/Doctors/Doctors.js
@@ -8,7 +8,7 @@ const Doctors = props => {
  <div className="DoctorsMainContainer">
  <div className="DoctorsContainer" style={{boxSizing: 'border-box'}}> 
  <div className="cardHeader9">
- <h2>Doctors</h2>
+ <h2 className="siddheshfontheading">Doctors</h2>
  </div>
  <div className="DoctorsCardContent">
  <div className="DoctorsImageContainer">

diff --git a/src/Homepage/HomepageComponents/Doctors/assessdoctors.css b/src/Homepage/HomepageComponents/Doctors/assessdoctors.css
@@ -21,14 +21,17 @@
  width: 60%;
 }
 .cardHeader9{
+ font-family: 'Texturina', serif;
  text-transform: capitalize;
  font-size: 22px;
  box-sizing: border-box;
  letter-spacing: 2px;
  color: #333;
  text-align: right;
- padding-right: 450px;
+ padding-right: 555px;
+ margin-bottom: 1.3rem;
 }
+
 .DoctorsDescriptionContent{
  font-size: 20px;
  color: black;

diff --git a/src/Homepage/HomepageComponents/SelfAssessment/selfassessment.css b/src/Homepage/HomepageComponents/SelfAssessment/selfassessment.css
@@ -20,15 +20,18 @@
 .SelfDescription{
  width: 60%;
 }
-.cardHeader6{
+.cardHeadersiddhesh{
  text-transform: capitalize;
  font-size: 22px;
- padding-right: 595px;
+ /* padding-right: 395px; */
  box-sizing: border-box;
  letter-spacing: 2px;
  color: #333;
- text-align: right;
- padding-left: 55px;
+ /* text-align: right; */
+ margin-left: 29rem;
+ margin-bottom: 1.7rem;
+ margin-top: -0.5rem;
+
 }
 .SelfDescriptionContent{
  font-size: 20px;

diff --git a/src/Homepage/HomepageComponents/SelfAssessment/selfassessment.js b/src/Homepage/HomepageComponents/SelfAssessment/selfassessment.js
@@ -7,15 +7,15 @@ const SelfAssessment = props => {
  return (
  <div className="SelfMainContainer">
  <div className="SelfContainer" style={{boxSizing: 'border-box'}}> 
- <div className="cardHeader6">
- <h2>Self Assessment</h2>
+ <div className="cardHeadersiddhesh">
+ <h2 className="siddheshfontheading">Self Tracking and Assessment</h2>
  </div>
  <div className="SelfCardContent">
  <div className="SelfImageContainer">
  <img className="SelfImage" src={doctorsHome}></img>
  </div>
  <div className="SelfDescription">
- <p className="SelfDescriptionContent">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p className="SelfDescriptionContent">A portal that gamifies stress/anxiety/depression management in an actionable manner to provide relief. It quantifies the difference in a user's actual and ideal stress/anxiety/depression level as credits to be spent on a prescribed set of activities before the day ends. By doing so, users inadvertently take actionable steps to deal with their condition.</p>
  <br></br>
  <div>
  {/* <a href="http:https://example.com" class="round-button">Take Therapy</a> */}

diff --git a/src/Homepage/HomepageComponents/Therapy/Therapy.js b/src/Homepage/HomepageComponents/Therapy/Therapy.js
@@ -9,7 +9,7 @@ const Therapy = props => {
  <div className="TherapyMainContainer">
  <div className="AssignmentContainer" style={{boxSizing: 'border-box'}}> 
  <div className="cardHeader3">
- <h2>Therapy</h2>
+ <h2 className="siddheshfontheading">Therapies and Games</h2>
  </div>
  <div className="TherapyCardContent">
  <div className="TherapyImageContainer">

diff --git a/src/Homepage/HomepageComponents/Therapy/therapy.css b/src/Homepage/HomepageComponents/Therapy/therapy.css
@@ -23,12 +23,14 @@
 .cardHeader3{
  text-transform: capitalize;
  font-size: 22px;
- padding-right: 445px;
+ padding-right: 305px;
  box-sizing: border-box;
  letter-spacing: 2px;
  color: #333;
  text-align: right;
  padding-left: 55px;
+ margin-top: 1rem;
+ margin-bottom: 1.5rem;
 }
 .TherapyDescriptionContent{
  font-size: 20px;
@@ -70,4 +72,12 @@
  color: white;
  text-decoration: none;
  transform: scale(1.05);
+}
+
+.siddheshfontheading
+{
+ font-family: 'Texturina', serif;
+ margin-bottom: 1.3rem;
+ font-size: 2.1rem;
+ /* margin-left: 5rem; */
 }
diff --git a/src/Homepage/HomepageComponents/Track/Track.js b/src/Homepage/HomepageComponents/Track/Track.js
@@ -10,11 +10,13 @@ class Track extends Component {
  <div className="TrackMainContainer">
  <div className="TrackContainer" style={{boxSizing: 'border-box'}}>
  <div className="cardHeader6">
- <h2>Track Your Medication</h2>
+ <h2 className="siddheshfontheading">Track Your Medication</h2>
  </div>
  <div className="TrackCardContent">
  <div className="Description">
- <p className="DescriptionContent">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ {/* <p className="notavailableguys">Feature not available yet.</p> */}
+
+ <p className="DescriptionContent">You'll record when you take your medications and receive medication reminders. You can use this to help manage numerous people's medication regimens, thanks to the ability to have multiple profiles. It also tracks your prescriptions and reminds you when it's time for a refill.</p>
  <a href="http:https://example.com" class="round-button">Track</a>
  </div>
  <div className="TrackImageContainer">

diff --git a/src/Homepage/HomepageComponents/Track/track.css b/src/Homepage/HomepageComponents/Track/track.css
@@ -82,4 +82,10 @@
  transform: scale(1.05); 
 
 
+}
+
+.notavailableguys
+{
+ padding-left: 1.8rem;
+ font-weight: bold;
 }
diff --git a/src/Homepage/HomepageMainComponent/index.js b/src/Homepage/HomepageMainComponent/index.js
@@ -3,7 +3,7 @@ import Assignment from "../HomepageComponents/Assignment/index";
 import Blogss from "../HomepageComponents/Blogss/Blogss";
 import "./style.css";
 import Doctors from "../HomepageComponents/Doctors/Doctors";
-import Games from "../HomepageComponents/Games/games";
+// import Games from "../HomepageComponents/Games/games";
 import SelfAssessment from "../HomepageComponents/SelfAssessment/selfassessment";
 import Therapy from "../HomepageComponents/Therapy/Therapy";
 import Track from "../HomepageComponents/Track/Track";

diff --git a/src/Homepage/HomepageSidebar/newsidebar.js b/src/Homepage/HomepageSidebar/newsidebar.js
@@ -65,46 +65,46 @@ export default function ClippedDrawer() {
  </ListItemIcon>
  <ListItemText primary="Assessment" />
  </ListItem>
- <Link to="/therapy">
+
  <ListItem button key="Therapies and Games">
  <ListItemIcon>
  <GamesIcon />
  </ListItemIcon>
  <ListItemText primary="Therapies and Games" />
  </ListItem>
- </Link>
+
 
- <Link to="/post/1">
+ {/* <Link to="/post/1"> */}
  <ListItem button key="Blogs">
  <ListItemIcon>
  <ChromeReaderModeIcon />
  </ListItemIcon>
  <ListItemText primary="Blogs" />
  </ListItem>
- </Link>
- <Link to="/expertdoctors">
+ {/* </Link> */}
+
  <ListItem button key="Doctors">
  <ListItemIcon>
  <LocalHospitalIcon />
  </ListItemIcon>
  <ListItemText primary="Doctors" />
  </ListItem>
-  </Link>
+
 
  <ListItem button key="Track your Medication">
  <ListItemIcon>
  <AssessmentIcon />
  </ListItemIcon>
  <ListItemText primary="Track your Medication" />
  </ListItem>
- <Link to="/welcome">
+ {/* <Link to="/welcome"> */}
  <ListItem button key="Self Assessment">
  <ListItemIcon>
  <TrackChangesIcon />
  </ListItemIcon>
  <ListItemText primary="Self Assessment" />
  </ListItem>
- </Link>
+ {/* </Link> */}
  </List>
  </div>
  </div>

diff --git a/src/HomepageSubparts/Assessment/src/components/Result.js b/src/HomepageSubparts/Assessment/src/components/Result.js
@@ -110,13 +110,13 @@ are functioning within the healthy range for the general population.</h3>
  <br></br>
  <li>If your worry or panic feels out of control, and especially if you feel like you may hurt yourself, then talking to someone is really important. Get immediate assistance from the Depression Helpline 0800 111 757.</li>
  <br></br>
- <li>Buttons on Blogs,Games,etc.</li>
+ {/* <li>Buttons on Blogs,Games,etc.</li> */}
  </ul>
  </div>
 
  </CSSTransitionGroup>
 
- <CSSTransitionGroup
+ {/* <CSSTransitionGroup
  className="container result"
  component="div"
  transitionName="fade"
@@ -131,7 +131,7 @@ are functioning within the healthy range for the general population.</h3>
  
  </div>
  
- </CSSTransitionGroup>
+ </CSSTransitionGroup> */}
  </div>
  );
 }