Update add calendar modal, update menu list style (#521)

This commit is contained in:
lenhanphung
2026-02-09 17:06:05 +07:00
committed by GitHub
parent 1720965f0f
commit ce9ad27256
5 changed files with 47 additions and 11 deletions
+3 -3
View File
@@ -40,8 +40,8 @@ function CalendarItem({
<Box <Box
key={cal.owner.email + cal.cal["dav:name"]} key={cal.owner.email + cal.cal["dav:name"]}
display="flex" display="flex"
alignItems="center" flexDirection="column"
justifyContent="space-between" alignItems="flex-start"
style={{ style={{
borderRadius: 8, borderRadius: 8,
border: "1px solid #e5e7eb", border: "1px solid #e5e7eb",
@@ -49,7 +49,7 @@ function CalendarItem({
marginBottom: 8, marginBottom: 8,
}} }}
> >
<Box display="flex" alignItems="center" gap={2}> <Box display="flex" alignItems="center" gap={2} mb={1}>
<Avatar <Avatar
{...stringAvatar(cal.owner.displayName || cal.owner.email)} {...stringAvatar(cal.owner.displayName || cal.owner.email)}
style={{ style={{
@@ -363,3 +363,15 @@ tbody > tr.fc-scrollgrid-section:first-of-type .fc-scroller
margin: 0 margin: 0
.date-time-group.show-full-field > .MuiBox-root:first-of-type .date-time-group.show-full-field > .MuiBox-root:first-of-type
margin-bottom: 8px margin-bottom: 8px
li.MuiButtonBase-root.MuiMenuItem-root
padding 8px 16px
font-size 14px
color #243B55
min-width 120px
&:hover
background #f6f6f7
hr.MuiDivider-root.MuiDivider-fullWidth
margin 0
+1 -1
View File
@@ -187,7 +187,7 @@ function ResponsiveDialog({
aria-label="show less" aria-label="show less"
sx={{ marginLeft: "-8px" }} sx={{ marginLeft: "-8px" }}
> >
<ArrowBackIcon /> <ArrowBackIcon sx={{ color: "#605D62", fontSize: 30 }} />
</IconButton> </IconButton>
) : showHeaderActions ? ( ) : showHeaderActions ? (
<Box <Box
+30 -6
View File
@@ -26,7 +26,7 @@ import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import ChevronRightIcon from "@mui/icons-material/ChevronRight";
import LogoutIcon from "@mui/icons-material/Logout"; import LogoutIcon from "@mui/icons-material/Logout";
import RefreshIcon from "@mui/icons-material/Refresh"; import RefreshIcon from "@mui/icons-material/Refresh";
import SettingsIcon from "@mui/icons-material/Settings"; import SettingsOutlinedIcon from "@mui/icons-material/SettingsOutlined";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { push } from "redux-first-history"; import { push } from "redux-first-history";
import { useI18n } from "twake-i18n"; import { useI18n } from "twake-i18n";
@@ -343,25 +343,49 @@ export function Menubar({
> >
<Avatar <Avatar
color={stringToGradient(getUserDisplayName(user))} color={stringToGradient(getUserDisplayName(user))}
size="m" size="l"
sx={{ marginBottom: "8px" }} sx={{ marginBottom: "8px" }}
> >
{getInitials(getUserDisplayName(user))} {getInitials(getUserDisplayName(user))}
</Avatar> </Avatar>
<Typography variant="body1" sx={{ fontWeight: 500 }}> <Typography
sx={{
color: "#424244",
fontFamily: "Inter",
fontSize: 22,
fontWeight: 600,
}}
>
{getUserDisplayName(user)} {getUserDisplayName(user)}
</Typography> </Typography>
<Typography variant="body2" color="text.secondary"> <Typography
sx={{
fontSize: 14,
fontWeight: 500,
}}
>
{user?.email} {user?.email}
</Typography> </Typography>
</Box> </Box>
<MenuItem onClick={handleSettingsClick} sx={{ py: 1.5 }}> <MenuItem onClick={handleSettingsClick} sx={{ py: 1.5 }}>
<SettingsIcon sx={{ mr: 2 }} /> <SettingsOutlinedIcon
sx={{
mr: 2,
color: "rgba(28, 27, 31, 0.48)",
fontSize: 20,
}}
/>
{t("menubar.settings") || "Settings"} {t("menubar.settings") || "Settings"}
</MenuItem> </MenuItem>
<Divider /> <Divider />
<MenuItem onClick={handleLogoutClick} sx={{ py: 1.5 }}> <MenuItem onClick={handleLogoutClick} sx={{ py: 1.5 }}>
<LogoutIcon sx={{ mr: 2 }} /> <LogoutIcon
sx={{
mr: 2,
color: "rgba(28, 27, 31, 0.48)",
fontSize: 20,
}}
/>
{t("menubar.logout") || "Logout"} {t("menubar.logout") || "Logout"}
</MenuItem> </MenuItem>
</Menu> </Menu>
+1 -1
View File
@@ -278,7 +278,7 @@ export default function SettingsPage() {
aria-label={t("settings.back") || "Back to calendar"} aria-label={t("settings.back") || "Back to calendar"}
className="back-button" className="back-button"
> >
<ArrowBackIcon /> <ArrowBackIcon sx={{ color: "#605D62", fontSize: 30 }} />
</IconButton> </IconButton>
{activeNavItem === "settings" && ( {activeNavItem === "settings" && (
<Tabs <Tabs