+ 
Lumen
+
Lumen
](https://github.com/vzhou842) | [
](https://github.com/alehel) | [
](https://github.com/abisz) | [
](https://github.com/remi-bruguier) | [
](https://github.com/mariolopjr) | [
](https://github.com/ihororlovskyi) |
-| :-------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------: |
-| [vzhou842](https://github.com/vzhou842) | [alehel](https://github.com/alehel) | [abisz](https://github.com/abisz) | [remi-bruguier](https://github.com/remi-bruguier) | [mariolopjr](https://github.com/mariolopjr) | [ihororlovskyi](https://github.com/ihororlovskyi) |
+[
](https://github.com/vzhou842) |[
](https://github.com/abisz) |[
](https://github.com/remi-bruguier) |[
](https://github.com/sparklesam) |[
](https://github.com/vinnymac) |[
](https://github.com/mariolopjr) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[vzhou842](https://github.com/vzhou842) |[abisz](https://github.com/abisz) |[remi-bruguier](https://github.com/remi-bruguier) |[sparklesam](https://github.com/sparklesam) |[vinnymac](https://github.com/vinnymac) |[mariolopjr](https://github.com/mariolopjr) |
-| [
](https://github.com/timbroder) | [
](https://github.com/vinnymac) | [
](https://github.com/yodahuang) | [
](https://github.com/axelclark) | [
](https://github.com/BigTony666) | [
](https://github.com/stigrune) |
-| :-------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: |
-| [timbroder](https://github.com/timbroder) | [vinnymac](https://github.com/vinnymac) | [yodahuang](https://github.com/yodahuang) | [axelclark](https://github.com/axelclark) | [BigTony666](https://github.com/BigTony666) | [stigrune](https://github.com/stigrune) |
+[
](https://github.com/ihororlovskyi) |[
](https://github.com/rtveitch) |[
](https://github.com/timbroder) |[
](https://github.com/yodahuang) |[
](https://github.com/axelclark) |[
](https://github.com/tonyz0x0) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[ihororlovskyi](https://github.com/ihororlovskyi) |[rtveitch](https://github.com/rtveitch) |[timbroder](https://github.com/timbroder) |[yodahuang](https://github.com/yodahuang) |[axelclark](https://github.com/axelclark) |[tonyz0x0](https://github.com/tonyz0x0) |
-| [
](https://github.com/ybbarng) | [
](https://github.com/marktani) | [
](https://github.com/concreted) | [
](https://github.com/chmac) | [
](https://github.com/charandas) | [
](https://github.com/marcelabomfim) |
-| :----------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------: |
-| [ybbarng](https://github.com/ybbarng) | [marktani](https://github.com/marktani) | [concreted](https://github.com/concreted) | [chmac](https://github.com/chmac) | [charandas](https://github.com/charandas) | [marcelabomfim](https://github.com/marcelabomfim) |
+[
](https://github.com/tranlehaiquan) |[
](https://github.com/seandearnaley) |[
](https://github.com/stigrune) |[
](https://github.com/ybbarng) |[
](https://github.com/marktani) |[
](https://github.com/concreted) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[tranlehaiquan](https://github.com/tranlehaiquan) |[seandearnaley](https://github.com/seandearnaley) |[stigrune](https://github.com/stigrune) |[ybbarng](https://github.com/ybbarng) |[marktani](https://github.com/marktani) |[concreted](https://github.com/concreted) |
-| [
](https://github.com/zollillo) | [
](https://github.com/codejet) | [
](https://github.com/reed-jones) | [
](https://github.com/rtveitch) | [
](https://github.com/SayakaOno) | [
](https://github.com/swapnilmishra) |
-| :------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------: |
-| [zollillo](https://github.com/zollillo) | [codejet](https://github.com/codejet) | [reed-jones](https://github.com/reed-jones) | [rtveitch](https://github.com/rtveitch) | [SayakaOno](https://github.com/SayakaOno) | [swapnilmishra](https://github.com/swapnilmishra) |
+[
](https://github.com/gipcompany) |[
](https://github.com/chmac) |[
](https://github.com/charandas) |[
](https://github.com/ibraheemdev) |[
](https://github.com/sladinji) |[
](https://github.com/marcelabomfim) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[gipcompany](https://github.com/gipcompany) |[chmac](https://github.com/chmac) |[charandas](https://github.com/charandas) |[ibraheemdev](https://github.com/ibraheemdev) |[sladinji](https://github.com/sladinji) |[marcelabomfim](https://github.com/marcelabomfim) |
-| [
](https://github.com/vvasiloud) | [
](https://github.com/vstoms) | [
](https://github.com/wichopy) | [
](https://github.com/yairmark) |
-| :--------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------: |
-| [vvasiloud](https://github.com/vvasiloud) | [vstoms](https://github.com/vstoms) | [wichopy](https://github.com/wichopy) | [yairmark](https://github.com/yairmark) |
+[
](https://github.com/zollillo) |[
](https://github.com/codejet) |[
](https://github.com/reed-jones) |[
](https://github.com/SayakaOno) |[
](https://github.com/Puterism) |[
](https://github.com/swapnilmishra) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[zollillo](https://github.com/zollillo) |[codejet](https://github.com/codejet) |[reed-jones](https://github.com/reed-jones) |[SayakaOno](https://github.com/SayakaOno) |[Puterism](https://github.com/Puterism) |[swapnilmishra](https://github.com/swapnilmishra) |
+
+[
](https://github.com/vvasiloud) |[
](https://github.com/lune-sta) |[
](https://github.com/yaaooo) |[
](https://github.com/vstoms) |[
](https://github.com/wichopy) |[
](https://github.com/yairmark) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[vvasiloud](https://github.com/vvasiloud) |[lune-sta](https://github.com/lune-sta) |[yaaooo](https://github.com/yaaooo) |[vstoms](https://github.com/vstoms) |[wichopy](https://github.com/wichopy) |[yairmark](https://github.com/yairmark) |
## License
The MIT License (MIT)
-Copyright (c) 2016-2021 Alexander Shelepenok
+Copyright (c) 2016-2022 Alexander Shelepenok
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/content/config.json b/content/config.json
index 820d66a..d26857c 100644
--- a/content/config.json
+++ b/content/config.json
@@ -1,11 +1,11 @@
{
"title": "Blog by John Doe",
- "url": "https://lumen.netlify.com",
+ "url": "https://lumen.alxshelepenok.com",
"subtitle": "Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu.",
"copyright": "© All rights reserved.",
"googleAnalyticsId": "UA-73379983-2",
"disqusShortname": "",
- "postsPerPage": "4",
+ "postsLimit": 4,
"pathPrefix": "/",
"menu": [
{
@@ -32,7 +32,6 @@
"facebook": "#",
"telegram": "#",
"twitter": "#",
- "vkontakte": "",
"linkedin": "#",
"instagram": "#",
"line": "",
diff --git a/content/media/cpu.svg b/content/media/cpu.svg
deleted file mode 100644
index 94cb00e..0000000
--- a/content/media/cpu.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/content/media/image-1.jpg b/content/media/image-1.jpg
deleted file mode 100644
index 05eedae..0000000
Binary files a/content/media/image-1.jpg and /dev/null differ
diff --git a/content/pages/about.md b/content/pages/about/index.md
similarity index 90%
rename from content/pages/about.md
rename to content/pages/about/index.md
index 71625f5..b844952 100644
--- a/content/pages/about.md
+++ b/content/pages/about/index.md
@@ -1,12 +1,12 @@
---
title: "About me"
template: "page"
-socialImage: "/media/image-2.jpg"
+socialImage: "/notebook.jpg"
---
Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante.
-
+
_Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi._
diff --git a/content/media/image-2.jpg b/content/pages/about/notebook.jpg
similarity index 100%
rename from content/media/image-2.jpg
rename to content/pages/about/notebook.jpg
diff --git a/content/media/image-4.jpg b/content/pages/contacts/book.jpg
similarity index 100%
rename from content/media/image-4.jpg
rename to content/pages/contacts/book.jpg
diff --git a/content/pages/contacts.md b/content/pages/contacts/index.md
similarity index 94%
rename from content/pages/contacts.md
rename to content/pages/contacts/index.md
index b824225..32942d8 100644
--- a/content/pages/contacts.md
+++ b/content/pages/contacts/index.md
@@ -1,14 +1,14 @@
---
title: "Contact me"
template: "page"
-socialImage: "/media/image-4.jpg"
+socialImage: "/book.jpg"
---
Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat.
Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui.
-
+
_Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi._
diff --git a/content/photo.jpg b/content/photo.jpg
index 057226c..40f66ea 100644
Binary files a/content/photo.jpg and b/content/photo.jpg differ
diff --git a/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection.md b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
similarity index 95%
rename from content/posts/2016-01-09---Perfecting-the-Art-of-Perfection.md
rename to content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
index c9cac01..9461eb8 100644
--- a/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection.md
+++ b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/index.md
@@ -9,12 +9,12 @@ tags:
- "Handwriting"
- "Learning to write"
description: "Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum."
-socialImage: "/media/image-2.jpg"
+socialImage: "/media/notebook.jpg"
---
Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum.
-
+
Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. Donec non enim in turpis pulvinar facilisis. Ut felis.
diff --git a/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/media/notebook.jpg b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/media/notebook.jpg
new file mode 100644
index 0000000..53845ed
Binary files /dev/null and b/content/posts/2016-01-09---Perfecting-the-Art-of-Perfection/media/notebook.jpg differ
diff --git a/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering.md b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
similarity index 95%
rename from content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering.md
rename to content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
index 80dce5e..5018a69 100644
--- a/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering.md
+++ b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/index.md
@@ -6,14 +6,14 @@ draft: false
slug: "the-origins-of-social-stationery-lettering"
category: "Design Culture"
description: "Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante."
-socialImage: "/media/image-3.jpg"
+socialImage: "/media/square.jpg"
---
**Pellentesque habitant morbi tristique** senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. _Aenean ultricies mi vitae est._ Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra.
Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. [Donec non enim](#) in turpis pulvinar facilisis.
-
+
## Header Level 2
@@ -48,4 +48,4 @@ Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac tu
Donec non enim in turpis pulvinar facilisis. Ut felis. Praesent dapibus, neque id cursus faucibus, tortor neque egestas augue, eu vulputate magna eros eu erat. Aliquam erat volutpat. Nam dui mi, tincidunt quis, accumsan porttitor, facilisis luctus, metus.
-
+
diff --git a/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/media/logo.svg b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/media/logo.svg
new file mode 100644
index 0000000..9d75d4f
--- /dev/null
+++ b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/media/logo.svg
@@ -0,0 +1,50 @@
+
diff --git a/content/media/image-3.jpg b/content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/media/square.jpg
similarity index 100%
rename from content/media/image-3.jpg
rename to content/posts/2016-01-12---The-Origins-of-Social-Stationery-Lettering/media/square.jpg
diff --git a/content/posts/2016-02-02---A-Brief-History-of-Typography.md b/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
similarity index 96%
rename from content/posts/2016-02-02---A-Brief-History-of-Typography.md
rename to content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
index 117ea91..57a7e7a 100644
--- a/content/posts/2016-02-02---A-Brief-History-of-Typography.md
+++ b/content/posts/2016-02-02---A-Brief-History-of-Typography/index.md
@@ -7,18 +7,17 @@ slug: "a-brief-history-of-typography"
category: "Design Inspiration"
tags:
- "Linotype"
- - "Monotype"
- - "History of typography"
- "Helvetica"
+ - "History of typography"
description: "Morbi in sem quis dui placerat ornare. Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu. Cras consequat."
-socialImage: "/media/image-0.jpg"
+socialImage: "/media/cherry.jpg"
---
**Pellentesque habitant morbi tristique** senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. _Aenean ultricies mi vitae est._ Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra.
Vestibulum erat wisi, condimentum sed, commodo vitae, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. [Donec non enim](#) in turpis pulvinar facilisis.
-
+
## Header Level 2
diff --git a/content/media/image-0.jpg b/content/posts/2016-02-02---A-Brief-History-of-Typography/media/cherry.jpg
similarity index 100%
rename from content/media/image-0.jpg
rename to content/posts/2016-02-02---A-Brief-History-of-Typography/media/cherry.jpg
diff --git a/content/posts/2017-18-08---The-Birth-of-Movable-Type.md b/content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md
similarity index 100%
rename from content/posts/2017-18-08---The-Birth-of-Movable-Type.md
rename to content/posts/2017-18-08---The-Birth-of-Movable-Type/index.md
diff --git a/content/media/gutenberg.jpg b/content/posts/2017-18-08---The-Birth-of-Movable-Type/media/gutenberg.jpg
similarity index 100%
rename from content/media/gutenberg.jpg
rename to content/posts/2017-18-08---The-Birth-of-Movable-Type/media/gutenberg.jpg
diff --git a/content/media/movable-type.jpg b/content/posts/2017-18-08---The-Birth-of-Movable-Type/media/movable-type.jpg
similarity index 100%
rename from content/media/movable-type.jpg
rename to content/posts/2017-18-08---The-Birth-of-Movable-Type/media/movable-type.jpg
diff --git a/content/media/printing-press.jpg b/content/posts/2017-18-08---The-Birth-of-Movable-Type/media/printing-press.jpg
similarity index 100%
rename from content/media/printing-press.jpg
rename to content/posts/2017-18-08---The-Birth-of-Movable-Type/media/printing-press.jpg
diff --git a/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age.md b/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md
similarity index 100%
rename from content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age.md
rename to content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/index.md
diff --git a/content/media/42-line-bible.jpg b/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/media/42-line-bible.jpg
similarity index 100%
rename from content/media/42-line-bible.jpg
rename to content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/media/42-line-bible.jpg
diff --git a/content/media/type-through-time.jpg b/content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/media/type-through-time.jpg
similarity index 100%
rename from content/media/type-through-time.jpg
rename to content/posts/2017-19-08---Humane-Typography-in-the-Digital-Age/media/type-through-time.jpg
diff --git a/gatsby-browser.ts b/gatsby-browser.ts
new file mode 100644
index 0000000..a1555d4
--- /dev/null
+++ b/gatsby-browser.ts
@@ -0,0 +1 @@
+import "./src/assets/scss/main.scss";
diff --git a/gatsby-config.js b/gatsby-config.ts
similarity index 74%
rename from gatsby-config.js
rename to gatsby-config.ts
index b7c314d..2d79e6b 100644
--- a/gatsby-config.js
+++ b/gatsby-config.ts
@@ -1,23 +1,26 @@
-const config = require("./content/config.json");
+import path from "path";
-module.exports = {
+import config from "./content/config.json";
+import * as types from "./internal/gatsby/types";
+
+export default {
pathPrefix: config.pathPrefix,
siteMetadata: {
url: config.url,
+ menu: config.menu,
title: config.title,
+ author: config.author,
subtitle: config.subtitle,
copyright: config.copyright,
+ postsLimit: config.postsLimit,
disqusShortname: config.disqusShortname,
- postsPerPage: config.postsPerPage,
- menu: config.menu,
- author: config.author,
},
plugins: [
{
resolve: "gatsby-source-filesystem",
options: {
- path: `${__dirname}/content`,
name: "content",
+ path: path.resolve("content"),
},
},
{
@@ -28,22 +31,33 @@ module.exports = {
site {
siteMetadata {
url
- title
- subtitle
}
}
}
`,
feeds: [
{
- serialize: ({ query: { site, allMarkdownRemark } }) =>
- allMarkdownRemark.edges.map(edge => ({
- ...edge.node.frontmatter,
- description: edge.node.frontmatter.description,
- date: edge.node.frontmatter.date,
- url: site.siteMetadata.url + edge.node.fields.slug,
- guid: site.siteMetadata.url + edge.node.fields.slug,
- custom_elements: [{ "content:encoded": edge.node.html }],
+ serialize: ({
+ query: { site, allMarkdownRemark },
+ }: {
+ query: {
+ site: {
+ siteMetadata: {
+ url: string;
+ };
+ };
+ allMarkdownRemark: {
+ edges: ArrayAn Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.
", + }, + }, + { + node: { + id: "066adc91-f87a-4e57-9fef-7a677baf5c1d", + fields: { + slug: "/posts/the-birth-of-movable-type", + categorySlug: "/design-inspiration", + }, + frontmatter: { + date: "2016-09-01", + description: + "German inventor Johannes Gutenberg developed a method of movable type and used it to create one of the western world’s first major printed books, the “Forty–Two–Line” Bible.", + category: "design inspiration", + title: "Johannes Gutenberg: The Birth of Movable Type", + template: "post", + }, + html: "German inventor Johannes Gutenberg developed a method of movable type and used it to create one of the western world’s first major printed books, the “Forty–Two–Line” Bible.
", + }, + }, +]; diff --git a/internal/testing/__mocks__/group.ts b/internal/testing/__mocks__/group.ts new file mode 100644 index 0000000..eecace4 --- /dev/null +++ b/internal/testing/__mocks__/group.ts @@ -0,0 +1,10 @@ +export default [ + { + fieldValue: "typography", + totalCount: 1, + }, + { + fieldValue: "design inspiration", + totalCount: 1, + }, +]; diff --git a/internal/testing/__mocks__/index.ts b/internal/testing/__mocks__/index.ts index d9d609d..ea5c831 100644 --- a/internal/testing/__mocks__/index.ts +++ b/internal/testing/__mocks__/index.ts @@ -5,3 +5,4 @@ export { default as pageContext } from "./page-context"; export { default as contacts } from "./contacts"; export { default as author } from "./author"; export { default as menu } from "./menu"; +export { default as edges } from "./edges"; diff --git a/internal/testing/__mocks__/markdown-remark.ts b/internal/testing/__mocks__/markdown-remark.ts index bb95bbd..a6d3abb 100644 --- a/internal/testing/__mocks__/markdown-remark.ts +++ b/internal/testing/__mocks__/markdown-remark.ts @@ -2,15 +2,17 @@ export default { id: "08870ea6-bdc8-4ec6-bf72-1e7d4488eb72", fields: { slug: "/posts/perfecting-the-art-of-perfection", + tagsSlugs: ["/handwriting", "/helvetica"], categorySlug: "/typography", }, frontmatter: { date: "2016-09-01", description: "An Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.", - category: "typography", + category: "Typography", + tags: ["Handwriting", "Helvetica"], title: "Perfecting the Art of Perfection", template: "post", }, - html: "", + html: "An Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.
", }; diff --git a/internal/testing/__mocks__/page-context.ts b/internal/testing/__mocks__/page-context.ts index 1077955..a4ec2b1 100644 --- a/internal/testing/__mocks__/page-context.ts +++ b/internal/testing/__mocks__/page-context.ts @@ -1,12 +1,10 @@ export default { - pageContext: { - group: "typography", - pagination: { - currentPage: 2, - prevPagePath: "/typography/page/1", - nextPagePath: "/typography/page/3", - hasNextPage: true, - hasPrevPage: true, - }, + group: "typography", + pagination: { + currentPage: 2, + prevPagePath: "/typography/page/1", + nextPagePath: "/typography/page/3", + hasNextPage: true, + hasPrevPage: true, }, }; diff --git a/internal/testing/jest-config.ts b/internal/testing/jest-config.ts index 71328c3..9fece73 100644 --- a/internal/testing/jest-config.ts +++ b/internal/testing/jest-config.ts @@ -20,6 +20,12 @@ const jestConfig: Config.InitialOptions = { ".+\\.(css|sass|scss)$": "identity-obj-proxy", ".+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "identity-obj-proxy", + "^gatsby-page-utils/(.*)$": "gatsby-page-utils/dist/$1", + "^gatsby-core-utils/(.*)$": "gatsby-core-utils/dist/$1", + "^gatsby-plugin-utils/(.*)$": [ + "gatsby-plugin-utils/dist/$1", + "gatsby-plugin-utils/$1", + ], }, transform: { "^.+\\.(t)sx?$": ["@swc/jest", swc] }, setupFiles: ["test
", - }, - }, - { - node: { - fields: { - slug: "/test_1", - categorySlug: "/test_1", - tagSlugs: ["/test-1", "/test-2"], - }, - frontmatter: { - template: "post", - date: "2016-09-01", - description: "test_1", - category: "test_1", - tags: ["test-1", "test-2"], - title: "test_1", - }, - id: "test-321", - html: "test
", - }, - }, - ], - }; - it("renders correctly", () => { + const props = { edges: mocks.edges }; const tree = renderer.create(+
{edge.node.frontmatter.description}
- + Read- test_0 +
+ An Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.
Read- test_1 +
+ German inventor Johannes Gutenberg developed a method of movable type and used it to create one of the western world’s first major printed books, the “Forty–Two–Line” Bible.
Read diff --git a/src/components/Icon/Icon.module.scss b/src/components/Icon/Icon.module.scss index 97a181c..cbeb5ff 100644 --- a/src/components/Icon/Icon.module.scss +++ b/src/components/Icon/Icon.module.scss @@ -1,6 +1,6 @@ .icon { display: inline-block; - fill: currentColor; + fill: currentcolor; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-style: normal; @@ -8,10 +8,8 @@ font-weight: normal; height: 1em; line-height: 1em; - margin-left: 0.2em; - margin-right: 0.2em; speak: none; - stroke: currentColor; + stroke: currentcolor; stroke-width: 0; text-align: center; text-transform: none; diff --git a/src/components/Icon/Icon.test.tsx b/src/components/Icon/Icon.test.tsx index 0fa40c7..434eda9 100644 --- a/src/components/Icon/Icon.test.tsx +++ b/src/components/Icon/Icon.test.tsx @@ -2,17 +2,13 @@ import React from "react"; import renderer from "react-test-renderer"; import { Icon } from "@/components/Icon"; +import { ICONS } from "@/constants"; +import { getIcon } from "@/utils"; describe("Icon", () => { - const props = { - name: "test", - icon: { - viewBox: "0 0 0 0", - path: "", - }, - }; - it("renders correctly", () => { + const [github] = Object.keys(ICONS) as Array+
{author.bio}
-
+
Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu.
{
mockedStaticQuery.mockImplementationOnce(({ render }) =>
render(mocks.siteMetadata),
);
+
mockedUseStaticQuery.mockReturnValue(mocks.siteMetadata);
});
- const props = {
- postTitle: "test",
- postSlug: "/test",
- };
-
it("renders correctly", () => {
+ const props = {
+ postTitle: mocks.markdownRemark.frontmatter.title,
+ postSlug: mocks.markdownRemark.fields.slug,
+ };
+
const tree = renderer.create( test An Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.
+
Published{" "}
{new Date(date).toLocaleDateString("en-US", {
year: "numeric",
diff --git a/src/components/Post/Meta/__snapshots__/Meta.test.tsx.snap b/src/components/Post/Meta/__snapshots__/Meta.test.tsx.snap
index abe1ad9..52d1a22 100644
--- a/src/components/Post/Meta/__snapshots__/Meta.test.tsx.snap
+++ b/src/components/Post/Meta/__snapshots__/Meta.test.tsx.snap
@@ -1,12 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Meta renders correctly 1`] = `
-
+
Published
Sep 1, 2016
diff --git a/src/components/Post/Post.module.scss b/src/components/Post/Post.module.scss
index 7365ac8..9733148 100644
--- a/src/components/Post/Post.module.scss
+++ b/src/components/Post/Post.module.scss
@@ -2,19 +2,23 @@
@import "../../assets/scss/mixins";
.post {
- &__footer {
- margin: 0 auto;
- max-width: $layout-post-width;
- padding: 0 15px;
+ .content {
+ @include margin-auto();
}
- &__comments {
- margin: 0 auto;
+ .footer {
max-width: $layout-post-width;
- padding: 0 15px;
+ @include padding(0, 0.5);
+ @include margin-auto();
}
- &__home-button {
+ .comments {
+ max-width: $layout-post-width;
+ @include padding(0, 0.5);
+ @include margin-auto();
+ }
+
+ .button {
border: 1px solid $color-gray-border;
border-radius: $button-border-radius;
color: $color-base;
@@ -26,8 +30,8 @@
margin-left: auto;
margin-right: auto;
max-width: 90px;
- padding: 0 24px;
text-align: center;
+ @include padding(0, 1);
@include margin-top(1);
&:hover,
@@ -39,20 +43,20 @@
@include breakpoint-md {
.post {
- &__footer {
- padding: 0;
+ .footer {
+ @include padding-equal(0);
}
- &__comments {
- padding: 0;
+ .comments {
+ @include padding-equal(0);
}
- &__home-button {
+ .button {
left: 30px;
- margin: 0;
- max-width: auto;
+ max-width: none;
position: fixed;
top: 30px;
+ @include margin-equal(0);
}
}
}
diff --git a/src/components/Post/Post.test.tsx b/src/components/Post/Post.test.tsx
index 9810763..4875c3e 100644
--- a/src/components/Post/Post.test.tsx
+++ b/src/components/Post/Post.test.tsx
@@ -17,24 +17,8 @@ describe("Post", () => {
mockedUseStaticQuery.mockReturnValue(mocks.siteMetadata);
});
- const props = {
- post: {
- id: "test-123",
- html: " test An Essay on Typography by Eric Gill takes the reader back to the year 1930. The year when a conflict between two worlds came to its term. The machines of the industrial world finally took over the handicrafts.
+
Published
Sep 1, 2016
{author.bio} {author.bio}
+
Pellentesque odio nisi, euismod in, pharetra a, ultricies in, diam. Sed arcu.
+
-
);
diff --git a/src/components/Post/Content/__snapshots__/Content.test.tsx.snap b/src/components/Post/Content/__snapshots__/Content.test.tsx.snap
index 19ba1a1..501c28e 100644
--- a/src/components/Post/Content/__snapshots__/Content.test.tsx.snap
+++ b/src/components/Post/Content/__snapshots__/Content.test.tsx.snap
@@ -1,19 +1,14 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Content renders correctly 1`] = `
-{title}
-
+ {title}
+
-
- test
+
+
+ Perfecting the Art of Perfection
test",
+ "__html": "
-
-
+
-
+
All Articles
-
+
-
+
{tags && tagSlugs &&
-
+
diff --git a/src/components/Post/Tags/Tags.module.scss b/src/components/Post/Tags/Tags.module.scss
index 43bda57..baa3d84 100644
--- a/src/components/Post/Tags/Tags.module.scss
+++ b/src/components/Post/Tags/Tags.module.scss
@@ -4,24 +4,30 @@
.tags {
@include margin-bottom(0.5);
- &__list {
+ .list {
list-style: none;
- margin: 0 -10px;
- padding: 0;
+ @include padding-equal(0);
- &-item {
+ .item {
display: inline-block;
- margin: 10px 5px;
+ @include margin(0.5, 0.125);
- &-link {
+ @include breakpoint-sm {
+ &:first-child {
+ @include margin-left(0);
+ @include padding-left(0);
+ }
+ }
+
+ .link {
border: 1px solid $color-gray-border;
border-radius: $button-border-radius;
color: $color-base;
display: inline-block;
height: $button-height;
line-height: $button-height;
- padding: 0 24px;
text-decoration: none;
+ @include padding(0, 0.75);
&:hover,
&:focus {
diff --git a/src/components/Post/Tags/Tags.test.tsx b/src/components/Post/Tags/Tags.test.tsx
index 93bd9c3..935f84f 100644
--- a/src/components/Post/Tags/Tags.test.tsx
+++ b/src/components/Post/Tags/Tags.test.tsx
@@ -2,13 +2,15 @@ import React from "react";
import renderer from "react-test-renderer";
import { Tags } from "@/components/Post/Tags";
+import * as mocks from "@/mocks";
describe("Tags", () => {
it("renders correctly", () => {
const props = {
- tags: ["test_0", "test_1"],
- tagSlugs: ["/test_0", "/test_1"],
+ tags: mocks.markdownRemark.frontmatter.tags,
+ tagSlugs: mocks.markdownRemark.fields.tagsSlugs,
};
+
const tree = renderer.create(
-
- {tagSlugs &&
- tagSlugs.map((slug, i) => (
-
+
);
diff --git a/src/components/Post/Tags/__snapshots__/Tags.test.tsx.snap b/src/components/Post/Tags/__snapshots__/Tags.test.tsx.snap
index b3b4787..5938962 100644
--- a/src/components/Post/Tags/__snapshots__/Tags.test.tsx.snap
+++ b/src/components/Post/Tags/__snapshots__/Tags.test.tsx.snap
@@ -1,30 +1,20 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Tags renders correctly 1`] = `
-
+ {tagSlugs
+ ? tagSlugs.map((slug, i) => (
+
-
-
+
diff --git a/src/components/Post/__snapshots__/Post.test.tsx.snap b/src/components/Post/__snapshots__/Post.test.tsx.snap
index 348d5a3..fe43855 100644
--- a/src/components/Post/__snapshots__/Post.test.tsx.snap
+++ b/src/components/Post/__snapshots__/Post.test.tsx.snap
@@ -1,87 +1,38 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Post renders correctly 1`] = `
-
+
All Articles
-
-
-
- test
+
+
+
-
+ Perfecting the Art of Perfection
test",
+ "__html": "
-
-
+
`;
diff --git a/src/components/Sidebar/Author/Author.module.scss b/src/components/Sidebar/Author/Author.module.scss
index 3df7359..b0bfec4 100644
--- a/src/components/Sidebar/Author/Author.module.scss
+++ b/src/components/Sidebar/Author/Author.module.scss
@@ -2,20 +2,22 @@
@import "../../../assets/scss/mixins";
.author {
- &__photo {
+ .photo {
background-clip: padding-box;
border-radius: 50%;
display: inline-block;
- margin-bottom: 0;
+ height: 75px;
+ width: 75px;
+ @include margin-bottom(0);
}
- &__title {
+ .title {
font-size: $typographic-base-font-size * 1.125;
font-weight: 600;
@include line-height(1.125);
@include margin(0.5, 0, 0.5, 0);
- &-link {
+ .link {
color: $color-base;
&:hover,
@@ -25,7 +27,7 @@
}
}
- &__subtitle {
+ .subtitle {
color: $color-gray;
@include line-height(1);
@include margin-bottom(1);
diff --git a/src/components/Sidebar/Author/Author.test.tsx b/src/components/Sidebar/Author/Author.test.tsx
index b9f9153..52e3fef 100644
--- a/src/components/Sidebar/Author/Author.test.tsx
+++ b/src/components/Sidebar/Author/Author.test.tsx
@@ -5,9 +5,8 @@ import { Author } from "@/components/Sidebar/Author";
import * as mocks from "@/mocks";
describe("Author", () => {
- const props = { isIndex: false, author: mocks.author };
-
it("renders correctly", () => {
+ const props = { isIndex: false, author: mocks.author };
const tree = renderer.create(
+
-
-
-
-
+
-
-
-
);
diff --git a/src/components/Sidebar/Author/__snapshots__/Author.test.tsx.snap b/src/components/Sidebar/Author/__snapshots__/Author.test.tsx.snap
index a49001b..75e3749 100644
--- a/src/components/Sidebar/Author/__snapshots__/Author.test.tsx.snap
+++ b/src/components/Sidebar/Author/__snapshots__/Author.test.tsx.snap
@@ -1,33 +1,18 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Author renders correctly 1`] = `
-
+
-
+ {isIndex ? (
+
+
{author.name}
) : (
-
-
+
+
{author.name}
)}
-
+
-
diff --git a/src/components/Sidebar/Contacts/Contacts.module.scss b/src/components/Sidebar/Contacts/Contacts.module.scss
index da5a871..cb2b5ae 100644
--- a/src/components/Sidebar/Contacts/Contacts.module.scss
+++ b/src/components/Sidebar/Contacts/Contacts.module.scss
@@ -4,17 +4,17 @@
.contacts {
@include margin-bottom(1);
- &__list {
+ .list {
display: flex;
flex-flow: row wrap;
flex-grow: 0;
flex-shrink: 0;
list-style: none;
- margin: 10px -3px;
- padding: 0;
- width: 140px;
+ max-width: 150px;
+ @include padding-equal(0);
+ @include margin(0.5, 0);
- &-item {
+ .item {
align-content: center;
align-items: center;
border: 1px solid $color-gray-bg;
@@ -23,12 +23,16 @@
height: $button-height;
justify-content: center;
line-height: $button-height;
- margin: 4px;
- padding: 0;
text-align: center;
width: $button-height;
+ @include padding-equal(0);
+ @include margin-equal(0.25);
- &-link {
+ &:nth-child(3n + 1) {
+ @include margin-left(0);
+ }
+
+ .link {
border: 0;
color: $color-base;
display: flex;
diff --git a/src/components/Sidebar/Contacts/Contacts.test.tsx b/src/components/Sidebar/Contacts/Contacts.test.tsx
index 10343ad..bf17106 100644
--- a/src/components/Sidebar/Contacts/Contacts.test.tsx
+++ b/src/components/Sidebar/Contacts/Contacts.test.tsx
@@ -5,9 +5,8 @@ import { Contacts } from "@/components/Sidebar/Contacts";
import * as mocks from "@/mocks";
describe("Contacts", () => {
- const props = { contacts: mocks.contacts };
-
it("renders correctly", () => {
+ const props = { contacts: mocks.contacts };
const tree = renderer.create(
-
-
+ />
+
John Doe
-
-
);
diff --git a/src/components/Sidebar/Contacts/__snapshots__/Contacts.test.tsx.snap b/src/components/Sidebar/Contacts/__snapshots__/Contacts.test.tsx.snap
index 42c9701..8a19e61 100644
--- a/src/components/Sidebar/Contacts/__snapshots__/Contacts.test.tsx.snap
+++ b/src/components/Sidebar/Contacts/__snapshots__/Contacts.test.tsx.snap
@@ -1,23 +1,15 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Contacts renders correctly 1`] = `
-
-
-
+
`;
diff --git a/src/components/Sidebar/Copyright/Copyright.module.scss b/src/components/Sidebar/Copyright/Copyright.module.scss
index bd400ad..67f33aa 100644
--- a/src/components/Sidebar/Copyright/Copyright.module.scss
+++ b/src/components/Sidebar/Copyright/Copyright.module.scss
@@ -4,6 +4,6 @@
@import "../../../assets/scss/mixins";
.copyright {
- color: color.adjust($color-gray, 18%);
+ color: color.adjust($color-gray, $whiteness: 18%);
font-size: $typographic-small-font-size;
}
diff --git a/src/components/Sidebar/Copyright/Copyright.test.tsx b/src/components/Sidebar/Copyright/Copyright.test.tsx
index 3f375bb..469e60a 100644
--- a/src/components/Sidebar/Copyright/Copyright.test.tsx
+++ b/src/components/Sidebar/Copyright/Copyright.test.tsx
@@ -2,10 +2,11 @@ import React from "react";
import renderer from "react-test-renderer";
import { Copyright } from "@/components/Sidebar/Copyright";
+import * as mocks from "@/mocks";
describe("Copyright", () => {
it("renders correctly", () => {
- const props = { copyright: "copyright" };
+ const props = { copyright: mocks.siteMetadata.site.siteMetadata.copyright };
const tree = renderer.create(
+
- copyright
+
+ All rights reserved.
`;
diff --git a/src/components/Sidebar/Menu/Menu.module.scss b/src/components/Sidebar/Menu/Menu.module.scss
index c055758..8242866 100644
--- a/src/components/Sidebar/Menu/Menu.module.scss
+++ b/src/components/Sidebar/Menu/Menu.module.scss
@@ -4,16 +4,16 @@
.menu {
@include margin-bottom(1);
- &__list {
+ .list {
list-style: none;
- margin: 0;
- padding: 0;
+ @include margin-equal(0);
+ @include padding-equal(0);
- &-item {
- margin: 10px 0;
- padding: 0;
+ .item {
+ @include margin(0.5, 0);
+ @include padding-equal(0);
- &-link {
+ .link {
border: 0;
color: $typographic-base-font-color;
font-size: $typographic-base-font-size;
@@ -25,7 +25,7 @@
color: $color-primary;
}
- &--active {
+ &.active {
border-bottom: 1px solid $color-base;
color: $color-base;
}
diff --git a/src/components/Sidebar/Menu/Menu.test.tsx b/src/components/Sidebar/Menu/Menu.test.tsx
index 2ebbe95..c8d9e59 100644
--- a/src/components/Sidebar/Menu/Menu.test.tsx
+++ b/src/components/Sidebar/Menu/Menu.test.tsx
@@ -5,11 +5,8 @@ import { Menu } from "@/components/Sidebar/Menu";
import * as mocks from "@/mocks";
describe("Menu", () => {
- const props = {
- menu: mocks.menu,
- };
-
it("renders correctly", () => {
+ const props = { menu: mocks.menu };
const tree = renderer.create().toJSON();
expect(tree).toMatchSnapshot();
});
diff --git a/src/components/Sidebar/Menu/Menu.tsx b/src/components/Sidebar/Menu/Menu.tsx
index 76e67ae..a311e51 100644
--- a/src/components/Sidebar/Menu/Menu.tsx
+++ b/src/components/Sidebar/Menu/Menu.tsx
@@ -2,24 +2,24 @@ import React from "react";
import { Link } from "gatsby";
-import styles from "./Menu.module.scss";
+import * as styles from "./Menu.module.scss";
type Props = {
- menu: {
+ menu: Array<{
label: string;
path: string;
- }[];
+ }>;
};
const Menu: React.FC