From 211567e7e7b81f2b7cd00e2bc6ce30acb27d25b4 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sun, 2 Aug 2020 08:26:57 -0600 Subject: [PATCH 1/4] Master (#84) * v2.0.0 (#26) * install next * ejected * feat: SSR * fix: typescript errors * fix: share url * Fixes #15 * Add website name to each page title * better seo * increment version * change source url * change source url * update api url * fix: race condition error * increment version * fix: render error * fix: og:image meta tag * fix: og:image --- gatsby-config.js | 6 ++++-- package.json | 2 +- src/components/SEO.tsx | 14 ++++++++++--- src/views/BlankLetter/BlankLetter.tsx | 19 ++++++++---------- src/views/CreateTemplate/CreateTemplate.tsx | 6 +++--- src/views/EditLetter/EditLetter.tsx | 6 +++--- src/views/EditTemplate/EditTemplate.tsx | 6 +++--- .../ListDraftLetters/ListDraftLetters.tsx | 6 +++--- .../ListTemplateLetters.tsx | 6 +++--- src/views/SharedLetter/SharedLetter.tsx | 6 +++--- src/views/WriteLetter/WriteLetter.tsx | 6 +++--- src/views/WriteTemplate/WriteTemplate.tsx | 6 +++--- {src/images => static}/social-card.png | Bin 13 files changed, 48 insertions(+), 41 deletions(-) rename {src/images => static}/social-card.png (100%) diff --git a/gatsby-config.js b/gatsby-config.js index cbcaf9b..47d5e87 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -8,7 +8,9 @@ module.exports = { title: `Voice Your Stance`, description: `The easiest way to find and contact your representatives about the issues that you care about.`, author: `@kalm42`, - image: `src/images/social-card.png`, + url: `https://voiceyourstance.com`, + twitterUsername: `@VoiceYourStance`, + image: `/social-card.png`, }, plugins: [ `gatsby-plugin-react-helmet`, @@ -24,7 +26,7 @@ module.exports = { options: { typeName: `VYSAPI`, fieldName: `vysapi`, - url: `${process.env.GATSBY_BACKEND}/graphql`, + url: `https://api.voiceyourstance.com/graphql`, }, }, { diff --git a/package.json b/package.json index 03b8249..55fcfa8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "voiceyourstance.com", - "version": "1.0.0", + "version": "2.1.2", "author": "Kyle Melton ", "private": true, "dependencies": { diff --git a/src/components/SEO.tsx b/src/components/SEO.tsx index b244ccc..eda44ca 100644 --- a/src/components/SEO.tsx +++ b/src/components/SEO.tsx @@ -9,6 +9,7 @@ import React from "react" import PropTypes from "prop-types" import { Helmet } from "react-helmet" import { useStaticQuery, graphql } from "gatsby" +import { useLocation } from "@reach/router" interface Props { description?: string @@ -19,6 +20,7 @@ interface Props { } function SEO(props: Props) { + const { pathname } = useLocation() const { description = "The easiest way to find and contact your elected representatives.", lang = "en", @@ -34,6 +36,8 @@ function SEO(props: Props) { title description author + url + twitterUsername image } } @@ -48,9 +52,13 @@ function SEO(props: Props) { name: `description`, content: metaDescription, }, + { + property: `og:url`, + content: `${site.siteMetadata.url}${pathname}`, + }, { property: `og:image`, - content: image, + content: `${site.siteMetadata.url}${site.siteMetadata.image}`, }, { property: `og:title`, @@ -66,11 +74,11 @@ function SEO(props: Props) { }, { name: `twitter:card`, - content: `summary`, + content: `summary_large_image`, }, { name: `twitter:creator`, - content: site.siteMetadata.author, + content: site.siteMetadata.twitterUsername, }, { name: `twitter:title`, diff --git a/src/views/BlankLetter/BlankLetter.tsx b/src/views/BlankLetter/BlankLetter.tsx index b1c5bab..83c18fb 100644 --- a/src/views/BlankLetter/BlankLetter.tsx +++ b/src/views/BlankLetter/BlankLetter.tsx @@ -106,9 +106,9 @@ const BlankLetter = (props: RouteComponentProps) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * Clear error after some time @@ -250,13 +250,6 @@ const BlankLetter = (props: RouteComponentProps) => { setMailDialogIsOpen(true) } - /** - * safe open dialog - */ - const openRepresentativeDialog = useCallback(() => { - setChooseRepresentativeDialogIsOpen(true) - }, []) - return ( @@ -274,7 +267,11 @@ const BlankLetter = (props: RouteComponentProps) => { zip={zip} disabled={loading || isLocked} /> - + setChooseRepresentativeDialogIsOpen(true)} + /> What do you want to say? diff --git a/src/views/CreateTemplate/CreateTemplate.tsx b/src/views/CreateTemplate/CreateTemplate.tsx index 58b5a65..5b26a0d 100644 --- a/src/views/CreateTemplate/CreateTemplate.tsx +++ b/src/views/CreateTemplate/CreateTemplate.tsx @@ -76,9 +76,9 @@ const CreateTemplate = (props: RouteComponentProps) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * On state change calcuate the number of characters remaining. diff --git a/src/views/EditLetter/EditLetter.tsx b/src/views/EditLetter/EditLetter.tsx index 3a344a6..93be577 100644 --- a/src/views/EditLetter/EditLetter.tsx +++ b/src/views/EditLetter/EditLetter.tsx @@ -128,9 +128,9 @@ const EditLetter = (props: Props) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Drafts") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Drafts") + // }, [MetaData]) /** * Clear error after some time diff --git a/src/views/EditTemplate/EditTemplate.tsx b/src/views/EditTemplate/EditTemplate.tsx index 5736165..f406baa 100644 --- a/src/views/EditTemplate/EditTemplate.tsx +++ b/src/views/EditTemplate/EditTemplate.tsx @@ -79,9 +79,9 @@ const EditTemplate = (props: Props) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * On state change calcuate the number of characters remaining. diff --git a/src/views/ListDraftLetters/ListDraftLetters.tsx b/src/views/ListDraftLetters/ListDraftLetters.tsx index 37c43d8..8a84ec4 100644 --- a/src/views/ListDraftLetters/ListDraftLetters.tsx +++ b/src/views/ListDraftLetters/ListDraftLetters.tsx @@ -64,9 +64,9 @@ const ListDraftLetters = (props: RouteComponentProps) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Drafts") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Drafts") + // }, [MetaData]) /** * Clear error after some time diff --git a/src/views/ListTemplateLetters/ListTemplateLetters.tsx b/src/views/ListTemplateLetters/ListTemplateLetters.tsx index 1438450..8ac7cc7 100644 --- a/src/views/ListTemplateLetters/ListTemplateLetters.tsx +++ b/src/views/ListTemplateLetters/ListTemplateLetters.tsx @@ -69,9 +69,9 @@ const ListTemplateLetters = (props: RouteComponentProps) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Registry") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Registry") + // }, [MetaData]) /** * Clear error after some time diff --git a/src/views/SharedLetter/SharedLetter.tsx b/src/views/SharedLetter/SharedLetter.tsx index 884b1be..02f3062 100644 --- a/src/views/SharedLetter/SharedLetter.tsx +++ b/src/views/SharedLetter/SharedLetter.tsx @@ -142,9 +142,9 @@ const SharedLetter = (props: Props) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * Clear error after some time diff --git a/src/views/WriteLetter/WriteLetter.tsx b/src/views/WriteLetter/WriteLetter.tsx index a343dbe..7b53884 100644 --- a/src/views/WriteLetter/WriteLetter.tsx +++ b/src/views/WriteLetter/WriteLetter.tsx @@ -86,9 +86,9 @@ const WriteLetter = (props: Props) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * On state change calcuate the number of characters remaining. diff --git a/src/views/WriteTemplate/WriteTemplate.tsx b/src/views/WriteTemplate/WriteTemplate.tsx index 4171303..7003c1e 100644 --- a/src/views/WriteTemplate/WriteTemplate.tsx +++ b/src/views/WriteTemplate/WriteTemplate.tsx @@ -114,9 +114,9 @@ const WriteTemplate = (props: Props) => { /** * set the title */ - useEffect(() => { - MetaData?.safeSetTitle("Write a letter") - }, [MetaData]) + // useEffect(() => { + // MetaData?.safeSetTitle("Write a letter") + // }, [MetaData]) /** * Clear error after some time diff --git a/src/images/social-card.png b/static/social-card.png similarity index 100% rename from src/images/social-card.png rename to static/social-card.png From 505cdcf1599321cf503eecc4399d5b3e6edb2aaf Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 3 Aug 2020 18:48:03 -0600 Subject: [PATCH 2/4] Issue 86 edit button (#88) * v2.0.0 (#26) * install next * ejected * feat: SSR * fix: typescript errors * fix: share url * Fixes #15 * Add website name to each page title * better seo * feat: edit button * fix: z-index issue --- src/components/Layout.tsx | 2 ++ src/components/elements.ts | 1 + src/views/ListTemplateLetters/ListTemplateLetters.tsx | 5 ++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index 82975de..fba61df 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -49,6 +49,7 @@ const Nav = styled.nav` height: 100vh; background: white; padding: 20px; + z-index: 100; ` const Main = styled.main` min-height: calc(100vh - 222px - 60px); @@ -125,6 +126,7 @@ const AuthenticationMenu = styled.div` background: var(--background); border: 1px solid var(--accent); transition: all 200ms ease; + z-index: 100; ` const Layout: FunctionComponent = ({ children }) => { diff --git a/src/components/elements.ts b/src/components/elements.ts index a42e1d0..1622828 100644 --- a/src/components/elements.ts +++ b/src/components/elements.ts @@ -47,6 +47,7 @@ export const PrimaryLink = styled(Link)` text-transform: lowercase; transition: all 200ms ease; text-decoration: none; + text-align: center; &:hover { background: var(--mainDark); } diff --git a/src/views/ListTemplateLetters/ListTemplateLetters.tsx b/src/views/ListTemplateLetters/ListTemplateLetters.tsx index 8ac7cc7..a240675 100644 --- a/src/views/ListTemplateLetters/ListTemplateLetters.tsx +++ b/src/views/ListTemplateLetters/ListTemplateLetters.tsx @@ -4,10 +4,9 @@ import styled from "styled-components" import { useMetaData } from "../../context/MetaData" import { useTemplate } from "../../context/TemplateContext" import ErrorMessage from "../../components/ErrorMessage" -import Layout from "../../components/Layout" import SEO from "../../components/SEO" import { format } from "date-fns" -import { PrimaryButton, SecondaryButton } from "../../components/elements" +import { SecondaryButton, PrimaryLink } from "../../components/elements" const Wrapper = styled.div` padding: 2rem; @@ -108,7 +107,7 @@ const ListTemplateLetters = (props: RouteComponentProps) => { - Edit + Edit Delete From 83a954124d85ec6787dc56f6d5be648af5e5af0c Mon Sep 17 00:00:00 2001 From: Kyle Melton Date: Mon, 3 Aug 2020 18:52:35 -0600 Subject: [PATCH 3/4] fix: remove delete button --- src/views/ListTemplateLetters/ListTemplateLetters.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ListTemplateLetters/ListTemplateLetters.tsx b/src/views/ListTemplateLetters/ListTemplateLetters.tsx index a240675..6b9f755 100644 --- a/src/views/ListTemplateLetters/ListTemplateLetters.tsx +++ b/src/views/ListTemplateLetters/ListTemplateLetters.tsx @@ -108,7 +108,6 @@ const ListTemplateLetters = (props: RouteComponentProps) => { Edit - Delete

{t.title}

From ca56430c13c09b19e3d477881680cf8f794e372a Mon Sep 17 00:00:00 2001 From: Kyle Melton Date: Mon, 3 Aug 2020 19:30:01 -0600 Subject: [PATCH 4/4] increment version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55fcfa8..15513f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "voiceyourstance.com", - "version": "2.1.2", + "version": "2.1.3", "author": "Kyle Melton ", "private": true, "dependencies": {