From b64c2a5fba9110193e4b4bf25c8acc4c8c8167ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E6=A0=91=E4=BA=BA?= <lu.shuren@um-react.app>
Date: Sun, 4 Jun 2023 23:56:15 +0100
Subject: [PATCH] refactor: use tab instead of modal. fixed layout as well.

---
 src/__tests__/sanity-check.test.tsx |  4 +-
 src/components/App.tsx              | 23 ----------
 src/components/AppRoot.tsx          | 32 ++++++++++++--
 src/components/Footer.tsx           | 66 ++++++++++++++---------------
 src/components/Toolbar.tsx          | 23 ----------
 src/modals/SettingsModal.tsx        | 42 ------------------
 src/tabs/MainTab.tsx                | 18 ++++++++
 src/tabs/SettingsTab.tsx            | 10 +++++
 src/theme.ts                        |  9 ++--
 9 files changed, 98 insertions(+), 129 deletions(-)
 delete mode 100644 src/components/App.tsx
 delete mode 100644 src/components/Toolbar.tsx
 delete mode 100644 src/modals/SettingsModal.tsx
 create mode 100644 src/tabs/MainTab.tsx
 create mode 100644 src/tabs/SettingsTab.tsx

diff --git a/src/__tests__/sanity-check.test.tsx b/src/__tests__/sanity-check.test.tsx
index e6f25a0..bebac59 100644
--- a/src/__tests__/sanity-check.test.tsx
+++ b/src/__tests__/sanity-check.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithProviders, screen, waitFor } from '~/test-utils/test-helper';
-import App from '~/components/App';
+import { AppRoot } from '~/components/AppRoot';
 
 vi.mock('../decrypt-worker/client', () => {
   return {
@@ -10,7 +10,7 @@ vi.mock('../decrypt-worker/client', () => {
 });
 
 test('should be able to render App', async () => {
-  renderWithProviders(<App />);
+  renderWithProviders(<AppRoot />);
 
   // Should eventually load sdk version
   await waitFor(() => screen.getByTestId('sdk-version'));
diff --git a/src/components/App.tsx b/src/components/App.tsx
deleted file mode 100644
index 6505f44..0000000
--- a/src/components/App.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Box, Center, Container } from '@chakra-ui/react';
-import { SelectFile } from './SelectFile';
-
-import { FileListing } from '~/features/file-listing/FileListing';
-import { Footer } from './Footer';
-import { Toolbar } from './Toolbar';
-
-function App() {
-  return (
-    <Box height="full" width="full" pt="4">
-      <Container maxW="container.large">
-        <Center>
-          <SelectFile />
-        </Center>
-        <Toolbar />
-        <FileListing />
-        <Footer />
-      </Container>
-    </Box>
-  );
-}
-
-export default App;
diff --git a/src/components/AppRoot.tsx b/src/components/AppRoot.tsx
index 70d1115..897b89e 100644
--- a/src/components/AppRoot.tsx
+++ b/src/components/AppRoot.tsx
@@ -1,11 +1,15 @@
 import { useEffect } from 'react';
-import App from './App';
+import { MdSettings, MdHome } from 'react-icons/md';
+import { ChakraProvider, Tabs, TabList, TabPanels, Tab, TabPanel, Icon, chakra } from '@chakra-ui/react';
+
+import { MainTab } from '~/tabs/MainTab';
+import { SettingsTab } from '~/tabs/SettingsTab';
 
-import { ChakraProvider } from '@chakra-ui/react';
 import { Provider } from 'react-redux';
 import { theme } from '~/theme';
 import { persistSettings } from '~/features/settings/persistSettings';
 import { setupStore } from '~/store';
+import { Footer } from '~/components/Footer';
 
 // Private to this file only.
 const store = setupStore();
@@ -16,7 +20,29 @@ export function AppRoot() {
   return (
     <ChakraProvider theme={theme}>
       <Provider store={store}>
-        <App />
+        <Tabs flex={1} minH={0} display="flex" flexDir="column">
+          <TabList justifyContent="center">
+            <Tab>
+              <Icon as={MdHome} mr="1" />
+              <chakra.span>应用</chakra.span>
+            </Tab>
+            <Tab>
+              <Icon as={MdSettings} mr="1" />
+              <chakra.span>设置</chakra.span>
+            </Tab>
+          </TabList>
+
+          <TabPanels overflow="auto" minW={0}>
+            <TabPanel>
+              <MainTab />
+            </TabPanel>
+            <TabPanel>
+              <SettingsTab />
+            </TabPanel>
+          </TabPanels>
+        </Tabs>
+
+        <Footer />
       </Provider>
     </ChakraProvider>
   );
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 8cd3c68..4aa0f55 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -5,39 +5,39 @@ import { CurrentYear } from './CurrentYear';
 
 export function Footer() {
   return (
-    <Center height="footer.container">
-      <Center
-        height="footer.content"
-        fontSize="sm"
-        textAlign="center"
-        position="fixed"
-        bottom="0"
-        w="full"
-        bg="gray.100"
-        color="gray.800"
-        left="0"
-        flexDir="column"
-      >
-        <Flex as={Text}>
-          {'音乐解锁 (__APP_VERSION_SHORT__'}
-          <Suspense>
-            <SDKVersion />
-          </Suspense>
-          {') - 移除已购音乐的加密保护。'}
-        </Flex>
-        <Text>
-          {'Copyright © 2019 - '}
-          <CurrentYear />{' '}
-          <Link href="https://git.unlock-music.dev/um" isExternal>
-            UnlockMusic 团队
-          </Link>
-          {' | 音乐解锁授权基于'}
-          <Link href="https://git.unlock-music.dev/um/um-react/src/branch/main/LICENSE" isExternal>
-            MIT许可协议
-          </Link>
-          。
-        </Text>
-      </Center>
+    <Center
+      fontSize="sm"
+      textAlign="center"
+      bottom="0"
+      w="full"
+      pt="3"
+      pb="3"
+      borderTop="1px solid"
+      borderColor="gray.300"
+      bg="gray.100"
+      color="gray.800"
+      flexDir="column"
+      flexShrink={0}
+    >
+      <Flex as={Text}>
+        {'音乐解锁 (__APP_VERSION_SHORT__'}
+        <Suspense>
+          <SDKVersion />
+        </Suspense>
+        {') - 移除已购音乐的加密保护。'}
+      </Flex>
+      <Text>
+        {'Copyright © 2019 - '}
+        <CurrentYear />{' '}
+        <Link href="https://git.unlock-music.dev/um" isExternal>
+          UnlockMusic 团队
+        </Link>
+        {' | 音乐解锁授权基于'}
+        <Link href="https://git.unlock-music.dev/um/um-react/src/branch/main/LICENSE" isExternal>
+          MIT许可协议
+        </Link>
+        。
+      </Text>
     </Center>
   );
 }
diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx
deleted file mode 100644
index bfab2c1..0000000
--- a/src/components/Toolbar.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Button, HStack, Icon, useDisclosure } from '@chakra-ui/react';
-import { MdSettings } from 'react-icons/md';
-import { SettingsModal } from '~/modals/SettingsModal';
-
-export function Toolbar() {
-  const {
-    isOpen: isSettingsModalOpen,
-    onClose: onSettingsModalClose,
-    getButtonProps: getSettingsButtonProps,
-  } = useDisclosure();
-
-  return (
-    <>
-      <HStack alignItems="center" justifyContent="center" p="4">
-        <Button {...getSettingsButtonProps()}>
-          <Icon as={MdSettings} mr="1" />
-          设置
-        </Button>
-      </HStack>
-      <SettingsModal isOpen={isSettingsModalOpen} onClose={onSettingsModalClose} />
-    </>
-  );
-}
diff --git a/src/modals/SettingsModal.tsx b/src/modals/SettingsModal.tsx
deleted file mode 100644
index 869d19b..0000000
--- a/src/modals/SettingsModal.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-  Button,
-  HStack,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-} from '@chakra-ui/react';
-
-export interface SettingsModalProps {
-  onClose: () => void;
-  isOpen: boolean;
-}
-
-export function SettingsModal({ isOpen, onClose }: SettingsModalProps) {
-  return (
-    <Modal onClose={onClose} isOpen={isOpen} closeOnOverlayClick={false} scrollBehavior="inside" size="full" isCentered>
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader>应用设置</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <p>Hallo</p>
-          <p>Thank you, thank you very much.</p>
-          <p>Ha-Halo, thank you</p>
-          <p>Thank you very much!</p>
-        </ModalBody>
-        <ModalFooter>
-          <HStack>
-            <Button onClick={onClose} variant="ghost" colorScheme="red">
-              放弃
-            </Button>
-            <Button onClick={onClose}>应用</Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}
diff --git a/src/tabs/MainTab.tsx b/src/tabs/MainTab.tsx
new file mode 100644
index 0000000..8027d12
--- /dev/null
+++ b/src/tabs/MainTab.tsx
@@ -0,0 +1,18 @@
+import { Box, VStack } from '@chakra-ui/react';
+import { SelectFile } from '../components/SelectFile';
+
+import { FileListing } from '~/features/file-listing/FileListing';
+
+export function MainTab() {
+  return (
+    <Box h="full" w="full" pt="4">
+      <VStack gap="3">
+        <SelectFile />
+
+        <Box w="full">
+          <FileListing />
+        </Box>
+      </VStack>
+    </Box>
+  );
+}
diff --git a/src/tabs/SettingsTab.tsx b/src/tabs/SettingsTab.tsx
new file mode 100644
index 0000000..da5f34a
--- /dev/null
+++ b/src/tabs/SettingsTab.tsx
@@ -0,0 +1,10 @@
+export function SettingsTab() {
+  return (
+    <div>
+      <p>Hallo</p>
+      <p>Thank you, thank you very much.</p>
+      <p>Ha-Halo, thank you</p>
+      <p>Thank you very much!</p>
+    </div>
+  );
+}
diff --git a/src/theme.ts b/src/theme.ts
index b7c85ea..c278b56 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -21,15 +21,18 @@ export const theme = extendTheme({
   },
   styles: {
     global: {
-      body: {
+      '#root': {
         minHeight: '100vh',
+        maxHeight: '100vh',
+        display: 'flex',
+        flexDirection: 'column',
       },
     },
   },
   sizes: {
     footer: {
-      container: '7rem',
-      content: '5rem',
+      container: '5rem',
+      content: '4rem',
     },
   },
 });