Skip to content

Commit

Permalink
Merge pull request #23 from codefordenver/dh-header-nav
Browse files Browse the repository at this point in the history
Dh header nav
  • Loading branch information
jwexitplan authored Apr 16, 2019
2 parents 963c78e + 120dbad commit a015026
Show file tree
Hide file tree
Showing 17 changed files with 92,955 additions and 3,474 deletions.
Binary file added .DS_Store
Binary file not shown.
6,860 changes: 3,430 additions & 3,430 deletions frontend/package-lock.json

Large diffs are not rendered by default.

44,062 changes: 44,062 additions & 0 deletions frontend/public/assets/Exit_Plan-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44,056 changes: 44,056 additions & 0 deletions frontend/public/assets/Exit_Plan-SecondaryLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 0 additions & 28 deletions frontend/src/App.js

This file was deleted.

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

const App = () => {
return (
<main className="app-wrapper">
<Header />
</main>
)
};

export default App;
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions frontend/src/Header/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import Nav from '../Nav/Nav.js';
import './Header.scss';

const Header = () => {
return (
<header>
<div role="logo-container" className="header-logo-container">
<img className="header-logo" src="./assets/Exit_Plan-SecondaryLogo.svg" alt="exit plan logo"/>
</div>
<Nav/>
</header>
)
};

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

header {
background-color: $dark-blue;
height: 100px;
display: flex;
justify-content: space-between;
}

.header-logo {
height: 80px;
width: 200px;
margin-top: 10px;
padding: 10px;
}

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

const navFilters = ['HOME', 'ABOUT', 'RESOURCES', 'ARTICLES', 'CONTACT'];

const Nav = () => {
const filterList = navFilters.map(filter => (<li>{filter}</li>))
return(
<nav>
<ul>
{ filterList }
</ul>
</nav>
)
};

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

nav {
margin-right: 30px;
padding: 20px;
}

ul {
display: flex;
}

li {
list-style: none;
cursor: pointer;
color: $off-white;
font-family: Helvetica, sans-serif;
font-size: 2rem;
font-weight: 400;
padding: 15px;
}
8 changes: 8 additions & 0 deletions frontend/src/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Colors
$dark-blue: #1B1464;
$light-blue: #AFC3E0;
$off-white: #F5F5F5;

// Fonts
@import url('https://fonts.googleapis.com/css?family=Gothic+A1');
$font-family: 'Gothic A1', sans-serif;
14 changes: 0 additions & 14 deletions frontend/src/index.css

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import './index.scss';
import App from './App/App.js';
import * as serviceWorker from './serviceWorker';

ReactDOM.render(<App />, document.getElementById('root'));
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import 'variables';

* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
Loading

0 comments on commit a015026

Please sign in to comment.