Skip to content

Commit cc1a61f

Browse files
authored
Merge pull request #90 from martis-git/dev
Release v.0.0.X
2 parents 740d236 + a733666 commit cc1a61f

File tree

105 files changed

+15035
-10806
lines changed

Some content is hidden

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

105 files changed

+15035
-10806
lines changed

.editorconfig

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 4
7+
indent_style = tab
8+
insert_final_newline = true
9+
max_line_length = 120
10+
tab_width = 4
11+
12+
[*.scss]
13+
indent_style = space
14+
15+
[{*.ats,*.ts,*.tsx}]
16+
indent_style = space
17+
tab_width = 2
18+
ij_typescript_use_double_quotes = true
19+
20+
[{*.cjs,*.js,*.jsx}]
21+
indent_style = space
22+
tab_width = 2
23+
ij_javascript_use_double_quotes = true
24+
25+
[{*.graphql,*.graphqls,*.gql}]
26+
indent_style = space
27+
28+
[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
29+
indent_style = space

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ SKIP_PREFLIGHT_CHECK=true
22
API_GENCOMMENT=/** @generated THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
33

44
REACT_APP_API_URL=https://api.github.com/graphql
5+
# TODO: Убрать позднее (пока что нужен для кодогенерации)
56
REACT_APP_ACCESS_TOKEN=d70d97689ae25f0eb61a1f49ee49fa4b9fc3c370

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ node_modules/**
22
dist/**
33
build/**
44
*.gen.ts
5+
.github

.eslintrc.js

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
browser: true,
1313
es6: true,
1414
},
15-
plugins: ["react", "@typescript-eslint"],
15+
plugins: ["react", "@typescript-eslint", "@graphql-eslint"],
1616
extends: [
1717
"react-app",
1818
"eslint:recommended",
@@ -30,7 +30,14 @@ module.exports = {
3030
"import/order": [
3131
2,
3232
{
33-
pathGroups: ["shared/**", "pages", "features"].map((pattern) => ({
33+
pathGroups: [
34+
"shared",
35+
"shared/**",
36+
"pages",
37+
"features",
38+
"features/**",
39+
"models",
40+
].map((pattern) => ({
3441
pattern,
3542
group: "internal",
3643
position: "after",
@@ -40,5 +47,16 @@ module.exports = {
4047
groups: ["builtin", "external", "internal", "parent", "sibling", "index"],
4148
},
4249
],
50+
"@graphql-eslint/no-anonymous-operations": 2,
4351
},
52+
overrides: [
53+
{
54+
files: ["*.gql"],
55+
parser: "@graphql-eslint/eslint-plugin",
56+
plugins: ["@graphql-eslint"],
57+
rules: {
58+
"prettier/prettier": 0,
59+
},
60+
},
61+
],
4462
};

.firebaserc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"projects": {
33
"default": "github-client-47c49"
4+
},
5+
"targets": {
6+
"github-client-47c49": {
7+
"hosting": {
8+
"dev": [
9+
"dev-github-client"
10+
],
11+
"prod": [
12+
"github-client-47c49"
13+
]
14+
}
15+
}
416
}
5-
}
17+
}

.github/workflows/dev-merge.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This file was auto-generated by the Firebase CLI
2+
# https://github.com/firebase/firebase-tools
3+
4+
name: Deploy to Firebase Hosting on merge
5+
on:
6+
push:
7+
branches:
8+
- dev
9+
jobs:
10+
build_and_deploy:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout Repository
14+
uses: actions/checkout@v2
15+
16+
- name: Setup Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: ${{ matrix.node-version }}
20+
21+
- name: Cache node modules
22+
uses: actions/cache@v2
23+
with:
24+
path: ~/.npm
25+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
26+
restore-keys: |
27+
${{ runner.os }}-node-
28+
29+
- name: Install dependencies
30+
run: npm install
31+
32+
- name: Run Tests
33+
run: npm run test
34+
env:
35+
CI: true
36+
37+
- name: Build
38+
run: npm run build
39+
40+
- name: Deploy to Firebase
41+
uses: w9jds/firebase-action@master
42+
with:
43+
args: deploy --only hosting:dev
44+
env:
45+
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}

.github/workflows/dev-pr.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# This file was auto-generated by the Firebase CLI
2+
# https://github.com/firebase/firebase-tools
3+
4+
name: Deploy to Firebase Hosting on PR
5+
on: pull_request
6+
jobs:
7+
build_and_preview:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Repository
11+
uses: actions/checkout@v2
12+
13+
- name: Setup Node.js ${{ matrix.node-version }}
14+
uses: actions/setup-node@v1
15+
with:
16+
node-version: ${{ matrix.node-version }}
17+
18+
- name: Cache node modules
19+
uses: actions/cache@v2
20+
with:
21+
path: ~/.npm
22+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
23+
restore-keys: |
24+
${{ runner.os }}-node-
25+
26+
- name: Install dependencies
27+
run: npm install
28+
29+
- name: Run Tests
30+
run: npm run test
31+
env:
32+
CI: true
33+
34+
- name: Build
35+
run: npm run build
36+
37+
- uses: FirebaseExtended/action-hosting-deploy@v0
38+
with:
39+
repoToken: '${{ secrets.GITHUB_TOKEN }}'
40+
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GITHUB_CLIENT_47C49 }}'
41+
projectId: github-client-47c49
42+
expires: 20d
43+
env:
44+
FIREBASE_CLI_PREVIEWS: hostingchannels

.github/workflows/dev.yml

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

.github/workflows/prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ jobs:
7070
- name: Deploy to Firebase
7171
uses: w9jds/firebase-action@master
7272
with:
73-
args: deploy --only hosting
73+
args: deploy --only hosting:prod
7474
env:
7575
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}

.prettierrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
printWidth: 120,
2+
printWidth: 100,
33
tabWidth: 4,
44
singleQuote: false,
55
semi: true,

0 commit comments

Comments
 (0)