Merge pull request #4 from Game-as-a-Service/revert-3-main

Revert "新增卡片元件及翻轉效果以及可覆用的useCardRenderer hook"
Game-as-a-Service · Sep 12, 2023 · e0718ae · e0718ae
2 parents 787315b + 931e8f4
commit e0718ae
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 151 deletions.
diff --git a/Frontend/the-message/src/App.tsx b/Frontend/the-message/src/App.tsx
@@ -1,19 +1,8 @@
-import { ChakraProvider } from '@chakra-ui/react'
-import {
-  RouterProvider,
-} from "react-router-dom";
-import router from '../src/routes/route';
-
-
-
-
-
-const App = () => {
+import Layout from './layout/layout'
+function App() {
   return (
     <>
-      <ChakraProvider>
-        <RouterProvider router={router} />
-      </ChakraProvider>
+     <Layout/>
     </>
   )
 }

diff --git a/Frontend/the-message/src/assets/images/allset.jpg b/Frontend/the-message/src/assets/images/allset.jpg
diff --git a/Frontend/the-message/src/assets/images/backOfFunctionCard.jpg b/Frontend/the-message/src/assets/images/backOfFunctionCard.jpg
diff --git a/Frontend/the-message/src/assets/images/backOfLineUpCard.jpg b/Frontend/the-message/src/assets/images/backOfLineUpCard.jpg
diff --git a/Frontend/the-message/src/assets/images/lurking.jpg b/Frontend/the-message/src/assets/images/lurking.jpg
diff --git a/Frontend/the-message/src/assets/images/lurking1.jpg b/Frontend/the-message/src/assets/images/lurking1.jpg
diff --git a/Frontend/the-message/src/assets/images/millitaryIntelligence.jpg b/Frontend/the-message/src/assets/images/millitaryIntelligence.jpg
diff --git a/Frontend/the-message/src/assets/images/soysauce.jpg b/Frontend/the-message/src/assets/images/soysauce.jpg
diff --git a/Frontend/the-message/src/components/items/card.tsx b/Frontend/the-message/src/components/items/card.tsx
diff --git a/Frontend/the-message/src/components/page/entrance/entrance.tsx b/Frontend/the-message/src/components/page/entrance/entrance.tsx
@@ -1,22 +1,23 @@
-import { Input } from '@chakra-ui/react'
-import { Button } from '@chakra-ui/react'
-import { Link } from "react-router-dom";
-
-
 
+import Button from "@material-ui/core/Button/Button";
+import SendIcon from '@mui/icons-material/Send';
+import title from "../../../assets/images/title.png";
+import TextField from "@mui/material/TextField/TextField";
 
 const Entrance = () => {
 
     return (
         <div className="absolute h-4/5 w-96 right-10">
-            <div className="flex align-item justify-center w-full text-5xl text-white">
-                <p className="s">風聲</p>
+            <div className="flex align-item justify-center w-full">
+                <img src={title} className="scale-75"/>
             </div>
-            <div className="flex items-center justify-center mt-5">
-                <Input placeholder='輸入玩家姓名' errorBorderColor="red" focusBorderColor='gray.500' color='#fff'/>
+            <div className="flex items-center justify-center">
+                <TextField id="outlined-basic" color="info" label="Outlined" variant="outlined" />
             </div>
             <div className="p-10 flex items-center justify-center">
-                <Button className='bg-gray-500' bg='#66666' color='#fff'><Link to="/game/map">Enter The Game</Link></Button>
+                <Button variant="outlined" color="primary" endIcon={<SendIcon />} >
+                    進入遊戲
+                </Button>
             </div>
         </div>
     );

diff --git a/Frontend/the-message/src/components/page/game/map.tsx b/Frontend/the-message/src/components/page/game/map.tsx
diff --git a/Frontend/the-message/src/hooks/useCardRenderer.tsx b/Frontend/the-message/src/hooks/useCardRenderer.tsx
diff --git a/Frontend/the-message/src/routes/route.tsx b/Frontend/the-message/src/routes/route.tsx