Compare commits

...

14 Commits

Author SHA1 Message Date
Leonmmcoset
84cbf588e0 error 2025-11-04 18:40:12 +08:00
Leonmmcoset
6d3cb4f4b3 csc no dog talking 2025-10-26 21:21:31 +08:00
Leonmmcoset
b8447640df upd 2025-10-26 21:04:12 +08:00
Leonmmcoset
6f155f8238 qrcode 2025-10-26 20:49:02 +08:00
Leonmmcoset
e77b0d7978 feat(组件): 添加线性进度条组件并替换圆形进度条
重构进度指示器,使用新的LinearProgress组件替换原有的CircularProgress
更新文件管理器中的进度指示器引用
修改首页加载动画为线性进度条样式
2025-10-26 20:23:36 +08:00
Leonmmcoset
59d39fbc11 update theme 2025-10-25 18:04:54 +08:00
Leonmmcoset
18d98a25f9 update togglebutton theme 2025-10-25 17:42:34 +08:00
Leonmmcoset
15992bd1a8 change font 2025-10-25 09:57:04 +08:00
Leonmmcoset
d05cde8068 awa 2025-10-24 23:34:49 +08:00
Leonmmcoset
96aeebeee5 qwq 2025-10-24 23:13:50 +08:00
Leonmmcoset
a0e791f2eb update 2025-10-24 22:54:40 +08:00
Leonmmcoset
ea27514eac awa 2025-10-24 22:31:42 +08:00
Leonmmcoset
76671ed625 fix 2025-10-24 22:18:17 +08:00
Leonmmcoset
7519a81c88 awa 2025-10-24 22:04:48 +08:00
11 changed files with 194 additions and 137 deletions

View File

@@ -1,6 +1,12 @@
<!doctype html> <!DOCTYPE html>
<html> <html>
<head> <head>
<!--
Using LeonPan open source project.
Powered by LeonCloud
awa
-->
<link href="https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Latin/MiSansLatin-Medium.min.css" rel="stylesheet">
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="shortcut icon" href="{pwa_small_icon}" sizes="64x64" /> <link rel="shortcut icon" href="{pwa_small_icon}" sizes="64x64" />
<meta <meta
@@ -40,43 +46,39 @@
transform: scale(0.8); transform: scale(0.8);
animation: fadeIn 0.6s ease-out 0.3s forwards; animation: fadeIn 0.6s ease-out 0.3s forwards;
} }
#app-loader .spinner { #app-loader .progress-container {
width: 28px; width: 200px;
height: 28px; height: 4px;
position: relative; background-color: rgba(0, 0, 0, 0.1);
border-radius: 2px;
overflow: hidden;
opacity: 0; opacity: 0;
transform: scale(0.8); transform: scale(0.8);
animation: fadeIn 0.6s ease-out 0.3s forwards; animation: fadeIn 0.6s ease-out 0.3s forwards;
} }
#app-loader .spinner { #app-loader .progress-bar {
display: inline-block; height: 100%;
width: 40px; background-color: var(--defaultThemeColor);
height: 40px; border-radius: 2px;
} animation: linearProgress 1.5s infinite ease-in-out;
#app-loader .spinner svg {
display: block;
}
#app-loader .spinner .stroke {
stroke: var(--defaultThemeColor);
stroke-linecap: round;
animation: spinDash 1.4s ease-in-out infinite;
}
#app-loader .spinner .background {
stroke: rgba(0, 0, 0, 0.1)
} }
@keyframes spinDash { @keyframes linearProgress {
0% { 0% {
stroke-dasharray: 1px, 200px; transform: translateX(-100%);
stroke-dashoffset: 0; width: 50%;
} }
50% { 50% {
stroke-dasharray: 100px, 200px; transform: translateX(100%);
stroke-dashoffset: -15px; width: 50%;
}
51% {
transform: translateX(100%);
width: 50%;
} }
100% { 100% {
stroke-dasharray: 1px, 200px; transform: translateX(-100%);
stroke-dashoffset: -126px; width: 50%;
} }
} }
@keyframes fadeIn { @keyframes fadeIn {
@@ -91,11 +93,8 @@
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
<div id="app-loader"> <div id="app-loader">
<div class="logo"></div> <div class="logo"></div>
<div class="spinner"> <div class="progress-container">
<svg viewBox="22 22 44 44"> <div class="progress-bar"></div>
<circle class="background" cx="44" cy="44" r="20" fill="none" stroke-width="4"></circle>
<circle class="stroke" cx="44" cy="44" r="20" fill="none" stroke-width="4"></circle>
</svg>
</div> </div>
</div> </div>
<script async type="module" src="/src/main.tsx"></script> <script async type="module" src="/src/main.tsx"></script>

View File

@@ -404,6 +404,7 @@
"deleteViewSetting": "Delete view setting" "deleteViewSetting": "Delete view setting"
}, },
"modals": { "modals": {
"scanQRCodeToAccess": "Scan QR Code to Access",
"includePasswordInShareLink": "Include password in share link", "includePasswordInShareLink": "Include password in share link",
"includePasswordInShareLinkDes": "If selected, password will be included in the share link, and no password is required when accessing the share link.", "includePasswordInShareLinkDes": "If selected, password will be included in the share link, and no password is required when accessing the share link.",
"showFileName": "Show file name", "showFileName": "Show file name",

View File

@@ -404,6 +404,7 @@
"deleteViewSetting": "删除视图设置" "deleteViewSetting": "删除视图设置"
}, },
"modals": { "modals": {
"scanQRCodeToAccess": "扫描二维码访问分享链接",
"includePasswordInShareLink": "在链接中包含密码", "includePasswordInShareLink": "在链接中包含密码",
"includePasswordInShareLinkDes": "勾选后,分享链接中会包含密码,通过此链接访问时不需要再输入密码。", "includePasswordInShareLinkDes": "勾选后,分享链接中会包含密码,通过此链接访问时不需要再输入密码。",
"showFileName": "显示文件名", "showFileName": "显示文件名",

View File

@@ -24,11 +24,20 @@ export const applyThemeWithOverrides = (themeConfig: ThemeOptions): ThemeOptions
...themeConfig.shape, ...themeConfig.shape,
borderRadius: 4, borderRadius: 4,
}, },
typography: {
...themeConfig.typography,
fontFamily:
'"MiSans", -apple-system, BlinkMacSystemFont, "ZCOOL QingKe HuangYou", "Inter", "Hiragino Sans GB", "Microsoft YaHei", sans-serif',
},
components: { components: {
MuiCssBaseline: { MuiCssBaseline: {
styleOverrides: { styleOverrides: {
body: { body: {
overscrollBehavior: "none", overscrollBehavior: "none",
fontFamily: '"MiSans", sans-serif',
},
html: {
fontFamily: '"MiSans", sans-serif',
}, },
}, },
}, },
@@ -53,6 +62,35 @@ export const applyThemeWithOverrides = (themeConfig: ThemeOptions): ThemeOptions
styleOverrides: { styleOverrides: {
root: { root: {
textTransform: "none", textTransform: "none",
borderRadius: 4,
border: "1px solid transparent",
transition: "all 0.2s ease",
minWidth: 48,
minHeight: 32,
padding: "4px 12px",
"&:hover": {
backgroundColor: "rgba(0, 0, 0, 0.04)",
},
"&.Mui-selected": {
backgroundColor: "rgba(25, 118, 210, 0.1)",
color: "rgb(25, 118, 210)",
borderColor: "rgba(25, 118, 210, 0.3)",
"&:hover": {
backgroundColor: "rgba(25, 118, 210, 0.15)",
},
},
},
},
},
MuiToggleButtonGroup: {
styleOverrides: {
grouped: {
margin: 2,
border: 0,
borderRadius: 4,
"&.Mui-disabled": {
border: 0,
},
}, },
}, },
}, },
@@ -64,7 +102,12 @@ export const applyThemeWithOverrides = (themeConfig: ThemeOptions): ThemeOptions
}, },
defaultProps: { defaultProps: {
disableElevation: true, disableElevation: true,
disableRipple: false, disableRipple: true,
},
},
MuiButtonBase: {
defaultProps: {
disableRipple: true,
}, },
}, },
MuiAlert: { MuiAlert: {

View File

@@ -72,23 +72,11 @@ const ProDialog = ({ open, onClose }: ProDialogProps) => {
> >
<DialogContent> <DialogContent>
<Typography variant="body1" color="text.secondary"> <Typography variant="body1" color="text.secondary">
{t("pro.description")} Cloudreve的sb pro玩意
</Typography>
<Typography variant="body1" fontWeight={600} sx={{ mt: 2 }}>
{t("pro.proInclude")}
</Typography> </Typography>
<List dense> <List dense>
{features.map((feature) => ( <ListItem>
<ListItem key={feature}>
<ListItemIcon
sx={{
minWidth: "36px",
}}
>
<CheckmarkCircleFilled color="primary" />
</ListItemIcon>
<ListItemText <ListItemText
slotProps={{ slotProps={{
primary: { primary: {
@@ -97,10 +85,21 @@ const ProDialog = ({ open, onClose }: ProDialogProps) => {
}, },
}} }}
> >
{t(`pro.${feature}`)} Pro我骂谁
</ListItemText>
</ListItem>
<ListItem>
<ListItemText
slotProps={{
primary: {
sx: {},
variant: "body1",
},
}}
>
</ListItemText> </ListItemText>
</ListItem> </ListItem>
))}
</List> </List>
{showPromotion && ( {showPromotion && (
<Alert <Alert
@@ -128,11 +127,8 @@ const ProDialog = ({ open, onClose }: ProDialogProps) => {
}} }}
> >
<Button variant="outlined" color="primary" onClick={onClose}> <Button variant="outlined" color="primary" onClick={onClose}>
{t("pro.later")}
</Button> </Button>
<StyledButton onClick={openMore} variant="contained" color="primary">
{t("pro.learnMore")}
</StyledButton>
</StyledDialogActions> </StyledDialogActions>
</DraggableDialog> </DraggableDialog>
); );

View File

@@ -1,39 +1,27 @@
import { Box, CircularProgress, circularProgressClasses, CircularProgressProps } from "@mui/material"; import { Box } from "@mui/material";
import { forwardRef } from "react"; import { forwardRef } from "react";
import LinearProgressComponent from "./LinearProgress";
export interface FacebookCircularProgressProps extends CircularProgressProps { export interface FacebookCircularProgressProps {
bgColor?: string; sx?: any;
color?: string;
size?: number;
thickness?: number;
fgColor?: string; fgColor?: string;
} }
const FacebookCircularProgress = forwardRef(({ sx, bgColor, fgColor, ...rest }: FacebookCircularProgressProps, ref) => { const FacebookCircularProgress = forwardRef(({ sx, color, fgColor }: FacebookCircularProgressProps, ref) => {
return ( return (
<Box sx={{ position: "relative", ...sx }} ref={ref}> <Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", ...sx }} ref={ref}>
<CircularProgress <LinearProgressComponent color={color || fgColor} height={8} />
variant="determinate"
sx={{
color: (theme) => bgColor ?? theme.palette.grey[theme.palette.mode === "light" ? 200 : 800],
}}
size={40}
thickness={4}
{...rest}
value={100}
/>
<CircularProgress
sx={{
color: (theme) => fgColor ?? theme.palette.primary.main,
position: "absolute",
left: 0,
[`& .${circularProgressClasses.circle}`]: {
strokeLinecap: "round",
},
}}
size={40}
thickness={4}
{...rest}
/>
</Box> </Box>
); );
}); });
export default FacebookCircularProgress; export default FacebookCircularProgress;
// === 耻辱榜 ===
// csc禁止狗叫
// 要不然你的传奇事迹将在这几行注释里留存一辈子
// 2025/10/26
// === 永久留存 禁止删除 ===

View File

@@ -8,7 +8,11 @@ function ErrorBoundary() {
// Uncaught ReferenceError: path is not defined // Uncaught ReferenceError: path is not defined
return ( return (
<div style={{ padding: 16 }}> <div style={{ padding: 16 }}>
<h1 style={{ color: "#a4a4a4", margin: "5px 0px" }}>:(</h1> <h1 style={{ color: "#a4a4a4", margin: "5px 0px" }}>:) OHH FUCKING YES!!!</h1>
<p>LeonPan发生了一些意想不到的错误</p>
<p>
<a href="http://leonmmcoset.jjxmm.win:2000/leonmmcoset/leonpan-assets/issues">LeonGit Issues</a>
</p>
<h2 style={{ margin: "15px 0px" }}>{t("common:renderError")}</h2> <h2 style={{ margin: "15px 0px" }}>{t("common:renderError")}</h2>
{!!error && ( {!!error && (
<details> <details>
@@ -23,6 +27,8 @@ function ErrorBoundary() {
)} )}
</details> </details>
)} )}
<hr />
<p></p>
</div> </div>
); );
} }

View File

@@ -0,0 +1,30 @@
import { Box, LinearProgress, linearProgressClasses } from "@mui/material";
import { forwardRef } from "react";
export interface LinearProgressProps {
color?: string;
height?: number;
}
const LinearProgressComponent = forwardRef(({ color, height = 8, ...rest }: LinearProgressProps, ref) => {
return (
<Box sx={{ width: "100%", maxWidth: 200, ...rest }} ref={ref}>
<LinearProgress
variant="indeterminate"
sx={{
height: height,
borderRadius: height / 2,
[`&.${linearProgressClasses.colorPrimary}`]: {
backgroundColor: (theme) => theme.palette.grey[theme.palette.mode === "light" ? 200 : 800],
},
[`& .${linearProgressClasses.bar}`]: {
borderRadius: height / 2,
backgroundColor: color || ((theme) => theme.palette.primary.main),
},
}}
/>
</Box>
);
});
export default LinearProgressComponent;

View File

@@ -1,4 +1,16 @@
import { Box, Checkbox, Collapse, DialogContent, IconButton, Stack, Tooltip, useTheme } from "@mui/material"; import {
Box,
Checkbox,
Collapse,
DialogContent,
IconButton,
Paper,
Stack,
Tooltip,
Typography,
useTheme,
} from "@mui/material";
import { QRCodeSVG } from "qrcode.react";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { TFunction } from "i18next"; import { TFunction } from "i18next";
import React, { useCallback, useEffect, useMemo, useState } from "react"; import React, { useCallback, useEffect, useMemo, useState } from "react";
@@ -216,6 +228,17 @@ const ShareDialog = () => {
}, },
}} }}
/> />
<Paper
sx={{ mt: 2, p: 3, display: "flex", flexDirection: "column", alignItems: "center" }}
elevation={1}
>
<Typography variant="subtitle2" sx={{ mb: 2 }}>
{t("application:modals.scanQRCodeToAccess")}
</Typography>
<Box sx={{ bgcolor: "white", p: 2 }}>
<QRCodeSVG value={finalShareLink} size={200} level="M" includeMargin />
</Box>
</Paper>
{shareLinkPassword.password && ( {shareLinkPassword.password && (
<> <>
<Collapse in={!includePassword}> <Collapse in={!includePassword}>

View File

@@ -6,7 +6,7 @@ import { useAppDispatch, useAppSelector } from "../../../redux/hooks.ts";
import { ConfigLoadState } from "../../../redux/siteConfigSlice.ts"; import { ConfigLoadState } from "../../../redux/siteConfigSlice.ts";
import { openEmptyContextMenu } from "../../../redux/thunks/filemanager.ts"; import { openEmptyContextMenu } from "../../../redux/thunks/filemanager.ts";
import { loadSiteConfig } from "../../../redux/thunks/site.ts"; import { loadSiteConfig } from "../../../redux/thunks/site.ts";
import CircularProgress from "../../Common/CircularProgress.tsx"; import FacebookCircularProgress from "../../Common/CircularProgress.tsx";
import "../../Common/FadeTransition.css"; import "../../Common/FadeTransition.css";
import { RadiusFrame } from "../../Frame/RadiusFrame.tsx"; import { RadiusFrame } from "../../Frame/RadiusFrame.tsx";
import ExplorerError from "./ExplorerError.tsx"; import ExplorerError from "./ExplorerError.tsx";
@@ -137,7 +137,7 @@ const Explorer = () => {
alignItems: "center", alignItems: "center",
}} }}
> >
<CircularProgress /> <FacebookCircularProgress />
</Box> </Box>
)} )}
{index == ExplorerPage.GridView && <GridView />} {index == ExplorerPage.GridView && <GridView />}

View File

@@ -1,12 +1,11 @@
import { Box, Container, Grid, Paper, AppBar, Toolbar, IconButton, Typography, Button } from "@mui/material"; import { Box, Container, Grid, Paper, Typography, Button } from "@mui/material";
import MenuIcon from "@mui/icons-material/Menu";
import { Outlet, useNavigation } from "react-router-dom"; import { Outlet, useNavigation } from "react-router-dom";
import { useAppDispatch, useAppSelector } from "../../redux/hooks.ts"; import { useAppDispatch, useAppSelector } from "../../redux/hooks";
import AutoHeight from "../Common/AutoHeight.tsx"; import AutoHeight from "../Common/AutoHeight";
import CircularProgress from "../Common/CircularProgress.tsx"; import CircularProgress from "../Common/CircularProgress";
import Logo from "../Common/Logo.tsx"; import Logo from "../Common/Logo";
import LanguageSwitcher from "../Common/LanguageSwitcher.tsx"; import LanguageSwitcher from "../Common/LanguageSwitcher";
import PoweredBy from "./PoweredBy.tsx"; import PoweredBy from "./PoweredBy";
const Loading = () => { const Loading = () => {
return ( return (
@@ -25,7 +24,7 @@ const Loading = () => {
const HeadlessFrame = () => { const HeadlessFrame = () => {
const loading = useAppSelector((state) => state.globalState.loading.headlessFrame); const loading = useAppSelector((state) => state.globalState.loading.headlessFrame);
const { headless_footer, headless_bottom, sidebar_bottom } = useAppSelector( const { headlessFooter, headlessBottom } = useAppSelector(
(state) => state.siteConfig.basic?.config?.custom_html ?? {}, (state) => state.siteConfig.basic?.config?.custom_html ?? {},
); );
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
@@ -41,35 +40,6 @@ const HeadlessFrame = () => {
overflow: "auto", overflow: "auto",
}} }}
> >
<Box sx={{ flexGrow: 1 }}>
<AppBar
sx={{
backgroundColor: "#f5f5f5",
}}
>
<Toolbar>
{/* <IconButton
size="large"
edge="start"
color="inherit"
aria-label="menu"
sx={{ mr: 2 }}
>
<MenuIcon />
</IconButton> */}
{/* <Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
News
</Typography> */}
<Logo
sx={{
maxWidth: "40%",
maxHeight: "40px",
mb: 2,
}}
/>
</Toolbar>
</AppBar>
</Box>
<Container maxWidth={"xs"}> <Container maxWidth={"xs"}>
<Grid <Grid
container container
@@ -110,9 +80,9 @@ const HeadlessFrame = () => {
}} }}
> >
<Outlet /> <Outlet />
{headless_bottom && ( {headlessBottom && (
<Box sx={{ width: "100%" }}> <Box sx={{ width: "100%" }}>
<div dangerouslySetInnerHTML={{ __html: headless_bottom }} /> <div dangerouslySetInnerHTML={{ __html: headlessBottom }} />
</Box> </Box>
)} )}
</Box> </Box>
@@ -122,9 +92,9 @@ const HeadlessFrame = () => {
</Paper> </Paper>
</Box> </Box>
<PoweredBy /> <PoweredBy />
{headless_footer && ( {headlessFooter && (
<Box sx={{ width: "100%", mb: 2 }}> <Box sx={{ width: "100%", mb: 2 }}>
<div dangerouslySetInnerHTML={{ __html: headless_footer }} /> <div dangerouslySetInnerHTML={{ __html: headlessFooter }} />
</Box> </Box>
)} )}
</Grid> </Grid>