Index: components/AddComponentDialog.tsx =================================================================== --- components/AddComponentDialog.tsx (revision ad211d1ca8417919b1358701f1f24d8b8b875a44) +++ components/AddComponentDialog.tsx (revision 87b79bc538e0365a7b1fa7e9903355b32304937e) @@ -20,8 +20,13 @@ ]; -export default function AddComponentDialog({ open, onClose, onSuccess }: { +export default function AddComponentDialog({ open, onClose, onSuccess, prefillData }: { open: boolean; onClose: () => void; onSuccess: () => void; + prefillData?: { + type?: string; + suggestionLink?: string; + suggestionDescription?: string; + }; }) { const [name, setName] = useState(''); @@ -68,4 +73,10 @@ } }, [type]); + + useEffect(() => { + if (open && prefillData) { + if (prefillData.type) setType(prefillData.type); + } + }, [open, prefillData]); const handleFieldChange = (fieldName: string, value: any) => { Index: components/ComponentDialog.tsx =================================================================== --- components/ComponentDialog.tsx (revision ad211d1ca8417919b1358701f1f24d8b8b875a44) +++ components/ComponentDialog.tsx (revision 87b79bc538e0365a7b1fa7e9903355b32304937e) @@ -40,4 +40,14 @@ useEffect(() => { + if (open && category) { + setSuggestForm({ + link: '', + description: '', + componentType: category + }); + } + }, [open, category]); + + useEffect(() => { const timeoutId = setTimeout(() => { setSearchQuery(tempSearchQuery); @@ -46,5 +56,4 @@ }, [tempSearchQuery]); - // Load user auth useEffect(() => { if (open) { @@ -97,5 +106,7 @@ [e.target.name]: e.target.value }); - }; + } + + const submitSuggestion = async () => { Index: components/Navbar.tsx =================================================================== --- components/Navbar.tsx (revision ad211d1ca8417919b1358701f1f24d8b8b875a44) +++ components/Navbar.tsx (revision 87b79bc538e0365a7b1fa7e9903355b32304937e) @@ -7,7 +7,28 @@ import Menu from "@mui/material/Menu"; import MenuItem from "@mui/material/MenuItem"; +import IconButton from "@mui/material/IconButton"; +import Drawer from "@mui/material/Drawer"; +import List from "@mui/material/List"; +import ListItem from "@mui/material/ListItem"; +import ListItemButton from "@mui/material/ListItemButton"; +import ListItemIcon from "@mui/material/ListItemIcon"; +import ListItemText from "@mui/material/ListItemText"; +import Divider from "@mui/material/Divider"; +import Collapse from "@mui/material/Collapse"; + import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'; +import MenuIcon from '@mui/icons-material/Menu'; +import CloseIcon from '@mui/icons-material/Close'; +import BuildIcon from '@mui/icons-material/Build'; +import ViewListIcon from '@mui/icons-material/ViewList'; +import ExpandLess from '@mui/icons-material/ExpandLess'; +import ExpandMore from '@mui/icons-material/ExpandMore'; +import PersonIcon from '@mui/icons-material/Person'; +import LogoutIcon from '@mui/icons-material/Logout'; +import LoginIcon from '@mui/icons-material/Login'; +import PersonAddIcon from '@mui/icons-material/PersonAdd'; + import { - Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions, ListItemText + Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from "@mui/material"; @@ -39,6 +60,4 @@ { id: 'power_supply', label: 'Power Supplies', icon: }, { id: 'cooler', label: 'Cooling', icon: }, - - // Peripherals / Accessories (Missing ones) { id: 'network_adapter', label: 'Network Adapters (WiFi)', icon: }, { id: 'network_card', label: 'Network Cards (Ethernet)', icon: }, @@ -49,8 +68,9 @@ ]; - export default function Navbar() { const [auth, setAuth] = useState(null); const [openLogoutDialog, setOpenLogoutDialog] = useState(false); + const [mobileDrawerOpen, setMobileDrawerOpen] = useState(false); + const [mobileComponentsOpen, setMobileComponentsOpen] = useState(false); const [anchorEl, setAnchorEl] = useState(null); @@ -72,4 +92,6 @@ setBrowserOpen(true); handleMenuClose(); + setMobileDrawerOpen(false); + setMobileComponentsOpen(false); }; @@ -77,4 +99,5 @@ e.preventDefault(); setOpenLogoutDialog(true); + setMobileDrawerOpen(false); }; @@ -114,7 +137,23 @@ - - window.location.href='/'} /> - + + window.location.href='/'} + /> + PC Forge @@ -140,5 +179,5 @@ {COMPONENT_CATEGORIES.map((cat) => ( handleCategorySelect(cat.id)}> - {/*{cat.icon}*/} + {cat.icon} {cat.label} @@ -151,5 +190,5 @@ - + {auth?.isLoggedIn ? ( <> @@ -159,11 +198,110 @@ ) : ( <> - - + + )} + + setMobileDrawerOpen(true)} + sx={{ display: { xs: 'block', md: 'none' } }} + > + + + + setMobileDrawerOpen(false)} + sx={{ + display: { xs: 'block', md: 'none' }, + '& .MuiDrawer-paper': { width: 280 , height: '60%'} + }} + > + + Menu + setMobileDrawerOpen(false)}> + + + + + + + + { window.location.href = '/forge'; }}> + + + + + + + setMobileComponentsOpen(!mobileComponentsOpen)}> + + + {mobileComponentsOpen ? : } + + + + + {COMPONENT_CATEGORIES.map((cat) => ( + handleCategorySelect(cat.id)} + > + {cat.icon} + + + ))} + + + + + { window.location.href = '/completed-builds'; }}> + + + + + + + + {auth?.isLoggedIn ? ( + <> + + { window.location.href = checkDashboardUrl; }}> + + + + + + + + + + + + ) : ( + <> + + { window.location.href = '/auth/login'; }}> + + + + + + { window.location.href = '/auth/register'; }}> + + + + + + )} + + setOpenLogoutDialog(false)}> Index: pages/dashboard/admin/+Page.tsx =================================================================== --- pages/dashboard/admin/+Page.tsx (revision ad211d1ca8417919b1358701f1f24d8b8b875a44) +++ pages/dashboard/admin/+Page.tsx (revision 87b79bc538e0365a7b1fa7e9903355b32304937e) @@ -51,4 +51,9 @@ const [adminComment, setAdminComment] = useState(""); + const [createComponentDialog, setCreateComponentDialog] = useState<{ + open: boolean; + suggestion: any | null; + }>({open: false, suggestion: null}); + const loadData = () => { setLoading(true); @@ -143,6 +148,13 @@ if (loading) { return ( - - + + ); @@ -196,7 +208,7 @@ size="large" fullWidth - startIcon={} + startIcon={} onClick={() => setAddDialogOpen(true)} - sx={{ mb: 2 }} + sx={{mb: 2}} > Add Component @@ -213,10 +225,10 @@ - Suggested Components ({data.componentSuggestions?.length || 0}) + Component Suggestions ({data.componentSuggestions?.length || 0}) {data.componentSuggestions?.length === 0 ? ( - No pending suggestions. + No suggestions. ) : ( @@ -226,4 +238,5 @@ TypeUser + StatusActions @@ -245,19 +258,51 @@ {sug.componentType?.toUpperCase()}{sug.userId} + + + - openSuggestionReview(sug.id, 'approved')} - > - - - openSuggestionReview(sug.id, 'rejected')} - > - - + {sug.status === 'pending' ? ( + <> + openSuggestionReview(sug.id, 'approved')} + > + + + openSuggestionReview(sug.id, 'rejected')} + > + + + + ) : sug.status === 'approved' ? ( + + ) : ( + + {sug.adminComment || 'Rejected'} + + )} @@ -299,5 +344,5 @@ color="warning" size="small" - startIcon={} + startIcon={} onClick={(e) => { e.stopPropagation(); @@ -337,5 +382,5 @@ color="error" size="small" - startIcon={} + startIcon={} onClick={(e) => { e.stopPropagation(); @@ -358,5 +403,6 @@ - setSuggestionDialog({...suggestionDialog, open: false})}> + setSuggestionDialog({...suggestionDialog, open: false})}> Review Component Suggestion @@ -369,5 +415,5 @@ value={adminComment} onChange={(e) => setAdminComment(e.target.value)} - sx={{ mt: 2 }} + sx={{mt: 2}} /> @@ -448,5 +494,5 @@ color="error" disabled={deleteLoading} - startIcon={deleteLoading ? : } + startIcon={deleteLoading ? : } > {deleteLoading ? 'Deleting...' : 'Delete Build'} @@ -471,4 +517,18 @@ }} /> + + setCreateComponentDialog({ open: false, suggestion: null })} + onSuccess={() => { + loadData(); + setCreateComponentDialog({ open: false, suggestion: null }); + }} + prefillData={createComponentDialog.suggestion ? { + type: createComponentDialog.suggestion.componentType, + suggestionLink: createComponentDialog.suggestion.link, + suggestionDescription: createComponentDialog.suggestion.description + } : undefined} + /> );