- {firebase => }
+ {firebase => }
Don't have an account? Sign Up
@@ -49,7 +49,7 @@ class LoginFormBase extends Component {
.doSignInWithEmailAndPassword(email, password)
.then(() => {
this.setState({ email: "", password: "", error: null })
- this.props.history.push(format(new Date(), "/"))
+ navigate(`app/${format(new Date(), "/")}`)
})
.catch(error => {
this.setState({ error })
@@ -95,10 +95,7 @@ class LoginFormBase extends Component {
}
}
-const LoginForm = compose(
- withTheme,
- withRouter
-)(LoginFormBase)
+const LoginForm = compose(withTheme)(LoginFormBase)
export default withTheme(LoginPage)
diff --git a/src/components/screens/Month/Month.js b/src/components/screens/Month/Month.js
index 97c74e2..9f7a49a 100644
--- a/src/components/screens/Month/Month.js
+++ b/src/components/screens/Month/Month.js
@@ -38,11 +38,7 @@ const YearCard = styled.div`
class Month extends Component {
render() {
- const {
- match: {
- params: { year, month },
- },
- } = this.props
+ const { year, month } = this.props
const currentDay = new Date(year, month - 1)
// include all months unless it's this year
diff --git a/src/components/screens/Privacy/Privacy.js b/src/components/screens/Privacy/Privacy.js
deleted file mode 100644
index 5200423..0000000
--- a/src/components/screens/Privacy/Privacy.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, { Component } from "react"
-import { withRouter } from "react-router-dom"
-import styled from "@emotion/styled"
-import { compose } from "recompose"
-import { format } from "date-fns"
-import { withTheme } from "emotion-theming"
-
-import { Input, Button, P } from "../../elements"
-import { SIZES } from "../../../styles/constants"
-import { StyledLink as Link } from "../../elements"
-
-const Terms = ({}) => (
- <>
-
Privacy Policy
- Last update: April 30, 2019
-
- Sol Journal supports the following browsers: Chrome (latest), Safari
- (latest), Firefox (50+)
-
- Rights
-
- You don't have to provide your real name when you register to an account,
- but you need to use a valid/verifiable email address.
-
-
- You have the right to export your data at any time, in JSON format.
-
-
- Your data will not be intentionally shown to other users or shared with
- third parties.
-
-
- Your personal data will not be shared with anyone without your consent.
-
-
- Data saved on the hosted version of Sol Journal is encrypted as it is
- transmitted and stored. However, data is not salted or hashed when it is
- stored on Google servers so database administrators (me) can view the data
- as plaintext. I won't view or use the data of other users for any reason
- but if you would like to have more ownership of your data you can setup
- the code on your own.
-
-
- If the site ceases operation, you will receive an opportunity to export
- all your data before the site dies.
-
-
- Any new features that affect privacy will be strictly opt-in.
-
- Responsibilites
-
- You will not use the site to store illegal information or data under
- United States law (or any law).
-
-
- You have to be at least 18+ to create an account and use the site.
-
-
- You must not abuse the site by knowingly posting malicious code that could
- harm you or the other users.
-
-
- You may not make automated requests to the site.
-
-
- You may not abuse the registration system.
-
-
- You are responsible for keeping your account secure.
-
-
I reserve the right to close accounts that abuse the system
- (millions of entries or overloading services with requests) or use it in
- an unreasonable manner.
-
- Other
-
- Other important legal stuff Though I want to provide a great service,
- there are certain things about the service I cannot promise. For example,
- the services and software are provided “as-is”, at your own risk, without
- express or implied warranty or condition of any kind. I also disclaim any
- warranties of merchantability, fitness for a particular purpose or
- non-infringement. Sol Journal will have no responsibility for any harm to
- your computer system, loss or corruption of data, or other harm that
- results from your access to or use of the Services or Software.
-
-
- These Terms can change at any time, but I'll try to be reasonable. This is
- a service I've always and hope to be able to run it for a long time.
-
-
-)
-
-export default withTheme(Terms)
diff --git a/src/components/screens/Privacy/index.js b/src/components/screens/Privacy/index.js
deleted file mode 100644
index 30919f7..0000000
--- a/src/components/screens/Privacy/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Privacy from "./Privacy"
-export default Privacy
diff --git a/src/components/screens/Register/Register.js b/src/components/screens/Register/Register.js
index a848251..fdcdfc8 100644
--- a/src/components/screens/Register/Register.js
+++ b/src/components/screens/Register/Register.js
@@ -1,5 +1,4 @@
import React, { Component } from "react"
-import { withRouter } from "react-router-dom"
import styled from "@emotion/styled"
import { compose } from "recompose"
import { withTheme } from "emotion-theming"
@@ -137,10 +136,7 @@ class RegisterFormBase extends Component {
}
}
-const RegisterForm = compose(
- withTheme,
- withRouter
-)(RegisterFormBase)
+const RegisterForm = compose(withTheme)(RegisterFormBase)
export default withTheme(RegisterPage)
diff --git a/src/components/screens/Start/Start.js b/src/components/screens/Start/Start.js
index 7157f00..c3d36d3 100644
--- a/src/components/screens/Start/Start.js
+++ b/src/components/screens/Start/Start.js
@@ -1,5 +1,5 @@
import React, { Component } from "react"
-import { AppLink as Link } from "../../elements"
+import { Link } from "gatsby"
import styled from "@emotion/styled"
import { withTheme } from "emotion-theming"
@@ -11,12 +11,14 @@ import Logo from "../../Logo"
const StartGrid = styled.div`
margin-top: 30px;
+ text-align: center;
line-height: 1.5;
color: ${props => props.theme.colors.primary};
height: 100%;
`
const FeatureGrid = styled.div`
display: grid;
+ text-align: left;
grid-template-rows: 1fr;
grid-gap: 30px;
`
@@ -97,7 +99,7 @@ class Start extends Component {
to record thoughts and events from the day.
-
+
(
- <>
-
Terms of Service
-
Last update: April 30, 2019
-
Scope of Service
-
- Sol Journal supports the following browsers: Chrome (latest), Safari
- (latest), Firefox (50+)
-
-
Rights
-
- You don't have to provide your real name when you register to an account,
- but you need to use a valid/verifiable email address.
-
-
- You have the right to export your data at any time, in JSON format.
-
-
- Your data will not be intentionally shown to other users or shared with
- third parties.
-
-
- Your personal data will not be shared with anyone without your consent.
-
-
- We reserve the right to discontinue any feature of the service at any
- time. If the site ceases operation, you will receive an opportunity to
- export all your data before the site dies.
-
-
- Any new features that affect privacy will be strictly opt-in.
-
-
Responsibilites
-
- You will not use the site to store illegal information or data under
- United States law (or any law).
-
-
- You have to be at least 18+ to create an account and use the site.
-
-
- You must not abuse the site by knowingly posting malicious code that could
- harm you or the other users.
-
-
- You may not make automated requests to the site.
-
-
- You may not abuse the registration system.
-
-
- You are responsible for keeping your account secure.
-
-
I reserve the right to close accounts that abuse the system
- (millions of entries or overloading services with requests) or use it in
- an unreasonable manner.
-
-
Other
-
- Other important legal stuff Though I want to provide a great service,
- there are certain things about the service I cannot promise. For example,
- the services and software are provided “as-is”, at your own risk, without
- express or implied warranty or condition of any kind. I also disclaim any
- warranties of merchantability, fitness for a particular purpose or
- non-infringement. Sol Journal will have no responsibility for any harm to
- your computer system, loss or corruption of data, or other harm that
- results from your access to or use of the Services or Software.
-
-
- These Terms can change at any time, but I'll try to be reasonable. This is
- a service I've always and hope to be able to run it for a long time.
-
-
-)
-
-export default Terms
diff --git a/src/components/screens/Terms/index.js b/src/components/screens/Terms/index.js
deleted file mode 100644
index a05ba9a..0000000
--- a/src/components/screens/Terms/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Terms from "./Terms"
-export default Terms
diff --git a/src/components/screens/Welcome/Welcome.js b/src/components/screens/Welcome/Welcome.js
new file mode 100644
index 0000000..a9cd160
--- /dev/null
+++ b/src/components/screens/Welcome/Welcome.js
@@ -0,0 +1,63 @@
+import React, { Component } from "react"
+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"
+
+const WelcomeGrid = styled.div`
+ margin-top: 30px;
+ line-height: 1.5;
+ color: ${props => props.theme.colors.primary};
+ height: 100%;
+`
+const Footer = styled.footer`
+ margin-top: 120px;
+ padding: 30px 0px;
+ text-align: center;
+ color: ${props => props.theme.colors.secondary};
+`
+const FooterLink = styled(Link)`
+ cursor: pointer;
+ color: ${props => props.theme.colors.secondary};
+ text-decoration: none;
+ margin: 10px;
+ &:hover {
+ color: ${props => props.theme.colors.tertiary};
+ }
+`
+
+class Welcome extends Component {
+ render() {
+ const { theme } = this.props
+ return (
+
+ 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.
+
+
+
+
+
+
+ )
+ }
+}
+
+export default withTheme(Welcome)
diff --git a/src/components/screens/Welcome/index.js b/src/components/screens/Welcome/index.js
new file mode 100644
index 0000000..2483f45
--- /dev/null
+++ b/src/components/screens/Welcome/index.js
@@ -0,0 +1,2 @@
+import Welcome from "./Welcome"
+export default Welcome
diff --git a/src/components/screens/Year/Year.js b/src/components/screens/Year/Year.js
index 310e26f..a0743c4 100644
--- a/src/components/screens/Year/Year.js
+++ b/src/components/screens/Year/Year.js
@@ -31,11 +31,7 @@ const MonthCard = styled.div`
class Year extends Component {
render() {
- const {
- match: {
- params: { year },
- },
- } = this.props
+ const { year } = this.props
const currentDate = new Date(year, 0, 1)
// include all months unless it's this year
diff --git a/src/pages/index.js b/src/pages/index.js
index bfea060..31876a8 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,2 +1,12 @@
+import React from "react"
import Index from "../components/screens/Start/index"
-export default Index
+import Layout from "../components/Layout"
+import Container from "../components/container"
+
+export default () => (
+
+
+
+
+
+)
diff --git a/src/pages/privacy.js b/src/pages/privacy.js
new file mode 100644
index 0000000..b575d40
--- /dev/null
+++ b/src/pages/privacy.js
@@ -0,0 +1,91 @@
+import React from "react"
+
+import { P } from "../components/elements"
+import Layout from "../components/Layout"
+import Container from "../components/container"
+
+const Terms = () => (
+
+
+ Privacy Policy
+ Last update: April 30, 2019
+
+ Sol Journal supports the following browsers: Chrome (latest), Safari
+ (latest), Firefox (50+)
+
+ Rights
+
+ You don't have to provide your real name when you register to an
+ account, but you need to use a valid/verifiable email address.
+
+
+ You have the right to export your data at any time, in JSON format.
+
+
+ Your data will not be intentionally shown to other users or shared with
+ third parties.
+
+
+ Your personal data will not be shared with anyone without your consent.
+
+
+ Data saved on the hosted version of Sol Journal is encrypted as it is
+ transmitted and stored. However, data is not salted or hashed when it is
+ stored on Google servers so database administrators (me) can view the
+ data as plaintext. I won't view or use the data of other users for any
+ reason but if you would like to have more ownership of your data you can
+ setup the code on your own.
+
+
+ If the site ceases operation, you will receive an opportunity to export
+ all your data before the site dies.
+
+
+ Any new features that affect privacy will be strictly opt-in.
+
+ Responsibilites
+
+ You will not use the site to store illegal information or data under
+ United States law (or any law).
+
+
+ You have to be at least 18+ to create an account and use the site.
+
+
+ You must not abuse the site by knowingly posting malicious code that
+ could harm you or the other users.
+
+
+ You may not make automated requests to the site.
+
+
+ You may not abuse the registration system.
+
+
+ You are responsible for keeping your account secure.
+
+
I reserve the right to close accounts that abuse the system
+ (millions of entries or overloading services with requests) or use it in
+ an unreasonable manner.
+
+ Other
+
+ Other important legal stuff Though I want to provide a great service,
+ there are certain things about the service I cannot promise. For
+ example, the services and software are provided “as-is”, at your own
+ risk, without express or implied warranty or condition of any kind. I
+ also disclaim any warranties of merchantability, fitness for a
+ particular purpose or non-infringement. Sol Journal will have no
+ responsibility for any harm to your computer system, loss or corruption
+ of data, or other harm that results from your access to or use of the
+ Services or Software.
+
+
+ These Terms can change at any time, but I'll try to be reasonable. This
+ is a service I've always and hope to be able to run it for a long time.
+
+
+
+)
+
+export default Terms
diff --git a/src/pages/terms.js b/src/pages/terms.js
new file mode 100644
index 0000000..1999b66
--- /dev/null
+++ b/src/pages/terms.js
@@ -0,0 +1,85 @@
+import React from "react"
+
+import { P } from "../components/elements"
+import Layout from "../components/Layout"
+import Container from "../components/container"
+
+const Terms = () => (
+
+
+ Terms of Service
+ Last update: April 30, 2019
+ Scope of Service
+
+ Sol Journal supports the following browsers: Chrome (latest), Safari
+ (latest), Firefox (50+)
+
+ Rights
+
+ You don't have to provide your real name when you register to an
+ account, but you need to use a valid/verifiable email address.
+
+
+ You have the right to export your data at any time, in JSON format.
+
+
+ Your data will not be intentionally shown to other users or shared with
+ third parties.
+
+
+ Your personal data will not be shared with anyone without your consent.
+
+
+ We reserve the right to discontinue any feature of the service at any
+ time. If the site ceases operation, you will receive an opportunity to
+ export all your data before the site dies.
+
+
+ Any new features that affect privacy will be strictly opt-in.
+
+ Responsibilites
+
+ You will not use the site to store illegal information or data under
+ United States law (or any law).
+
+
+ You have to be at least 18+ to create an account and use the site.
+
+
+ You must not abuse the site by knowingly posting malicious code that
+ could harm you or the other users.
+
+
+ You may not make automated requests to the site.
+
+
+ You may not abuse the registration system.
+
+
+ You are responsible for keeping your account secure.
+
+
I reserve the right to close accounts that abuse the system
+ (millions of entries or overloading services with requests) or use it in
+ an unreasonable manner.
+
+ Other
+
+ Other important legal stuff Though I want to provide a great service,
+ there are certain things about the service I cannot promise. For
+ example, the services and software are provided “as-is”, at your own
+ risk, without express or implied warranty or condition of any kind. I
+ also disclaim any warranties of merchantability, fitness for a
+ particular purpose or non-infringement. Sol Journal will have no
+ responsibility for any harm to your computer system, loss or corruption
+ of data, or other harm that results from your access to or use of the
+ Services or Software.
+
+
+ These Terms can change at any time, but I'll try to be reasonable. This
+ is a service I've always and hope to be able to run it for a long time.
+
+
+
+)
+
+export default Terms