Index: components/BuildDetailsDialog.tsx =================================================================== --- components/BuildDetailsDialog.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ components/BuildDetailsDialog.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -1,5 +1,5 @@ import React, {useEffect, useState} from 'react'; import { - Dialog, DialogTitle, DialogContent, DialogActions, Button, Grid, Box, Typography, + Dialog, DialogTitle, DialogContent, DialogActions, Button, Box, Typography, IconButton, Tab, Tabs, Table, TableBody, TableCell, TableRow, Rating, TextField, Avatar, Chip, Alert } from '@mui/material'; @@ -34,7 +34,6 @@ const [ratingVal, setRatingVal] = useState(5); - // Main details fetch useEffect(() => { - if (open && buildId !== null && typeof buildId === 'number') { + if (open && buildId !== null) { setLoading(true); setReviewText(""); @@ -52,5 +51,5 @@ useEffect(() => { - if (open && buildId !== null && typeof buildId === 'number') { + if (open && buildId !== null) { onGetBuildState({buildId}) .then(state => { @@ -63,4 +62,11 @@ }, [open, buildId]); + useEffect(() => { + if (open) { + setTabIndex(0); + } + }, [open, buildId]); + + const handleFavorite = async () => { if (!currentUser || buildId === null) return alert("Please login to favorite builds."); @@ -103,5 +109,5 @@ return ( <> - + {loading || !details ? ( Loading Forge Schematics... @@ -146,6 +152,16 @@ {tabIndex === 0 && ( - - + + @@ -193,10 +209,11 @@
- - - + + + - Builder's - Notes + + Builder's Notes + @@ -243,6 +260,6 @@ - - + + )} @@ -313,6 +330,7 @@ ))} {details.reviews.length === 0 && ( - No reviews yet. Be the - first! + + No reviews yet. Be the first! + )} Index: components/ComponentDetailsDialog.tsx =================================================================== --- components/ComponentDetailsDialog.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ components/ComponentDetailsDialog.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -2,5 +2,5 @@ import { Dialog, DialogTitle, DialogContent, DialogActions, Button, - Typography, Box, Grid, Chip, CircularProgress, IconButton, + Typography, Box, Chip, CircularProgress, IconButton, Table, TableBody, TableCell, TableContainer, TableRow, Paper } from '@mui/material'; @@ -92,6 +92,7 @@ open={open} onClose={onClose} - maxWidth="lg" - // fullWidth + maxWidth="md" + fullWidth + scroll="body" sx={{zIndex: 1400}} > @@ -116,5 +117,10 @@ - + {loading ? ( @@ -122,9 +128,18 @@ ) : ( - - + + @@ -144,21 +158,58 @@ sx={{fontWeight: 'bold'}} /> - - - - + + + + Technical Specifications - - + +
- + Brand - {displayData.brand} + + {displayData.brand} + @@ -168,12 +219,24 @@ return ( - + {formatKey(key)} - {renderValue(key, val)} + + {renderValue(key, val)} + ); @@ -182,11 +245,18 @@
- + + {formatMoney(displayData.price)} - - + + )} @@ -198,5 +268,5 @@ color: 'white', borderColor: '#ff8201', - onHover: {backgroundColor: '#ba5d02', borderColor: '#ba5d02'} + '&:hover': {backgroundColor: '#ba5d02', borderColor: '#ba5d02'} }} >Close Index: components/ComponentDialog.tsx =================================================================== --- components/ComponentDialog.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ components/ComponentDialog.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -57,4 +57,15 @@ return () => clearTimeout(timeoutId); }, [tempSearchQuery]); + + useEffect(() => { + if (open && category) { + setSelectedBrands([]); + setSortOrder('price_desc'); + setTempSearchQuery(''); + setSearchQuery(''); + setPriceRange([0, 2000]); + } + }, [open, category]); + useEffect(() => { @@ -297,5 +308,5 @@ Browsing: - {category === 'gpu' ? 'Graphics Cards' : category?.toUpperCase()} + {category === 'gpu' ? 'GRAPHICS CARDS' : category === 'memory_card' ? 'STORAGE EXPANSION CARDS' : category?.toUpperCase()} {mode === 'forge' && currentBuildId && ( }, { id: 'optical_drive', label: 'Optical Drives', icon: }, - { id: 'memory_card', label: 'Memory Cards', icon: }, + { id: 'memory_card', label: 'Storage Cards', icon: }, { id: 'cables', label: 'Cables', icon: }, ]; Index: pages/completed-builds/+Page.tsx =================================================================== --- pages/completed-builds/+Page.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ pages/completed-builds/+Page.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -9,5 +9,5 @@ import BuildCard from '../../components/BuildCard'; import BuildDetailsDialog from '../../components/BuildDetailsDialog'; -import { onGetApprovedBuilds, onCloneBuild, onGetAuthState } from '../+Layout.telefunc'; +import { onGetApprovedBuilds, onGetAuthState } from '../+Layout.telefunc'; export default function CompletedBuildsPage() { @@ -65,15 +65,6 @@ useEffect(() => { - loadBuilds(); + void loadBuilds(); }, [sortBy, searchQuery]); - - const handleClone = async (buildId: number) => { - if (!userId) return alert("Please login to clone builds!"); - if (confirm(`Clone this build?`)) { - await onCloneBuild({buildId}); - alert("Build cloned!"); - setSelectedBuildId(null); - } - }; return ( @@ -102,6 +93,8 @@ value={searchQuery} onChange={(e) => setSearchQuery(e.target.value)} - InputProps={{ - startAdornment: , + slotProps={{ + input: { + startAdornment: , + } }} sx={{ mb: 3 }} @@ -193,5 +186,4 @@ currentUser={userId} onClose={() => setSelectedBuildId(null)} - onClone={handleClone} /> Index: pages/dashboard/admin/+Page.tsx =================================================================== --- pages/dashboard/admin/+Page.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ pages/dashboard/admin/+Page.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -1,5 +1,5 @@ import React, {useEffect, useState} from 'react'; import { - Container, Grid, Paper, Typography, Box, Avatar, Divider, Button, + Container, Paper, Typography, Box, Avatar, Divider, Button, CircularProgress, Table, TableBody, TableCell, TableHead, TableRow, Chip, IconButton, TextField, Dialog, DialogTitle, DialogContent, DialogActions @@ -173,6 +173,13 @@ return ( - - + + - - - - - - - - - - Component Suggestions ({data.componentSuggestions?.length || 0}) - - - - {data.componentSuggestions?.length === 0 ? ( - No suggestions. - ) : ( - - - - Link/Description - Type - User - Status - Actions - - - - {data.componentSuggestions?.map((sug: any) => ( - - - - {sug.description || sug.link} - - - {sug.componentType?.toUpperCase()} - {sug.userId} - - + + + + + + + Component Suggestions ({data.componentSuggestions?.length || 0}) + + + + {data.componentSuggestions?.length === 0 ? ( + No suggestions. + ) : ( + +
+ + + Link/Description + Type + User + Status + Actions + + + + {data.componentSuggestions?.map((sug: any) => ( + + + + {sug.description || sug.link} + + + + {sug.componentType?.toUpperCase()} + + + {sug.user?.username || `${sug.userId}`} + + + + + + {sug.status === 'pending' ? ( + <> + openSuggestionReview(sug.id, 'approved')} + > + + + openSuggestionReview(sug.id, 'rejected')} + > + + + + ) : sug.status === 'approved' ? ( + - ) : ( - - {sug.adminComment || 'Rejected'} - - )} - - - ))} - -
- )} - - - - - - - - - Builds Waiting for Approval ({data.pendingBuilds?.length || 0}) - - - - {data.pendingBuilds?.length === 0 ? ( - No pending builds. - ) : ( - - {data.pendingBuilds.map((build: any) => ( - - - setSelectedBuildId(build.id)} - /> - - - - - + ) : ( + + {sug.adminComment || 'Rejected'} + + )} + + ))} - - )} - - - - - - - My Builds / Sandbox - - {data.userBuilds?.length === 0 ? ( - No builds created by admin. - ) : ( - - {data.userBuilds.slice(0, 4).map((build: any) => ( - - - setSelectedBuildId(build.id)} - /> - - - - - - ))} - - )} - - - - - + + + + )} + + + + + + + Builds Waiting for Approval ({data.pendingBuilds?.length || 0}) + + + + {data.pendingBuilds?.length === 0 ? ( + No pending builds. + ) : ( + + {data.pendingBuilds.map((build: any) => ( + + setSelectedBuildId(build.id)} + /> + + + + + ))} + + )} + + + + + My Builds / Sandbox + + {data.userBuilds?.length === 0 ? ( + No builds created by admin. + ) : ( + + {data.userBuilds.slice(0, 4).map((build: any) => ( + + setSelectedBuildId(build.id)} + /> + + + + + ))} + + )} + + + setCreateComponentDialog({ open: false, suggestion: null })} + onClose={() => setCreateComponentDialog({open: false, suggestion: null})} onSuccess={() => { loadData(); - setCreateComponentDialog({ open: false, suggestion: null }); + setCreateComponentDialog({open: false, suggestion: null}); }} prefillData={createComponentDialog.suggestion ? { Index: pages/dashboard/user/+Page.tsx =================================================================== --- pages/dashboard/user/+Page.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ pages/dashboard/user/+Page.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -10,5 +10,4 @@ CircularProgress, IconButton, - Grid, Dialog, DialogTitle, @@ -24,5 +23,4 @@ import {getUserInfoAndData, onDeleteBuild} from "./userDashboard.telefunc"; -import {onCloneBuild} from "../../+Layout.telefunc"; import BuildCard from "../../../components/BuildCard"; @@ -72,5 +70,5 @@ await onDeleteBuild({buildId: deleteDialog.buildId}); setDeleteDialog({ open: false, buildId: null, buildName: '' }); - loadData(); // refresh na user i favorite builds + loadData(); setSelectedBuildId(null); } catch (e) { @@ -81,246 +79,274 @@ }; - const handleCloneWrapper = async (buildId: number) => { - if (!data?.user) return alert("Please login to clone builds!"); - if (confirm(`Clone this build to your dashboard?`)) { - await onCloneBuild({buildId}); - alert("Build cloned! Check your dashboard."); - setSelectedBuildId(null); - loadData(); - } - }; - if (loading) return ; - if (error || !data) return {error}; + if (error || !data) return {error}; return ( - - - - - + + + + + + + {data.user.username} {data.user.email} - - - - - - - - - - - Favorited Builds - - - {data.favoriteBuilds.length > 4 && ( + + + + + + + + Favorited Builds + + + {data.favoriteBuilds.length > 6 && ( + + )} + + + + {data.favoriteBuilds.length === 0 ? ( + + You haven't favorited any builds yet. + + ) : ( + + {data.favoriteBuilds.slice(0, 6).map((build: any) => ( + setSelectedBuildId(build.id)} + /> + ))} + + )} + + + + + + + My Builds + + + {data.userBuilds.length > 6 && ( + + )} + + + + {data.userBuilds.length === 0 ? ( + + + You haven't created any builds yet. + + + + ) : ( + + {data.userBuilds.slice(0, 6).map((build: any) => ( + + + setSelectedBuildId(build.id)} + /> + - )} + + ))} + + )} + + + + + setOpenMyBuildsDialog(false)} maxWidth="xl" fullWidth> + + All My Builds + setOpenMyBuildsDialog(false)}> + + + + + + {data.userBuilds.map((build: any) => ( + + { + setOpenMyBuildsDialog(false); + setSelectedBuildId(build.id); + }} + /> + + - - - {data.favoriteBuilds.length === 0 ? ( - You haven't favorited - any builds yet. - ) : ( - - {data.favoriteBuilds.slice(0, 4).map((build: any) => ( - - setSelectedBuildId(build.id)} - /> - - ))} - - )} - - - - - - - - - My Builds - - - {data.userBuilds.length > 4 && ( - - )} - - - - {data.userBuilds.length === 0 ? ( - - You haven't created any builds - yet. - - - ) : ( - - {data.userBuilds.slice(0, 4).map((build: any) => ( - - - setSelectedBuildId(build.id)} - /> - - - - - - ))} - - )} - - - - setOpenMyBuildsDialog(false)} maxWidth="lg" - fullWidth> - - All My Builds - setOpenMyBuildsDialog(false)}> - - - - - - {data.userBuilds.map((build: any) => ( - - - { - setOpenMyBuildsDialog(false); - setSelectedBuildId(build.id); - }} - /> - - - - - - ))} - - - - - - - - setOpenFavoritesDialog(false)} maxWidth="lg" - fullWidth> - - All Favorited Builds - setOpenFavoritesDialog(false)}> - - - - - - {data.favoriteBuilds.map((build: any) => ( - - { - setOpenFavoritesDialog(false); - setSelectedBuildId(build.id); - }} - /> - - ))} - - - - - - - - setDeleteDialog({ open: false, buildId: null, buildName: '' })}> - Delete Build - - {deleteDialog.buildName} - - Are you sure you want to permanently delete this build? This action cannot be undone. - - - - - - - - - - - + + ))} + + + + + + + + setOpenFavoritesDialog(false)} maxWidth="xl" fullWidth> + + All Favorited Builds + setOpenFavoritesDialog(false)}> + + + + + + {data.favoriteBuilds.map((build: any) => ( + { + setOpenFavoritesDialog(false); + setSelectedBuildId(build.id); + }} + /> + ))} + + + + + + + + setDeleteDialog({ open: false, buildId: null, buildName: '' })}> + Delete Build + + {deleteDialog.buildName} + + Are you sure you want to permanently delete this build? This action cannot be undone. + + + + + + + Index: pages/index/+Page.tsx =================================================================== --- pages/index/+Page.tsx (revision c586cbdaba421799f528cc117955c0b3ad697da2) +++ pages/index/+Page.tsx (revision 92fafb3082c4f8125549aa91ec28c46ea0366d99) @@ -10,5 +10,5 @@ import BuildCard from '../../components/BuildCard'; -import {onGetApprovedBuilds, onGetAuthState, onCloneBuild} from '../+Layout.telefunc'; +import {onGetApprovedBuilds, onGetAuthState} from '../+Layout.telefunc'; export default function HomePage() { @@ -46,15 +46,6 @@ } - loadSite(); + void loadSite(); }, []); - - const handleCloneWrapper = async (buildId: number) => { - if (!data?.isLoggedIn) return alert("Please login to clone builds!"); - if (confirm(`Clone this build to your dashboard?`)) { - await onCloneBuild({buildId}); - alert("Build cloned! Check your dashboard."); - setSelectedBuildId(null); - } - }; if (!data) return Loading Forge...; @@ -160,5 +151,4 @@ currentUser={data.userId} onClose={() => setSelectedBuildId(null)} - onClone={handleCloneWrapper} />