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.

Sign up for GitHub

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

feat: 데스크탑 뷰 전역 레이아웃 구현 #494

Merged
merged 2 commits into from
Oct 18, 2023
Merged

feat: 데스크탑 뷰 전역 레이아웃 구현 #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac3e0b9
feat: DesktopView 구현
ksone02 Oct 17, 2023
0786386
fix: storybook ci 오류 해결
ksone02 Oct 17, 2023
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
60 changes: 58 additions & 2 deletions frontend/.pnp.cjs
View file
Open in desktop

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

Binary file added frontend/.yarn/cache/postcss-npm-8.4.31-385051a82b-1d8611341b.zip
View file
Open in desktop
Binary file not shown.
Binary file added frontend/.yarn/cache/styled-components-npm-6.1.0-309a24863e-989262a2be.zip
View file
Open in desktop
Binary file not shown.
Binary file added frontend/.yarn/cache/zipgo-layout-npm-0.3.0-7cfca6820b-dc91581cd7.zip
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@
"react-dom": "^18.2.0",
"react-router": "^6.14.2",
"react-router-dom": "^6.14.1",
"styled-normalize": "^8.0.7"
"styled-normalize": "^8.0.7",
"zipgo-layout": "^0.3.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

멋있어용

},
"lint-staged": {
"**/*.{ts,tsx}": [
Expand Down
21 changes: 12 additions & 9 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ThemeProvider } from 'styled-components';
import { CriticalBoundary } from './components/@common/ErrorBoundary/ErrorBoundary';
import QueryBoundary from './components/@common/ErrorBoundary/QueryBoundary/QueryBoundary';
import GlobalStyle from './components/@common/GlobalStyle';
import MobileToDesktop from './components/@common/MobileToDesktop/MobileToDesktop';
import { ERROR_MESSAGE_KIT } from './constants/errors';
import { ONE_HOUR } from './constants/time';
import ToastProvider, { useToast } from './context/Toast/ToastContext';
Expand Down Expand Up @@ -37,15 +38,17 @@ const App = () => (
<ThemeProvider theme={theme}>
<GlobalStyle />
<QueryClientProvider client={queryClient}>
<CriticalBoundary fallback={errorFallback}>
<QueryBoundary errorFallback={errorFallback}>
<ToastProvider>
<GlobalEvent />
<Outlet />
{isDevelopment && <ReactQueryDevtools initialIsOpen={false} />}
</ToastProvider>
</QueryBoundary>
</CriticalBoundary>
<MobileToDesktop>
<CriticalBoundary fallback={errorFallback}>
<QueryBoundary errorFallback={errorFallback}>
<ToastProvider>
<GlobalEvent />
<Outlet />
{isDevelopment && <ReactQueryDevtools initialIsOpen={false} />}
</ToastProvider>
</QueryBoundary>
</CriticalBoundary>
</MobileToDesktop>
</QueryClientProvider>
</ThemeProvider>
);
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/assets/svg/background_img.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading