From 83b1e6c900bb322e1066d5c032b9b99e634a31c0 Mon Sep 17 00:00:00 2001 From: Kyle Gill Date: Wed, 15 May 2019 17:40:27 -0600 Subject: [PATCH] wip migration --- public/index.html | 2 +- src/App.js | 40 ++++----- src/components/Layout/Layout.js | 5 ++ src/components/Navbar/Navbar.js | 11 ++- src/components/PrivateRoute/PrivateRoute.js | 15 ++-- src/components/container.js | 17 ++++ src/components/elements/elements.js | 2 +- src/components/firebase/fire.js | 2 +- src/components/screens/Day/Day.js | 42 +++------- src/components/screens/Login/Login.js | 13 ++- src/components/screens/Month/Month.js | 6 +- src/components/screens/Privacy/Privacy.js | 93 --------------------- src/components/screens/Privacy/index.js | 2 - src/components/screens/Register/Register.js | 6 +- src/components/screens/Start/Start.js | 6 +- src/components/screens/Terms/Terms.js | 80 ------------------ src/components/screens/Terms/index.js | 2 - src/components/screens/Welcome/Welcome.js | 63 ++++++++++++++ src/components/screens/Welcome/index.js | 2 + src/components/screens/Year/Year.js | 6 +- src/pages/index.js | 12 ++- src/pages/privacy.js | 91 ++++++++++++++++++++ src/pages/terms.js | 85 +++++++++++++++++++ 23 files changed, 333 insertions(+), 270 deletions(-) create mode 100644 src/components/container.js delete mode 100644 src/components/screens/Privacy/Privacy.js delete mode 100644 src/components/screens/Privacy/index.js delete mode 100644 src/components/screens/Terms/Terms.js delete mode 100644 src/components/screens/Terms/index.js create mode 100644 src/components/screens/Welcome/Welcome.js create mode 100644 src/components/screens/Welcome/index.js create mode 100644 src/pages/privacy.js create mode 100644 src/pages/terms.js diff --git a/public/index.html b/public/index.html index bc63325..3c2e2db 100644 --- a/public/index.html +++ b/public/index.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/src/App.js b/src/App.js index aad5a70..b6e7dd0 100644 --- a/src/App.js +++ b/src/App.js @@ -1,5 +1,5 @@ import React, { Component } from "react" -import { BrowserRouter as Router, Route } from "react-router-dom" +import { Router } from "@reach/router" import { compose } from "recompose" import styled from "@emotion/styled" import { ThemeProvider } from "emotion-theming" @@ -15,9 +15,7 @@ import User from "./components/screens/User" import Login from "./components/screens/Login" import Search from "./components/screens/Search" import Register from "./components/screens/Register" -import Start from "./components/screens/Start" -import Terms from "./components/screens/Terms" -import Privacy from "./components/screens/Privacy" +import Welcome from "./components/screens/Welcome" import PrivateRoute from "./components/PrivateRoute" import { OnlineContext } from "./components/context/online" @@ -94,25 +92,25 @@ class App extends Component { return ( - - - - + + + + @@ -128,14 +126,18 @@ class App extends Component { component={User} exact /> - - - - - - - - + + + + {/* */} + + + ) diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js index 9046510..9af8b9c 100644 --- a/src/components/Layout/Layout.js +++ b/src/components/Layout/Layout.js @@ -9,6 +9,11 @@ export default ({ children }) => ( * { transition: 0.2s all ease-in-out; } + h1 { + font-family: "Montserrat", -apple-system, BlinkMacSystemFont, + "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", + "Droid Sans", "Helvetica Neue", sans-serif; + } body { margin: 0; padding: 0; diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index 2fb8986..592e082 100644 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -1,5 +1,5 @@ import React from "react" -import { withRouter } from "react-router-dom" +import { navigate } from "gatsby" import { StyledLink as Link } from "../elements" import styled from "@emotion/styled" /** @jsx jsx */ @@ -62,10 +62,10 @@ const NavIcons = styled.div` } ` -const Navbar = ({ authUser, theme, toggleTheme, history }) => ( +const Navbar = ({ authUser, theme, toggleTheme }) => (