Skip to content

Commit 1ab5b43

Browse files
authored
Merge branch 'master' into restyled/master
2 parents 8c3607c + 58793ad commit 1ab5b43

10 files changed

+588
-148
lines changed

README.md

+25-15
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,17 @@ bryan@LAPTOP-9LGJ3JGS:/c/MY-WEB-DEV/BLOG____2.0/BLOG_2.0/src$
498498
<details>
499499
<summary>ActionLink!</summary>
500500
501+
#Components
502+
503+
<details>
504+
<summary><h1>Click to see React Components (src folder)!</h1></summary>
505+
506+
507+
508+
509+
<details>
510+
<summary>ActionLink!</summary>
511+
501512
##ActionLink
502513
```js
503514
import React from 'react';
@@ -508,9 +519,8 @@ import Icon from './Icon';
508519
509520
export default class ActionLink extends React.Component {
510521
render() {
511-
let action = \_.get(this.props, 'action', null);
522+
let action = _.get(this.props, 'action', null);
512523
return (
513-
514524
<Link
515525
to={withPrefix(_.get(action, 'url', null))}
516526
{...(_.get(action, 'new_window', null) ? { target: '\_blank' } : null)}
@@ -582,7 +592,7 @@ export default class CtaButtons extends React.Component {
582592
583593
<details>
584594
<summary>Click to expand!</summary>
585-
595+
586596
## DocsMenu
587597
588598
---
@@ -661,7 +671,7 @@ export default class DocsMenu extends React.Component {
661671
662672
<details>
663673
<summary>Click to expand!</summary>
664-
674+
665675
## DocsSubmenu
666676
667677
---
@@ -698,7 +708,7 @@ export default class DocsSubmenu extends React.Component {
698708
699709
<details>
700710
<summary>Click to expand!</summary>
701-
711+
702712
## Footer
703713
704714
---
@@ -744,7 +754,7 @@ export default class Footer extends React.Component {
744754
745755
<details>
746756
<summary>Click to expand!</summary>
747-
757+
748758
## Header
749759
750760
---
@@ -878,7 +888,7 @@ export default class Header extends React.Component {
878888

879889
<details>
880890
<summary>Click to expand!</summary>
881-
891+
882892
## Icon
883893

884894
---
@@ -925,7 +935,7 @@ export default class Icon extends React.Component {
925935

926936
<details>
927937
<summary>Click to expand!</summary>
928-
938+
929939
## Body
930940

931941
---
@@ -995,7 +1005,7 @@ export default class Body extends React.Component {
9951005

9961006
<details>
9971007
<summary>Click to expand!</summary>
998-
1008+
9991009
## SectionContent
10001010

10011011
---
@@ -1048,7 +1058,7 @@ export default class SectionContent extends React.Component {
10481058

10491059
<details>
10501060
<summary>Click to expand!</summary>
1051-
1061+
10521062
## SectionCta
10531063

10541064
---
@@ -1092,7 +1102,7 @@ export default class SectionCta extends React.Component {
10921102

10931103
<details>
10941104
<summary>Click to expand!</summary>
1095-
1105+
10961106
## SectionDocs
10971107

10981108
---
@@ -1163,7 +1173,7 @@ export default class SectionDocs extends React.Component {
11631173

11641174
<details>
11651175
<summary>Click to expand!</summary>
1166-
1176+
11671177
## SectionGrid
11681178

11691179
---
@@ -1242,7 +1252,7 @@ export default class SectionGrid extends React.Component {
12421252

12431253
<details>
12441254
<summary>Click to expand!</summary>
1245-
1255+
12461256
## SectionHero
12471257

12481258
---
@@ -1285,7 +1295,7 @@ export default class SectionHero extends React.Component {
12851295

12861296
<details>
12871297
<summary>Click to expand!</summary>
1288-
1298+
12891299
## Submenu
12901300

12911301
---
@@ -1327,7 +1337,7 @@ export default class Submenu extends React.Component {
13271337

13281338
<details>
13291339
<summary>Click to expand!</summary>
1330-
1340+
13311341
## Index.js
13321342

13331343
---

_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
theme: jekyll-theme-slate

gatsby-browser.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See: https://www.gatsbyjs.org/docs/browser-apis/
55
*/
66

7-
// onPreRouteUpdate() and onRouteUpdate() are called before
8-
// onInitialClientRender, use initialized flag to ensure that
9-
// window.onGatsbyPreRouteUpdate() and window.onGatsbyRouteUpdate() will not be
10-
// called before window.onGatsbyInitialClientRender() has run
7+
// onPreRouteUpdate() and onRouteUpdate() are called before onInitialClientRender,
8+
// use initialized flag to ensure that window.onGatsbyPreRouteUpdate() and
9+
// window.onGatsbyRouteUpdate() will not be called before
10+
// window.onGatsbyInitialClientRender() has run
1111
let initialized = false;
1212

1313
exports.onInitialClientRender = () => {

gatsby-config.js

+16-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,25 @@ module.exports = {
99
`gatsby-transformer-remark`,
1010
{
1111
resolve: `gatsby-source-filesystem`,
12-
options: { name: `pages`, path: `${__dirname}/src/pages` }
12+
options: {
13+
name: `pages`,
14+
path: `${__dirname}/src/pages`
15+
}
16+
},
17+
{
18+
resolve: `gatsby-plugin-sass`,
19+
options: {}
20+
},
21+
{
22+
resolve: `gatsby-remark-page-creator`,
23+
options: {}
1324
},
14-
{ resolve: `gatsby-plugin-sass`, options: {} },
15-
{ resolve: `gatsby-remark-page-creator`, options: {} },
1625
{
1726
resolve: `@stackbit/gatsby-plugin-menus`,
18-
options: { sourceUrlPath: `fields.url`, pageContextProperty: `menus` }
27+
options: {
28+
sourceUrlPath: `fields.url`,
29+
pageContextProperty: `menus`
30+
}
1931
}
2032
]
2133
};

lambda/hello.js

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
// For more info, check https://docs.netlify.com/functions/build-with-javascript
2-
module.exports.handler = async function (event, context) {
3-
console.log('queryStringParameters', event.queryStringParameters);
2+
module.exports.handler = async function(event, context) {
3+
console.log("queryStringParameters", event.queryStringParameters)
44
return {
55
// return null to show no errors
66
statusCode: 200, // http status code
77
body: JSON.stringify({
8-
msg: 'Hello, World! This is better ' + Math.round(Math.random() * 10)
8+
msg: "Hello, World! This is better " + Math.round(Math.random() * 10)
99
})
10-
};
11-
};
10+
}
11+
}
1212

13-
// Now you are ready to access this API from anywhere in your Gatsby app!
14-
// For example, in any event handler or lifecycle method, insert:
15-
fetch('/.netlify/functions/hello')
16-
.then((response) => response.json())
17-
.then(console.log);
18-
// For more info see:
19-
// https://www.gatsbyjs.org/blog/2018-12-17-turning-the-static-dynamic/#static-dynamic-is-a-spectrum
13+
// Now you are ready to access this API from anywhere in your Gatsby app! For example, in any event handler or lifecycle method, insert:
14+
fetch("/.netlify/functions/hello")
15+
.then(response => response.json())
16+
.then(console.log)
17+
// For more info see: https://www.gatsbyjs.org/blog/2018-12-17-turning-the-static-dynamic/#static-dynamic-is-a-spectrum

netlify.toml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[build]
22
publish = "public"
33
command = "npm run build"
4+
5+

renovate.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"extends": ["config:base"]
2+
"extends": [
3+
"config:base"
4+
]
35
}

0 commit comments

Comments
 (0)