Skip to content

Commit a578dc3

Browse files
committed
merge dev branch into feat/auth-login branch
2 parents 7916e75 + d544f2c commit a578dc3

38 files changed

+1071
-48
lines changed

src/app/providers.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
QueryClientProvider,
88
isServer,
99
} from '@tanstack/react-query'
10-
import { ReactNode } from 'react'
1110

1211
// In Next.js, this file would be called: app/providers.tsx
1312

@@ -38,7 +37,11 @@ function getQueryClient() {
3837
return browserQueryClient
3938
}
4039

41-
const Providers = ({ children }: { children: ReactNode }): JSX.Element => {
40+
const Providers = ({
41+
children,
42+
}: {
43+
children: React.ReactNode
44+
}): JSX.Element => {
4245
// NOTE: Avoid useState when initializing the query client if you don't
4346
// have a suspense boundary between this and the code that may
4447
// suspend because React will throw away the client on the initial

src/assets/IconList.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ import IcBin from './icons/ic-bin.svg'
44
import IcCalendar from './icons/ic-calendar.svg'
55
import IcCaretDown from './icons/ic-caret-down.svg'
66
import IcCaretUp from './icons/ic-caret-up.svg'
7+
import IcCheckOff from './icons/ic-check-off.svg'
8+
import IcCheckOn from './icons/ic-check-on.svg'
79
import IcCheck from './icons/ic-check.svg'
10+
import IcCheckboxOff from './icons/ic-checkbox-off.svg'
11+
import IcCheckboxOn from './icons/ic-checkbox-on.svg'
812
import IcChevronLeft from './icons/ic-chevron-left.svg'
913
import IcChevronRight from './icons/ic-chevron-right.svg'
1014
import IcClose from './icons/ic-close.svg'
15+
import IcCodefile from './icons/ic-codefile.svg'
1116
import IcComment from './icons/ic-comment.svg'
1217
import IcEdit from './icons/ic-edit.svg'
1318
import IcEditorAlignCenter from './icons/ic-editor-align-center.svg'
@@ -26,17 +31,24 @@ import IcEyeClosed from './icons/ic-eye-closed.svg'
2631
import IcEyeOpen from './icons/ic-eye-open.svg'
2732
import IcHeart from './icons/ic-heart.svg'
2833
import IcKebabMenu from './icons/ic-kebab-menu.svg'
34+
import IcLogout from './icons/ic-logout.svg'
2935
import IcMemberAdd from './icons/ic-member-add.svg'
3036
import IcMemberDelete from './icons/ic-member-delete.svg'
3137
import IcPaperPlane from './icons/ic-paper-plane.svg'
3238
import IcPlus from './icons/ic-plus.svg'
3339
import IcSearch from './icons/ic-search.svg'
40+
import IcSetting from './icons/ic-setting.svg'
3441
import IcShare from './icons/ic-share.svg'
3542
import IcStart from './icons/ic-start.svg'
43+
import IcWorkbag from './icons/ic-workbag.svg'
3644

3745
export {
3846
IcArrowRight,
47+
IcLogout,
3948
IcAvatar,
49+
IcCodefile,
50+
IcWorkbag,
51+
IcSetting,
4052
IcBin,
4153
IcCalendar,
4254
IcCaretDown,
@@ -70,4 +82,8 @@ export {
7082
IcSearch,
7183
IcShare,
7284
IcStart,
85+
IcCheckboxOn,
86+
IcCheckboxOff,
87+
IcCheckOn,
88+
IcCheckOff,
7389
}

src/assets/icons/ic-check-off.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/ic-check-on.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

src/assets/icons/ic-codefile.svg

Lines changed: 5 additions & 0 deletions
Loading

src/assets/icons/ic-logout.svg

Lines changed: 4 additions & 0 deletions
Loading

src/assets/icons/ic-setting.svg

Lines changed: 5 additions & 0 deletions
Loading

src/assets/icons/ic-workbag.svg

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)