Skip to content

Commit 853b85b

Browse files
authored
Merge pull request #90 from carryall/release/2.0.0
Release 2.0.0
2 parents e328dd2 + 1f53807 commit 853b85b

File tree

222 files changed

+11523
-17466
lines changed

Some content is hidden

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

222 files changed

+11523
-17466
lines changed

.env.example

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
APP_HOST=0.0.0.0
22
PORT=8080
3-
APP_RUN_MODE=prod
4-
DATABASE_NAME=google_scraper_development
5-
DATABASE_URL=postgresql://postgres:postgres@0.0.0.0:5432/google_scraper_development?sslmode=disable
3+
DATABASE_URL=

.env.test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
APP_HOST=0.0.0.0
22
PORT=8080
3-
APP_RUN_MODE=test
4-
DATABASE_NAME=google_scraper_test
5-
DATABASE_URL=postgresql://postgres:postgres@0.0.0.0:5432/google_scraper_test?sslmode=disable
3+
DATABASE_URL=postgres://postgres:postgres@0.0.0.0:5433/google_scraper_test?sslmode=disable

.eslintrc.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"rules": {},
3+
"env": {
4+
"es6": true,
5+
"browser": true,
6+
"node": true
7+
},
8+
"parserOptions": {
9+
"ecmaVersion": 2018,
10+
"sourceType": "module"
11+
},
12+
"extends": [
13+
"eslint:recommended",
14+
"plugin:prettier/recommended"
15+
],
16+
"globals": {
17+
"Atomics": "readonly",
18+
"SharedArrayBuffer": "readonly"
19+
}
20+
}

.github/ISSUE_TEMPLATE/bug_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ labels: "type : bug"
77

88
## Issue
99

10-
Describe the issue you are facing. Show us the implementation: screenshots, gifs, etc.
10+
Describe the issue you are facing. Show us the implementation: screenshots, gif, etc.
1111

1212
## Expected
1313

14-
Describe what should be the correct behavior.
14+
Describe what should be the correct behaviour.
1515

1616
## Steps to reproduce
1717

.github/ISSUE_TEMPLATE/feature_template.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ labels: "type : feature"
77

88
## Why
99

10-
Describe the big picture of the feature and why it's needed.
10+
Describe the idea of the user story as in what the motive of the user story is.
1111

12-
## Who Benefits?
12+
## Acceptance Criteria
1313

14-
Describe who will be the beneficiaries e.g. everyone, specific chapters, clients...
14+
List down how the user story will be tested and what criteria are necessary for the user story to be accepted.
1515

16-
## Acceptance Criteria
16+
## Design
17+
18+
(Optional) Add design screenshots or Figma links for UI/UX-related stories.
19+
20+
## Resources
1721

18-
Describe the definition of done for this feature
22+
(Optional) Add useful resources such as links to documentation, implementation ideas, or best practices.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Describe the big picture of your changes here to communicate to the team why we
66

77
## Insight 📝
88

9-
Describe in detail how to test the changes, which solution you tried but did not go with, referenced documentation is welcome as well.
9+
Describe in details how to test the changes, which solution you tried but did not go with, referenced documentation is welcome as well.
1010

1111
## Proof Of Work 📹
1212

13-
Show us the implementation: screenshots, gifs, etc.
13+
Show us the implementation: screenshots, gif, etc.

.github/workflows/deploy.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,40 @@ on:
1414
jobs:
1515
deploy:
1616
runs-on: ubuntu-latest
17-
1817
steps:
18+
- name: Cancel previous runs
19+
uses: styfle/cancel-workflow-action@0.9.1
20+
with:
21+
access_token: ${{ github.token }}
22+
1923
- name: Checkout
20-
uses: actions/checkout@v2.3.4
24+
uses: actions/checkout@v3
2125

2226
- name: Set BRANCH_TAG
2327
uses: nimblehq/branch-tag-action@v1.2
2428
with:
2529
ref: ${{ github.event.workflow_run.head_branch || github.ref }}
2630

27-
- name: Set environment variables
31+
- name: Set HEROKU_APP_NAME
2832
run: |
2933
if [[ $BRANCH_TAG = "latest" ]]
3034
then
31-
echo "DATABASE_URL=${{ secrets.DATABASE_URL_PRODUCTION }}" >> $GITHUB_ENV
3235
echo "HEROKU_APP_NAME=${{ secrets.HEROKU_PRODUCTION_APP }}" >> $GITHUB_ENV
3336
else
34-
echo "DATABASE_URL=${{ secrets.DATABASE_URL_STAGING }}" >> $GITHUB_ENV
3537
echo "HEROKU_APP_NAME=${{ secrets.HEROKU_STAGING_APP }}" >> $GITHUB_ENV
3638
fi
3739
40+
- name: Set DATABASE_URL
41+
run: |
42+
if [[ $BRANCH_TAG = "latest" ]]
43+
then
44+
echo "DATABASE_URL=${{ secrets.DATABASE_URL_PRODUCTION }}" >> $GITHUB_ENV
45+
else
46+
echo "DATABASE_URL=${{ secrets.DATABASE_URL_STAGING }}" >> $GITHUB_ENV
47+
fi
48+
3849
- name: Deploy
39-
uses: akhileshns/heroku-deploy@v3.8.8
50+
uses: akhileshns/heroku-deploy@v3.12.12
4051
with:
4152
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
4253
heroku_app_name: $HEROKU_APP_NAME

.github/workflows/test.yml

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,52 @@
11
name: Test
22

3-
on:
4-
push:
3+
on: push
54

65
jobs:
7-
test:
6+
lint:
7+
name: Lint
88
runs-on: ubuntu-latest
9-
109
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2.3.4
13-
14-
- name: Setup Go environment
15-
uses: actions/setup-go@v2
10+
- name: Cancel previous runs
11+
uses: styfle/cancel-workflow-action@0.9.1
1612
with:
17-
go-version: 1.15.x
13+
access_token: ${{ github.token }}
14+
15+
- name: Check out Git repository
16+
uses: actions/checkout@v3
17+
18+
- name: Setup Go
19+
uses: actions/setup-go@v3
20+
with:
21+
go-version: 1.18.x
1822

1923
- name: Go Lint
20-
uses: golangci/golangci-lint-action@v2
24+
uses: golangci/golangci-lint-action@v3
2125
with:
22-
version: v1.29
26+
version: v1.45
2327

24-
- name: Copy ENV file
25-
run: cp ".env.test" ".env"
28+
test:
29+
name: Test
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Cancel previous runs
33+
uses: styfle/cancel-workflow-action@0.9.1
34+
with:
35+
access_token: ${{ github.token }}
36+
37+
- name: Check out Git repository
38+
uses: actions/checkout@v3
2639

27-
- name: Install dependency
28-
run: npm install
40+
- name: Setup Go
41+
uses: actions/setup-go@v3
42+
with:
43+
go-version: 1.18.x
44+
45+
- name: Create .env file
46+
run: cp ".env.test" ".env"
2947

30-
- name: Prepare assets
31-
run: make assets
48+
- name: Install dependencies
49+
run: make install-dependencies
3250

33-
- name: Run test
51+
- name: Run tests
3452
run: make test

.gitignore

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,17 @@
1-
# Binaries for programs and plugins
2-
*.exe
3-
*.exe~
4-
*.dll
5-
*.so
6-
*.dylib
1+
# compired assets
2+
static
73

8-
# Test binary, built with `go test -c`
9-
*.test
10-
11-
# Except the environment file for test
12-
!.env.test
13-
14-
# Output of the go coverage tool, specifically when used with LiteIDE
15-
*.out
16-
17-
# Dependency directories (remove the comment below to include it)
18-
# vendor/
19-
20-
# Binary file
21-
go-google-scraper-challenge
22-
23-
# Node modules
4+
# dependencies
245
/node_modules
256

26-
# ENV file
27-
.env
7+
# Terraform generated files
8+
deploy/**/.terraform/
9+
deploy/**/terraform.tfstate
10+
deploy/**/terraform.tfstate.backup
11+
deploy/**/*.tfvars
2812

29-
# System Files
13+
# misc
3014
.DS_Store
31-
.idea/*
32-
33-
# SASS Cache
34-
.sass-cache
35-
36-
# Temp file
37-
*.tmp
38-
39-
# Generated files
40-
/static/css/*
41-
/static/js/*
42-
/static/symbol/*
15+
tmp/
16+
.env
17+
.vscode

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
save-exact=true

0 commit comments

Comments
 (0)