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

Fandom-K v1.0.0 #15

Merged
merged 69 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
c5707ba
feat: 아이돌 아이템 카드 컴포넌트 ui 완성
Apr 30, 2024
1093288
Merge branch 'main' of https://github.com/Sprint6-Fandom-K/Fandom-K i…
Apr 30, 2024
892675f
Merge branch 'main' of https://github.com/Sprint6-Fandom-K/Fandom-K i…
Apr 30, 2024
ccbe4bc
test: 깃 푸시 테스트
Bellaeoeoo Apr 30, 2024
15bad30
마이페이지 레이아웃
Bellaeoeoo Apr 30, 2024
8e2b0d1
refactor: global css 삭제
May 1, 2024
9cb08f9
Merge branch '김어진' of https://github.com/Sprint6-Fandom-K/Fandom-K in…
May 1, 2024
88785ce
fix: 마이페이지 병합
May 1, 2024
ab963ac
Merge branch 'mypage' of https://github.com/Sprint6-Fandom-K/Fandom-K…
May 1, 2024
0451442
jax와 css 수정한 것
Bellaeoeoo May 1, 2024
eab8667
feat: 아이돌 목록 api 불러오기 완성
May 1, 2024
f86e10a
style: 코드 스타일 변경
May 1, 2024
e3bfb2d
fixed:jsx, css
Bellaeoeoo May 1, 2024
9a9053f
Merge branch '이은빈' of https://github.com/Sprint6-Fandom-K/Fandom-K in…
May 1, 2024
11ea5e9
Merge branch '김어진' of https://github.com/Sprint6-Fandom-K/Fandom-K in…
May 1, 2024
2d3e06b
feat: 마이페이지 style 수정
May 1, 2024
3933066
fix: style 오류 수정
May 2, 2024
7c830bd
feat: add carousel (#1)
Sombian May 2, 2024
ab20947
style: 아이콘 svg로 변경
May 2, 2024
f7001ad
chore: add some asset
codefug Apr 30, 2024
6dbfd4e
feat: APP, ListPage 기본 세팅 for devlop
codefug Apr 30, 2024
2c81ddf
feat: add some shared
codefug Apr 30, 2024
c2e00c9
feat: add layout of SortChart
codefug Apr 30, 2024
632b8cf
feat: add function of SortChart
codefug Apr 30, 2024
84f7afd
feat: add MonthChart till moreButton
codefug Apr 30, 2024
4e31b87
chore: other config
codefug Apr 30, 2024
98973fd
fix: MenuButton hover style
codefug Apr 30, 2024
32e04f2
feat: getChart API,related hooks and SortChart
codefug Apr 30, 2024
8a45728
feat: complete SortChart Layout
codefug Apr 30, 2024
5c78b17
feat: add customMediaQuery
codefug Apr 30, 2024
1fc23ac
feat: add moreItemsButton
codefug May 1, 2024
c8eb691
feat: complete IdolChartCard
codefug May 1, 2024
cad185a
feat: put sort logic in chartList
codefug May 1, 2024
00d814b
fix: arrange itemSort logic
codefug May 1, 2024
76c4140
feat: remove scrollbar style, and add Overflow to SortChart
codefug May 1, 2024
e4f4b2b
feat: add Refresh icon layout
codefug May 1, 2024
2576f3e
feat(SortChart): create keyframe for refreshicon and apply infinite S…
codefug May 1, 2024
044886f
fix: merge for ListPage
codefug May 2, 2024
818854f
fix: 아이돌 목록 전체 너비 수정
May 2, 2024
2959a08
fix: 미사용 이미지 폴더 삭제
May 2, 2024
57418c1
feat: 체크 ui 완성
May 2, 2024
201b504
feat: 반응형 LandingPage 구현 완료
JustDevRae May 2, 2024
3317dc1
StyleComponenets: AddButton.jsx is incomplete
Bellaeoeoo May 2, 2024
87f889d
feat: 추가하기 버튼 클릭시 localStorage 업데이트
May 3, 2024
9c379ab
feat: 아이돌 선택시 체크 ui 완성
May 3, 2024
6e98a45
feat: localStorage에 관심있는 아이돌 추가 기능 작업 완료
May 3, 2024
3a3ed8f
style: console.log 제거
May 3, 2024
21e3bba
스타일컨포넌트
Bellaeoeoo May 3, 2024
00ca18e
fix: 스타일 오류 수정
May 3, 2024
78b5c42
Merge branch 'mypage' of https://github.com/Sprint6-Fandom-K/Fandom-K…
May 3, 2024
448c037
fix: api 경로 변경
May 3, 2024
7cb01cd
fix: LandingPage 코드 구조 수정
JustDevRae May 4, 2024
c374b4b
feat: 크레딧 충전하기 모달 레이아웃 구현
JustDevRae May 4, 2024
952f0e6
style componenets: 경로수정필요
Bellaeoeoo May 5, 2024
317fc55
fix: runtime 오류 해결
May 5, 2024
b8843e5
Merge branch '이은빈' of https://github.com/Sprint6-Fandom-K/Fandom-K in…
May 5, 2024
c14a8aa
fix: 경로 오류 수정
May 5, 2024
72d902e
rename: 폴더명 수정
JustDevRae May 5, 2024
8005d82
fix: 코드수정
JustDevRae May 5, 2024
15fff22
Merge branch 'LandingPage' of https://github.com/Sprint6-Fandom-K/Fan…
May 5, 2024
7e3589f
fix: 안쓰는 파일 삭제, 파일 경로 수정
May 5, 2024
809d238
feat: MonthChart (#6)
codefug May 5, 2024
7e33112
화면오류해결
Bellaeoeoo May 5, 2024
8c8ab7f
feat: Donate (#4)
Sombian May 5, 2024
af8bcaa
Merge branch 'ListPage' of https://github.com/Sprint6-Fandom-K/Fandom…
May 5, 2024
9e9d098
Co-authored-by: KimSeungRae <JustDevRae@users.noreply.github.com>
Sombian May 5, 2024
81844de
feat: 기능 완성 && 리팩토링 회의 (#11)
codefug May 10, 2024
d96a338
feat: arrange file structure (#13)
codefug May 11, 2024
ab95e6c
feat: project Arrange (#14)
codefug May 14, 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
40 changes: 40 additions & 0 deletions .github/workflows/netlify.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: build and deploy to Netlify
on:
pull_request:
types:
- closed

jobs:
build:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup-node
uses: actions/setup-node@v3
- name: Cache Node.js modules
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{hashFiles('**/package-lock.json')}}
restore-keys: |
${{ runner.os }}-node-
- name: Install dependencies, build
run: |
npm ci
npm run build
- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v3.0
with:
publish-dir: "./dist"
production-branch: "이승현"
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: "Deploy from GitHub Actions"
enable-pull-request-comment: false
enable-commit-comment: true
overwrites-pull-request-comment: true
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dist
node_modules
package-lock.json
3 changes: 1 addition & 2 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/** @type {import("prettier").Config} */
export default
{
export default {
semi: true,
useTabs: true,
singleQuote: false,
Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
// terminal
//
"terminal.integrated.defaultProfile.windows": "Command Prompt",

"cSpell.enabled":false
}
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# Fandom-K

스프린트 기초 프로젝트

1. 재사용 컨포넌트 처리

버튼, subtitle, 스켈레톤 통일, api 통일

2. 폴더 구조 개선
src > app, widgets, shared

app 안에 pages,
pages 안에 page
page 안에 page에서만 쓰이는 애들
widgets 안에 다른 곳에서 쓸 것 같은데 큰 덩어리들
shared 다른 곳에서 쓰는 것들
4 changes: 3 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export default
//
// custom rules
//
"react/react-in-jsx-scope": "off",
"react/prop-types": ["off", {}],
"react/react-in-jsx-scope": ["off", {}],
"react/no-unknown-property": ["error", { ignore: ["class"] }],
},
plugins:
{
Expand Down
11 changes: 8 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
<!DOCTYPE html>
<!doctype html>

<html lang="ko">

<head>
<meta charset="UTF-8">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" as="style" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard-dynamic-subset.css" crossorigin />
</head>

<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>

<script type="module" src="/src/main.jsx">
document.title = "Fandom-K";
</script>

</html>
3 changes: 2 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"compilerOptions":
{
"paths": {
"@/*": ["./src/*"]
}
Expand Down
Loading
Loading