From 35e11d61340938c0dc9c2352fdf5e0473cdc31dd Mon Sep 17 00:00:00 2001
From: Kyle Gill <kylerobertgill@gmail.com>
Date: Sat, 18 May 2019 16:14:38 -0600
Subject: [PATCH] chore: move screens into routes folder

---
 gatsby-config.js                                     |  1 +
 src/App.js                                           | 12 ++++++------
 src/components/Layout.js                             |  2 +-
 src/components/SignOut.js                            |  4 ++--
 src/components/screens/Day/index.js                  |  2 --
 src/components/screens/Month/index.js                |  2 --
 src/components/screens/Search/index.js               |  2 --
 src/components/screens/Start/index.js                |  2 --
 src/components/screens/User/index.js                 |  2 --
 src/components/screens/Welcome/index.js              |  2 --
 src/components/screens/Year/index.js                 |  2 --
 src/components/session/withAuthentication.js         |  2 +-
 src/pages/index.js                                   |  2 +-
 src/{components/screens/Day => routes}/Day.js        |  0
 src/{components/screens/Month => routes}/Month.js    |  4 ++--
 src/{components/screens/Search => routes}/Search.js  |  0
 src/{components/screens/Start => routes}/Start.js    |  4 ++--
 src/{components/screens/User => routes}/User.js      |  7 +++----
 .../screens/Welcome => routes}/Welcome.js            |  0
 src/{components/screens/Year => routes}/Year.js      |  6 +++---
 20 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 src/components/screens/Day/index.js
 delete mode 100644 src/components/screens/Month/index.js
 delete mode 100644 src/components/screens/Search/index.js
 delete mode 100644 src/components/screens/Start/index.js
 delete mode 100644 src/components/screens/User/index.js
 delete mode 100644 src/components/screens/Welcome/index.js
 delete mode 100644 src/components/screens/Year/index.js
 rename src/{components/screens/Day => routes}/Day.js (100%)
 rename src/{components/screens/Month => routes}/Month.js (98%)
 rename src/{components/screens/Search => routes}/Search.js (100%)
 rename src/{components/screens/Start => routes}/Start.js (98%)
 rename src/{components/screens/User => routes}/User.js (98%)
 rename src/{components/screens/Welcome => routes}/Welcome.js (100%)
 rename src/{components/screens/Year => routes}/Year.js (98%)

diff --git a/gatsby-config.js b/gatsby-config.js
index 99d595e..265ae73 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -48,6 +48,7 @@ module.exports = {
         aliases: {
           components: "./components",
           img: "./img",
+          routes: "./routes",
           styles: "./styles",
           utils: "./utils",
         },
diff --git a/src/App.js b/src/App.js
index 49d6573..f75874a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -8,12 +8,12 @@ import { SIZES } from "./styles/constants"
 
 import theme from "./styles/theme"
 import Navbar from "./components/Navbar"
-import Day from "./components/screens/Day"
-import Month from "./components/screens/Month"
-import Year from "./components/screens/Year"
-import User from "./components/screens/User"
-import Search from "./components/screens/Search"
-import Welcome from "./components/screens/Welcome"
+import Day from "routes/Day"
+import Month from "routes/Month"
+import Year from "routes/Year"
+import User from "routes/User"
+import Search from "routes/Search"
+import Welcome from "routes/Welcome"
 import PrivateRoute from "./components/PrivateRoute"
 
 import { OnlineContext } from "./components/context/online"
diff --git a/src/components/Layout.js b/src/components/Layout.js
index df60211..4e97bbe 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -3,7 +3,7 @@ import { Helmet } from "react-helmet"
 import { Global, css } from "@emotion/core"
 import styled from "@emotion/styled"
 
-import { SimpleNavbar } from "../Navbar"
+import { SimpleNavbar } from "components/Navbar"
 import { withTheme } from "emotion-theming"
 
 const Layout = ({ children, theme }) => (
diff --git a/src/components/SignOut.js b/src/components/SignOut.js
index 3f572ed..f04bf60 100644
--- a/src/components/SignOut.js
+++ b/src/components/SignOut.js
@@ -2,9 +2,9 @@ import React from "react"
 import { compose } from "recompose"
 import { withTheme } from "emotion-theming"
 
-import { Button } from "../elements"
+import { Button } from "components/elements"
 
-import { withFirebase } from "../firebase"
+import { withFirebase } from "components/firebase"
 
 const SignOutButton = ({ firebase, theme }) => (
   <Button
diff --git a/src/components/screens/Day/index.js b/src/components/screens/Day/index.js
deleted file mode 100644
index a8ec12c..0000000
--- a/src/components/screens/Day/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Day from "./Day"
-export default Day
diff --git a/src/components/screens/Month/index.js b/src/components/screens/Month/index.js
deleted file mode 100644
index ab03bfb..0000000
--- a/src/components/screens/Month/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Month from "./Month"
-export default Month
diff --git a/src/components/screens/Search/index.js b/src/components/screens/Search/index.js
deleted file mode 100644
index ca4f06c..0000000
--- a/src/components/screens/Search/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Search from "./Search"
-export default Search
diff --git a/src/components/screens/Start/index.js b/src/components/screens/Start/index.js
deleted file mode 100644
index 4dcdd5e..0000000
--- a/src/components/screens/Start/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Start from "./Start"
-export default Start
diff --git a/src/components/screens/User/index.js b/src/components/screens/User/index.js
deleted file mode 100644
index 01f33f4..0000000
--- a/src/components/screens/User/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import User from "./User"
-export default User
diff --git a/src/components/screens/Welcome/index.js b/src/components/screens/Welcome/index.js
deleted file mode 100644
index 2483f45..0000000
--- a/src/components/screens/Welcome/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Welcome from "./Welcome"
-export default Welcome
diff --git a/src/components/screens/Year/index.js b/src/components/screens/Year/index.js
deleted file mode 100644
index d65d30c..0000000
--- a/src/components/screens/Year/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Year from "./Year"
-export default Year
diff --git a/src/components/session/withAuthentication.js b/src/components/session/withAuthentication.js
index bfe34e4..94f3b29 100644
--- a/src/components/session/withAuthentication.js
+++ b/src/components/session/withAuthentication.js
@@ -1,7 +1,7 @@
 import React from "react"
 
 import AuthUserContext from "./context"
-import { withFirebase } from "../firebase"
+import { withFirebase } from "components/firebase"
 
 const withAuthentication = Component => {
   class WithAuthentication extends React.Component {
diff --git a/src/pages/index.js b/src/pages/index.js
index 2266146..0996e0d 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,6 +1,6 @@
 import React from "react"
 import { SimpleNavbar } from "components/Navbar"
-import Index from "components/screens/Start/index"
+import Index from "routes/Start"
 import Layout from "components/Layout"
 import Container from "components/container"
 
diff --git a/src/components/screens/Day/Day.js b/src/routes/Day.js
similarity index 100%
rename from src/components/screens/Day/Day.js
rename to src/routes/Day.js
diff --git a/src/components/screens/Month/Month.js b/src/routes/Month.js
similarity index 98%
rename from src/components/screens/Month/Month.js
rename to src/routes/Month.js
index 779d06b..0d18322 100644
--- a/src/components/screens/Month/Month.js
+++ b/src/routes/Month.js
@@ -1,5 +1,4 @@
 import React, { Component } from "react"
-import { AppLink as Link } from "components/elements"
 import styled from "@emotion/styled"
 import {
   isAfter,
@@ -12,7 +11,8 @@ import {
   startOfMonth,
 } from "date-fns"
 
-import Seek from "../../Seek"
+import { AppLink as Link } from "components/elements"
+import Seek from "components/Seek"
 
 const YearCardGrid = styled.div`
   display: grid;
diff --git a/src/components/screens/Search/Search.js b/src/routes/Search.js
similarity index 100%
rename from src/components/screens/Search/Search.js
rename to src/routes/Search.js
diff --git a/src/components/screens/Start/Start.js b/src/routes/Start.js
similarity index 98%
rename from src/components/screens/Start/Start.js
rename to src/routes/Start.js
index cda6072..2d8ac10 100644
--- a/src/components/screens/Start/Start.js
+++ b/src/routes/Start.js
@@ -7,8 +7,8 @@ import { withTheme } from "emotion-theming"
 import { SIZES } from "styles/constants"
 import { Button, P } from "components/elements"
 import { todayUrl } from "utils/date"
-import Icon from "component/Icon"
-import Logo from "component/Logo"
+import Icon from "components/Icon"
+import Logo from "components/Logo"
 
 const StartGrid = styled.div`
   margin-top: 30px;
diff --git a/src/components/screens/User/User.js b/src/routes/User.js
similarity index 98%
rename from src/components/screens/User/User.js
rename to src/routes/User.js
index 1026b35..8eb1db5 100644
--- a/src/components/screens/User/User.js
+++ b/src/routes/User.js
@@ -5,12 +5,11 @@ import { compose } from "recompose"
 import { format } from "date-fns"
 import { BeatLoader } from "react-spinners"
 
+import { SIZES } from "styles/constants"
 import { withFirebase } from "components/firebase"
 import { withAuthentication } from "components/session"
-import { SIZES } from "styles/constants"
-
-import SignOut from "../../SignOut"
-import { Button } from "../../elements"
+import SignOut from "components/SignOut"
+import { Button } from "components/elements"
 
 const ProfileGrid = styled.div`
   display: grid;
diff --git a/src/components/screens/Welcome/Welcome.js b/src/routes/Welcome.js
similarity index 100%
rename from src/components/screens/Welcome/Welcome.js
rename to src/routes/Welcome.js
diff --git a/src/components/screens/Year/Year.js b/src/routes/Year.js
similarity index 98%
rename from src/components/screens/Year/Year.js
rename to src/routes/Year.js
index c10ea08..2471594 100644
--- a/src/components/screens/Year/Year.js
+++ b/src/routes/Year.js
@@ -1,11 +1,11 @@
 import React, { Component } from "react"
-import { AppLink as Link } from "components/elements"
-import styled from "@emotion/styled"
 import { addYears, subYears, format, isThisYear, getMonth } from "date-fns"
+import styled from "@emotion/styled"
 import { withTheme } from "emotion-theming"
 
+import { AppLink as Link } from "components/elements"
+import Seek from "components/Seek"
 import { months } from "utils/date"
-import Seek from "../../Seek"
 
 const MonthCardGrid = styled.div`
   display: grid;