Skip to content

Commit

Permalink
Bp 5 build about summary component (#15)
Browse files Browse the repository at this point in the history
* Added design for the homepage.

* Fix contact info

* Added new design for the website.

* Add rough draft of summary component

* Fix up spacing for component left side and refactor some of code

* Change image size depending on viewport width

* Styled the button and the text.

Co-authored-by: Minh Lu <[email protected]>
  • Loading branch information
micksumm and MinhLu12 authored Jul 2, 2020
1 parent 67ac0c8 commit 407015b
Show file tree
Hide file tree
Showing 9 changed files with 20,649 additions and 39 deletions.
20,485 changes: 20,485 additions & 0 deletions design/Bergin_Homepage_20200627 .ai

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import Navigation from "./components/Navigation/Navigation";
import Summary from "./components/Summary/Summary";
import ContactInfo from "./components/ContactInfo/ContactInfo";
import BeforeAndAfter from "./components/BeforeAndAfter/BeforeAndAfter";
import FeaturedServices from "./components/FeaturedServices/FeaturedServices"
Expand All @@ -8,7 +9,8 @@ export default function App() {
return (
<>
<Navigation></Navigation>
<div style={{minHeight: "700px"}}></div>
<div style={{minHeight: "500px"}}></div>
<Summary></Summary>
<BeforeAndAfter></BeforeAndAfter>
<FeaturedServices></FeaturedServices>
<ContactInfo></ContactInfo>
Expand Down
Binary file added src/assets/summary/dr_bergin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 18 additions & 18 deletions src/components/BeforeAndAfter/BeforeAndAfter.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import React from 'react';
import cn from './BeforeAndAfter.module.scss';
import teethBefore from 'assets/before_and_after/teeth-before.png';
import teethAfter from 'assets/before_and_after/teeth-after.png';
import TeethBefore from 'assets/before_and_after/teeth-before.png';
import TeethAfter from 'assets/before_and_after/teeth-after.png';

const BeforeAndAfter = () => {
return (
<>
<div className={cn.BeforeAndAfter}>
return (
<>
<div className={cn.BeforeAndAfter}>

<div className={cn.Images}>
<img src={teethBefore}></img>
<img src={teethAfter}></img>
</div>
<div className={cn.Images}>
<img src={TeethBefore}></img>
<img src={TeethAfter}></img>
</div>

<div className={cn.Text}>
<span className={cn.Header}>Creating Smiles with a Gentle touch.</span>
<span className={cn.Captions}>
<a href="#">Click here</a> to view our full smile gallery.
</span>
</div>
</div>
</>
)
<div className={cn.Text}>
<span className={cn.Header}>Creating Smiles with a Gentle touch.</span>
<span className={cn.Captions}>
<a href="#">Click here</a> to view our full smile gallery.
</span>
</div>
</div>
</>
)
}

export default BeforeAndAfter;
35 changes: 17 additions & 18 deletions src/components/FeaturedServices/FeaturedServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,25 @@ import ImplantRestoration from 'assets/services/implant_restoration.png';
import RemovableProstho from 'assets/services/removable_prosthodontics.png';
import RestorativeDentistry from 'assets/services/restorative_dentistry.png';


const FeaturedServices = () => {
return (
<>
<div className={cn.FeaturedServices}>
<div className={cn.Text}>
<span className={cn.Header}>FEATURED SERVICES</span>
<hr className={cn.Break}></hr>
<span className={cn.Caption}>Handcrafted artistry meets cutting-edge dentistry</span>
</div>
return (
<>
<div className={cn.FeaturedServices}>
<div className={cn.Text}>
<span className={cn.Header}>FEATURED SERVICES</span>
<hr className={cn.Break}></hr>
<span className={cn.Caption}>Handcrafted artistry meets cutting-edge dentistry</span>
</div>

<div className={cn.Images}>
<img src={RestorativeDentistry}></img>
<img src={RemovableProstho}></img>
<img src={CosmeticDentistry}></img>
<img src={ImplantRestoration}></img>
</div>
</div>
</>
)
<div className={cn.Images}>
<img src={RestorativeDentistry}></img>
<img src={RemovableProstho}></img>
<img src={CosmeticDentistry}></img>
<img src={ImplantRestoration}></img>
</div>
</div>
</>
)
}

export default FeaturedServices
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
display: flex;
justify-content: center;
background-color: $secondary-background-color;
min-height: 360px;
min-height: 420px;
align-items: center;
flex-direction: column;
box-shadow : 2px 0px 5px rgba(35, 31, 32, 0.62);
Expand Down
38 changes: 38 additions & 0 deletions src/components/Summary/Summary.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from 'react';
import cn from './Summary.module.scss';
import DrBergin from 'assets/summary/dr_bergin.jpg';
import { Button } from "@material-ui/core";

const Summary = () => {
return (
<>
<div className={cn.Summary}>

<div className={cn.Welcome_Text}>

<div className={cn.Left_Space}></div>
<div className={cn.Right_Box}>
<div className={cn.Title_Text}>
<span>Welcome to</span>
<span>Bergin Prosthodontics</span>
</div>
<hr className={cn.Break}></hr>
<div className={cn.Paragraph}>
<p>lots of text here about the office lots of text here about the office</p>
</div>

</div>

</div>

<div className={cn.Bergin_Image}>
<img src={DrBergin}></img>
<Button variant="contained" className={cn.Button}>Meet Dr. Bergin</Button>
</div>

</div>
</>
)
}

export default Summary
85 changes: 85 additions & 0 deletions src/components/Summary/Summary.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
@import 'global.scss';

.Summary {
display: flex;
justify-content: center;
min-height: 620px;
background-color: $quaternary-background-color;
}

.Welcome_Text {
flex-basis: 60%;
display: flex;
}

.Left_Space {
flex-basis: 30%;
}

.Right_Box {
flex-basis: 70%;
margin-top: 40px;
}

.Title_Text {
font-size: $secondary-font-size;
color: $secondary-text;
text-align: center;
text-transform: uppercase;
}

.Title_Text span:nth-child(1) {
font-family: PlayfairDisplay-Regular;
display: block;
text-align: center;
justify-content: center;
}

.Title_Text span:nth-child(2) {
display: block;
font-family: PlayfairDisplay-Bold;
}

.Break{
margin-top: 2px;
margin-bottom: 10px;
color: $secondary-text;
}

.Paragraph {
font-size: $primary-font-size;
font-family: OpenSans-Regular;
text-align: center;
}

.Bergin_Image {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
flex-basis: 40%;
}

// Tablets, phones
@media only screen and (min-width: 600px) {
.Bergin_Image img {
width: 300px;
}
}

// Monitors, laptops
@media only screen and (min-width: 1200px) {
.Bergin_Image img {
width: 379px;
}
}

.Button {
margin-top: 16px !important;
background-color: $quaternary-background-color;
color: $secondary-text;
font-family: PlayfairDisplay-Bold4 !important;
font-size: 20px !important;
border: 1px solid #304774 !important;

}
3 changes: 2 additions & 1 deletion src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
$primary-background-color: #1A2440 !important; // #304774
$secondary-background-color: #E4EAF1 !important;
$teriary-background-color: #73305B !important; //#B4B8C5
$quaternary-background-color: #F1F2F2 !important;

// Texts
$primary-text: white !important;
$secondary-text: #304774 !important;

// Font size
$primary-font-size: 23px !important;
$secondary-font-size: 27px !important;
$secondary-font-size: 38px !important;

body {
margin: 0;
Expand Down

0 comments on commit 407015b

Please sign in to comment.