Skip to content

Commit 3387834

Browse files
committed
Merge gatsby
2 parents 1be525f + 162f8ab commit 3387834

File tree

543 files changed

+16959
-14421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

543 files changed

+16959
-14421
lines changed

.env.example

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# rename this file to .env and supply the values listed below
2+
# also make sure they are available to the build tool (e.g. Netlify)
3+
# warning: variables prefixed with GATSBY_ will be made available to client-side code
4+
# be careful not to expose sensitive data (in this case your Algolia admin key)
5+
6+
GATSBY_ALGOLIA_APP_ID=insertValue
7+
GATSBY_ALGOLIA_SEARCH_KEY=insertValue
8+
ALGOLIA_ADMIN_KEY=insertValue

.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,44 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: 'Type: Bug'
6-
assignees: ''
7-
4+
title: ""
5+
labels: "Type: Bug"
6+
assignees: ""
87
---
98

109
**Describe the bug**
10+
1111
<!-- A clear and concise description of what the bug is. -->
1212

1313
**To Reproduce**
1414
Steps to reproduce the behavior:
15+
1516
1. Go to '...'
1617
2. Click on '....'
1718
3. Scroll down to '....'
1819
4. See error
1920

2021
**Expected behavior**
22+
2123
<!-- A clear and concise description of what you expected to happen. -->
2224

2325
**Screenshots**
26+
2427
<!-- If applicable, add screenshots to help explain your problem. -->
2528

2629
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
30+
31+
- OS: [e.g. iOS]
32+
- Browser [e.g. chrome, safari]
33+
- Version [e.g. 22]
3034

3135
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
36+
37+
- Device: [e.g. iPhone6]
38+
- OS: [e.g. iOS8.1]
39+
- Browser [e.g. stock browser, safari]
40+
- Version [e.g. 22]
3641

3742
**Additional context**
43+
3844
<!-- Add any other context about the problem here. -->
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: 'Type: Feature'
6-
assignees: ''
7-
4+
title: ""
5+
labels: "Type: Feature"
6+
assignees: ""
87
---
98

109
**Is your feature request related to a problem? Please describe.**
10+
1111
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
1212

1313
**Describe the solution you'd like**
14+
1415
<!-- A clear and concise description of what you want to happen. -->
1516

1617
**Describe alternatives you've considered**
18+
1719
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
1820

1921
**Additional context**
22+
2023
<!-- Add any other context or screenshots about the feature request here. -->

.github/workflows/docsearch-crawl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Docsearch Crawl
33
on:
44
push:
55
branches:
6-
- master
6+
- gatsby
77

88
jobs:
99
crawl:
@@ -13,8 +13,8 @@ jobs:
1313
uses: actions/checkout@v2
1414
- name: Crawl the site
1515
env:
16-
APPLICATION_ID: ${{ secrets.DOCSEARCH_APP_ID }}
17-
API_KEY: ${{ secrets.DOCSEARCH_API_KEY }}
16+
APPLICATION_ID: ${{ secrets.DEV_DOCSEARCH_APP_ID }}
17+
API_KEY: ${{ secrets.DEV_DOCSEARCH_API_KEY }}
1818
run: |
1919
docker run \
2020
-e APPLICATION_ID -e API_KEY \
Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,69 @@
11
{
2-
"index_name": "prod-ethereum-org",
3-
"start_urls": ["https://ethereum.org/"],
2+
"index_name": "dev-ethereum-org",
3+
"start_urls": [
4+
{
5+
"url": "https://deploy-preview-1134--ethereumorg.netlify.app/(?P<lang>.*?)/",
6+
"variables": {
7+
"lang": [
8+
"en",
9+
"ar",
10+
"bn",
11+
"cs",
12+
"de",
13+
"el",
14+
"es",
15+
"fa",
16+
"fr",
17+
"id",
18+
"ig",
19+
"it",
20+
"ja",
21+
"ko",
22+
"ml",
23+
"nl",
24+
"no",
25+
"pl",
26+
"pt-br",
27+
"ru",
28+
"sk",
29+
"sl",
30+
"ro",
31+
"se",
32+
"tr",
33+
"zh",
34+
"zh-tw"
35+
]
36+
}
37+
}
38+
],
439
"stop_urls": [],
540
"selectors": {
6-
"lvl0": ".content__default h1",
7-
"lvl1": ".content__default h2",
8-
"lvl2": ".content__default h3",
9-
"lvl3": ".content__default h4",
10-
"lvl4": ".content__default h5",
11-
"text": ".content__default p, .content__default li",
41+
"lvl0": {
42+
"selector": "title",
43+
"global": true
44+
},
45+
"lvl1": "#___gatsby h1",
46+
"lvl2": {
47+
"selector": "meta[name=description]",
48+
"global": true
49+
},
50+
"lvl3": "#___gatsby h2",
51+
"lvl4": "#___gatsby h3",
52+
"lvl5": "#___gatsby h4",
53+
"text": "#___gatsby p, #___gatsby ul, #___gatsby ol, #___gatsby li",
1254
"lang": {
1355
"selector": "/html/@lang",
1456
"type": "xpath",
1557
"global": true,
16-
"default_value": "en-US"
58+
"default_value": "en"
1759
}
1860
},
19-
"selectors_exclude": [".table-of-contents", ".header-anchor"],
61+
"selectors_exclude": ["aside", "nav", "footer"],
2062
"strip_chars": " .,;:#",
2163
"custom_settings": {
22-
"attributesForFaceting": ["lang"]
64+
"attributesForFaceting": ["lang", "content"],
65+
"attributeForDistinct": "url_without_anchor",
66+
"distinct": true
2367
},
2468
"scrape_start_urls": false
2569
}

.gitignore

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
.DS_Store
2-
node_modules
3-
dist
4-
yarn-error.log
5-
61
# Logs
72
logs
83
*.log
@@ -56,15 +51,22 @@ typings/
5651
# Output of 'npm pack'
5752
*.tgz
5853

59-
# Yarn Integrity file
60-
.yarn-integrity
61-
62-
# dotenv environment variables file
54+
# dotenv environment variable files
6355
.env
6456

65-
# IDE
66-
.idea
67-
.vscode
57+
# gatsby files
58+
.cache/
59+
public
60+
61+
# Mac files
62+
.DS_Store
63+
64+
# Yarn
65+
yarn-error.log
66+
.pnp/
67+
.pnp.js
68+
# Yarn Integrity file
69+
.yarn-integrity
6870

69-
# Netlify configuration
71+
# Local Netlify folder
7072
.netlify

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.cache
2+
package.json
3+
package-lock.json
4+
public

.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"endOfLine": "lf",
3+
"semi": false,
4+
"singleQuote": false,
5+
"tabWidth": 2,
6+
"trailingComma": "es5"
7+
}

0 commit comments

Comments
 (0)