m/blog
1
0
Fork 0
mirror of https://github.com/kremalicious/blog.git synced 2024-12-22 09:13:35 +01:00
Code

build & lint updates

Browse Source
This commit is contained in:
Matthias Kretschmann 2018-09-30 03:11:08 +02:00
parent 41d3766f4a
commit f3bac97270
Signed by: m
GPG Key ID: 606EEEF3C479A91F
20 changed files with 160 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintignore Normal file
View File

@ -0,0 +1,4 @@
plugins/gatsby-redirect-from
node_modules
public
.cache

3
.eslintrc
View File

@ -3,9 +3,10 @@
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:jsx-a11y/recommended",
"plugin:prettier/recommended"
],
"plugins": ["react", "graphql", "prettier"],
"plugins": ["react", "graphql", "prettier", "jsx-a11y"],
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {

37
config.js Normal file
View File

@ -0,0 +1,37 @@
const path = require('path')
module.exports = {
siteTitle: 'kremalicious',
siteTitleShort: 'krlc',
siteDescription: 'Blog of designer & developer Matthias Kretschmann.',
siteUrl: 'https://kremalicious.com',
themeColor: '#88bec8',
backgroundColor: '#e7eef4',
pathPrefix: null,
logo: path.resolve(__dirname, 'src/images/avatar.jpg'),
author: {
name: 'Matthias Kretschmann',
email: 'm@kretschmann.io',
uri: 'https://matthiaskretschmann.com',
avatar: './src/images/avatar.jpg',
twitter: 'https://twitter.com/kremalicious',
github: 'https://github.com/kremalicious',
facebook: 'https://facebook.com/matthiaskretschmann',
bitcoin: '171qDmKEXm9YBgBLXyGjjPvopP5o9htQ1V',
ether: '0x339dbC44d39bf1961E385ed0Ae88FC6069b87Ea1'
},
rss: '/feed.xml',
jsonfeed: '/feed.json',
typekitID: 'msu4qap',
itemsPerPage: 20,
menu: [
{
title: 'Photos',
link: '/photos'
},
{
title: 'Goodies',
link: '/goodies'
}
]
}

5
content/menu.yml
View File

@ -1,5 +0,0 @@
- title: Photos
link: /photos
- title: Goodies
link: /goodies

31
content/meta.yml
View File

@ -1,31 +0,0 @@
#
# Home: /
# Archive Page: /archive/
# Pagination: /page/N/
# Post: /post-slug/
# RSS Feed: /feed/
#
# Basics
# --------------------
title: kremalicious
tagline: 'Blog of designer & developer Matthias Kretschmann'
url: https://kremalicious.com
author:
name: Matthias Kretschmann
email: m@kretschmann.io
uri: https://matthiaskretschmann.com
twitter: https://twitter.com/kremalicious
github: https://github.com/kremalicious
facebook: https://facebook.com/matthiaskretschmann
googleplus: https://plus.google.com/+MatthiasKretschmann
rss: /feed.xml
jsonfeed: /feed.json
avatar: ../src/images/avatar.jpg
bitcoin: 171qDmKEXm9YBgBLXyGjjPvopP5o9htQ1V
ether: "0x339dbC44d39bf1961E385ed0Ae88FC6069b87Ea1"
typekitID: msu4qap
itemsPerPage: 20

37
gatsby-config.js
View File

@ -1,18 +1,12 @@
const path = require('path')
const fs = require('fs')
const yaml = require('js-yaml')
const meta = yaml.load(fs.readFileSync('./content/meta.yml', 'utf8'))
const { title, tagline, url, author } = meta
const siteConfig = require('./config')
// required for gatsby-plugin-meta-redirect
require('regenerator-runtime/runtime')
module.exports = {
siteMetadata: {
title: `${title}`,
description: `${tagline}`,
siteUrl: `${url}`,
author: `${author.name}`
...siteConfig
},
plugins: [
{
@ -29,13 +23,6 @@ module.exports = {
path: path.join(__dirname, 'content', 'media')
}
},
{
resolve: 'gatsby-source-filesystem',
options: {
name: 'posts',
path: path.join(__dirname, 'content')
}
},
{
resolve: 'gatsby-source-filesystem',
options: {
@ -129,7 +116,7 @@ module.exports = {
options: {
siteId: '1',
matomoUrl: 'https://analytics.kremalicious.com',
siteUrl: `${url}`
siteUrl: `${siteConfig.siteUrl}`
}
},
{
@ -138,14 +125,14 @@ module.exports = {
logo: './src/images/apple-touch-icon.png',
// WebApp Manifest Configuration
appName: title.toLowerCase(),
appDescription: tagline,
developerName: author.name,
developerURL: author.uri,
appName: siteConfig.siteTitle.toLowerCase(),
appDescription: siteConfig.siteDescription,
developerName: siteConfig.author.name,
developerURL: siteConfig.author.uri,
dir: 'auto',
lang: 'en-US',
background: '#e7eef4',
theme_color: '#88bec8',
background: siteConfig.backgroundColor,
theme_color: siteConfig.themeColor,
display: 'minimal-ui',
orientation: 'any',
start_url: '/?homescreen=1',
@ -172,11 +159,9 @@ module.exports = {
{
site {
siteMetadata {
title
description
siteUrl
site_url: siteUrl
author
site_url: siteUrl
}
}
}
@ -224,8 +209,8 @@ module.exports = {
]
}
},
'gatsby-plugin-webpack-size',
'gatsby-plugin-react-helmet',
'gatsby-transformer-yaml',
'gatsby-plugin-sharp',
'gatsby-transformer-sharp',
'gatsby-plugin-sitemap',

6
gatsby-node.js
View File

@ -1,13 +1,9 @@
const path = require('path')
const fs = require('fs')
const yaml = require('js-yaml')
const { createFilePath } = require('gatsby-source-filesystem')
const fastExif = require('fast-exif')
const Fraction = require('fraction.js')
const dms2dec = require('dms2dec')
const meta = yaml.load(fs.readFileSync('./content/meta.yml', 'utf8'))
const { itemsPerPage } = meta
const { itemsPerPage } = require('./config')
const redirects = [
{ f: '/feed', t: '/feed.xml' },

21
package.json
View File

@ -9,15 +9,19 @@
"scripts": {
"start": "gatsby develop",
"build": "gatsby build",
"format": "prettier --write 'src/**/*.{js,jsx}'",
"format:css": "prettier-stylelint --write --quiet 'src/**/*.{css,scss}'",
"lint:js": "eslint ./gatsby-*.js && eslint ./src/**/*.jsx",
"ssr": "npm run build && serve -s public/",
"format": "run-p format:js format:css format:md format:yaml",
"format:js": "prettier-eslint --write 'src/**/*.{js,jsx}'",
"format:css": "prettier-stylelint --write",
"format:md": "prettier --write \"**/*.md\" --no-semi",
"format:yaml": "prettier --write \"**/*.y?(a)ml\"",
"lint:js": "eslint --ext .js,.jsx .",
"lint:css": "stylelint ./src/**/*.{css,scss}",
"lint:md": "markdownlint ./content/posts/**/*.md && markdownlint ./README.md",
"lint": "npm run lint:md && npm run lint:js && npm run lint:css",
"lint:md": "markdownlint \"**/*.md\"",
"lint:yaml": "prettier --list-different \"**/*.y?(a)ml\"",
"lint": "run-p --continue-on-error lint:js lint:css lint:yaml",
"test": "npm run lint",
"deploy": "./scripts/deploy.sh",
"svg": "./scripts/svg.sh",
"new": "babel-node ./scripts/new.js"
},
"browserslist": [
@ -41,6 +45,7 @@
"gatsby-plugin-sharp": "^2.0.5",
"gatsby-plugin-sitemap": "^2.0.1",
"gatsby-plugin-svgr": "^2.0.0-alpha",
"gatsby-plugin-webpack-size": "^0.0.2",
"gatsby-redirect-from": "^0.1.1",
"gatsby-remark-autolink-headers": "^2.0.6",
"gatsby-remark-copy-linked-files": "^2.0.5",
@ -50,7 +55,6 @@
"gatsby-source-filesystem": "^2.0.1",
"gatsby-transformer-remark": "^2.1.4",
"gatsby-transformer-sharp": "^2.1.3",
"gatsby-transformer-yaml": "^2.1.1",
"graphql": "^0.13.2",
"intersection-observer": "^0.5.0",
"load-script": "^1.0.0",
@ -77,12 +81,15 @@
"eslint-config-prettier": "^3.1.0",
"eslint-loader": "^2.1.1",
"eslint-plugin-graphql": "^2.1.1",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-prettier": "^2.7.0",
"eslint-plugin-react": "^7.11.1",
"markdownlint": "^0.11.0",
"markdownlint-cli": "^0.13.0",
"npm-run-all": "^4.1.3",
"ora": "^3.0.0",
"prettier": "^1.14.3",
"prettier-eslint-cli": "^4.7.1",
"prettier-stylelint": "^0.4.2",
"stylelint": "^9.6.0",
"stylelint-config-css-modules": "^1.3.0",

4
src/components/atoms/PostActions.jsx
View File

@ -42,9 +42,7 @@ export default class PostActions extends PureComponent {
<h1 className={styles.actionTitle}>Found something useful?</h1>
<p className={styles.actionText}>
Say thanks{' '}
<a href="#" onClick={this.toggleModal}>
with Bitcoins or Ether.
</a>
<button onClick={this.toggleModal}>with Bitcoins or Ether.</button>
</p>
</article>

40
src/components/atoms/SEO.jsx
View File

@ -5,19 +5,15 @@ import Helmet from 'react-helmet'
const query = graphql`
query {
contentYaml {
title
tagline
url
author {
name
twitter
avatar {
childImageSharp {
resize(width: 160) {
src
}
}
site {
siteMetadata {
siteTitle
siteDescription
siteUrl
author {
name
twitter
avatar
}
}
}
@ -134,7 +130,7 @@ const SEO = ({ post, slug, postSEO }) => (
<StaticQuery
query={query}
render={data => {
const siteMeta = data.contentYaml
const siteMeta = data.site.siteMetadata
let title
let description
let image
@ -142,20 +138,20 @@ const SEO = ({ post, slug, postSEO }) => (
if (postSEO) {
const postMeta = post.frontmatter
title = `${postMeta.title} ¦ ${siteMeta.tagline}`
title = `${postMeta.siteTitle} ¦ ${siteMeta.siteDescription}`
description = postMeta.description ? postMeta.description : post.excerpt
image = postMeta.image
? postMeta.image.childImageSharp.fluid.src
: siteMeta.author.avatar.childImageSharp.resize.src
postURL = `${siteMeta.url}${slug}`
: siteMeta.author.avatar
postURL = `${siteMeta.siteUrl}${slug}`
} else {
title = `${siteMeta.title} ¦ ${siteMeta.tagline}`
description = siteMeta.tagline
image = siteMeta.author.avatar.childImageSharp.resize.src
title = `${siteMeta.siteTitle} ¦ ${siteMeta.siteDescription}`
description = siteMeta.siteDescription
image = siteMeta.author.avatar
}
image = `${siteMeta.url}${image}`
const blogURL = siteMeta.url
image = `${siteMeta.siteUrl}${image}`
const blogURL = siteMeta.siteUrl
const url = postSEO ? postURL : blogURL
let schema = createSchemaOrg(

2
src/components/atoms/SearchInput.jsx
View File

@ -4,7 +4,7 @@ import styles from './SearchInput.module.scss'
const SearchInput = props => (
<Fragment>
<Input autoFocus type="search" placeholder="Search everything" {...props} />
<Input type="search" placeholder="Search everything" {...props} />
<button className={styles.searchInputClose} onClick={props.onToggle}>
&times;
</button>

8
src/components/atoms/Typekit.jsx
View File

@ -19,8 +19,10 @@ const TypekitScript = typekitID => (
const query = graphql`
query {
contentYaml {
typekitID
site {
siteMetadata {
typekitID
}
}
}
`
@ -29,7 +31,7 @@ const Typekit = () => (
<StaticQuery
query={query}
render={data => {
const { typekitID } = data.contentYaml
const { typekitID } = data.site.siteMetadata
return (
typekitID && (

16
src/components/molecules/Menu.jsx
View File

@ -6,9 +6,9 @@ import styles from './Menu.module.scss'
const query = graphql`
query {
allMenuYaml {
edges {
node {
site {
siteMetadata {
menu {
title
link
}
@ -39,12 +39,12 @@ export default class Menu extends PureComponent {
<StaticQuery
query={query}
render={data => {
const { edges } = data.allMenuYaml
const { menu } = data.site.siteMetadata
const MenuItems = edges.map(({ node }) => (
<li key={node.title}>
<Link onClick={this.toggleMenu} to={node.link}>
{node.title}
const MenuItems = menu.map(item => (
<li key={item.title}>
<Link onClick={this.toggleMenu} to={item.link}>
{item.title}
</Link>
</li>
))

12
src/components/molecules/ModalThanks.jsx
View File

@ -9,10 +9,12 @@ import styles from './ModalThanks.module.scss'
const query = graphql`
query {
contentYaml {
author {
bitcoin
ether
site {
siteMetadata {
author {
bitcoin
ether
}
}
}
}
@ -22,7 +24,7 @@ const ModalThanks = ({ ...props }) => (
<StaticQuery
query={query}
render={data => {
const { author } = data.contentYaml
const { author } = data.site.siteMetadata
return (
<Modal

6
src/components/molecules/Subscribe.jsx
View File

@ -5,8 +5,8 @@ import styles from './Subscribe.module.scss'
const query = graphql`
query {
contentYaml {
author {
site {
siteMetadata {
rss
jsonfeed
}
@ -18,7 +18,7 @@ const Subscribe = () => (
<StaticQuery
query={query}
render={data => {
const { rss, jsonfeed } = data.contentYaml.author
const { rss, jsonfeed } = data.site.siteMetadata
const links = [rss, jsonfeed]

28
src/components/molecules/Vcard.jsx
View File

@ -1,24 +1,20 @@
import React from 'react'
import { StaticQuery, graphql } from 'gatsby'
import Img from 'gatsby-image'
// import Img from 'gatsby-image'
import IconLinks from './IconLinks'
import styles from './Vcard.module.scss'
const query = graphql`
query {
contentYaml {
author {
name
uri
twitter
github
facebook
avatar {
childImageSharp {
fixed(width: 80, height: 80) {
...GatsbyImageSharpFixed
}
}
site {
siteMetadata {
author {
name
uri
twitter
github
facebook
avatar
}
}
}
@ -36,13 +32,13 @@ const Vcard = () => (
avatar,
name,
uri
} = data.contentYaml.author
} = data.site.siteMetadata.author
const links = [twitter, github, facebook]
return (
<div className="vcard author">
<Img className={styles.avatar} fixed={avatar.childImageSharp.fixed} />
<img className={styles.avatar} src={avatar} alt="avatar" />
<p className={styles.description}>
Blog of designer &amp; developer{' '}
<a className="fn" rel="author" href={uri}>

24
src/components/organisms/Footer.jsx
View File

@ -13,12 +13,14 @@ import styles from './Footer.module.scss'
const query = graphql`
query {
contentYaml {
author {
name
uri
bitcoin
github
site {
siteMetadata {
author {
name
uri
bitcoin
github
}
}
}
}
@ -44,7 +46,7 @@ export default class Footer extends PureComponent {
<StaticQuery
query={query}
render={data => {
const { name, uri, bitcoin, github } = data.contentYaml.author
const { name, uri, bitcoin, github } = data.site.siteMetadata.author
return (
<footer role="contentinfo" className={styles.footer}>
@ -66,14 +68,10 @@ export default class Footer extends PureComponent {
<Github />
View source
</a>
<a
href="#"
className={styles.btc}
onClick={this.toggleModal}
>
<button className={styles.btc} onClick={this.toggleModal}>
<Bitcoin />
<code>{bitcoin}</code>
</a>
</button>
</p>
<ModalThanks

32
src/styles/_syntax.scss
View File

@ -173,9 +173,9 @@ copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
/*+------+
/* +------+
+ Base +
+------+*/
+------+ */
.source {
-webkit-font-smoothing: auto;
color: #d8dee9;
@ -185,9 +185,9 @@ copyright Copyright (C) 2017 +
color: #d8dee9;
}
/*+----------+
/* +----------+
+ Entities +
+----------+*/
+----------+ */
.comment {
color: #4c566a;
}
@ -516,7 +516,7 @@ copyright Copyright (C) 2017 +
color: #d8dee9;
}
/*+--- Languages ---+*/
/* +--- Languages ---+ */
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -976,9 +976,9 @@ copyright Copyright (C) 2017 +
(http://scala-lang.org)
*/
/*+------+
/* +------+
+ Java +
+------+*/
+------+ */
.source.java .comment.block.javadoc .variable.parameter {
color: #88c0d0;
}
@ -1012,9 +1012,9 @@ copyright Copyright (C) 2017 +
color: #81a1c1;
}
/*+-------+
/* +-------+
+ Scala +
+-------+*/
+-------+ */
.source.scala .entity.name.package {
color: #8fbcbb;
}
@ -1035,9 +1035,9 @@ copyright Copyright (C) 2017 +
color: #8fbcbb;
}
/*+-----------------+
/* +-----------------+
+ Java Properties +
+-----------------+*/
+-----------------+ */
.source.java-properties .meta.key-pair {
color: #81a1c1;
}
@ -1396,9 +1396,9 @@ copyright Copyright (C) 2017 +
font-weight: bold;
}
/*+----------------+
/* +----------------+
+ Theme Settings +
+----------------+*/
+----------------+ */
/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@ -1411,11 +1411,11 @@ copyright Copyright (C) 2017 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
*/
/*+-------------+
/* +-------------+
+ Accessibility +
+---------------+*/
+---------------+ */
/*+--- Custom Comment Contrast ---+*/
/* +--- Custom Comment Contrast ---+ */
.theme-nord-atom-syntax-accessibility-custom-comment-contrast .comment {
color: #4c566a;
}

14
src/templates/Post.jsx
View File

@ -18,7 +18,7 @@ import styles from './Post.module.scss'
const Post = ({ data, location }) => {
const { markdownRemark: post } = data
const { contentYaml: meta } = data
const meta = data.site.siteMetadata
const {
title,
image,
@ -48,7 +48,7 @@ const Post = ({ data, location }) => {
{image && image.fields && <Exif exif={image.fields.exif} />}
<PostContent post={post} />
{type === 'link' && <PostLinkActions slug={slug} linkurl={linkurl} />}
<PostActions slug={slug} url={meta.url} />
<PostActions slug={slug} url={meta.siteUrl} />
<PostMeta post={post} meta={meta} />
</article>
@ -117,10 +117,12 @@ export const pageQuery = graphql`
rawMarkdownBody
}
contentYaml {
url
author {
uri
site {
siteMetadata {
siteUrl
author {
uri
}
}
}
}

2
static/robots.txt
View File

@ -2,7 +2,7 @@ User-agent: *
Disallow: /search/
Disallow: /page/
Disallow: /*/page/
Disallow: /tag/
Disallow: /tags/
Disallow: /api/
Sitemap: https://kremalicious.com/sitemap.xml