Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 625f325

Browse files
mydearxymmydearxym
committed
chore: merge branch 'restructure' into dev
2 parents 5587bb8 + a85bb60 commit 625f325

File tree

1,217 files changed

+188
-102
lines changed

Some content is hidden

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

1,217 files changed

+188
-102
lines changed

‎.babelrc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,19 @@
5353
{
5454
"root": ["./"],
5555
"alias": {
56-
"@containers": "./containers",
57-
"@components": "./components",
58-
"@services": "./services",
56+
"@containers": "./src/containers",
57+
"@components": "./src/components",
58+
"@services": "./src/services",
5959
"@constant": "./utils/constant/",
60-
"@hooks": "./components/Hooks",
60+
"@hooks": "./src/hooks",
61+
"@hoc": "./src/hoc",
6162
"@config": "./config",
62-
"@stores": "./stores",
63-
"@model": "./stores/SharedModel",
63+
"@stores": "./src/stores",
64+
"@model": "./src/stores/SharedModel",
6465
"@utils": "./utils",
65-
"@schemas": "./containers/schemas",
66-
"@Img": "./components/Img",
67-
"@SvgIcons": "./components/SvgIcons"
66+
"@schemas": "./src/schemas",
67+
"@Img": "./src/components/Img",
68+
"@SvgIcons": "./src/components/SvgIcons"
6869
}
6970
}
7071
]

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ before_script:
3131
script:
3232
# - codecov
3333
- rm -rf .next
34+
- cp config/config.ci.json config/config.json
3435
- nvm exec 10.12.0 npm run build.ci
3536
- nvm exec 10.12.0 npm run test:ci
3637

‎Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ dep:
2020

2121
# shortcut for serve.local
2222
dev:
23+
cp config/config.local.json config/config.json
2324
npm run local
2425

2526
build:
2627
npm build
2728

2829
build.dev:
30+
cp config/config.dev.json config/config.json
2931
npm run build.dev
3032

3133
build.prod:
34+
cp config/config.prod.json config/config.json
3235
npm run build.prod
3336

3437
serve.help:

‎config/assets.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
export const ASSETS_ENDPOINT = 'https://cps-oss.oss-cn-shanghai.aliyuncs.com'
1+
import * as CONFIG from './config.json'
2+
3+
export const { ASSETS_ENDPOINT } = CONFIG
24
// process.env.ALI_OSS_ADDR
35
// export const ASSETS_ENDPOINT = 'https://coderplanets.oss-cn-beijing.aliyuncs.com'
46

‎config/config.ci.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"// endpoint configs //": "--------------------------------",
3+
"ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
4+
"GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
5+
6+
"// general configs //": "--------------------------------",
7+
"DEFAULT_THEME": "cyan",
8+
"SENIOR_AMOUNT_THRESHOLD": 51.2,
9+
"SPONSOR_AMOUNT_THRESHOLD": 3999,
10+
"PAGE_SIZE": {
11+
"S": 10,
12+
"D": 20,
13+
"M": 30,
14+
"L": 40
15+
},
16+
17+
"// contact configs //": "--------------------------------",
18+
"EMAIL_CLUB": "[email protected]",
19+
"EMAIL_SUPPORT": "[email protected]",
20+
"EMAIL_HELLO": "[email protected]",
21+
"EMAIL_BUSINESS": "[email protected]"
22+
}

‎config/config.dev.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"// endpoint configs //": "--------------------------------",
3+
"ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
4+
"GRAPHQL_ENDPOINT": "https://devapi.coderplanets.com/graphiql",
5+
6+
"// general configs //": "--------------------------------",
7+
"DEFAULT_THEME": "cyan",
8+
"SENIOR_AMOUNT_THRESHOLD": 51.2,
9+
"SPONSOR_AMOUNT_THRESHOLD": 3999,
10+
"PAGE_SIZE": {
11+
"S": 10,
12+
"D": 20,
13+
"M": 30,
14+
"L": 40
15+
},
16+
17+
"// contact configs //": "--------------------------------",
18+
"EMAIL_CLUB": "[email protected]",
19+
"EMAIL_SUPPORT": "[email protected]",
20+
"EMAIL_HELLO": "[email protected]",
21+
"EMAIL_BUSINESS": "[email protected]"
22+
}

‎config/config.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"// endpoint configs //": "--------------------------------",
3+
"ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
4+
"GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
5+
"//GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
6+
7+
"// general configs //": "--------------------------------",
8+
"DEFAULT_THEME": "cyan",
9+
"SENIOR_AMOUNT_THRESHOLD": 51.2,
10+
"SPONSOR_AMOUNT_THRESHOLD": 3999,
11+
"PAGE_SIZE": {
12+
"S": 10,
13+
"D": 20,
14+
"M": 30,
15+
"L": 40
16+
},
17+
18+
"// contact configs //": "--------------------------------",
19+
"EMAIL_CLUB": "[email protected]",
20+
"EMAIL_SUPPORT": "[email protected]",
21+
"EMAIL_HELLO": "[email protected]",
22+
"EMAIL_BUSINESS": "[email protected]"
23+
}

‎config/config.local.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"// endpoint configs //": "--------------------------------",
3+
"ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
4+
"GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
5+
"//GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
6+
7+
"// general configs //": "--------------------------------",
8+
"DEFAULT_THEME": "cyan",
9+
"SENIOR_AMOUNT_THRESHOLD": 51.2,
10+
"SPONSOR_AMOUNT_THRESHOLD": 3999,
11+
"PAGE_SIZE": {
12+
"S": 10,
13+
"D": 20,
14+
"M": 30,
15+
"L": 40
16+
},
17+
18+
"// contact configs //": "--------------------------------",
19+
"EMAIL_CLUB": "[email protected]",
20+
"EMAIL_SUPPORT": "[email protected]",
21+
"EMAIL_HELLO": "[email protected]",
22+
"EMAIL_BUSINESS": "[email protected]"
23+
}

‎config/config.prod.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"// endpoint configs //": "--------------------------------",
3+
"ASSETS_ENDPOINT": "https://cps-oss.oss-cn-shanghai.aliyuncs.com",
4+
"GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
5+
6+
"// general configs //": "--------------------------------",
7+
"DEFAULT_THEME": "cyan",
8+
"SENIOR_AMOUNT_THRESHOLD": 51.2,
9+
"SPONSOR_AMOUNT_THRESHOLD": 3999,
10+
"PAGE_SIZE": {
11+
"S": 10,
12+
"D": 20,
13+
"M": 30,
14+
"L": 40
15+
},
16+
17+
"// contact configs //": "--------------------------------",
18+
"EMAIL_CLUB": "[email protected]",
19+
"EMAIL_SUPPORT": "[email protected]",
20+
"EMAIL_HELLO": "[email protected]",
21+
"EMAIL_BUSINESS": "[email protected]"
22+
}

‎config/contacts.js

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

0 commit comments

Comments
 (0)