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

튜토리얼 추가/WIP #235

Draft
wants to merge 53 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
1c0cbfa
feat: merge animation 기반 잡기
sumi-0011 Nov 3, 2024
fe56da2
refactor: clone item 분리
sumi-0011 Nov 3, 2024
d464805
refactor: merge 애니매이션 컴포넌트 분리
sumi-0011 Nov 3, 2024
8093445
feat: select persona logic 추가
sumi-0011 Nov 8, 2024
26c71a9
feat: merge item style 수정 및 API 초안 작성
sumi-0011 Nov 9, 2024
456e277
feat: merge result 보여주기
sumi-0011 Nov 12, 2024
011dd30
feat: merge result 애니매이션 수정 및 로딩 추가
sumi-0011 Nov 13, 2024
dec8af3
refactor: 코드 정리 및 다국어 적용
sumi-0011 Nov 13, 2024
55e99f5
refactor: merge 방식 수정
sumi-0011 Nov 15, 2024
40aa011
feat: levelbanner 컴포넌트 추가
sumi-0011 Nov 15, 2024
c520234
fix: merge person 안바뀌는 문제 수정
sumi-0011 Nov 15, 2024
bdac7e7
feat: 선택한 펫 표시
sumi-0011 Nov 15, 2024
05faf7e
refactor: portal 사용 컨벤션 맞게 수정 및 폴더 이름 변경
sumi-0011 Nov 15, 2024
7d74938
feat: shadow panda 설치 및 적용
sumi-0011 Nov 15, 2024
d10abd9
feat: 폴더 컨벤션에 맞게 이동 및 dialog 추가
sumi-0011 Nov 15, 2024
4dfb8c9
refactor: 래빗 코드리뷰 적용
sumi-0011 Nov 16, 2024
435993c
fix: 쿼리 무효화가 아닌 쿼리 데이터 조작으로 optimistic update 구현
sumi-0011 Nov 16, 2024
f751ded
fix: 오타 수정
sumi-0011 Nov 16, 2024
a1f08a7
fix: 선택된 펫이 없을 때만 첫번째 선택
sumi-0011 Nov 16, 2024
ceb8a34
fix: 성능 이슈 해결 memo 사용
sumi-0011 Nov 16, 2024
9e22dd3
fix: 디자인에 맞게 디테일 수정
sumi-0011 Nov 17, 2024
a8a5007
refactor: select option 컴포넌트 옮기기
sumi-0011 Nov 17, 2024
12afb66
refactor: sort option select
sumi-0011 Nov 17, 2024
e1e0cf2
refactor: sort option 제거
sumi-0011 Nov 18, 2024
eee72b2
refactor: path fix
sumi-0011 Nov 18, 2024
310a234
fix: portal import module fix
sumi-0011 Nov 18, 2024
ffee8ce
10개 뽑기 기능 추가 (#218)
sumi-0011 Nov 8, 2024
e596600
할로윈 이벤트 끝 (#231)
sumi-0011 Nov 8, 2024
87f5f09
hotfeat: 준영님 이슈 할당에 추가
sumi-0011 Nov 11, 2024
2d66f09
chore: append comma at shot and background section (#232)
hyesungoh Nov 13, 2024
bb429e7
feat: shadow panda 설치 및 적용
sumi-0011 Nov 15, 2024
c977805
feat: 폴더 컨벤션에 맞게 이동 및 dialog 추가
sumi-0011 Nov 15, 2024
33e8b69
Merge branch 'feat/setting-shadow-panda' of https://github.com/git-go…
sumi-0011 Nov 18, 2024
dae492d
refactor: dialog export 형식 변경
sumi-0011 Nov 18, 2024
63d81d8
feat: large dialog 초안
sumi-0011 Nov 18, 2024
63f5e5e
refactor: shadow panda style issue fix
sumi-0011 Nov 18, 2024
ddd8173
Merge branch 'main' into feat/setting-shadow-panda
sumi-0011 Nov 18, 2024
93187c1
Merge branch 'main' into feat/setting-shadow-panda
sumi-0011 Nov 18, 2024
c840989
fix: 나머지 깨지는곳 처리
sumi-0011 Nov 18, 2024
629b3a6
refactor: dialog export 형식 변경
sumi-0011 Nov 18, 2024
0ccbdf6
feat: large dialog 초안
sumi-0011 Nov 18, 2024
bd5c6fa
feat: large dialog 틀 잡기
sumi-0011 Nov 18, 2024
ac7230a
Merge branch 'feat/setting-shadow-panda-dialog' of https://github.com…
sumi-0011 Nov 18, 2024
b57d1e3
refactor: full modal base 제거, Dialog 컴포넌트로 대체
sumi-0011 Nov 19, 2024
bfd5356
feat: farm persona select에 추가
sumi-0011 Nov 19, 2024
74f9db9
fix: merge persona overflow height fix
sumi-0011 Nov 19, 2024
7ff5484
refactor: style 정리
sumi-0011 Nov 19, 2024
1fba56b
refactor: full modal 제거
sumi-0011 Nov 19, 2024
245148a
feat: drive js 설치
sumi-0011 Nov 19, 2024
90d9f4c
feat: line mode 페이지에 적용
sumi-0011 Nov 19, 2024
afa681d
feat: style 조금 추가
sumi-0011 Nov 20, 2024
94f08e1
feat: farm mode tutorial 추가
sumi-0011 Nov 20, 2024
878c575
refactor: 파일 이름 수정
sumi-0011 Nov 20, 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
8 changes: 4 additions & 4 deletions apps/admin/app/components/layout/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { css } from '_panda/css';
import Nav from './Nav';
import { Avatar, AvatarImage, AvatarFallback } from '@radix-ui/react-avatar';
import { Avatar, AvatarImage } from '@radix-ui/react-avatar';

const PROFILE_IMG = 'https://avatars.githubusercontent.com/u/171903401?s=200&v=4';
function Header() {
Expand All @@ -19,12 +19,12 @@ function Header() {
export default Header;

const containerStyle = css({
h: '16',
h: '16px',
bg: 'background',
shadow: 'md',
zIndex: 'sticky',
px: 4,
py: 3,
px: '4px',
py: '3px',

display: 'flex',
alignItems: 'center',
Expand Down
4 changes: 2 additions & 2 deletions apps/admin/app/components/layout/Header/Nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export default function Example() {
const listStyle = css({
display: 'flex',
flexDirection: 'column',
gap: '3',
p: '6',
gap: '3px',
p: '6px',
md: {
w: '400px',
},
Expand Down
2 changes: 1 addition & 1 deletion apps/admin/app/components/layout/Main/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ function Main({ children }: PropsWithChildren<{}>) {
export default Main;

const containerStyle = css({
p: 8,
p: '8px',
});
5 changes: 3 additions & 2 deletions apps/web/messages/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"copy-link-success": "Copy success!",
"line-set-error": "Cannot set more than 1000.",
"apply-button": "Apply",
"customize-size": "Line TypeCustomize Size",
"customize-size": "Customize Size",
"extend-button": "Extend",
"shrink-button": "Shrink",
"change-pet": "Change pet",
Expand All @@ -102,7 +102,8 @@
"Merge": {
"merge": "Merge",
"merge-result": "Merge result",
"cancel": "Cancel"
"cancel": "Cancel",
"please-choose-pet": "Please choose a pet to use to merge the level. The pet used disappears."
}
},
"Event": {
Expand Down
5 changes: 3 additions & 2 deletions apps/web/messages/ko_KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"copy-link-success": "복사 성공!",
"line-set-error": "1000 이상은 설정할 수 없습니다.",
"apply-button": "적용하기",
"customize-size": "Line Type 사이즈 조정",
"customize-size": "Customize Size",
"extend-button": "확장",
"shrink-button": "축소",
"change-pet": "펫 변경",
Expand All @@ -104,7 +104,8 @@
"Merge": {
"merge": "합치기",
"merge-result": "합치기 결과",
"cancel": "취소"
"cancel": "취소",
"please-choose-pet": "합치기에 사용할 펫을 선택해주세요. 합친 펫은 사라집니다."
}
},
"Event": {
Expand Down
3 changes: 3 additions & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
"@gitanimals/util-common": "workspace:*",
"@next/third-parties": "^14.2.5",
"@octokit/core": "^6.1.2",
"@shadow-panda/style-context": "^0.7.1",
"@suspensive/react": "^2.17.1",
"@tanstack/react-query": "*",
"axios": "^1.6.8",
"driver.js": "^1.3.1",
"framer-motion": "^11.1.7",
"google-auth-library": "^9.11.0",
"google-spreadsheet": "^4.1.2",
Expand All @@ -51,6 +53,7 @@
"@gitanimals/util-common": "workspace:*",
"@next/bundle-analyzer": "^14.2.5",
"@pandacss/dev": "^0.41.0",
"@shadow-panda/preset": "^0.7.1",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-interactions": "^8.0.9",
"@storybook/addon-links": "^8.0.9",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/panda.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,5 @@ export default defineConfig({
outdir: 'styled-system',

// delete default presets
presets: [],
presets: ['@shadow-panda/preset'],
});
17 changes: 17 additions & 0 deletions apps/web/src/app/[locale]/dev/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { css } from '_panda/css';
import { Box } from '_panda/jsx';
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@gitanimals/ui-panda';

import GNB from '@/components/GNB/GNB';

Expand All @@ -13,6 +14,22 @@ async function DevPage() {
<hr className={dividerStyle} />
<h1>client</h1>
<DevClient />
<Accordion type="single" collapsible w="full">
<AccordionItem value="item-1">
<AccordionTrigger>Is it accessible?</AccordionTrigger>
<AccordionContent>Yes. It adheres to the WAI-ARIA design pattern.</AccordionContent>
</AccordionItem>
<AccordionItem value="item-2">
<AccordionTrigger>Is it styled?</AccordionTrigger>
<AccordionContent>
Yes. It comes with default styles that matches the other components&apos; aesthetic.
</AccordionContent>
</AccordionItem>
<AccordionItem value="item-3">
<AccordionTrigger>Is it animated?</AccordionTrigger>
<AccordionContent>Yes. It&apos;s animated by default, but you can disable it if you prefer.</AccordionContent>
</AccordionItem>
</Accordion>
</Box>
);
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/[locale]/event/[eventCode]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const imageStyle = css({
zIndex: 1,
minHeight: 'calc(100vh - 60px)',
pointerEvents: 'none',
top: -60,
top: '-60px',
_mobile: {
display: 'none',
},
Expand Down
10 changes: 5 additions & 5 deletions apps/web/src/app/[locale]/event/[eventCode]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,16 @@ const logoImageStyle = css({
});

const descriptionStyle = css({
marginTop: 24,
fontSize: 28,
lineHeight: 1.5,
marginTop: '24px',
fontSize: '28px',
lineHeight: '1.5',
textAlign: 'center',
color: '#fff',
mb: 40,
mb: '40px',
whiteSpace: 'pre-line',
fontWeight: 600,

_mobile: {
fontSize: 24,
fontSize: '24px',
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function AnimalCardContainer() {
export default AnimalCardContainer;

const container = grid({
gap: 20,
gap: '20px',
justifyContent: 'center',
gridTemplateColumns: 'repeat(4, 1fr)',
width: '1120px',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const showMobile = css({
});

export const cardContainer = grid({
gap: 20,
gap: '20px',
justifyContent: 'center',
gridTemplateColumns: 'repeat(4, 1fr)',
gridTemplateRows: 'repeat(3, 1fr)',
Expand Down
20 changes: 10 additions & 10 deletions apps/web/src/app/[locale]/landing/Footer/Footer.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const footer = css({

_mobile: {
padding: '80px 16px',
gap: 60,
gap: '60px',
},
});

Expand All @@ -24,7 +24,7 @@ export const article = css({

_mobile: {
flexDir: 'column',
gap: 24,
gap: '24px',
},
});

Expand All @@ -45,11 +45,11 @@ const defaultContentWrapper: SystemStyleObject = {

export const teamContentWrapper = css(defaultContentWrapper, {
display: 'flex',
gap: 12,
gap: '12px',

_mobile: {
flexDir: 'column',
gap: 16,
gap: '16px',
},
});

Expand All @@ -61,24 +61,24 @@ export const repoContentWrapper = css(defaultContentWrapper, {

export const repoLi = css({
display: 'flex',
gap: 8,
gap: '8px',

_mobile: {
flexDir: 'column',
gap: 1,
gap: '1px',
},
});

export const repoLiTitle = css({
display: 'flex',
alignItems: 'center',
gap: 8,
width: 226,
gap: '8px',
width: '226px',
textStyle: 'glyph18.bold',

_mobile: {
textStyle: 'glyph15.bold',
gap: 17,
gap: '17px',
},
});

Expand All @@ -89,6 +89,6 @@ export const repoLiLink = css({

_mobile: {
textStyle: 'glyph12.regular',
marginLeft: 37,
marginLeft: '37px',
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ export const wrapperCss = css({
_mobile: {
width: '100%',
flexDir: 'row',
gap: 5,
gap: '5px',
},
});

export const imageCss = css({
marginBottom: 8,
marginBottom: '8px',

_mobile: {
width: 32,
height: 24,
marginBottom: 0,
width: '32px',
height: '24px',
marginBottom: '0px',
objectFit: 'contain',
objectPosition: 'left 50%',
},
Expand All @@ -32,16 +32,16 @@ export const textWrapperCss = css({
export const nicknameWrapperCss = css({
display: 'flex',
alignItems: 'center',
gap: 5,
marginBottom: 4,
gap: '5px',
marginBottom: '4px',

'& span': {
textStyle: 'glyph18.bold',
color: 'white.white_90',
},

_mobile: {
marginBottom: 1,
marginBottom: '1px',
'& span': {
textStyle: 'glyph15.bold',
fontWeight: 'bold',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const backgroundListStyle = cx(
width: 'fit-content',
display: 'flex',
flexWrap: 'nowrap',
gap: 4,
gap: '4px',
}),
);

Expand All @@ -93,8 +93,8 @@ const backgroundContainerStyle = cx(

const backgroundItemStyle = css({
border: '1px solid transparent',
width: 248,
borderRadius: 8,
width: '248px',
borderRadius: '8px',
overflow: 'hidden',
});

Expand Down
Loading