From 7a91a60af9e674324994508db2b118a52fe2b697 Mon Sep 17 00:00:00 2001
From: Han Cen <cenhan@outlook.com>
Date: Fri, 17 Jun 2022 23:35:53 +0800
Subject: [PATCH] fix: fix build (#149)

---
 src/components/Layout.tsx |  6 ++---
 src/lib/redux/store.ts    | 49 ++++-----------------------------------
 src/pages/[...id].tsx     |  2 +-
 src/pages/_app.tsx        |  4 +---
 4 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 421ce05..316a571 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -181,7 +181,7 @@ export default function Layout({ children, user }) {
       fixed
       navbar={
         <Navbar
-          padding='md'
+          p='md'
           hiddenBreakpoint='sm'
           hidden={!opened}
           width={{ sm: 200, lg: 230 }}
@@ -247,7 +247,7 @@ export default function Layout({ children, user }) {
         </Navbar>
       }
       header={
-        <Header height={70} padding='md'>
+        <Header height={70} p='md'>
           <div style={{ display: 'flex', alignItems: 'center', height: '100%' }}>
             <MediaQuery largerThan='sm' styles={{ display: 'none' }}>
               <Burger
@@ -325,7 +325,7 @@ export default function Layout({ children, user }) {
         </Header>
       }
     >
-      <Paper withBorder padding='md' shadow='xs'>{children}</Paper>
+      <Paper withBorder p='md' shadow='xs'>{children}</Paper>
     </AppShell>
   );
 }
\ No newline at end of file
diff --git a/src/lib/redux/store.ts b/src/lib/redux/store.ts
index c983eef..6a60b49 100644
--- a/src/lib/redux/store.ts
+++ b/src/lib/redux/store.ts
@@ -1,54 +1,13 @@
-// https://github.com/mikecao/umami/blob/master/redux/store.js
-import { useMemo } from 'react';
-import { Action, CombinedState, configureStore, EnhancedStore } from '@reduxjs/toolkit';
-import thunk, { ThunkAction } from 'redux-thunk';
+import { configureStore } from '@reduxjs/toolkit';
 import rootReducer from './reducers';
-import { User } from './reducers/user';
 import { useDispatch, TypedUseSelectorHook, useSelector } from 'react-redux';
 
-let store: EnhancedStore<CombinedState<{
-  user: User;
-}>>;
-
-export function getStore(preloadedState) {
-  return configureStore({
-    reducer: rootReducer,
-    middleware: [thunk],
-    preloadedState,
-  });
-}
-
-export const initializeStore = preloadedState => {
-  let _store = store ?? getStore(preloadedState);
-
-  if (preloadedState && store) {
-    _store = getStore({
-      ...store.getState(),
-      ...preloadedState,
-    });
-    store = undefined;
-  }
-
-  if (typeof window === 'undefined') return _store;
-  if (!store) store = _store;
-
-  return _store;
-};
-
-export function useStore(initialState?: User) {
-  return useMemo(() => initializeStore(initialState), [initialState]);
-}
+export const store = configureStore({
+  reducer: rootReducer,
+});
 
 export type AppState = ReturnType<typeof store.getState>
-
 export type AppDispatch = typeof store.dispatch
 
-export type AppThunk<ReturnType = void> = ThunkAction<
-  ReturnType,
-  AppState,
-  unknown,
-  Action<User>
->
-
 export const useStoreDispatch = () => useDispatch<AppDispatch>();
 export const useStoreSelector: TypedUseSelectorHook<AppState> = useSelector;
\ No newline at end of file
diff --git a/src/pages/[...id].tsx b/src/pages/[...id].tsx
index 99ec9c8..3eb2c21 100644
--- a/src/pages/[...id].tsx
+++ b/src/pages/[...id].tsx
@@ -71,7 +71,7 @@ export default function EmbeddedImage({ image, user, pass }) {
         onClose={() => setOpened(false)}
         title='Password Protected'
         centered={true}
-        hideCloseButton={true}
+        withCloseButton={true}
         closeOnEscape={false}
         closeOnClickOutside={false}
       >
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 915f861..f3f575c 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -1,12 +1,10 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import Head from 'next/head';
-import { useStore } from 'lib/redux/store';
+import { store } from 'lib/redux/store';
 import ZiplineTheming from 'components/Theming';
 
 export default function MyApp({ Component, pageProps }) {
-  const store = useStore();
-
   return (
     <Provider store={store}>
       <Head>