Skip to content

Commit

Permalink
Merge branch 'master' into dh-general-info
Browse files Browse the repository at this point in the history
  • Loading branch information
drhanciles authored Apr 23, 2019
2 parents c45d4bc + dd4cc3b commit 2ceb17d
Show file tree
Hide file tree
Showing 19 changed files with 790 additions and 16 deletions.
Binary file added designAssets/ExitPlanMockUp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
591 changes: 575 additions & 16 deletions frontend/package-lock.json

Large diffs are not rendered by default.

Binary file added frontend/public/assets/Exit-Plan-Logo.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 added frontend/public/assets/Exit_Plan_Hero.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 added frontend/public/assets/Video_Holder.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions frontend/src/App/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import React from 'react';
import './App.scss';
import Header from '../Header/Header.js';
import GeneralInfo from '../GeneralInfo/GeneralInfo.js';
import Main from '../Main/Main.js';
import Footer from '../Footer/Footer.js';


const App = () => {
return (
<main className="app-wrapper">
<Header />
<GeneralInfo />
<Main />
<Footer />
</main>
)
};
Expand Down
15 changes: 15 additions & 0 deletions frontend/src/App/App.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.App {
text-align: center;
}
.app-wrapper {
display: flex;
flex-direction: column;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
Expand All @@ -19,6 +23,17 @@
color: white;
}

.App-footer {
background-color: #282c34;
min-height: 170vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
}
Expand Down
12 changes: 12 additions & 0 deletions frontend/src/Email/Email.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import './Email.scss';

const Email = () => {
return (
<div className="email">

</div>
)
};

export default Email;
9 changes: 9 additions & 0 deletions frontend/src/Email/Email.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import '../index.scss';

.email {
background-color: $off-white;
display: flex;
justify-content: space-between;
height: 300px;
}

27 changes: 27 additions & 0 deletions frontend/src/Footer/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import './Footer.scss';

const Footer = () => {
return (
<footer>
<div className="footer-location">
<h3>Exit Plan</h3>
<hr></hr>
<br />
<p>123 W 12th Street,</p>
<p>Denver, CO 12345</p>
</div>
<div className="footer-links">
<h3>Useful Links</h3>
<hr></hr>
<a>Customer Support</a>
<br/>
<a>Emergency Resources</a>
<br/>
<a>Directory</a>
</div>
</footer>
)
};

export default Footer;
33 changes: 33 additions & 0 deletions frontend/src/Footer/Footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@import '../index.scss';

footer {
background-color: $dark-blue;
height: 100px;
display: flex;
flex-direction: row;
justify-content: space-between;
color: $off-white;
align-items: center;
font-family: Helvetica, sans-serif;
}

.footer-location {
width: 125px;
margin-left: 20px;
}

.footer-links {
width: 125px;
text-align: right;
margin-right: 20px;
}

h3 {
font-size: 18px;
font-style: italic;
}

p, a {
font-size: 12px;
}

12 changes: 12 additions & 0 deletions frontend/src/Hero/Hero.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import './Hero.scss';

const Hero = () => {
return (
<div className="hero">
<img className="hero-logo" src="./assets/Exit_Plan_Hero.png" alt="exit plan hero"/>
</div>
)
};

export default Hero;
16 changes: 16 additions & 0 deletions frontend/src/Hero/Hero.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import '../index.scss';

.hero {
background-color: $off-white;
display: flex;
justify-content: space-between;
height: 400px;
}

.hero-logo {
width: 100%;
margin-top: 3%;
padding-left: 10%;
padding-right: 10%;
margin-bottom: 3%;
}
17 changes: 17 additions & 0 deletions frontend/src/Intro/Intro.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import './Intro.scss';

const Intro = () => {
return (
<div className="intro">
<div className="intro-text">
some text
</div>
<div className="intro-video">
some more text
</div>
</div>
)
};

export default Intro;
20 changes: 20 additions & 0 deletions frontend/src/Intro/Intro.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@import '../index.scss';

.intro {
background-color: $off-white;
display: flex;
justify-content: space-between;
height: 300px;
flex-direction: row;
font-family: Helvetica, sans-serif;
}

.intro-text {
width: 50%;
background: green;
}

.intro-video {
width: 50%;
background: purple;
}
12 changes: 12 additions & 0 deletions frontend/src/Link/Link.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import './Link.scss';

const Link = () => {
return (
<div className="link">

</div>
)
};

export default Link;
8 changes: 8 additions & 0 deletions frontend/src/Link/Link.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import '../index.scss';

.link {
background-color: $light-blue;
display: flex;
justify-content: space-between;
height: 300px;
}
20 changes: 20 additions & 0 deletions frontend/src/Main/Main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import React from 'react';
import './Main.scss';
import Hero from '../Hero/Hero.js';
import Intro from '../Intro/Intro.js';
import Link from '../Link/Link.js';
import Email from '../Email/Email.js';


const Main = () => {
return (
<main>
<Hero />
<Intro />
<Link />
<Email />
</main>
)
};

export default Main;
9 changes: 9 additions & 0 deletions frontend/src/Main/Main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import '../index.scss';

main {
background-color: $off-white;
height: 900px;
display: flex;
flex: 1;
justify-content: space-between;
}

0 comments on commit 2ceb17d

Please sign in to comment.