Merge pull request #381 from 42Statistics/develop

v0.3.0

Author: yoopark

app/.storybook/preview.tsx

@@ -1,9 +1,9 @@
 import { Global, ThemeProvider } from '@emotion/react';
 import type { Preview } from '@storybook/react';
 import React from 'react';
-import { defaultTheme } from '../src/styles/defaultTheme';
-import { global } from '../src/styles/global';
-import { reset } from '../src/styles/reset';
+import { lightTheme } from '../src/@core/styles/lightTheme';
+import { global } from '../src/@core/styles/global';
+import { reset } from '../src/@core/styles/reset';
 
 const preview: Preview = {
   parameters: {
@@ -17,7 +17,7 @@ const preview: Preview = {
   },
   decorators: [
     (Story) => (
-      <ThemeProvider theme={defaultTheme}>
+      <ThemeProvider theme={lightTheme}>
         <Global styles={[reset, global]} />
         <Story />
       </ThemeProvider>

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "42stat-frontend",
   "private": true,
-  "version": "0.0.3",
+  "version": "0.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite -m localhost",

app/public/favicon.ico

@@ -1,24 +1,15 @@
-import { PropsWithReactElementChildren } from '@shared/types/PropsWithChildren';
-import { BrowserRouter as Router } from 'react-router-dom';
-import ApolloProvider from './providers/ApolloProvider';
-import ErrorBoundaryProvider from './providers/ErrorBoundaryProvider';
-import HelmetProvider from './providers/HelmetProvider';
-import ModalProvider from './providers/ModalProvider';
-import { ScrollToTop } from './providers/ScrollToTop';
-import ThemeProvider from './providers/ThemeProvider';
+import ApolloProvider from '@core/providers/ApolloProvider';
+import ErrorBoundaryProvider from '@core/providers/ErrorBoundaryProvider';
+import HelmetProvider from '@core/providers/HelmetProvider';
+import ThemeProvider from '@core/providers/ThemeProvider';
+import type { PropsWithReactElementChildren } from '@shared/types/PropsWithChildren';
 
 export const AppProvider = ({ children }: PropsWithReactElementChildren) => {
   return (
     <ErrorBoundaryProvider>
       <ApolloProvider>
         <HelmetProvider>
-          <ThemeProvider>
-            <Router>
-              <ScrollToTop>
-                <ModalProvider>{children}</ModalProvider>
-              </ScrollToTop>
-            </Router>
-          </ThemeProvider>
+          <ThemeProvider>{children}</ThemeProvider>
         </HelmetProvider>
       </ApolloProvider>
     </ErrorBoundaryProvider>