Skip to content

Commit

Permalink
Bp 4 build title (#22)
Browse files Browse the repository at this point in the history
* Added design for the homepage.

* Added new design for the website.

* Added title component.

* Updated the font in the Nav and Contact. Changed spacing in the Summary.

* Changed featured services photo size.

* Changed summary font color

* Changed the colors.

* Addressed minhs requests

* Fix app and title

* Standardized fonts and font sizes.

* Added routing package
  • Loading branch information
micksumm authored Jul 11, 2020
1 parent e46c7e3 commit 45b3b05
Show file tree
Hide file tree
Showing 21 changed files with 205 additions and 207 deletions.
Binary file added src/assets/fonts/DancingScript-Regular.ttf
Binary file not shown.
Binary file added src/assets/fonts/JuliusSansOne-Regular.ttf
Binary file not shown.
Binary file added src/assets/fonts/Quicksand-VariableFont_wght.ttf
Binary file not shown.
Binary file modified src/assets/home/services/cosmetic_dentistry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/home/services/implant_restoration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/home/services/removable_prosthodontics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/home/services/restorative_dentistry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 35 additions & 35 deletions src/components/ContactInfo/ContactInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,44 @@ import cn from './ContactInfo.module.scss';
import classNames from 'classnames/bind';

const ContactInfo = () => {
return (
<>
<div className={cn.Contact_Info}>
<div className={classNames(cn.Column, cn.Column_Left)}>
<div>
<p className={cn.Bold_Header}>Office Hours</p>
<p>Monday 8 AM - 5 PM</p>
<p>Tuesday 8 AM - 5 PM</p>
<p>Wednesday 8 AM - 5 PM</p>
<p>Thursday 8 AM - 12 PM</p>
</div>
</div>
return (
<>
<div className={cn.Contact_Info}>
<div className={classNames(cn.Column, cn.Column_Left)}>
<div>
<p className={cn.Bold_Header}>Office Hours</p>
<p>Monday 8 AM - 5 PM</p>
<p>Tuesday 8 AM - 5 PM</p>
<p>Wednesday 8 AM - 5 PM</p>
<p>Thursday 8 AM - 12 PM</p>
</div>
</div>

<div className={classNames(cn.Column, cn.Column_Middle)}>
<div>
<p className={cn.Bold_Header}>Location</p>
<p>3819 NE 45th St Suite C</p>
<p>Seattle, WA 98105</p>
<p className={cn.Bold_Header}>Contact</p>
<p>206-866-6466</p>
</div>
</div>
<div className={classNames(cn.Column, cn.Column_Middle)}>
<div>
<p className={cn.Bold_Header}>Location</p>
<p>3819 NE 45th St Suite C</p>
<p>Seattle, WA 98105</p>
<p className={cn.Bold_Header}>Contact</p>
<p>206-866-6466</p>
</div>
</div>

<div className={classNames(cn.Column, cn.Column_Right)}>
<div>
<p className={cn.Bold_Header}>Map</p>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2687.2076114399465!2d-122.2885698841777!3d47.660963092213805!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x5490149cab95f4f7%3A0xfbe3c5ac7551bbd7!2sBergin%20Prosthodontics!5e0!3m2!1sen!2sus!4v1590447131151!5m2!1sen!2sus" title="Bergin Prosthodontics Location"></iframe>
</div>
</div>
<div className={classNames(cn.Column, cn.Column_Right)}>
<div>
<p className={cn.Bold_Header}>Map</p>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2687.2076114399465!2d-122.2885698841777!3d47.660963092213805!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x5490149cab95f4f7%3A0xfbe3c5ac7551bbd7!2sBergin%20Prosthodontics!5e0!3m2!1sen!2sus!4v1590447131151!5m2!1sen!2sus" title="Bergin Prosthodontics Location"></iframe>
</div>
</div>

</div>
<div className ={cn.Copyright}>
© 2020 Junping Bergin PLLC, Incorporated. All Rights Reserved.
</div>
</>
);
</div>
<div className ={cn.Copyright}>
© 2020 Junping Bergin PLLC, Incorporated. All Rights Reserved.
</div>
</>
);
}

export default ContactInfo;
14 changes: 4 additions & 10 deletions src/components/ContactInfo/ContactInfo.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,10 @@
justify-content: center;
min-height: 300px;
color: $primary-text;
font-family: Raleway-Regular;
font-family: OpenSans-Regular;
font-size: $primary-font-size;
}

.ContactInfo p {
line-height: 15px;
font-size: 14px;
letter-spacing: 0.02857em;
color: $primary-text;
text-transform: uppercase;
}

.Column {
display: flex;
align-items: center;
Expand Down Expand Up @@ -49,5 +42,6 @@

.Bold_Header {
font-family: Raleway-Bold;
font-size: $teriary-font-size;
text-transform: uppercase;

}
28 changes: 14 additions & 14 deletions src/components/Navigation/Navigation.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import React from "react";
import TabDropdown from "./TabDropdown/TabDropdown";
import cn from "./Navigation.module.scss";
import cn from "./Navigation.module.scss";
import { AppBar, Toolbar, Button } from "@material-ui/core";
import PhoneIcon from "@material-ui/icons/Phone";

const Navigation = () => {
return (
<AppBar position="static" className={cn.AppBar}>
return (
<AppBar position="static" className={cn.AppBar}>

<Toolbar className={cn.Toolbar}>
<PhoneIcon className={cn.Phone_Icon} fontSize="small" />
<p className={cn.Phone_Number}>206-866-6466</p>
<Button variant="contained" className={cn.Button}>Contact Us</Button>
</Toolbar>
<Toolbar className={cn.Toolbar}>
<PhoneIcon className={cn.Phone_Icon} fontSize="small"/>
<p className={cn.Phone_Number}>206-866-6466</p>
<Button variant="contained" className={cn.Button}>Contact Us</Button>
</Toolbar>

<div className={cn.Tab_Dropdown}>
<TabDropdown></TabDropdown>
</div>

</AppBar>
)
<div className={cn.Tab_Dropdown}>
<TabDropdown></TabDropdown>
</div>
</AppBar>
)
}

export default Navigation;
15 changes: 9 additions & 6 deletions src/components/Navigation/Navigation.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
}

.Toolbar {
min-height: 60px !important;
align-items: flex-start !important;
padding-top: 8px;
display: flex;
justify-content: flex-end;
min-height: 60px !important;
align-items: flex-start !important;
padding-top: 8px;
display: flex;
justify-content: flex-end;
}

.Phone_Icon {
Expand All @@ -24,14 +24,17 @@
margin-right: 10px;
margin-top: 7px;
color: $primary-text;
font-size: $primary-font-size;
}

.Tab_Dropdown {
overflow: hidden !important;
overflow: hidden !important;
}

.Button {
font-family: Raleway-Bold !important;
background-color: $darkgray-background-color;
color: $secondary-text;
font-size: 14px !important;

}
128 changes: 64 additions & 64 deletions src/components/Navigation/TabDropdown/TabDropdown.js
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
import React, { Component } from "react";
import cn from "./TabDropdown.module.scss";
import { AppBar, Paper, Tabs, Tab, Popper, MenuList, MenuItem } from "@material-ui/core";
import { AppBar, Paper, Tabs, Tab, Popper, MenuList, MenuItem} from "@material-ui/core";

const aboutUsItems = ["Our Practice", "Meet Dr. Bergin", "Meet Our Team"];
const forPatientsItems = ["Patient Forms", "Financial Policy", "Insurance"];
const servicesItems = ["Cosmetic Dentistry", "Restorative Denstistry", "Implant Prosthodontics", "Removable Prosthodontics"];
const forDoctorsItems = ["Referring Dentists", "Publications"];

const tabs = [
{ key: 0, pathName: "/test", label: "Home", items: [] },
{ key: 1, pathName: "/test", label: "About Us", items: aboutUsItems },
{ key: 2, pathName: "/test", label: "Services", items: servicesItems },
{ key: 3, pathName: "/test", label: "For Patients", items: forPatientsItems },
{ key: 4, pathName: "/test", label: "Gallery", items: [] },
{ key: 5, pathName: "/test", label: "For Doctors", items: forDoctorsItems }
{ key: 0, pathName: "/test", label: "Home", items: [] },
{ key: 1, pathName: "/test", label: "About Us", items: aboutUsItems },
{ key: 2, pathName: "/test", label: "Services", items: servicesItems },
{ key: 3, pathName: "/test", label: "For Patients", items: forPatientsItems },
{ key: 4, pathName: "/test", label: "Gallery", items: [] },
{ key: 5, pathName: "/test", label: "For Doctors", items: forDoctorsItems }
];

class TabDropdown extends Component {
state = {
tabIndex: 0,
showDropdown: false,
targetTabElement: null
};
state = {
tabIndex: 0,
showDropdown: false,
targetTabElement: null
};

showDropdown = (index, event) => {
const { currentTarget } = event;
showDropdown = (index, event) => {
const { currentTarget } = event;

this.setState({
showDropdown: true,
targetTabElement: currentTarget,
tabIndex: index
});
};

this.setState({
showDropdown: true,
targetTabElement: currentTarget,
tabIndex: index
});
};
hideDropdown = () => {
this.setState({
showDropdown: false,
targetTabElement: null
});
};

hideDropdown = () => {
this.setState({
showDropdown: false,
targetTabElement: null
});
};
render() {
const { targetTabElement, showDropdown, tabIndex } = this.state;

render() {
const { targetTabElement, showDropdown, tabIndex } = this.state;
return (
<div onMouseLeave={this.hideDropdown}>
<AppBar position="static" className={cn.AppBar}>

<Tabs
value={tabIndex}
classes={{indicator: cn.TabUnderline}}
textColor="primary"
centered>
{tabs.map((tab) => (
<Tab
key={tab.key}
onMouseEnter={this.showDropdown.bind(this, tab.key)}
className={cn.Tab}
label={tab.label}
aria-owns={showDropdown ? "menu-list-grow" : undefined}
aria-haspopup={"true"}
/>
))}
</Tabs>

return (
<div onMouseLeave={this.hideDropdown}>
<AppBar position="static" className={cn.AppBar}>
<Popper open={showDropdown} anchorEl={targetTabElement} id="menu-list-grow">
<Paper>
<MenuList>
{tabs[tabIndex].items.map((item, index) => (
<MenuItem key={index} onClick={this.hideDropdown}>
{item}
</MenuItem>
))}
</MenuList>
</Paper>
</Popper>

<Tabs
value={tabIndex}
classes={{ indicator: cn.TabUnderline }}
textColor="primary"
centered>
{tabs.map((tab) => (
<Tab
key={tab.key}
onMouseEnter={this.showDropdown.bind(this, tab.key)}
className={cn.Tab}
label={tab.label}
aria-owns={showDropdown ? "menu-list-grow" : undefined}
aria-haspopup={"true"}
/>
))}
</Tabs>

<Popper open={showDropdown} anchorEl={targetTabElement} id="menu-list-grow">
<Paper>
<MenuList>
{tabs[tabIndex].items.map((item, index) => (
<MenuItem key={index} onClick={this.hideDropdown}>
{item}
</MenuItem>
))}
</MenuList>
</Paper>
</Popper>

</AppBar>
</div>
);
}
</AppBar>
</div>
);
}
}

export default TabDropdown;
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

.Tab {
font-family: Raleway-Bold !important;
font-size: $teriary-font-size;
font-size: $primary-font-size;
color: $primary-text;
}
Loading

0 comments on commit 45b3b05

Please sign in to comment.