From 677a045a3b1c33437f463451c2bf6095797c3718 Mon Sep 17 00:00:00 2001
From: eson <474420502@qq.com>
Date: Wed, 5 Jul 2023 01:33:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 22 ++++++++++++
 package.json      |  1 +
 src/Components.js | 92 +++++++++++++++++++++++++++++++++--------------
 3 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1b34b08..aa89d6d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@emotion/react": "^11.11.1",
         "@emotion/styled": "^11.11.0",
+        "@mui/icons-material": "^5.13.7",
         "@mui/material": "^5.13.7",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
@@ -3189,6 +3190,27 @@
       "resolved": "https://registry.npmmirror.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.13.7.tgz",
       "integrity": "sha512-/suIo4WoeL/OyO3KUsFVpdOmKiSAr6NpWXmQ4WLSxwKrTiha1FJxM6vwAki5W/5kR9WnVLw5E8JC4oHHsutT8w=="
     },
+    "node_modules/@mui/icons-material": {
+      "version": "5.13.7",
+      "resolved": "https://registry.npmmirror.com/@mui/icons-material/-/icons-material-5.13.7.tgz",
+      "integrity": "sha512-zoVtkb9jYVUGfI7CobOdDBEAlpg3XESiO6cWqSDGwEma69+CBDIAwGpnO5truvQDJHBGSAfzFj3nObwxjkyA7Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@mui/material": "^5.0.0",
+        "@types/react": "^17.0.0 || ^18.0.0",
+        "react": "^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@mui/material": {
       "version": "5.13.7",
       "resolved": "https://registry.npmmirror.com/@mui/material/-/material-5.13.7.tgz",
diff --git a/package.json b/package.json
index 1f6617e..6fcb795 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.13.7",
     "@mui/material": "^5.13.7",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
diff --git a/src/Components.js b/src/Components.js
index 24470b9..a0402b0 100644
--- a/src/Components.js
+++ b/src/Components.js
@@ -1,4 +1,3 @@
-// Main.js
 import React, { useState, useEffect } from 'react';
 import axios from 'axios';
 import Container from '@mui/material/Container';
@@ -9,6 +8,7 @@ import CardContent from '@mui/material/CardContent';
 import Typography from '@mui/material/Typography';
 import Pagination from '@mui/material/Pagination';
 import { Link } from 'react-router-dom';
+import CircularProgress from '@mui/material/CircularProgress';
 
 const config = {
   Host: 'http://192.168.31.121:4444',
@@ -22,9 +22,12 @@ const Main = () => {
     length: 1,
   });
 
+  const [loading, setLoading] = useState(false);
+
   const limit = 8;
 
   const fetchMovies = async (page) => {
+    setLoading(true);
     try {
       const response = await axios.get(
         `${config.Host}/movie/?page=${page}&limit=${limit}`
@@ -42,6 +45,8 @@ const Main = () => {
       }
     } catch (error) {
       console.error('Error fetching movies:', error);
+    } finally {
+      setLoading(false);
     }
   };
 
@@ -54,35 +59,66 @@ const Main = () => {
     fetchMovies(value);
   };
 
+  const truncateFilename = (filename, maxLength) => {
+    return filename.length > maxLength
+      ? filename.substring(0, maxLength - 3) + '...'
+      : filename;
+  };
+
   return (
     <Container>
       <div>
-        <Grid container spacing={2}>
-          {pagination.movies.map((item) => (
-            <Grid
-              item
-              xs={6}
-              sm={4}
-              md={3}
-              lg={2}
-              style={{ display: 'flex', justifyContent: 'space-between' }}
-              key={item.filename}
-            >
-              <Link to={`/res/${item.filename}`}>
-                <Card style={{ width: '100%', height: 200 }}>
-                  <CardMedia
-                    component="img"
-                    height="120"
-                    image={`${config.Host}/res/${item.image}`}
-                  />
-                  <CardContent>
-                    <Typography>{item.filename}</Typography>
-                  </CardContent>
-                </Card>
-              </Link>
-            </Grid>
-          ))}
-        </Grid>
+        {loading ? (
+          <div
+            style={{
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              height: '50vh',
+            }}
+          >
+            <CircularProgress />
+          </div>
+        ) : (
+          <Grid container spacing={2}>
+            {pagination.movies.map((item) => (
+              <Grid
+                item
+                xs={6}
+                sm={4}
+                md={3}
+                lg={2}
+                style={{ display: 'flex', justifyContent: 'space-between' }}
+                key={item.filename}
+              >
+                <Link to={`/res/${item.filename}`} style={{ textDecoration: 'none' }}>
+                  <Card
+                    style={{
+                      width: '100%',
+                      height: 200,
+                      boxShadow: '0 4px 6px rgba(0, 0, 0, 0.1)',
+                      transition: 'box-shadow 0.3s ease-in-out',
+                      '&:hover': {
+                        boxShadow: '0 8px 12px rgba(0, 0, 0, 0.2)',
+                      },
+                    }}
+                  >
+                    <CardMedia
+                      component="img"
+                      height="120"
+                      image={`${config.Host}/res/${item.image}`}
+                    />
+                    <CardContent>
+                      <Typography>
+                        {truncateFilename(item.filename, 20)}
+                      </Typography>
+                    </CardContent>
+                  </Card>
+                </Link>
+              </Grid>
+            ))}
+          </Grid>
+        )}
       </div>
 
       <div style={{ textAlign: 'center', marginTop: 2 }}>
@@ -91,6 +127,8 @@ const Main = () => {
           page={pagination.page}
           onChange={handlePageChange}
           shape="rounded"
+          color="primary"
+          size="large"
         />
       </div>
     </Container>