diff --git a/gatsby-config.js b/gatsby-config.js index 38d0c47..99d595e 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -48,6 +48,8 @@ module.exports = { aliases: { components: "./components", img: "./img", + styles: "./styles", + utils: "./utils", }, }, }, diff --git a/public/index.html b/public/index.html index 870e20c..a365e8c 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/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js index 4a0a297..b471670 100644 --- a/src/components/Navbar/Navbar.js +++ b/src/components/Navbar/Navbar.js @@ -1,14 +1,14 @@ import React from "react" import { navigate, Link } from "gatsby" -import { StyledLink } from "../../components/elements" +import { StyledLink } from "components/elements" import styled from "@emotion/styled" /** @jsx jsx */ import { jsx } from "@emotion/core" import { compose } from "recompose" import { withTheme } from "emotion-theming" -import { SIZES } from "../../styles/constants" -import { todayUrl, yearUrl } from "../../utils/date" +import { SIZES } from "styles/constants" +import { todayUrl, yearUrl } from "utils/date" import Logo from "../Logo" import Icon from "../Icon" diff --git a/src/components/container.js b/src/components/container.js index cf049c2..c890924 100644 --- a/src/components/container.js +++ b/src/components/container.js @@ -1,7 +1,7 @@ import React from "react" import styled from "@emotion/styled" -import { SIZES } from "../styles/constants" +import { SIZES } from "styles/constants" const Container = styled.div` display: flex; diff --git a/src/components/elements/elements.js b/src/components/elements/elements.js index c79b584..d0174cf 100644 --- a/src/components/elements/elements.js +++ b/src/components/elements/elements.js @@ -3,7 +3,7 @@ import { withTheme } from "emotion-theming" import { Link } from "gatsby" import styled from "@emotion/styled" -import { SIZES } from "../../styles/constants" +import { SIZES } from "styles/constants" export const H1 = styled.h1` display: block; diff --git a/src/components/screens/Day/Day.js b/src/components/screens/Day/Day.js index 0d88c08..16d9933 100644 --- a/src/components/screens/Day/Day.js +++ b/src/components/screens/Day/Day.js @@ -1,16 +1,17 @@ import React from "react" +import { addDays, subDays, format, isAfter, startOfYesterday } from "date-fns" +import { BeatLoader } from "react-spinners" import styled from "@emotion/styled" /** @jsx jsx */ import { jsx, css, keyframes } from "@emotion/core" import { compose } from "recompose" import { withTheme } from "emotion-theming" -import { withFirebase } from "../../firebase" -import { withAuthentication } from "../../session" -import { OnlineContext } from "../../context/online" -import { addDays, subDays, format, isAfter, startOfYesterday } from "date-fns" -import { BeatLoader } from "react-spinners" -import { SIZES } from "../../../styles/constants" +import { withFirebase } from "components/firebase" +import { withAuthentication } from "components/session" +import { OnlineContext } from "components/context/online" + +import { SIZES } from "styles/constants" import Seek from "../../Seek" import Icon from "../../Icon" diff --git a/src/components/screens/Month/Month.js b/src/components/screens/Month/Month.js index 9f7a49a..779d06b 100644 --- a/src/components/screens/Month/Month.js +++ b/src/components/screens/Month/Month.js @@ -1,5 +1,5 @@ import React, { Component } from "react" -import { AppLink as Link } from "../../../components/elements" +import { AppLink as Link } from "components/elements" import styled from "@emotion/styled" import { isAfter, diff --git a/src/components/screens/Search/Search.js b/src/components/screens/Search/Search.js index 32520c7..12a23ce 100644 --- a/src/components/screens/Search/Search.js +++ b/src/components/screens/Search/Search.js @@ -1,5 +1,4 @@ import { Component } from "react" -import { AppLink as Link } from "../../elements" /** @jsx jsx */ import { jsx, css, keyframes } from "@emotion/core" import styled from "@emotion/styled" @@ -7,11 +6,11 @@ import { compose } from "recompose" import { withTheme } from "emotion-theming" import { BeatLoader } from "react-spinners" -import { Input } from "../../elements" -import { pad } from "../../../utils/date" - -import { withFirebase } from "../../firebase" -import { withAuthentication } from "../../session" +import { AppLink as Link } from "components/elements" +import { Input } from "components/elements" +import { withFirebase } from "components/firebase" +import { withAuthentication } from "components/session" +import { pad } from "utils/date" const SearchGrid = styled.div` display: grid; diff --git a/src/components/screens/Start/Start.js b/src/components/screens/Start/Start.js index 23e1b59..9634f7b 100644 --- a/src/components/screens/Start/Start.js +++ b/src/components/screens/Start/Start.js @@ -4,13 +4,11 @@ import Img from "gatsby-image" import styled from "@emotion/styled" import { withTheme } from "emotion-theming" -import { SIZES } from "../../../styles/constants" -import { Button, P } from "../../elements" -import { todayUrl } from "../../../utils/date" +import { SIZES } from "styles/constants" +import { Button, P } from "components/elements" +import { todayUrl } from "utils/date" import Icon from "../../Icon" import Logo from "../../Logo" -import LandingGraphicLight from "../../../img/landing-graphic-light.svg" -import LandingGraphicDark from "../../../img/landing-graphic-dark.svg" const StartGrid = styled.div` margin-top: 30px; diff --git a/src/components/screens/User/User.js b/src/components/screens/User/User.js index 5275b00..1026b35 100644 --- a/src/components/screens/User/User.js +++ b/src/components/screens/User/User.js @@ -3,11 +3,11 @@ import styled from "@emotion/styled" import { withTheme } from "emotion-theming" import { compose } from "recompose" import { format } from "date-fns" -import { withFirebase } from "../../firebase" -import { withAuthentication } from "../../session" 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" diff --git a/src/components/screens/Welcome/Welcome.js b/src/components/screens/Welcome/Welcome.js index a9cd160..35e3a6b 100644 --- a/src/components/screens/Welcome/Welcome.js +++ b/src/components/screens/Welcome/Welcome.js @@ -3,10 +3,9 @@ import { Link } from "gatsby" import styled from "@emotion/styled" import { withTheme } from "emotion-theming" -import { SIZES } from "../../../styles/constants" -import { Button, P } from "../../elements" -import { todayUrl } from "../../../utils/date" -import Logo from "../../Logo" +import { Button, P } from "components/elements" +import Logo from "components/Logo" +import { todayUrl } from "utils/date" const WelcomeGrid = styled.div` margin-top: 30px; @@ -37,9 +36,8 @@ class Welcome extends Component {

Your Space for Wandering Thoughts and Ideas

- Journaling can improve your health and help you take inventory of your - day. Sol Journal works offline and from any device. Use it as a place - to record thoughts and events from the day. + This your space for wandering thoughts and ideas. Write about whatever + comes to mind.

diff --git a/src/components/screens/Year/Year.js b/src/components/screens/Year/Year.js index a0743c4..c10ea08 100644 --- a/src/components/screens/Year/Year.js +++ b/src/components/screens/Year/Year.js @@ -1,10 +1,10 @@ import React, { Component } from "react" -import { AppLink as Link } from "../../../components/elements" +import { AppLink as Link } from "components/elements" import styled from "@emotion/styled" import { addYears, subYears, format, isThisYear, getMonth } from "date-fns" import { withTheme } from "emotion-theming" -import { months } from "../../../utils/date" +import { months } from "utils/date" import Seek from "../../Seek" const MonthCardGrid = styled.div` diff --git a/src/pages/app.js b/src/pages/app.js index 25b3514..5a8c21e 100644 --- a/src/pages/app.js +++ b/src/pages/app.js @@ -1,7 +1,7 @@ import React from "react" import App from "../App" -import Layout from "../components/Layout" +import Layout from "components/Layout" export default () => ( diff --git a/src/pages/index.js b/src/pages/index.js index 8090515..2266146 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,8 +1,8 @@ import React from "react" -import { SimpleNavbar } from "../components/Navbar" -import Index from "../components/screens/Start/index" -import Layout from "../components/Layout" -import Container from "../components/container" +import { SimpleNavbar } from "components/Navbar" +import Index from "components/screens/Start/index" +import Layout from "components/Layout" +import Container from "components/container" export default () => ( diff --git a/src/pages/login.js b/src/pages/login.js index 18b107c..ee37f64 100644 --- a/src/pages/login.js +++ b/src/pages/login.js @@ -5,11 +5,11 @@ import { compose } from "recompose" import { format } from "date-fns" import { withTheme } from "emotion-theming" -import { SimpleNavbar } from "../components/Navbar" -import { Input, Button, P } from "../components/elements" -import { SIZES } from "../styles/constants" -import Layout from "../components/Layout" -import { FirebaseContext } from "../components/firebase" +import { SimpleNavbar } from "components/Navbar" +import { Input, Button, P } from "components/elements" +import Layout from "components/Layout" +import { FirebaseContext } from "components/firebase" +import { SIZES } from "styles/constants" const LoginGrid = styled.div` display: grid; diff --git a/src/pages/privacy.js b/src/pages/privacy.js index b575d40..53deba0 100644 --- a/src/pages/privacy.js +++ b/src/pages/privacy.js @@ -1,8 +1,8 @@ import React from "react" -import { P } from "../components/elements" -import Layout from "../components/Layout" -import Container from "../components/container" +import { P } from "components/elements" +import Layout from "components/Layout" +import Container from "components/container" const Terms = () => ( diff --git a/src/pages/register.js b/src/pages/register.js index fd1ea72..6ef3e79 100644 --- a/src/pages/register.js +++ b/src/pages/register.js @@ -4,11 +4,11 @@ import { navigate, Link } from "gatsby" import { compose } from "recompose" import { withTheme } from "emotion-theming" -import { SimpleNavbar } from "../components/Navbar" -import { Input, Button, P } from "../components/elements" -import { SIZES } from "../styles/constants" -import Layout from "../components/Layout" -import { FirebaseContext } from "../components/firebase" +import { SimpleNavbar } from "components/Navbar" +import { Input, Button, P } from "components/elements" +import Layout from "components/Layout" +import { FirebaseContext } from "components/firebase" +import { SIZES } from "styles/constants" const RegisterGrid = styled.div` display: grid; diff --git a/src/pages/terms.js b/src/pages/terms.js index 1999b66..3e3917e 100644 --- a/src/pages/terms.js +++ b/src/pages/terms.js @@ -1,8 +1,8 @@ import React from "react" -import { P } from "../components/elements" -import Layout from "../components/Layout" -import Container from "../components/container" +import { P } from "components/elements" +import Layout from "components/Layout" +import Container from "components/container" const Terms = () => (