summaryrefslogtreecommitdiffstats
path: root/stepped-solutions/08/frontend
diff options
context:
space:
mode:
authorjameygleason <james.p.gleason@gmail.com>2018-09-20 08:21:22 -0400
committerjameygleason <james.p.gleason@gmail.com>2018-09-20 08:21:22 -0400
commit8858b3dede6359d105be6c3baf65eef259d18f11 (patch)
tree99b9c23b9ca1b2146f4c649a37ddcba835077998 /stepped-solutions/08/frontend
parent09b5fe3b69c5082afe0129d451bd1afdd3577227 (diff)
Stepped Solutions
Diffstat (limited to 'stepped-solutions/08/frontend')
-rwxr-xr-xstepped-solutions/08/frontend/components/Nav.js20
-rwxr-xr-xstepped-solutions/08/frontend/components/Page.js29
2 files changed, 43 insertions, 6 deletions
diff --git a/stepped-solutions/08/frontend/components/Nav.js b/stepped-solutions/08/frontend/components/Nav.js
index 0bd20b7..a821bc1 100755
--- a/stepped-solutions/08/frontend/components/Nav.js
+++ b/stepped-solutions/08/frontend/components/Nav.js
@@ -1,14 +1,24 @@
import Link from 'next/link';
+import NavStyles from './styles/NavStyles';
const Nav = () => (
- <div>
+ <NavStyles>
+ <Link href="/items">
+ <a>Items</a>
+ </Link>
<Link href="/sell">
- <a>Sell!</a>
+ <a>Sell</a>
+ </Link>
+ <Link href="/signup">
+ <a>Signup</a>
+ </Link>
+ <Link href="/orders">
+ <a>Orders</a>
</Link>
- <Link href="/">
- <a>Home!</a>
+ <Link href="/me">
+ <a>Account</a>
</Link>
- </div>
+ </NavStyles>
);
export default Nav;
diff --git a/stepped-solutions/08/frontend/components/Page.js b/stepped-solutions/08/frontend/components/Page.js
index 0731f9f..99f3158 100755
--- a/stepped-solutions/08/frontend/components/Page.js
+++ b/stepped-solutions/08/frontend/components/Page.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
+import styled, { ThemeProvider, injectGlobal } from 'styled-components';
import Header from './Header';
import Meta from './Meta';
-import styled, { ThemeProvider, injectGlobal } from 'styled-components';
const theme = {
red: '#FF0000',
@@ -24,6 +24,33 @@ const Inner = styled.div`
padding: 2rem;
`;
+injectGlobal`
+ @font-face {
+ font-family: 'radnika_next';
+ src: url('/static/radnikanext-medium-webfont.woff2') format('woff2');
+ font-weight: normal;
+ font-style: normal;
+ }
+ html {
+ box-sizing: border-box;
+ font-size: 10px;
+ }
+ *, *:before, *:after {
+ box-sizing: inherit;
+ }
+ body {
+ padding: 0;
+ margin: 0;
+ font-size: 1.5rem;
+ line-height: 2;
+ font-family: 'radnika_next';
+ }
+ a {
+ text-decoration: none;
+ color: ${theme.black};
+ }
+`;
+
class Page extends Component {
render() {
return (