Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Deploy] - 1차 통합 #16

Merged
merged 32 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b600f69
[Fix] - build.sh 수정
sayyyho Oct 30, 2024
1bb662c
:sparkles: Feat: Router 추가 (#1)
GraceKim527 Nov 1, 2024
b04999d
:package: Chore: package.json 추가 (#1)
GraceKim527 Nov 1, 2024
344356f
:lipstick: Style: 로그인 UI 구현 (#1)
GraceKim527 Nov 1, 2024
e866153
:lipstick: Style: 로그인 UI 320px 수정 (#1)
GraceKim527 Nov 1, 2024
4dca803
Merge pull request #3 from GraceKim527/style/#1-LoginUI
GraceKim527 Nov 1, 2024
0083fd8
:sparkles: Feat: 팀 생성 페이지 구현 (#4)
GraceKim527 Nov 1, 2024
abe22d0
Merge pull request #5 from GraceKim527/feat/#4-CreateTeam
GraceKim527 Nov 1, 2024
3cbec38
Merge branch 'moyeothon:develop' into develop
sayyyho Nov 1, 2024
71b4db0
Merge remote-tracking branch 'upstream/develop' into develop
sayyyho Nov 1, 2024
f8528fc
:sparkles: Feat: 팀원 초대 페이지 구현 (#6)
GraceKim527 Nov 1, 2024
ca14b20
Merge pull request #7 from GraceKim527/feat/#6-InviteTeammate
GraceKim527 Nov 1, 2024
e8138f0
[feature] #2 - 테스트하기 페이지 페이징 서클 UI 및 기능 구현
sayyyho Nov 1, 2024
c176909
[Chore] #2 - html title, lang 수정 및 axios instance 설정
sayyyho Nov 2, 2024
652ccda
[Fix] #2 - 테스트하기 페이지 불러오기 수정
sayyyho Nov 2, 2024
087369a
[Feature] #2 - 테스트 페이지 UI 구현
sayyyho Nov 2, 2024
69663cc
Merge branch 'develop' into feature/#2
sayyyho Nov 2, 2024
4e502fc
[] #8 - 테스트 페이지 UI 구현
sayyyho Nov 2, 2024
82fc291
Merge remote-tracking branch 'upstream/develop' into develop
sayyyho Nov 2, 2024
53d2f9e
[Fix] - 공통 컴포넌트 버튼 수정
sayyyho Nov 2, 2024
d7fcc28
Merge pull request #9 from sayyyho/develop
sayyyho Nov 2, 2024
21b87eb
[Fix] #2 - 테스트하기 페이지 에러 수정
sayyyho Nov 2, 2024
304274c
[Feature] #11 - 결과페이지 UI 구현
sayyyho Nov 2, 2024
257e30c
[Feature] #12 - 결과페이지 UI 구현 완료
sayyyho Nov 2, 2024
77cf84a
[Fix] - 버셀 빌드 에러 픽스
sayyyho Nov 2, 2024
e0d8617
[Chore] - package-lock.json 최신화
sayyyho Nov 2, 2024
8cceecf
[Chore] - vercel.json 추가
sayyyho Nov 2, 2024
14f6447
[Chore] #13 - 확정페이지 초기 세팅 완료
sayyyho Nov 2, 2024
d1320bd
[Feature] #13 - 확정페이지 UI 구현
sayyyho Nov 2, 2024
e665785
[Merge] #14 - 확정 페이지 구현
sayyyho Nov 2, 2024
786a169
[Fix] - 미완성 파트 TODO 작성
sayyyho Nov 2, 2024
afbde72
Merge pull request #15 from sayyyho/develop
sayyyho Nov 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export default tseslint.config({
languageOptions: {
// other options...
parserOptions: {
project: ['./tsconfig.node.json', './tsconfig.app.json'],
project: ["./tsconfig.node.json", "./tsconfig.app.json"],
tsconfigRootDir: import.meta.dirname,
},
},
})
});
```

- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
Expand All @@ -31,11 +31,11 @@ export default tseslint.config({

```js
// eslint.config.js
import react from 'eslint-plugin-react'
import react from "eslint-plugin-react";

export default tseslint.config({
// Set the react version
settings: { react: { version: '18.3' } },
settings: { react: { version: "18.3" } },
plugins: {
// Add the react plugin
react,
Expand All @@ -44,7 +44,7 @@ export default tseslint.config({
// other rules...
// Enable its recommended rules
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
...react.configs["jsx-runtime"].rules,
},
})
});
```
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ cd ../

mkdir -p output

cp -R ./F4_Front/* ./output
cp -R ./F4_Front/* ./output

cp -R ./output ./F4_Front
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!doctype html>
<html lang="en">
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>Sync Up</title>
</head>
<body>
<div id="root"></div>
Expand Down
Loading