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

Archive Page Markup #67

Merged
merged 71 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c8524d8
jungjjeong | feat: init archive page
Jungjjeong Dec 27, 2023
1fbdb21
jungjjeong | chore: Merge origin main
Jungjjeong Dec 27, 2023
0169449
jungjjeong | style: margin auto style ์ถ”๊ฐ€
Jungjjeong Dec 27, 2023
9f3237e
jungjjeong | chore: ๊ตฌ์กฐ ์ดˆ๊ธฐ ์„ธํŒ…
Jungjjeong Dec 27, 2023
6ed3d21
jungjjeong | chore: Merge origin dev
Jungjjeong Dec 27, 2023
5ba2606
jungjjeong | feat: preview page markup
Jungjjeong Dec 27, 2023
408c5a7
jungjjeong | refactor: preview background image ๊ต์ฒด ๋ฐ ๊ตฌ์กฐ ๋ถ„๋ฆฌ
Jungjjeong Dec 27, 2023
a257960
jungjjeong | chore: matter-js setting
Jungjjeong Dec 27, 2023
1f0f2b9
fix : modify default layout
klmhyeonwoo Dec 27, 2023
f6297f2
style: border-radius ๊ฐ’ ์ˆ˜์ •
Chaemin-L Dec 27, 2023
19c9057
style: ๋ถˆํ•„์š”ํ•œ border-radius none ๊ฐ’ ์ œ๊ฑฐ
Chaemin-L Dec 27, 2023
00176b7
jungjjeong | style: marble texture file ์ถ”๊ฐ€
Jungjjeong Dec 27, 2023
c39b588
jungjjeong | chore: matter-js type ์ถ”๊ฐ€
Jungjjeong Dec 27, 2023
357b9c2
jungjjeong | feat: archive page function ์ถ”๊ฐ€
Jungjjeong Dec 27, 2023
a3cefff
jungjjeong | chore: matter-js ๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ํ™•์žฅ ์„ธํŒ…
Jungjjeong Dec 27, 2023
3a31ca8
jungjjeong | feat: matter-js archive page ๊ธฐ์ดˆ ๊ตฌํ˜„
Jungjjeong Dec 27, 2023
3381ffc
jungjjeong | feat: engine initialize ์ถ”๊ฐ€ ๊ตฌํ˜„
Jungjjeong Dec 28, 2023
5775a04
jungjjeong | refactor: refactor marble components code
Jungjjeong Dec 28, 2023
8665b01
jungjjeong | fix: mouse wheel ์ด๋ฒคํŠธ ์ดˆ๊ธฐํ™” ๋กœ์ง ์ถ”๊ฐ€
Jungjjeong Dec 28, 2023
d1d1c1e
jungjjeong | refactor: createMarbleObject ํ•จ์ˆ˜ ๋ถ„๋ฆฌ
Jungjjeong Dec 28, 2023
425cf52
jungjjeong | chore: swiper js setting
Jungjjeong Dec 28, 2023
a626b91
jungjjeong | feat: marbleModal layer markup
Jungjjeong Dec 28, 2023
9f4ad32
jungjjeong | fix: mousedown event๋ฅผ mouseup event ์‚ฌ์šฉ์œผ๋กœ ์ „ํ™˜
Jungjjeong Dec 28, 2023
461433a
jungjjeong | style: asset ๊ต์ฒด
Jungjjeong Jan 1, 2024
8e412a8
jungjjeong | style: marble detail Card ๋ณ€๊ฒฝ๋œ ๋””์ž์ธ ๋ฐ˜์˜
Jungjjeong Jan 1, 2024
4650804
jungjjeong | refactor: portal ์‚ฌ์šฉ modal ๋ฐฉ์‹ ๋ณ€๊ฒฝ
Jungjjeong Jan 1, 2024
4005cb9
jungjjeong | feat: pagination ๊ธฐ๋Šฅ ๊ตฌํ˜„
Jungjjeong Jan 1, 2024
b8a0b98
jungjjeong | feat: marble modal navigation bar ๊ตฌํ˜„
Jungjjeong Jan 1, 2024
f2194d4
jungjjeong | style: marble isViewed ์ƒํƒœ ์Šคํƒ€์ผ ๋ถ„๊ธฐ์ฒ˜๋ฆฌ
Jungjjeong Jan 1, 2024
61bca3f
jungjjeong | feat: marble grid layout ๊ธฐ์ดˆ ๋งˆํฌ์—…
Jungjjeong Jan 1, 2024
76e2f53
jungjjeong | chore: Merge origin main
Jungjjeong Jan 1, 2024
6672ac7
jungjjeong | chore: Merge branch 'dev' of https://github.com/depromeeโ€ฆ
Jungjjeong Jan 1, 2024
aad0d7f
jungjjeong | refactor: ๋ถˆํ•„์š” import ์ œ๊ฑฐ
Jungjjeong Jan 1, 2024
54a1cae
jungjjeong | feat: Switch component ์˜์—ญ UI ๊ตฌํ˜„
Jungjjeong Jan 2, 2024
0a9d97d
jungjjeong | refactor: marbleList ์ƒ์œ„ ์ปดํฌ๋„ŒํŠธ๋กœ ์ด๋™
Jungjjeong Jan 2, 2024
03e0c15
jungjjeong | refactor: marble component ์ด๋ฆ„ ๋ณ€๊ฒฝ ๋ฐ marbleList ์ƒ์œ„ ์ปดํฌ๋„ŒํŠธ๋กœ ์ด๋™
Jungjjeong Jan 2, 2024
7115854
jungjjeong | refactor: console.log ์ œ๊ฑฐ
Jungjjeong Jan 2, 2024
e806205
jungjjeong | chore: lodash setting
Jungjjeong Jan 2, 2024
62adadd
jungjjeong | feat: useWindowsScrollY hooks ๊ตฌํ˜„
Jungjjeong Jan 2, 2024
5e3b1b6
jungjjeong | style: default layout ์Šคํƒ€์ผ ๋ณ€๊ฒฝ
Jungjjeong Jan 2, 2024
94a98b6
jungjjeong | refactor: props type ์›Œ๋”ฉ ๋ณ€๊ฒฝ
Jungjjeong Jan 2, 2024
e789cbe
jungjjeong | refactor: ํด๋” ๊ตฌ์กฐ ๋ณ€๊ฒฝ
Jungjjeong Jan 2, 2024
2cec6f5
jungjjeong | chore: icon import ๋ฐฉ์‹ ๋ณ€๊ฒฝ
Jungjjeong Jan 2, 2024
643987f
jungjjeong | fix: marble FAB button scrollRef ์ˆ˜์ •
Jungjjeong Jan 2, 2024
41e3076
jungjjeong | feat: comfirm component ๊ตฌํ˜„
Jungjjeong Jan 3, 2024
f4e49cc
jungjjeong | feat: confirm component ์ ์šฉ
Jungjjeong Jan 3, 2024
f22e971
jungjjeong | style: confirm modal ์Šคํƒ€์ผ ์ˆ˜์ •
Jungjjeong Jan 3, 2024
9a476bc
jungjjeong | feat: fab button transition ๊ตฌํ˜„
Jungjjeong Jan 7, 2024
cb6913e
jungjjeong | refactor: width, height px ๋‹จ์œ„ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
7fafd38
jungjjeong | style: priview page ๋งˆํฌ์—… ์ˆ˜์ •
Jungjjeong Jan 7, 2024
73540b2
jungjjeong | style: marbleCanvas page ๋งˆํฌ์—… ์ˆ˜์ •
Jungjjeong Jan 7, 2024
df9238e
jungjjeong | chore: todo ์ฃผ์„ ์‚ญ์ œ
Jungjjeong Jan 7, 2024
6b63678
jungjjeong | style: marbleDetailCard ๋งˆํฌ์—… ์ˆ˜์ •
Jungjjeong Jan 7, 2024
5f51be9
jungjjeong | style: confirm modal ๋งˆํฌ์—… ์ˆ˜์ •
Jungjjeong Jan 7, 2024
e81304a
jungjjeong | style: marble grid page ๋งˆํฌ์—… ์ˆ˜์ •
Jungjjeong Jan 7, 2024
901cc7c
jungjjeong | style: appBar ์ž„์‹œ ์ถ”๊ฐ€
Jungjjeong Jan 7, 2024
89a9a07
jungjjeong | refactor: archive title ์ปดํฌ๋„ŒํŠธ ๋ถ„๋ฆฌ
Jungjjeong Jan 7, 2024
07e41f4
jungjjeong | style: marbleModal style ๋ณ€์ˆ˜ ๋‹จ์œ„ ์ˆ˜์ •
Jungjjeong Jan 7, 2024
aacde1c
jungjjeong | refactor: component ํ™•์žฅ์„ฑ์„ ์œ„ํ•ด confirm props ์ˆ˜์ •
Jungjjeong Jan 7, 2024
d4feac4
jungjjeong | chore: component name ์ผ€๋ฐฅ ์ผ€์ด์Šค๋กœ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
d4cf0db
jungjjeong | refactor: common component ์ผ€๋ฐฅ ์ผ€์ด์Šค๋กœ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
a3a920d
jungjjeong | refactor: images ์ผ€๋ฐฅ ์ผ€์ด์Šค๋กœ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
1e07457
jungjjeong | refactor: archive pages ์ผ€๋ฐฅ ์ผ€์ด์Šค๋กœ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
27c053c
jungjjeong | refactor: marble asset ์ผ€๋ฐฅ ์ผ€์ด์Šค๋กœ ๋ณ€๊ฒฝ
Jungjjeong Jan 7, 2024
9ec5964
jungjjeong | refactor: change handler function name
Jungjjeong Jan 7, 2024
3624a2d
jungjjeong | fix: content initialize issue
Jungjjeong Jan 7, 2024
9b05fb9
jungjjeong | refactor: delete unused import
Jungjjeong Jan 7, 2024
6c6e2ed
jungjjeong | fix: ์ž˜๋ชป๋œ type ํŒŒ์ผ ์ด๋ฆ„ ๋ณ€๊ฒฝ
Jungjjeong Jan 8, 2024
0ad1c66
jungjjeong | refactor: confirm btnDefaultStyle ์ƒ์ˆ˜ ์œ„์น˜ ๋ณ€๊ฒฝ
Jungjjeong Jan 8, 2024
2f5208e
jungjjeong | refactor: setIsOverflow setStateAction ์œ„์น˜ ๋ณ€๊ฒฝ
Jungjjeong Jan 8, 2024
f913662
jungjjeong | refactor: css background ๋ณ€์ˆ˜ global.css๋กœ ์œ„์น˜ ๋ณ€๊ฒฝ
Jungjjeong Jan 8, 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
6 changes: 5 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
.prettierrc.cjs

*.config.js
*.config.ts
*.config.ts


# lib/RenderExtension file
src/**/*.js
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"cSpell.words": ["clsx", "svgr"]
}
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
"dependencies": {
"axios": "^1.6.2",
"clsx": "^2.0.0",
"lodash": "^4.17.21",
"matter-js": "^0.19.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.19.0"
"react-router-dom": "^6.19.0",
"swiper": "^11.0.5"
},
"devDependencies": {
"@storybook/addon-essentials": "^7.5.3",
Expand All @@ -27,6 +30,8 @@
"@storybook/react": "^7.5.3",
"@storybook/react-vite": "^7.5.3",
"@storybook/testing-library": "^0.2.2",
"@types/lodash": "^4.14.202",
"@types/matter-js": "^0.19.5",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@typescript-eslint/eslint-plugin": "^6.11.0",
Expand Down
35 changes: 31 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions src/app/archive/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { useEffect, useState } from "react";

import { MarbleCanvas } from "./marble-canvas";
import { MarbleGrid } from "./marble-grid";
import { Preview } from "./preview";

import { ConfirmDialog } from "@/components/common/confirm/confirm-dialog";
import tempData from "@/data/archive-temp-data.json";
import { TMarble } from "@/types/archive";

export const Archive = () => {
const [marbleList, setMarbleList] = useState<TMarble[]>();

useEffect(() => {
// TODO: server Data
if (!tempData.data.length) return;

setMarbleList(tempData.data);
}, []);

if (!marbleList) return null;
return (
<ConfirmDialog>
{/* <Preview /> */}
<MarbleCanvas marbleList={marbleList} />
{/* <MarbleGrid marbleList={marbleList} /> */}
</ConfirmDialog>
);
};
Loading