- {data.allMarkdownRemark.edges.map(({ node }: { node: PostMetadata }) => {
+ {data.allMarkdownRemark.edges.map(({ node }: { node: Post }) => {
const { title, image } = node.frontmatter
const { slug } = node.fields
diff --git a/src/components/molecules/Menu.tsx b/src/components/molecules/Menu.tsx
index 4de1cf2e..b885a3b2 100644
--- a/src/components/molecules/Menu.tsx
+++ b/src/components/molecules/Menu.tsx
@@ -4,7 +4,7 @@ import { Link } from 'gatsby'
import Hamburger from '../atoms/Hamburger'
import styles from './Menu.module.scss'
import { useSiteMetadata } from '../../hooks/use-site-metadata'
-import { MenuItem } from '../../@types/SiteMetadata'
+import { MenuItem } from '../../@types/Site'
export default function Menu() {
const [menuOpen, setMenuOpen] = useState(false)
diff --git a/src/components/molecules/RelatedPosts.module.scss b/src/components/molecules/RelatedPosts.module.scss
index 86c70a95..831aa675 100644
--- a/src/components/molecules/RelatedPosts.module.scss
+++ b/src/components/molecules/RelatedPosts.module.scss
@@ -52,8 +52,6 @@
}
.title {
- @include heading-band;
-
font-size: $font-size-h3;
}
diff --git a/src/components/molecules/RelatedPosts.tsx b/src/components/molecules/RelatedPosts.tsx
index 0d40d38f..c1a77948 100644
--- a/src/components/molecules/RelatedPosts.tsx
+++ b/src/components/molecules/RelatedPosts.tsx
@@ -1,11 +1,8 @@
import React, { useState } from 'react'
import { graphql, useStaticQuery } from 'gatsby'
-import PostTeaser from '../Post/PostTeaser'
+import PostTeaser from '../../templates/Post/PostTeaser'
import styles from './RelatedPosts.module.scss'
-import {
- PostMetadata,
- PostMetadataFrontmatter
-} from '../../@types/PostMetadata'
+import { Post, Frontmatter } from '../../@types/Post'
const query = graphql`
query {
@@ -36,11 +33,11 @@ const query = graphql`
`
function postsWithDataFilter(
- posts: [{ node: PostMetadata }],
- key: keyof PostMetadataFrontmatter,
+ posts: [{ node: Post }],
+ key: keyof Frontmatter,
valuesToFind: string[]
) {
- const newArray = posts.filter(({ node }: { node: PostMetadata }) => {
+ const newArray = posts.filter(({ node }: { node: Post }) => {
const frontmatterKey = node.frontmatter[key] as []
if (
@@ -54,7 +51,7 @@ function postsWithDataFilter(
}
function photosWithDataFilter(posts: []) {
- const newArray = posts.filter((post: { node: PostMetadata }) => {
+ const newArray = posts.filter((post: { node: Post }) => {
const { fileAbsolutePath } = post.node
if (fileAbsolutePath.includes('content/photos')) {
@@ -93,7 +90,7 @@ export default function RelatedPosts({
{filteredPosts
.sort(() => 0.5 - Math.random())
.slice(0, 6)
- .map(({ node }: { node: PostMetadata }) => (
+ .map(({ node }: { node: Post }) => (
))}
diff --git a/src/components/Search/SearchButton.module.scss b/src/components/molecules/Search/SearchButton.module.scss
similarity index 100%
rename from src/components/Search/SearchButton.module.scss
rename to src/components/molecules/Search/SearchButton.module.scss
diff --git a/src/components/Search/SearchButton.tsx b/src/components/molecules/Search/SearchButton.tsx
similarity index 76%
rename from src/components/Search/SearchButton.tsx
rename to src/components/molecules/Search/SearchButton.tsx
index 8f08217f..a1a490e0 100644
--- a/src/components/Search/SearchButton.tsx
+++ b/src/components/molecules/Search/SearchButton.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { ReactComponent as SearchIcon } from '../../images/magnifying-glass.svg'
+import { ReactComponent as SearchIcon } from '../../../images/magnifying-glass.svg'
import styles from './SearchButton.module.scss'
const SearchButton = (props: any) => (
diff --git a/src/components/Search/SearchInput.module.scss b/src/components/molecules/Search/SearchInput.module.scss
similarity index 84%
rename from src/components/Search/SearchInput.module.scss
rename to src/components/molecules/Search/SearchInput.module.scss
index bad30172..2c2a6242 100644
--- a/src/components/Search/SearchInput.module.scss
+++ b/src/components/molecules/Search/SearchInput.module.scss
@@ -1,7 +1,7 @@
@import 'variables';
.searchInput {
- composes: input from '../atoms/Input.module.scss';
+ composes: input from '../../atoms/Input.module.scss';
&::-webkit-search-cancel-button {
display: none;
diff --git a/src/components/Search/SearchInput.tsx b/src/components/molecules/Search/SearchInput.tsx
similarity index 94%
rename from src/components/Search/SearchInput.tsx
rename to src/components/molecules/Search/SearchInput.tsx
index 0ee9427e..42741e3b 100644
--- a/src/components/Search/SearchInput.tsx
+++ b/src/components/molecules/Search/SearchInput.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import Input from '../atoms/Input'
+import Input from '../../atoms/Input'
import styles from './SearchInput.module.scss'
export default function SearchInput({
diff --git a/src/components/Search/SearchResults.module.scss b/src/components/molecules/Search/SearchResults.module.scss
similarity index 100%
rename from src/components/Search/SearchResults.module.scss
rename to src/components/molecules/Search/SearchResults.module.scss
diff --git a/src/components/Search/SearchResults.tsx b/src/components/molecules/Search/SearchResults.tsx
similarity index 84%
rename from src/components/Search/SearchResults.tsx
rename to src/components/molecules/Search/SearchResults.tsx
index f1d27c4e..705c1038 100644
--- a/src/components/Search/SearchResults.tsx
+++ b/src/components/molecules/Search/SearchResults.tsx
@@ -1,11 +1,11 @@
import React from 'react'
import ReactDOM from 'react-dom'
import { graphql, useStaticQuery } from 'gatsby'
-import Container from '../atoms/Container'
-import PostTeaser from '../Post/PostTeaser'
+import Container from '../../atoms/Container'
+import PostTeaser from '../../../templates/Post/PostTeaser'
import SearchResultsEmpty from './SearchResultsEmpty'
import styles from './SearchResults.module.scss'
-import { PostMetadata } from '../../@types/PostMetadata'
+import { Post } from '../../../@types/Post'
export interface Results {
slug: string
@@ -40,7 +40,7 @@ function SearchResultsPure({
toggleSearch,
posts
}: {
- posts: [{ node: PostMetadata }]
+ posts: [{ node: Post }]
searchQuery: string
results: Results[]
toggleSearch(): void
@@ -53,10 +53,9 @@ function SearchResultsPure({
{results.map((page: { slug: string }) =>
posts
.filter(
- ({ node }: { node: PostMetadata }) =>
- node.fields.slug === page.slug
+ ({ node }: { node: Post }) => node.fields.slug === page.slug
)
- .map(({ node }: { node: PostMetadata }) => (
+ .map(({ node }: { node: Post }) => (
{
- let messageOutput
+interface AlertProps {
+ transactionHash: string
+ message?: { text?: string; status?: string }
+}
- if (transactionHash) {
- messageOutput =
- message &&
- message.text +
- '
' +
- alertMessages(null, transactionHash).transaction
- } else {
- messageOutput = message && message.text
- }
+const constructMessage = (
+ transactionHash: string,
+ message?: { text?: string }
+) =>
+ transactionHash
+ ? message &&
+ message.text + '
' + alertMessages(null, transactionHash).transaction
+ : message && message.text
- return messageOutput
- }
-
- const classes = () => {
- const { status } = message
-
- if (status === 'success') {
- return styles.success
- } else if (status === 'error') {
- return styles.error
- }
- return styles.alert
- }
+const classes = (status: string) =>
+ status === 'success'
+ ? styles.success
+ : status === 'error'
+ ? styles.error
+ : styles.alert
+export default function Alerts({ transactionHash, message }: AlertProps) {
return (
)
}
diff --git a/src/components/Web3Donation/Conversion.module.scss b/src/components/molecules/Web3Donation/Conversion.module.scss
similarity index 100%
rename from src/components/Web3Donation/Conversion.module.scss
rename to src/components/molecules/Web3Donation/Conversion.module.scss
diff --git a/src/components/Web3Donation/Conversion.tsx b/src/components/molecules/Web3Donation/Conversion.tsx
similarity index 100%
rename from src/components/Web3Donation/Conversion.tsx
rename to src/components/molecules/Web3Donation/Conversion.tsx
diff --git a/src/components/Web3Donation/InputGroup.module.scss b/src/components/molecules/Web3Donation/InputGroup.module.scss
similarity index 100%
rename from src/components/Web3Donation/InputGroup.module.scss
rename to src/components/molecules/Web3Donation/InputGroup.module.scss
diff --git a/src/components/Web3Donation/InputGroup.tsx b/src/components/molecules/Web3Donation/InputGroup.tsx
similarity index 96%
rename from src/components/Web3Donation/InputGroup.tsx
rename to src/components/molecules/Web3Donation/InputGroup.tsx
index e6d0a794..c0933076 100644
--- a/src/components/Web3Donation/InputGroup.tsx
+++ b/src/components/molecules/Web3Donation/InputGroup.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import Input from '../atoms/Input'
+import Input from '../../atoms/Input'
import Account from './Account'
import Conversion from './Conversion'
import styles from './InputGroup.module.scss'
diff --git a/src/components/Web3Donation/index.module.scss b/src/components/molecules/Web3Donation/index.module.scss
similarity index 100%
rename from src/components/Web3Donation/index.module.scss
rename to src/components/molecules/Web3Donation/index.module.scss
diff --git a/src/components/Web3Donation/index.tsx b/src/components/molecules/Web3Donation/index.tsx
similarity index 100%
rename from src/components/Web3Donation/index.tsx
rename to src/components/molecules/Web3Donation/index.tsx
diff --git a/src/components/Web3Donation/utils.ts b/src/components/molecules/Web3Donation/utils.ts
similarity index 100%
rename from src/components/Web3Donation/utils.ts
rename to src/components/molecules/Web3Donation/utils.ts
diff --git a/src/components/organisms/Footer.tsx b/src/components/organisms/Footer.tsx
index e47da4f9..e4f2b699 100644
--- a/src/components/organisms/Footer.tsx
+++ b/src/components/organisms/Footer.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
import Container from '../atoms/Container'
import Vcard from '../molecules/Vcard'
import ThemeSwitch from '../molecules/ThemeSwitch'
-import ModalThanks from '../molecules/ModalThanks'
+import ModalThanks from './ModalThanks'
import { ReactComponent as Github } from '../../images/github.svg'
import { ReactComponent as Bitcoin } from '../../images/bitcoin.svg'
diff --git a/src/components/organisms/Header.tsx b/src/components/organisms/Header.tsx
index 1aab7517..42dee1dd 100644
--- a/src/components/organisms/Header.tsx
+++ b/src/components/organisms/Header.tsx
@@ -1,7 +1,7 @@
import React from 'react'
import { Link } from 'gatsby'
import Container from '../atoms/Container'
-import Search from '../Search'
+import Search from '../molecules/Search'
import Menu from '../molecules/Menu'
import { ReactComponent as Logo } from '../../images/logo.svg'
diff --git a/src/components/molecules/ModalThanks.module.scss b/src/components/organisms/ModalThanks.module.scss
similarity index 100%
rename from src/components/molecules/ModalThanks.module.scss
rename to src/components/organisms/ModalThanks.module.scss
diff --git a/src/components/molecules/ModalThanks.tsx b/src/components/organisms/ModalThanks.tsx
similarity index 53%
rename from src/components/molecules/ModalThanks.tsx
rename to src/components/organisms/ModalThanks.tsx
index 44fdbed0..642dd1eb 100644
--- a/src/components/molecules/ModalThanks.tsx
+++ b/src/components/organisms/ModalThanks.tsx
@@ -1,14 +1,26 @@
import React, { lazy, Suspense } from 'react'
+import shortid from 'shortid'
+import { Author } from '../../@types/Site'
import { useSiteMetadata } from '../../hooks/use-site-metadata'
-
+import Qr from '../atoms/Qr'
import Modal from '../atoms/Modal'
import styles from './ModalThanks.module.scss'
-const Web3Donation = lazy(() => import('../Web3Donation'))
-const Qr = lazy(() => import('../atoms/Qr'))
+const Web3Donation = lazy(() => import('../molecules/Web3Donation'))
+
+const Coin = ({ address, author }: { address: string; author: Author }) => (
+
+ Loading...
}>
+
+
+
-
+
)}
{image && image.fields &&
}
diff --git a/src/templates/Posts.module.scss b/src/templates/Posts.module.scss
index 5867385a..913835ba 100644
--- a/src/templates/Posts.module.scss
+++ b/src/templates/Posts.module.scss
@@ -9,28 +9,13 @@
padding-top: $spacer * 2;
padding-bottom: $spacer * 2;
- @media (min-width: $screen-sm) {
- padding-top: $spacer * 3;
- padding-bottom: $spacer * 3;
-
- &:first-of-type {
- padding-top: $spacer * 4;
- }
- }
-
:global(.gatsby-image-wrapper) {
max-height: 100vh;
}
}
.archiveTitle {
- @include heading-band();
-
font-size: $font-size-h3;
margin-top: 0;
margin-bottom: 0;
-
- @media (min-width: $screen-md) {
- margin-left: -117%;
- }
}
diff --git a/src/templates/Posts.tsx b/src/templates/Posts.tsx
index d47c51d1..740a25cf 100644
--- a/src/templates/Posts.tsx
+++ b/src/templates/Posts.tsx
@@ -1,25 +1,25 @@
import React from 'react'
import { Link, graphql } from 'gatsby'
import Layout from '../components/Layout'
-import PostImage from '../components/Post/PostImage'
-import PostTitle from '../components/Post/PostTitle'
-import PostLead from '../components/Post/PostLead'
-import PostContent from '../components/Post/PostContent'
-import PostMore from '../components/Post/PostMore'
-import PostLinkActions from '../components/Post/PostLinkActions'
+import PostImage from './Post/PostImage'
+import PostTitle from './Post/PostTitle'
+import PostLead from './Post/PostLead'
+import PostContent from './Post/PostContent'
+import PostMore from './Post/PostMore'
+import PostLinkActions from './Post/PostLinkActions'
import SEO from '../components/atoms/SEO'
import Pagination from '../components/molecules/Pagination'
import Featured from '../components/molecules/Featured'
import styles from './Posts.module.scss'
-import stylesPost from './Post.module.scss'
-import { PostMetadata } from '../@types/PostMetadata'
+import stylesPost from './Post/index.module.scss'
+import { Post } from '../@types/Post'
export default function Posts({
data,
location,
pageContext
}: {
- data: { allMarkdownRemark: { edges: [{ node: PostMetadata }] } }
+ data: { allMarkdownRemark: { edges: [{ node: Post }] } }
location: Location
pageContext: {
tag: string
@@ -31,7 +31,7 @@ export default function Posts({
const edges = data.allMarkdownRemark.edges
const { tag, currentPageNumber, numPages, nextPage } = pageContext
- const PostsList = edges.map(({ node }: { node: PostMetadata }) => {
+ const PostsList = edges.map(({ node }: { node: Post }) => {
const { type, linkurl, title, image } = node.frontmatter
const { slug } = node.fields
@@ -43,11 +43,12 @@ export default function Posts({
{image && (
-