Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: About dialog #799

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

UI: About dialog #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
839b0f5
UI: About dialog
Dorfieeee Dec 20, 2024
8a9f3a6
Merge branch 'master' into feature/about-modal
ElGuillermo Dec 21, 2024
699af1b
Merge branch 'master' of https://github.com/MarechJ/hll_rcon_tool int…
Dorfieeee Dec 26, 2024
701b30c
merge releases and about sidebar sections into a single modal
Dorfieeee Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,643 changes: 1,558 additions & 85 deletions rcongui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions rcongui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-markdown": "^9.0.1",
"react-router-dom": "^6.26.1",
"react-toastify": "^10.0.5",
"react-window": "^1.8.10",
"remark-gfm": "^4.0.0",
"tiny-invariant": "^1.2.0",
"zustand": "^5.0.0"
},
Expand Down
189 changes: 0 additions & 189 deletions rcongui/src/components/layout/NewReleases.jsx
View file
Open in desktop

This file was deleted.

32 changes: 16 additions & 16 deletions rcongui/src/components/layout/SideMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { styled } from "@mui/material/styles";
import Avatar from "@mui/material/Avatar";
import MuiDrawer, { drawerClasses } from "@mui/material/Drawer";
import Box from "@mui/material/Box";
import Divider from "@mui/material/Divider";
import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography";
import SelectContent from "./SelectContent";
import MenuContent from "./MenuContent";
import OptionsMenu from "./OptionsMenu";
import { useAuth } from "@/hooks/useAuth";
import { navMenus } from "../Header/nav-data";
import { List, ListItem, ListItemText } from "@mui/material";
import NewReleases from "./NewReleases";
import ConnectionStatus from "./ConnectionStatus";
import { styled } from '@mui/material/styles'
import Avatar from '@mui/material/Avatar'
import MuiDrawer, { drawerClasses } from '@mui/material/Drawer'
import Box from '@mui/material/Box'
import Divider from '@mui/material/Divider'
import Stack from '@mui/material/Stack'
import Typography from '@mui/material/Typography'
import SelectContent from './SelectContent'
import MenuContent from './MenuContent'
import OptionsMenu from './OptionsMenu'
import { useAuth } from '@/hooks/useAuth'
import { navMenus } from '../Header/nav-data'
import { List, ListItem, ListItemText } from '@mui/material'
import ConnectionStatus from './sidebar/ConnectionStatus'
import AboutDialog from './sidebar/About'

const drawerWidth = 240;

Expand Down Expand Up @@ -61,7 +61,7 @@ export default function SideMenu({ open }) {
<ListItem>
<ListItemText sx={{ marginLeft: -0.5 }} primary={<ConnectionStatus />} />
</ListItem>
<NewReleases />
<AboutDialog />
</List>
<Divider />
<Box
Expand Down
26 changes: 13 additions & 13 deletions rcongui/src/components/layout/SideMenuMobile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Button from "@mui/material/Button";
import Divider from "@mui/material/Divider";
import Drawer, { drawerClasses } from "@mui/material/Drawer";
import Stack from "@mui/material/Stack";
import LogoutRoundedIcon from "@mui/icons-material/LogoutRounded";
import MenuContent from "./MenuContent";
import SelectContent from "./SelectContent";
import { Box, List, ListItem, ListItemText } from "@mui/material";
import { Form } from "react-router-dom";
import { navMenus } from "../Header/nav-data";
import NewReleases from "./NewReleases";
import ConnectionStatus from "./ConnectionStatus";
import Button from '@mui/material/Button'
import Divider from '@mui/material/Divider'
import Drawer, { drawerClasses } from '@mui/material/Drawer'
import Stack from '@mui/material/Stack'
import LogoutRoundedIcon from '@mui/icons-material/LogoutRounded'
import MenuContent from './MenuContent'
import SelectContent from './SelectContent'
import { Box, List, ListItem, ListItemText } from '@mui/material'
import { Form } from 'react-router-dom'
import { navMenus } from '../Header/nav-data'
import ConnectionStatus from './sidebar/ConnectionStatus'
import AboutDialog from './sidebar/About'

const MobileDrawer = ({ open, toggleDrawer, children }) => {
return (
Expand Down Expand Up @@ -50,7 +50,7 @@ function AdminSideMenuMobile({ open, toggleDrawer }) {
primary={<ConnectionStatus />}
/>
</ListItem>
<NewReleases />
<AboutDialog />
</List>
<Divider />
<Box
Expand Down
Loading