Skip to content

Commit 448f16b

Browse files
Merge pull request #459 from FunD-StockProject/develop
Main Merge
2 parents 2e361bf + ca96dd8 commit 448f16b

469 files changed

Lines changed: 31584 additions & 15228 deletions

File tree

Some content is hidden

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

.env

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
VITE_BASE_URL=https://api.humanzipyo.com
2-
VITE_GOOGLE_ANALYTICS=G-EZPQMV95QJ
2+
VITE_GOOGLE_ANALYTICS=G-EZPQMV95QJ
3+
VITE_KAKAO_API_KEY=6c656322cc1bcb9669fbaee86b9df89a
4+
VITE_APPLE_CLIENT_ID=humanzipyo.app.com
5+
VITE_GOOGLE_CLIENT_ID=376774774273-5do2k4e5r3k13mgjdfam4csprajporr9.apps.googleusercontent.com
6+
VITE_NAVER_CLIENT_ID=c943YPmMR8bflLezMJGz

.github/workflows/ci.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
branches: ['main', 'develop']
6+
push:
7+
branches: ['develop']
8+
9+
jobs:
10+
lint-and-format:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
17+
- name: Set up Node.js
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version: '18.20.5'
21+
cache: 'npm'
22+
23+
- name: Install dependencies
24+
run: npm ci
25+
26+
- name: Check Prettier formatting
27+
run: npx prettier --check "src/**/*.{ts,tsx,js,jsx,json,css}"
28+
29+
- name: Type check
30+
run: npx tsc --noEmit

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
cache: 'npm'
3535

3636
- name: Install dependencies
37-
run: npm install
37+
run: npm ci
3838

3939
- name: Build the project
4040
run: npm run build

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ yarn-error.log*
77
pnpm-debug.log*
88
lerna-debug.log*
99

10+
*.tsbuildinfo
11+
1012
node_modules
1113
dist
1214
dist-ssr
1315
*.local
16+
.env
1417

1518
# Editor directories and files
1619
.vscode/*

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
],
5050
"importOrderSeparation": false,
5151
"importOrderSortSpecifiers": true,
52-
"plugins": ["prettier-plugin-css-order", "@trivago/prettier-plugin-sort-imports"]
52+
"plugins": ["@trivago/prettier-plugin-sort-imports"]
5353
}

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
![TypeScript](https://img.shields.io/badge/typescript-3178C6.svg?style=flat-square&logo=typescript&logoColor=white)
88
![react](https://img.shields.io/badge/react-61DAFB.svg?style=flat-square&logo=react&logoColor=black)
99
![vite](https://img.shields.io/badge/vite-646CFF.svg?style=flat-square&logo=vite&logoColor=white)
10-
1110
![reactquery](https://img.shields.io/badge/reactquery-FF4154.svg?style=flat-square&logo=reactquery&logoColor=white)
12-
1311
![ESLint](https://img.shields.io/badge/ESLint-4B32C3.svg?style=flat-square&logo=ESLint&logoColor=white)
1412
![prettier](https://img.shields.io/badge/prettier-F7B93E.svg?style=flat-square&logo=prettier&logoColor=black)
1513

asconfig.json

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

eslint.config.js

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,38 @@ import globals from 'globals';
44
import tseslint from 'typescript-eslint';
55

66
export default [
7+
{
8+
ignores: [
9+
'dist/**',
10+
'public/assets/**',
11+
'node_modules/**',
12+
'build/**',
13+
'*.config.js',
14+
'*.config.ts',
15+
'src/utils/test.js',
16+
'src/utils/worker/**',
17+
'src/utils/wasm/**',
18+
],
19+
},
720
{ files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
821
{ languageOptions: { globals: globals.browser } },
22+
pluginJs.configs.recommended,
23+
...tseslint.configs.recommended,
24+
pluginReact.configs.flat.recommended,
925
{
10-
'jsx-runtime': {
11-
env: {
12-
browser: true,
13-
es6: true,
14-
node: true,
15-
},
16-
plugins: ['@typescript-eslint', 'react', 'prettier'],
17-
extends: [
18-
'prettier',
19-
'eslint:recommended',
20-
'plugin:react/recommended',
21-
'plugin:prettier/recommended',
22-
'plugin:@typescript-eslint/recommended',
23-
],
24-
parser: '@typescript-eslint/parser',
25-
parserOptions: {
26-
ecmaVersion: 'latest',
27-
sourceType: 'module',
28-
project: './tsconfig.json',
29-
},
30-
rules: {
31-
'prettier/prettier': 'error',
32-
'react/react-in-jsx-scope': 0,
33-
'react/prefer-stateless-function': 0,
34-
'react/jsx-filename-extension': 0,
35-
'react/jsx-one-expression-per-line': 0,
36-
'no-nested-ternary': 0,
26+
settings: {
27+
react: {
28+
version: 'detect',
3729
},
3830
},
31+
rules: {
32+
'react/react-in-jsx-scope': 0,
33+
'react/prefer-stateless-function': 0,
34+
'react/jsx-filename-extension': 0,
35+
'react/jsx-one-expression-per-line': 0,
36+
'no-nested-ternary': 0,
37+
'react/prop-types': 0,
38+
'@typescript-eslint/no-explicit-any': 'warn',
39+
},
3940
},
40-
pluginJs.configs.recommended,
41-
...tseslint.configs.recommended,
42-
pluginReact.configs.flat.recommended,
4341
];

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<title>인간지표 : 주식투자심리도우미</title>
2222
</head>
2323
<body>
24-
<div id="root" style="height: 100%; width: 100%; margin: 0 auto"></div>
25-
<script type="module" src="/src/main.tsx"></script>
24+
<div id="root" style="height: 100%; width: 100%; max-width: 1280px; margin: 0 auto"></div>
25+
<script type="module" src="/src/main.tsx?v=26020801"></script>
2626
</body>
2727
</html>

netlify.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,14 @@
1818
cache-control = '''
1919
max-age=31536000,
2020
immutable
21-
'''
21+
'''
22+
23+
[[headers]]
24+
for = "/.well-known/apple-app-site-association"
25+
[headers.values]
26+
Content-Type = "application/json"
27+
28+
[[headers]]
29+
for = "/.well-known/assetlinks.json"
30+
[headers.values]
31+
Content-Type = "application/json"

0 commit comments

Comments
 (0)