From f213b4d117f90c59ee94b103848b37ba93415ecb Mon Sep 17 00:00:00 2001 From: Austyn Deseo Date: Wed, 25 Sep 2024 01:38:28 -0500 Subject: [PATCH] builds partially migrated --- .../builds/_components}/buildSystem.tsx | 7 ++--- .../builds/_components}/builds/buildCard.tsx | 4 +-- .../_components}/builds/buildDetail.tsx | 4 +-- .../builds/_components}/builds/buildList.tsx | 2 +- .../builds/shipImgAcknowledgement.tsx | 0 .../_components}/dialog/buildAddText.tsx | 0 .../_components}/dialog/buildCheckBox.tsx | 0 .../_components}/dialog/buildDialog.tsx | 4 +-- .../_components}/dialog/buildOption.tsx | 4 +-- .../builds/_components}/engIcons.tsx | 0 .../builds/_components}/engToggleGroup.tsx | 0 .../builds/_components}/index.ts | 0 .../builds/_components}/query/query.tsx | 27 +++++++++---------- .../_components}/query/queryActions.tsx | 0 .../_components}/query/queryEngineering.tsx | 0 .../builds/_components}/query/queryOther.tsx | 2 +- .../builds/_components}/query/queryShip.tsx | 2 +- .../_components}/query/querySpecialities.tsx | 2 +- .../_components}/query/sharedComponents.tsx | 0 .../builds/_components}/shipAutocomplete.tsx | 4 +-- .../builds/_components}/tagGroup.tsx | 2 +- .../data => app/builds/_data}/builds.json | 0 .../builds/_data}/initialBuilds.json | 0 .../data => app/builds/_data}/shipBuilds.json | 0 .../builds/_data}/shipBuildsChange.json | 0 .../data => app/builds/_data}/shipMap.json | 0 .../builds/_data}/testBuilds/testBuild.json | 0 .../builds/_data}/testBuilds/testBuild.ts | 2 +- .../_data}/testBuilds/testBuildClever.json | 0 .../_data}/testBuilds/testBuildCleverPP.json | 0 .../testBuilds/testBuildCleverPrismatic.json | 0 .../_data}/testBuilds/testCorvetteMiner.json | 0 .../builds/_functions}/filterShipBuilds.ts | 2 +- .../builds/_functions}/getShipInfo.ts | 4 +-- .../builds/_functions}/groupandSortBuilds.ts | 4 +-- .../builds/_functions}/index.ts | 0 .../builds/_functions}/processJSONBuild.ts | 2 +- .../builds/_hooks}/useShipBuilds.ts | 2 +- .../hooks => app/builds/_hooks}/useShipMap.ts | 4 +-- .../builds/_models}/buildInfo.ts | 0 .../builds/_models}/coriolis/coriolis.ts | 0 .../builds/_models}/coriolis/index.ts | 0 .../builds/_models}/coriolis/ratings.ts | 0 .../_models}/coriolis/shipComponents.ts | 0 .../_models}/coriolis/shipCoreModules.ts | 0 .../_models}/coriolis/shipHardpoints.ts | 0 .../_models}/coriolis/shipInternalModules.ts | 0 .../_models}/coriolis/shipUtilityMounts.ts | 0 .../models => app/builds/_models}/index.ts | 0 .../builds/_models}/otherFilters.ts | 0 .../models => app/builds/_models}/query.ts | 0 .../models => app/builds/_models}/shipInfo.ts | 0 .../models => app/builds/_models}/shipSize.ts | 0 .../builds/_models}/shipSpecialty.ts | 0 .../builds/_providers}/buildProvider.tsx | 14 +++++----- .../builds/detail/[id]/page.tsx} | 4 +-- src/app/builds/page.tsx | 16 +++++++++++ src/app/information/_hooks/useShipReviews.ts | 2 +- src/app/information/_models/shipInfo.ts | 2 +- .../components/builds/buildDashboard.tsx | 10 +++---- src/pages/admin/builds.page.tsx | 2 +- src/pages/api/builds.api.ts | 2 +- src/pages/builds/index.tsx | 25 ----------------- 63 files changed, 76 insertions(+), 85 deletions(-) rename src/{modules/builds/components => app/builds/_components}/buildSystem.tsx (91%) rename src/{modules/builds/components => app/builds/_components}/builds/buildCard.tsx (94%) rename src/{modules/builds/components => app/builds/_components}/builds/buildDetail.tsx (98%) rename src/{modules/builds/components => app/builds/_components}/builds/buildList.tsx (93%) rename src/{modules/builds/components => app/builds/_components}/builds/shipImgAcknowledgement.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/dialog/buildAddText.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/dialog/buildCheckBox.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/dialog/buildDialog.tsx (99%) rename src/{modules/builds/components => app/builds/_components}/dialog/buildOption.tsx (93%) rename src/{modules/builds/components => app/builds/_components}/engIcons.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/engToggleGroup.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/index.ts (100%) rename src/{modules/builds/components => app/builds/_components}/query/query.tsx (90%) rename src/{modules/builds/components => app/builds/_components}/query/queryActions.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/query/queryEngineering.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/query/queryOther.tsx (97%) rename src/{modules/builds/components => app/builds/_components}/query/queryShip.tsx (97%) rename src/{modules/builds/components => app/builds/_components}/query/querySpecialities.tsx (97%) rename src/{modules/builds/components => app/builds/_components}/query/sharedComponents.tsx (100%) rename src/{modules/builds/components => app/builds/_components}/shipAutocomplete.tsx (90%) rename src/{modules/builds/components => app/builds/_components}/tagGroup.tsx (92%) rename src/{modules/builds/data => app/builds/_data}/builds.json (100%) rename src/{modules/builds/data => app/builds/_data}/initialBuilds.json (100%) rename src/{modules/builds/data => app/builds/_data}/shipBuilds.json (100%) rename src/{modules/builds/data => app/builds/_data}/shipBuildsChange.json (100%) rename src/{modules/builds/data => app/builds/_data}/shipMap.json (100%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testBuild.json (100%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testBuild.ts (92%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testBuildClever.json (100%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testBuildCleverPP.json (100%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testBuildCleverPrismatic.json (100%) rename src/{modules/builds/data => app/builds/_data}/testBuilds/testCorvetteMiner.json (100%) rename src/{modules/builds/functions => app/builds/_functions}/filterShipBuilds.ts (96%) rename src/{modules/builds/functions => app/builds/_functions}/getShipInfo.ts (64%) rename src/{modules/builds/functions => app/builds/_functions}/groupandSortBuilds.ts (82%) rename src/{modules/builds/functions => app/builds/_functions}/index.ts (100%) rename src/{modules/builds/functions => app/builds/_functions}/processJSONBuild.ts (98%) rename src/{modules/builds/hooks => app/builds/_hooks}/useShipBuilds.ts (94%) rename src/{modules/builds/hooks => app/builds/_hooks}/useShipMap.ts (76%) rename src/{modules/builds/models => app/builds/_models}/buildInfo.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/coriolis.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/index.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/ratings.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/shipComponents.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/shipCoreModules.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/shipHardpoints.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/shipInternalModules.ts (100%) rename src/{modules/builds/models => app/builds/_models}/coriolis/shipUtilityMounts.ts (100%) rename src/{modules/builds/models => app/builds/_models}/index.ts (100%) rename src/{modules/builds/models => app/builds/_models}/otherFilters.ts (100%) rename src/{modules/builds/models => app/builds/_models}/query.ts (100%) rename src/{modules/builds/models => app/builds/_models}/shipInfo.ts (100%) rename src/{modules/builds/models => app/builds/_models}/shipSize.ts (100%) rename src/{modules/builds/models => app/builds/_models}/shipSpecialty.ts (100%) rename src/{modules/builds/providers => app/builds/_providers}/buildProvider.tsx (89%) rename src/{pages/builds/detail/[id].tsx => app/builds/detail/[id]/page.tsx} (87%) create mode 100644 src/app/builds/page.tsx delete mode 100644 src/pages/builds/index.tsx diff --git a/src/modules/builds/components/buildSystem.tsx b/src/app/builds/_components/buildSystem.tsx similarity index 91% rename from src/modules/builds/components/buildSystem.tsx rename to src/app/builds/_components/buildSystem.tsx index 1adbd9ff..2b3d60c9 100644 --- a/src/modules/builds/components/buildSystem.tsx +++ b/src/app/builds/_components/buildSystem.tsx @@ -1,6 +1,7 @@ -import { filterShipBuilds } from '@@/builds/functions'; -import { IBuildInfov2, IQuery } from '@@/builds/models'; -import { BuildContext, BuildContextProvider } from '@@/builds/providers/buildProvider'; +'use client'; +import { filterShipBuilds } from '@/app/builds/_functions'; +import { IBuildInfov2, IQuery } from '@/app/builds/_models'; +import { BuildContext, BuildContextProvider } from '@/app/builds/_providers/buildProvider'; import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward'; import { Box, Container, Fab, Slide, Theme, Typography, useMediaQuery } from '@mui/material'; import { useSnackbar } from 'notistack'; diff --git a/src/modules/builds/components/builds/buildCard.tsx b/src/app/builds/_components/builds/buildCard.tsx similarity index 94% rename from src/modules/builds/components/builds/buildCard.tsx rename to src/app/builds/_components/builds/buildCard.tsx index f35978a6..11fe2701 100644 --- a/src/modules/builds/components/builds/buildCard.tsx +++ b/src/app/builds/_components/builds/buildCard.tsx @@ -1,5 +1,5 @@ -import { useShipIdfromMap } from '@@/builds/hooks/useShipMap'; -import { IBuildInfov2, ShipSize } from '@@/builds/models'; +import { useShipIdfromMap } from '@/app/builds/_hooks/useShipMap'; +import { IBuildInfov2, ShipSize } from '@/app/builds/_models'; import { Box, Button, diff --git a/src/modules/builds/components/builds/buildDetail.tsx b/src/app/builds/_components/builds/buildDetail.tsx similarity index 98% rename from src/modules/builds/components/builds/buildDetail.tsx rename to src/app/builds/_components/builds/buildDetail.tsx index 5767ad41..9548c9d7 100644 --- a/src/modules/builds/components/builds/buildDetail.tsx +++ b/src/app/builds/_components/builds/buildDetail.tsx @@ -1,12 +1,12 @@ import { USCMarkdown } from '@/components/uscmarkdown'; import { BoxwMB1, CenteredTypography } from '@/components/_common'; import { useLinks } from '@/hooks/useLinks'; -import { IBuildInfov2, IShipInfo, ShipSize } from '@@/builds/models'; +import { IBuildInfov2, IShipInfo, ShipSize } from '@/app/builds/_models'; import { AddBuildFunction, BuildContext, BuildContextProvider, -} from '@@/builds/providers/buildProvider'; +} from '@/app/builds/_providers/buildProvider'; import { Box, Button, diff --git a/src/modules/builds/components/builds/buildList.tsx b/src/app/builds/_components/builds/buildList.tsx similarity index 93% rename from src/modules/builds/components/builds/buildList.tsx rename to src/app/builds/_components/builds/buildList.tsx index 3ee562c2..3b9ac12b 100644 --- a/src/modules/builds/components/builds/buildList.tsx +++ b/src/app/builds/_components/builds/buildList.tsx @@ -1,5 +1,5 @@ import { CenteredTypography, PaperP2 } from '@/components/_common'; -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; import { BuildCard } from './buildCard'; interface BuildListProps { diff --git a/src/modules/builds/components/builds/shipImgAcknowledgement.tsx b/src/app/builds/_components/builds/shipImgAcknowledgement.tsx similarity index 100% rename from src/modules/builds/components/builds/shipImgAcknowledgement.tsx rename to src/app/builds/_components/builds/shipImgAcknowledgement.tsx diff --git a/src/modules/builds/components/dialog/buildAddText.tsx b/src/app/builds/_components/dialog/buildAddText.tsx similarity index 100% rename from src/modules/builds/components/dialog/buildAddText.tsx rename to src/app/builds/_components/dialog/buildAddText.tsx diff --git a/src/modules/builds/components/dialog/buildCheckBox.tsx b/src/app/builds/_components/dialog/buildCheckBox.tsx similarity index 100% rename from src/modules/builds/components/dialog/buildCheckBox.tsx rename to src/app/builds/_components/dialog/buildCheckBox.tsx diff --git a/src/modules/builds/components/dialog/buildDialog.tsx b/src/app/builds/_components/dialog/buildDialog.tsx similarity index 99% rename from src/modules/builds/components/dialog/buildDialog.tsx rename to src/app/builds/_components/dialog/buildDialog.tsx index 7ecc0f7b..5d953208 100644 --- a/src/modules/builds/components/dialog/buildDialog.tsx +++ b/src/app/builds/_components/dialog/buildDialog.tsx @@ -1,5 +1,5 @@ -import { getShipInfofromID, groupandSortBuilds, processJSONBuild } from '@@/builds/functions'; -import { IBuildInfov2, IShipInfo } from '@@/builds/models'; +import { getShipInfofromID, groupandSortBuilds, processJSONBuild } from '@/app/builds/_functions'; +import { IBuildInfov2, IShipInfo } from '@/app/builds/_models'; import { Autocomplete, Button, diff --git a/src/modules/builds/components/dialog/buildOption.tsx b/src/app/builds/_components/dialog/buildOption.tsx similarity index 93% rename from src/modules/builds/components/dialog/buildOption.tsx rename to src/app/builds/_components/dialog/buildOption.tsx index 8dbdf3a4..87526cfe 100644 --- a/src/modules/builds/components/dialog/buildOption.tsx +++ b/src/app/builds/_components/dialog/buildOption.tsx @@ -1,5 +1,5 @@ -import { useShipIdfromMap } from '@@/builds/hooks/useShipMap'; -import { IBuildInfov2, IShipInfo, ShipSize } from '@@/builds/models'; +import { useShipIdfromMap } from '@/app/builds/_hooks/useShipMap'; +import { IBuildInfov2, IShipInfo, ShipSize } from '@/app/builds/_models'; import { Box, Card, CardContent, CardMedia, Divider, ListItem, Typography } from '@mui/material'; import { HTMLAttributes } from 'react'; import { EngIcons } from '../engIcons'; diff --git a/src/modules/builds/components/engIcons.tsx b/src/app/builds/_components/engIcons.tsx similarity index 100% rename from src/modules/builds/components/engIcons.tsx rename to src/app/builds/_components/engIcons.tsx diff --git a/src/modules/builds/components/engToggleGroup.tsx b/src/app/builds/_components/engToggleGroup.tsx similarity index 100% rename from src/modules/builds/components/engToggleGroup.tsx rename to src/app/builds/_components/engToggleGroup.tsx diff --git a/src/modules/builds/components/index.ts b/src/app/builds/_components/index.ts similarity index 100% rename from src/modules/builds/components/index.ts rename to src/app/builds/_components/index.ts diff --git a/src/modules/builds/components/query/query.tsx b/src/app/builds/_components/query/query.tsx similarity index 90% rename from src/modules/builds/components/query/query.tsx rename to src/app/builds/_components/query/query.tsx index f5f8f957..ff99dbcb 100644 --- a/src/modules/builds/components/query/query.tsx +++ b/src/app/builds/_components/query/query.tsx @@ -1,6 +1,7 @@ -import { IQuery, OtherFilters } from '@@/builds/models'; +'use client'; +import { IQuery, OtherFilters } from '@/app/builds/_models'; import { Box } from '@mui/material'; -import { useRouter } from 'next/router'; +import { useRouter, useSearchParams } from 'next/navigation'; import qs from 'query-string'; import { useEffect, useReducer } from 'react'; import { QueryActions } from './queryActions'; @@ -15,8 +16,8 @@ interface QueryProps { } export const Query = (props: QueryProps) => { + const queryParams = useSearchParams(); const router = useRouter(); - const queryParams = router.asPath.substring(router.asPath.indexOf('?')); const { updateQuery, addBuild } = props; type action = { @@ -91,9 +92,8 @@ export const Query = (props: QueryProps) => { } const queryString = qs.stringify(newQuery); - router.push({ pathname: '/builds', query: queryString }, undefined, { - shallow: true, - }); + router.push(`/builds?${queryString}`); + router.refresh(); updateQuery(newQuery); @@ -111,17 +111,16 @@ export const Query = (props: QueryProps) => { }); useEffect(() => { - const params = qs.parse(queryParams); - const shipParam = params['ship']; + const shipParam = queryParams?.get('ship'); const ship = shipParam && !Array.isArray(shipParam) ? shipParam : null; - const sizeParam = params['size']; + const sizeParam = queryParams?.get('size'); const size = sizeParam && !Array.isArray(sizeParam) ? parseInt(sizeParam) : null; - const engParam = params['engLevel']; + const engParam = queryParams?.get('engLevel'); const engLevel = engParam && !Array.isArray(engParam) ? parseInt(engParam) : null; - const specialtiesParam = params['specialties']; + const specialtiesParam = queryParams?.get('specialties'); let specialties: string[] = []; if (specialtiesParam) { if (Array.isArray(specialtiesParam) && specialtiesParam.length > 0) { @@ -131,13 +130,13 @@ export const Query = (props: QueryProps) => { } } - const guardianParam = params['guardian']; + const guardianParam = queryParams?.get('guardian'); const guardian = guardianParam === '1' ? 1 : guardianParam === '0' ? 0 : null; - const powerplayParam = params['powerplay']; + const powerplayParam = queryParams?.get('powerplay'); const powerplay = powerplayParam === '1' ? 1 : powerplayParam === '0' ? 0 : null; - const beginnerParam = params['beginner']; + const beginnerParam = queryParams?.get('beginner'); const beginner = beginnerParam === '1' ? 1 : beginnerParam === '0' ? 0 : null; const query: IQuery = { diff --git a/src/modules/builds/components/query/queryActions.tsx b/src/app/builds/_components/query/queryActions.tsx similarity index 100% rename from src/modules/builds/components/query/queryActions.tsx rename to src/app/builds/_components/query/queryActions.tsx diff --git a/src/modules/builds/components/query/queryEngineering.tsx b/src/app/builds/_components/query/queryEngineering.tsx similarity index 100% rename from src/modules/builds/components/query/queryEngineering.tsx rename to src/app/builds/_components/query/queryEngineering.tsx diff --git a/src/modules/builds/components/query/queryOther.tsx b/src/app/builds/_components/query/queryOther.tsx similarity index 97% rename from src/modules/builds/components/query/queryOther.tsx rename to src/app/builds/_components/query/queryOther.tsx index 0c5802f8..a2b4cb46 100644 --- a/src/modules/builds/components/query/queryOther.tsx +++ b/src/app/builds/_components/query/queryOther.tsx @@ -1,4 +1,4 @@ -import { OtherFilters } from '@@/builds/models/otherFilters'; +import { OtherFilters } from '@/app/builds/_models/otherFilters'; import BlockIcon from '@mui/icons-material/Block'; import CheckIcon from '@mui/icons-material/Check'; import { styled, ToggleButton, ToggleButtonGroup, Tooltip } from '@mui/material'; diff --git a/src/modules/builds/components/query/queryShip.tsx b/src/app/builds/_components/query/queryShip.tsx similarity index 97% rename from src/modules/builds/components/query/queryShip.tsx rename to src/app/builds/_components/query/queryShip.tsx index 79f6807b..4eb3f0a9 100644 --- a/src/modules/builds/components/query/queryShip.tsx +++ b/src/app/builds/_components/query/queryShip.tsx @@ -1,4 +1,4 @@ -import { IShipInfo } from '@@/builds/models'; +import { IShipInfo } from '@/app/builds/_models'; import { Box, ToggleButton, ToggleButtonGroup, Tooltip } from '@mui/material'; import { Dispatch, MouseEvent, SetStateAction } from 'react'; import { ShipAutocomplete } from '../shipAutocomplete'; diff --git a/src/modules/builds/components/query/querySpecialities.tsx b/src/app/builds/_components/query/querySpecialities.tsx similarity index 97% rename from src/modules/builds/components/query/querySpecialities.tsx rename to src/app/builds/_components/query/querySpecialities.tsx index c7e0b535..16bd7ec4 100644 --- a/src/modules/builds/components/query/querySpecialities.tsx +++ b/src/app/builds/_components/query/querySpecialities.tsx @@ -1,4 +1,4 @@ -import { ShipSpecialty } from '@@/builds/models/shipSpecialty'; +import { ShipSpecialty } from '@/app/builds/_models/shipSpecialty'; import { styled, ToggleButton } from '@mui/material'; import { QueryExplanation, QuerySection, QuerySectionHeader } from './sharedComponents'; diff --git a/src/modules/builds/components/query/sharedComponents.tsx b/src/app/builds/_components/query/sharedComponents.tsx similarity index 100% rename from src/modules/builds/components/query/sharedComponents.tsx rename to src/app/builds/_components/query/sharedComponents.tsx diff --git a/src/modules/builds/components/shipAutocomplete.tsx b/src/app/builds/_components/shipAutocomplete.tsx similarity index 90% rename from src/modules/builds/components/shipAutocomplete.tsx rename to src/app/builds/_components/shipAutocomplete.tsx index 759f44d7..fba33293 100644 --- a/src/modules/builds/components/shipAutocomplete.tsx +++ b/src/app/builds/_components/shipAutocomplete.tsx @@ -1,7 +1,7 @@ import { TextFieldwM1 } from '@/components/_common'; import { genericSortArray } from '@/functions/sort'; -import { useShipMap } from '@@/builds/hooks/useShipMap'; -import { IShipInfo } from '@@/builds/models'; +import { useShipMap } from '@/app/builds/_hooks/useShipMap'; +import { IShipInfo } from '@/app/builds/_models'; import { Autocomplete } from '@mui/material'; const findShipName = (ships: IShipInfo[], shipID: string | null) => { diff --git a/src/modules/builds/components/tagGroup.tsx b/src/app/builds/_components/tagGroup.tsx similarity index 92% rename from src/modules/builds/components/tagGroup.tsx rename to src/app/builds/_components/tagGroup.tsx index c770ae1c..d76e6822 100644 --- a/src/modules/builds/components/tagGroup.tsx +++ b/src/app/builds/_components/tagGroup.tsx @@ -1,4 +1,4 @@ -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; import { Box, Chip } from '@mui/material'; export const TagGroup = (props: { build: IBuildInfov2 }) => { diff --git a/src/modules/builds/data/builds.json b/src/app/builds/_data/builds.json similarity index 100% rename from src/modules/builds/data/builds.json rename to src/app/builds/_data/builds.json diff --git a/src/modules/builds/data/initialBuilds.json b/src/app/builds/_data/initialBuilds.json similarity index 100% rename from src/modules/builds/data/initialBuilds.json rename to src/app/builds/_data/initialBuilds.json diff --git a/src/modules/builds/data/shipBuilds.json b/src/app/builds/_data/shipBuilds.json similarity index 100% rename from src/modules/builds/data/shipBuilds.json rename to src/app/builds/_data/shipBuilds.json diff --git a/src/modules/builds/data/shipBuildsChange.json b/src/app/builds/_data/shipBuildsChange.json similarity index 100% rename from src/modules/builds/data/shipBuildsChange.json rename to src/app/builds/_data/shipBuildsChange.json diff --git a/src/modules/builds/data/shipMap.json b/src/app/builds/_data/shipMap.json similarity index 100% rename from src/modules/builds/data/shipMap.json rename to src/app/builds/_data/shipMap.json diff --git a/src/modules/builds/data/testBuilds/testBuild.json b/src/app/builds/_data/testBuilds/testBuild.json similarity index 100% rename from src/modules/builds/data/testBuilds/testBuild.json rename to src/app/builds/_data/testBuilds/testBuild.json diff --git a/src/modules/builds/data/testBuilds/testBuild.ts b/src/app/builds/_data/testBuilds/testBuild.ts similarity index 92% rename from src/modules/builds/data/testBuilds/testBuild.ts rename to src/app/builds/_data/testBuilds/testBuild.ts index c3612851..7bebbc03 100644 --- a/src/modules/builds/data/testBuilds/testBuild.ts +++ b/src/app/builds/_data/testBuilds/testBuild.ts @@ -1,4 +1,4 @@ -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; export const testBuildNoExtra: IBuildInfov2 = { _id: '1234', diff --git a/src/modules/builds/data/testBuilds/testBuildClever.json b/src/app/builds/_data/testBuilds/testBuildClever.json similarity index 100% rename from src/modules/builds/data/testBuilds/testBuildClever.json rename to src/app/builds/_data/testBuilds/testBuildClever.json diff --git a/src/modules/builds/data/testBuilds/testBuildCleverPP.json b/src/app/builds/_data/testBuilds/testBuildCleverPP.json similarity index 100% rename from src/modules/builds/data/testBuilds/testBuildCleverPP.json rename to src/app/builds/_data/testBuilds/testBuildCleverPP.json diff --git a/src/modules/builds/data/testBuilds/testBuildCleverPrismatic.json b/src/app/builds/_data/testBuilds/testBuildCleverPrismatic.json similarity index 100% rename from src/modules/builds/data/testBuilds/testBuildCleverPrismatic.json rename to src/app/builds/_data/testBuilds/testBuildCleverPrismatic.json diff --git a/src/modules/builds/data/testBuilds/testCorvetteMiner.json b/src/app/builds/_data/testBuilds/testCorvetteMiner.json similarity index 100% rename from src/modules/builds/data/testBuilds/testCorvetteMiner.json rename to src/app/builds/_data/testBuilds/testCorvetteMiner.json diff --git a/src/modules/builds/functions/filterShipBuilds.ts b/src/app/builds/_functions/filterShipBuilds.ts similarity index 96% rename from src/modules/builds/functions/filterShipBuilds.ts rename to src/app/builds/_functions/filterShipBuilds.ts index 97ac0c31..2aa55fc7 100644 --- a/src/modules/builds/functions/filterShipBuilds.ts +++ b/src/app/builds/_functions/filterShipBuilds.ts @@ -1,4 +1,4 @@ -import { IBuildInfov2, IQuery } from '@@/builds/models'; +import { IBuildInfov2, IQuery } from '@/app/builds/_models'; import { getShipInfofromID } from './getShipInfo'; export const filterShipBuilds = ( diff --git a/src/modules/builds/functions/getShipInfo.ts b/src/app/builds/_functions/getShipInfo.ts similarity index 64% rename from src/modules/builds/functions/getShipInfo.ts rename to src/app/builds/_functions/getShipInfo.ts index 931a142b..59529c93 100644 --- a/src/modules/builds/functions/getShipInfo.ts +++ b/src/app/builds/_functions/getShipInfo.ts @@ -1,5 +1,5 @@ -import shipMap from '@@/builds/data/shipMap.json'; -import { IShipInfo } from '@@/builds/models'; +import shipMap from '../_data/shipMap.json'; +import { IShipInfo } from '../_models'; export const getShipInfofromID = (shipID: string): IShipInfo | undefined => { const ship: IShipInfo | undefined = shipMap.find((x) => x.shipId === shipID); diff --git a/src/modules/builds/functions/groupandSortBuilds.ts b/src/app/builds/_functions/groupandSortBuilds.ts similarity index 82% rename from src/modules/builds/functions/groupandSortBuilds.ts rename to src/app/builds/_functions/groupandSortBuilds.ts index 54d4ceda..96f29809 100644 --- a/src/modules/builds/functions/groupandSortBuilds.ts +++ b/src/app/builds/_functions/groupandSortBuilds.ts @@ -1,6 +1,6 @@ import { genericSortArray } from '@/functions/sort'; -import shipMap from '@@/builds/data/shipMap.json'; -import { IBuildInfov2, IShipInfo } from '@@/builds/models'; +import shipMap from '../_data/shipMap.json'; +import { IBuildInfov2, IShipInfo } from '@/app/builds/_models'; export const groupandSortBuilds = (builds: IBuildInfov2[]) => { const shipMapSorted: IShipInfo[] = genericSortArray(shipMap, { order: 'asc', orderBy: 'shipId' }); diff --git a/src/modules/builds/functions/index.ts b/src/app/builds/_functions/index.ts similarity index 100% rename from src/modules/builds/functions/index.ts rename to src/app/builds/_functions/index.ts diff --git a/src/modules/builds/functions/processJSONBuild.ts b/src/app/builds/_functions/processJSONBuild.ts similarity index 98% rename from src/modules/builds/functions/processJSONBuild.ts rename to src/app/builds/_functions/processJSONBuild.ts index 7be51ecf..01461167 100644 --- a/src/modules/builds/functions/processJSONBuild.ts +++ b/src/app/builds/_functions/processJSONBuild.ts @@ -3,7 +3,7 @@ import { IShipCoreModules, IShipHardpoints, IShipInternalModules, -} from '@@/builds/models/coriolis'; +} from '@/app/builds/_models/coriolis'; export const processJSONBuild = ( json: string diff --git a/src/modules/builds/hooks/useShipBuilds.ts b/src/app/builds/_hooks/useShipBuilds.ts similarity index 94% rename from src/modules/builds/hooks/useShipBuilds.ts rename to src/app/builds/_hooks/useShipBuilds.ts index 11976727..561de496 100644 --- a/src/modules/builds/hooks/useShipBuilds.ts +++ b/src/app/builds/_hooks/useShipBuilds.ts @@ -1,4 +1,4 @@ -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; import axios from 'axios'; import useSWR from 'swr'; diff --git a/src/modules/builds/hooks/useShipMap.ts b/src/app/builds/_hooks/useShipMap.ts similarity index 76% rename from src/modules/builds/hooks/useShipMap.ts rename to src/app/builds/_hooks/useShipMap.ts index 288a6f37..363c4094 100644 --- a/src/modules/builds/hooks/useShipMap.ts +++ b/src/app/builds/_hooks/useShipMap.ts @@ -1,5 +1,5 @@ -import Ships from '@@/builds/data/shipMap.json'; -import { IShipInfo } from '@@/builds/models'; +import Ships from '../_data/shipMap.json'; +import { IShipInfo } from '@/app/builds/_models'; export const useShipMap = () => { const ships: IShipInfo[] = Ships; diff --git a/src/modules/builds/models/buildInfo.ts b/src/app/builds/_models/buildInfo.ts similarity index 100% rename from src/modules/builds/models/buildInfo.ts rename to src/app/builds/_models/buildInfo.ts diff --git a/src/modules/builds/models/coriolis/coriolis.ts b/src/app/builds/_models/coriolis/coriolis.ts similarity index 100% rename from src/modules/builds/models/coriolis/coriolis.ts rename to src/app/builds/_models/coriolis/coriolis.ts diff --git a/src/modules/builds/models/coriolis/index.ts b/src/app/builds/_models/coriolis/index.ts similarity index 100% rename from src/modules/builds/models/coriolis/index.ts rename to src/app/builds/_models/coriolis/index.ts diff --git a/src/modules/builds/models/coriolis/ratings.ts b/src/app/builds/_models/coriolis/ratings.ts similarity index 100% rename from src/modules/builds/models/coriolis/ratings.ts rename to src/app/builds/_models/coriolis/ratings.ts diff --git a/src/modules/builds/models/coriolis/shipComponents.ts b/src/app/builds/_models/coriolis/shipComponents.ts similarity index 100% rename from src/modules/builds/models/coriolis/shipComponents.ts rename to src/app/builds/_models/coriolis/shipComponents.ts diff --git a/src/modules/builds/models/coriolis/shipCoreModules.ts b/src/app/builds/_models/coriolis/shipCoreModules.ts similarity index 100% rename from src/modules/builds/models/coriolis/shipCoreModules.ts rename to src/app/builds/_models/coriolis/shipCoreModules.ts diff --git a/src/modules/builds/models/coriolis/shipHardpoints.ts b/src/app/builds/_models/coriolis/shipHardpoints.ts similarity index 100% rename from src/modules/builds/models/coriolis/shipHardpoints.ts rename to src/app/builds/_models/coriolis/shipHardpoints.ts diff --git a/src/modules/builds/models/coriolis/shipInternalModules.ts b/src/app/builds/_models/coriolis/shipInternalModules.ts similarity index 100% rename from src/modules/builds/models/coriolis/shipInternalModules.ts rename to src/app/builds/_models/coriolis/shipInternalModules.ts diff --git a/src/modules/builds/models/coriolis/shipUtilityMounts.ts b/src/app/builds/_models/coriolis/shipUtilityMounts.ts similarity index 100% rename from src/modules/builds/models/coriolis/shipUtilityMounts.ts rename to src/app/builds/_models/coriolis/shipUtilityMounts.ts diff --git a/src/modules/builds/models/index.ts b/src/app/builds/_models/index.ts similarity index 100% rename from src/modules/builds/models/index.ts rename to src/app/builds/_models/index.ts diff --git a/src/modules/builds/models/otherFilters.ts b/src/app/builds/_models/otherFilters.ts similarity index 100% rename from src/modules/builds/models/otherFilters.ts rename to src/app/builds/_models/otherFilters.ts diff --git a/src/modules/builds/models/query.ts b/src/app/builds/_models/query.ts similarity index 100% rename from src/modules/builds/models/query.ts rename to src/app/builds/_models/query.ts diff --git a/src/modules/builds/models/shipInfo.ts b/src/app/builds/_models/shipInfo.ts similarity index 100% rename from src/modules/builds/models/shipInfo.ts rename to src/app/builds/_models/shipInfo.ts diff --git a/src/modules/builds/models/shipSize.ts b/src/app/builds/_models/shipSize.ts similarity index 100% rename from src/modules/builds/models/shipSize.ts rename to src/app/builds/_models/shipSize.ts diff --git a/src/modules/builds/models/shipSpecialty.ts b/src/app/builds/_models/shipSpecialty.ts similarity index 100% rename from src/modules/builds/models/shipSpecialty.ts rename to src/app/builds/_models/shipSpecialty.ts diff --git a/src/modules/builds/providers/buildProvider.tsx b/src/app/builds/_providers/buildProvider.tsx similarity index 89% rename from src/modules/builds/providers/buildProvider.tsx rename to src/app/builds/_providers/buildProvider.tsx index 162ff53e..81e21727 100644 --- a/src/modules/builds/providers/buildProvider.tsx +++ b/src/app/builds/_providers/buildProvider.tsx @@ -1,9 +1,9 @@ import { EDSpinner } from '@/components/_common/spinner'; import { ConfirmDialog } from '@/components/confirmDialog'; -import { BuildDialog, BuildDialogProps } from '@@/builds/components/dialog/buildDialog'; -import { getShipInfofromID } from '@@/builds/functions/getShipInfo'; -import { useShipBuilds } from '@@/builds/hooks/useShipBuilds'; -import { IBuildInfov2, IShipInfo } from '@@/builds/models'; +import { BuildDialog, BuildDialogProps } from '@/app/builds/_components/dialog/buildDialog'; +import { getShipInfofromID } from '@/app/builds/_functions/getShipInfo'; +import { useShipBuilds } from '@/app/builds/_hooks/useShipBuilds'; +import { IBuildInfov2, IShipInfo } from '@/app/builds/_models'; import { useSnackbar } from 'notistack'; import { createContext, ReactNode, useState } from 'react'; @@ -25,7 +25,7 @@ const findBuildandShipInfo: FindBuildandShipInfoFunc = ( const build = builds.find((x) => x._id === buildId); if (build) { - return { build, shipInfo: getShipInfofromID(build.shipId) }; + return { build, shipInfo: getShipInfofromID(build.shipId)! }; } else { return null; } @@ -122,7 +122,7 @@ export const BuildContextProvider = ({ }; const wrapper: IBuildContext = { - builds: shipBuilds, + builds: shipBuilds ?? [], areBuildsLoading: isLoading, buildError: error, addBuild: handleAddBuild, @@ -139,7 +139,7 @@ export const BuildContextProvider = ({ <> {children} - + + + USC Build Archive + + + + + ); +} diff --git a/src/app/information/_hooks/useShipReviews.ts b/src/app/information/_hooks/useShipReviews.ts index 36769f94..7f1fddcc 100644 --- a/src/app/information/_hooks/useShipReviews.ts +++ b/src/app/information/_hooks/useShipReviews.ts @@ -1,5 +1,5 @@ import { genericSortArray } from '@/functions/sort'; -import reviews from '@@/builds/data/shipMap.json'; +import reviews from '@/app/builds/_data/shipMap.json'; import { IShipReview } from '@@/information/models/shipReview'; export const useShipReviews = (): IShipReview[] => { diff --git a/src/app/information/_models/shipInfo.ts b/src/app/information/_models/shipInfo.ts index e7e2ef17..f965d959 100644 --- a/src/app/information/_models/shipInfo.ts +++ b/src/app/information/_models/shipInfo.ts @@ -1,4 +1,4 @@ -import { ShipSize } from '@@/builds/models/shipSize'; +import { ShipSize } from '@/app/builds/_models/shipSize'; export interface IShipInfo { id: number; diff --git a/src/modules/admin/components/builds/buildDashboard.tsx b/src/modules/admin/components/builds/buildDashboard.tsx index 23dfc027..3290259a 100644 --- a/src/modules/admin/components/builds/buildDashboard.tsx +++ b/src/modules/admin/components/builds/buildDashboard.tsx @@ -1,10 +1,10 @@ import { TitleBarwAdd } from '@/components/_common'; import { genericSortArray, Order } from '@/functions/sort'; -import { EngIcons } from '@@/builds/components/engIcons'; -import { TagGroup } from '@@/builds/components/tagGroup'; -import { useShipMap } from '@@/builds/hooks/useShipMap'; -import { IBuildInfov2, IShipInfo } from '@@/builds/models'; -import { BuildContext, BuildContextProvider } from '@@/builds/providers/buildProvider'; +import { EngIcons } from '@/app/builds/_components/engIcons'; +import { TagGroup } from '@/app/builds/_components/tagGroup'; +import { useShipMap } from '@/app/builds/_hooks/useShipMap'; +import { IBuildInfov2, IShipInfo } from '@/app/builds/_models'; +import { BuildContext, BuildContextProvider } from '@/app/builds/_providers/buildProvider'; import { Delete, Edit } from '@mui/icons-material'; import { Box, diff --git a/src/pages/admin/builds.page.tsx b/src/pages/admin/builds.page.tsx index fec8540e..6b426373 100644 --- a/src/pages/admin/builds.page.tsx +++ b/src/pages/admin/builds.page.tsx @@ -1,7 +1,7 @@ import { getBuilds } from '#/builds.api'; import { runAdminAuthCheck } from '@/utils/runAuthCheck'; import { BuildDashboard } from '@@/admin/components/builds/buildDashboard'; -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; import { GetServerSideProps, InferGetServerSidePropsType } from 'next'; import Head from 'next/head'; diff --git a/src/pages/api/builds.api.ts b/src/pages/api/builds.api.ts index a9c0b9fb..1e425bf3 100644 --- a/src/pages/api/builds.api.ts +++ b/src/pages/api/builds.api.ts @@ -9,7 +9,7 @@ import { } from '@/utils/db'; import { getIsHC } from '@/utils/get-isHC'; import { getUserId } from '@/utils/get-userId'; -import { IBuildInfov2 } from '@@/builds/models'; +import { IBuildInfov2 } from '@/app/builds/_models'; import { Filter, WithId } from 'mongodb'; import { NextApiRequest, NextApiResponse } from 'next'; diff --git a/src/pages/builds/index.tsx b/src/pages/builds/index.tsx deleted file mode 100644 index 78b49fe7..00000000 --- a/src/pages/builds/index.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { getBuilds } from '#/builds.api'; -import { BuildSystem } from '@@/builds/components'; -import { IBuildInfov2 } from '@@/builds/models'; -import { GetStaticProps, InferGetStaticPropsType } from 'next'; -import Head from 'next/head'; - -const BuildPage = ({ data }: InferGetStaticPropsType) => { - return ( - <> - - USC Build Archive - - - - - ); -}; - -export const getStaticProps: GetStaticProps<{ data: IBuildInfov2[] }> = async () => { - const builds = await getBuilds(); - - return { props: { data: builds } }; -}; - -export default BuildPage;