From 0c0830d68da0b6d463a740fd56c57fbfeba2c091 Mon Sep 17 00:00:00 2001 From: Sakura Knoll Date: Fri, 14 Jul 2023 15:56:57 +0900 Subject: [PATCH] Move v2 modules and components --- .../{v2-pre => v2}/AttributeIcon.tsx | 2 +- .../{v2-pre => v2}/AvatarFigureImage.tsx | 0 .../{v2-pre => v2}/AvatarSkillIcon.tsx | 0 .../{v2-pre => v2}/AvatarSubSkillIcon.tsx | 0 .../{v2-pre => v2}/BattlesuitAvatarIcon.tsx | 2 +- .../BattlesuitCatalogItemCard.tsx | 2 +- .../{v2-pre => v2}/BattlesuitSmallIcon.tsx | 2 +- src/components/{v2-pre => v2}/ChibiIcon.tsx | 2 +- src/components/{v2-pre => v2}/ElfIcon.tsx | 0 .../{v2-pre => v2}/FormattedText.tsx | 2 +- .../{v2-pre => v2}/MaterialIcon.tsx | 0 src/components/{v2-pre => v2}/RarityBar.tsx | 0 .../{v2-pre => v2}/ResizedImage.tsx | 0 src/components/{v2-pre => v2}/SquareImage.tsx | 0 src/components/{v2-pre => v2}/StarIcon.tsx | 2 +- .../{v2-pre => v2}/StigmaFigureImage.tsx | 0 src/components/{v2-pre => v2}/StigmaIcon.tsx | 0 .../{v2-pre => v2}/StigmaTypeIcon.tsx | 2 +- src/components/{v2-pre => v2}/TagIcon.tsx | 2 +- src/components/{v2-pre => v2}/WeaponIcon.tsx | 0 .../{v2-pre => v2}/WeaponTypeIcon.tsx | 2 +- src/lib/{v2-pre => v2}/data/er.ts | 0 .../{v2-pre => v2}/data/formatText.spec.ts | 0 src/lib/{v2-pre => v2}/data/formatText.ts | 0 src/lib/{v2-pre => v2}/data/text.ts | 0 src/lib/{v2-pre => v2}/data/types.ts | 0 src/lib/{v2-pre => v2}/data/utils.ts | 0 .../formattedText/tokenize.spec.ts | 0 .../{v2-pre => v2}/formattedText/tokenize.ts | 0 .../compileData/compileBattlesuitData.spec.ts | 0 .../compileData/compileBattlesuitData.ts | 0 .../server/compileData/compileElfData.ts | 0 .../compileData/compileGodWarData.spec.ts | 0 .../server/compileData/compileGodWarData.ts | 0 .../server/compileData/compileStigmataData.ts | 0 .../compileData/compileWeaponData.spec.ts | 0 .../server/compileData/compileWeaponData.ts | 0 .../server/compileData/utils.ts | 0 src/lib/{v2-pre => v2}/server/fsUtils.spec.ts | 0 src/lib/{v2-pre => v2}/server/fsUtils.ts | 0 src/lib/{v2-pre => v2}/server/loadData.ts | 0 .../{v2-pre => v2}/server/raw/avatarData.ts | 0 .../server/raw/avatarSkillData.ts | 0 .../server/raw/avatarSubSkillData.ts | 0 .../server/raw/avatarTagUnLockData.ts | 0 src/lib/{v2-pre => v2}/server/raw/elfData.ts | 0 .../{v2-pre => v2}/server/raw/elfSkillData.ts | 0 .../server/raw/equipmentSetData.ts | 0 .../server/raw/equipmentSkillData.ts | 0 .../server/raw/godWarAvatarAbility.ts | 0 .../{v2-pre => v2}/server/raw/godWarBuff.ts | 0 .../server/raw/godWarBuffSuit.ts | 0 .../server/raw/godWarExxtraItem.ts | 0 .../server/raw/godWarMainAvatar.ts | 0 .../server/raw/godWarSupportAvatar.ts | 0 .../{v2-pre => v2}/server/raw/loadRawData.ts | 0 .../{v2-pre => v2}/server/raw/stigmataData.ts | 0 .../{v2-pre => v2}/server/raw/tagListData.ts | 0 src/lib/{v2-pre => v2}/server/raw/textMap.ts | 0 .../{v2-pre => v2}/server/raw/weaponData.ts | 0 .../server/raw/weaponMainIdData.ts | 0 .../v2/battlesuits/[battlesuitId].tsx | 30 +++++++++---------- src/pages/honkai3rd/v2/battlesuits/index.tsx | 6 ++-- src/pages/honkai3rd/v2/elfs/[elfId].tsx | 12 ++++---- src/pages/honkai3rd/v2/elfs/index.tsx | 8 ++--- .../v2/er/battlesuits/[battlesuitId].tsx | 10 ++----- src/pages/honkai3rd/v2/er/index.tsx | 14 ++++----- src/pages/honkai3rd/v2/er/sigils.tsx | 6 ++-- .../honkai3rd/v2/er/signets/[groupId].tsx | 10 +++---- src/pages/honkai3rd/v2/er/supports.tsx | 6 ++-- .../v2/stigmata-sets/[stigmataSetId].tsx | 12 ++++---- .../honkai3rd/v2/stigmata-sets/index.tsx | 6 ++-- .../honkai3rd/v2/stigmata/[stigmaId].tsx | 16 +++++----- src/pages/honkai3rd/v2/stigmata/index.tsx | 6 ++-- src/pages/honkai3rd/v2/weapons/[weaponId].tsx | 14 ++++----- src/pages/honkai3rd/v2/weapons/index.tsx | 6 ++-- src/scripts/compileRawData.ts | 16 +++++----- 77 files changed, 97 insertions(+), 101 deletions(-) rename src/components/{v2-pre => v2}/AttributeIcon.tsx (95%) rename src/components/{v2-pre => v2}/AvatarFigureImage.tsx (100%) rename src/components/{v2-pre => v2}/AvatarSkillIcon.tsx (100%) rename src/components/{v2-pre => v2}/AvatarSubSkillIcon.tsx (100%) rename src/components/{v2-pre => v2}/BattlesuitAvatarIcon.tsx (99%) rename src/components/{v2-pre => v2}/BattlesuitCatalogItemCard.tsx (92%) rename src/components/{v2-pre => v2}/BattlesuitSmallIcon.tsx (99%) rename src/components/{v2-pre => v2}/ChibiIcon.tsx (96%) rename src/components/{v2-pre => v2}/ElfIcon.tsx (100%) rename src/components/{v2-pre => v2}/FormattedText.tsx (92%) rename src/components/{v2-pre => v2}/MaterialIcon.tsx (100%) rename src/components/{v2-pre => v2}/RarityBar.tsx (100%) rename src/components/{v2-pre => v2}/ResizedImage.tsx (100%) rename src/components/{v2-pre => v2}/SquareImage.tsx (100%) rename src/components/{v2-pre => v2}/StarIcon.tsx (96%) rename src/components/{v2-pre => v2}/StigmaFigureImage.tsx (100%) rename src/components/{v2-pre => v2}/StigmaIcon.tsx (100%) rename src/components/{v2-pre => v2}/StigmaTypeIcon.tsx (92%) rename src/components/{v2-pre => v2}/TagIcon.tsx (97%) rename src/components/{v2-pre => v2}/WeaponIcon.tsx (100%) rename src/components/{v2-pre => v2}/WeaponTypeIcon.tsx (94%) rename src/lib/{v2-pre => v2}/data/er.ts (100%) rename src/lib/{v2-pre => v2}/data/formatText.spec.ts (100%) rename src/lib/{v2-pre => v2}/data/formatText.ts (100%) rename src/lib/{v2-pre => v2}/data/text.ts (100%) rename src/lib/{v2-pre => v2}/data/types.ts (100%) rename src/lib/{v2-pre => v2}/data/utils.ts (100%) rename src/lib/{v2-pre => v2}/formattedText/tokenize.spec.ts (100%) rename src/lib/{v2-pre => v2}/formattedText/tokenize.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileBattlesuitData.spec.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileBattlesuitData.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileElfData.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileGodWarData.spec.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileGodWarData.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileStigmataData.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileWeaponData.spec.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/compileWeaponData.ts (100%) rename src/lib/{v2-pre => v2}/server/compileData/utils.ts (100%) rename src/lib/{v2-pre => v2}/server/fsUtils.spec.ts (100%) rename src/lib/{v2-pre => v2}/server/fsUtils.ts (100%) rename src/lib/{v2-pre => v2}/server/loadData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/avatarData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/avatarSkillData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/avatarSubSkillData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/avatarTagUnLockData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/elfData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/elfSkillData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/equipmentSetData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/equipmentSkillData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarAvatarAbility.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarBuff.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarBuffSuit.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarExxtraItem.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarMainAvatar.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/godWarSupportAvatar.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/loadRawData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/stigmataData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/tagListData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/textMap.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/weaponData.ts (100%) rename src/lib/{v2-pre => v2}/server/raw/weaponMainIdData.ts (100%) diff --git a/src/components/v2-pre/AttributeIcon.tsx b/src/components/v2/AttributeIcon.tsx similarity index 95% rename from src/components/v2-pre/AttributeIcon.tsx rename to src/components/v2/AttributeIcon.tsx index 62202bd1..d53c96ef 100644 --- a/src/components/v2-pre/AttributeIcon.tsx +++ b/src/components/v2/AttributeIcon.tsx @@ -1,6 +1,6 @@ import { Image, ThemeUIStyleObject } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { AttributeType } from '../../lib/v2-pre/data/types' +import { AttributeType } from '../../lib/v2/data/types' interface AttributeIconProps { attributeType: AttributeType diff --git a/src/components/v2-pre/AvatarFigureImage.tsx b/src/components/v2/AvatarFigureImage.tsx similarity index 100% rename from src/components/v2-pre/AvatarFigureImage.tsx rename to src/components/v2/AvatarFigureImage.tsx diff --git a/src/components/v2-pre/AvatarSkillIcon.tsx b/src/components/v2/AvatarSkillIcon.tsx similarity index 100% rename from src/components/v2-pre/AvatarSkillIcon.tsx rename to src/components/v2/AvatarSkillIcon.tsx diff --git a/src/components/v2-pre/AvatarSubSkillIcon.tsx b/src/components/v2/AvatarSubSkillIcon.tsx similarity index 100% rename from src/components/v2-pre/AvatarSubSkillIcon.tsx rename to src/components/v2/AvatarSubSkillIcon.tsx diff --git a/src/components/v2-pre/BattlesuitAvatarIcon.tsx b/src/components/v2/BattlesuitAvatarIcon.tsx similarity index 99% rename from src/components/v2-pre/BattlesuitAvatarIcon.tsx rename to src/components/v2/BattlesuitAvatarIcon.tsx index 84f97349..db912bf2 100644 --- a/src/components/v2-pre/BattlesuitAvatarIcon.tsx +++ b/src/components/v2/BattlesuitAvatarIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2-pre/data/types' +import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2/data/types' interface BattlesuitAvatarIconProps { battlesuit: BattlesuitCatalogItem diff --git a/src/components/v2-pre/BattlesuitCatalogItemCard.tsx b/src/components/v2/BattlesuitCatalogItemCard.tsx similarity index 92% rename from src/components/v2-pre/BattlesuitCatalogItemCard.tsx rename to src/components/v2/BattlesuitCatalogItemCard.tsx index 446d1b6f..0f6025c2 100644 --- a/src/components/v2-pre/BattlesuitCatalogItemCard.tsx +++ b/src/components/v2/BattlesuitCatalogItemCard.tsx @@ -1,5 +1,5 @@ import { Box } from 'theme-ui' -import { BattlesuitCatalogItem } from '../../lib/v2-pre/data/types' +import { BattlesuitCatalogItem } from '../../lib/v2/data/types' import BattlesuitAvatarIcon from './BattlesuitAvatarIcon' interface BattlesuitCatalogItemCardProps { diff --git a/src/components/v2-pre/BattlesuitSmallIcon.tsx b/src/components/v2/BattlesuitSmallIcon.tsx similarity index 99% rename from src/components/v2-pre/BattlesuitSmallIcon.tsx rename to src/components/v2/BattlesuitSmallIcon.tsx index b4ba3b71..44b5d38e 100644 --- a/src/components/v2-pre/BattlesuitSmallIcon.tsx +++ b/src/components/v2/BattlesuitSmallIcon.tsx @@ -1,6 +1,6 @@ import { Box, Flex, Image } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2-pre/data/types' +import { AttributeType, BattlesuitCatalogItem } from '../../lib/v2/data/types' interface BattlesuitAvatarIconProps { battlesuit: BattlesuitCatalogItem diff --git a/src/components/v2-pre/ChibiIcon.tsx b/src/components/v2/ChibiIcon.tsx similarity index 96% rename from src/components/v2-pre/ChibiIcon.tsx rename to src/components/v2/ChibiIcon.tsx index 68e7330b..64f75121 100644 --- a/src/components/v2-pre/ChibiIcon.tsx +++ b/src/components/v2/ChibiIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { CharacterType } from '../../lib/v2-pre/data/types' +import { CharacterType } from '../../lib/v2/data/types' interface ChibiIconProps { id: string diff --git a/src/components/v2-pre/ElfIcon.tsx b/src/components/v2/ElfIcon.tsx similarity index 100% rename from src/components/v2-pre/ElfIcon.tsx rename to src/components/v2/ElfIcon.tsx diff --git a/src/components/v2-pre/FormattedText.tsx b/src/components/v2/FormattedText.tsx similarity index 92% rename from src/components/v2-pre/FormattedText.tsx rename to src/components/v2/FormattedText.tsx index 61cea8a6..d64791f7 100644 --- a/src/components/v2-pre/FormattedText.tsx +++ b/src/components/v2/FormattedText.tsx @@ -1,5 +1,5 @@ import { Text } from 'theme-ui' -import { FormattedTextToken, tokenize } from '../../lib/v2-pre/formattedText/tokenize' +import { FormattedTextToken, tokenize } from '../../lib/v2/formattedText/tokenize' interface FormattedTextProps { children: string diff --git a/src/components/v2-pre/MaterialIcon.tsx b/src/components/v2/MaterialIcon.tsx similarity index 100% rename from src/components/v2-pre/MaterialIcon.tsx rename to src/components/v2/MaterialIcon.tsx diff --git a/src/components/v2-pre/RarityBar.tsx b/src/components/v2/RarityBar.tsx similarity index 100% rename from src/components/v2-pre/RarityBar.tsx rename to src/components/v2/RarityBar.tsx diff --git a/src/components/v2-pre/ResizedImage.tsx b/src/components/v2/ResizedImage.tsx similarity index 100% rename from src/components/v2-pre/ResizedImage.tsx rename to src/components/v2/ResizedImage.tsx diff --git a/src/components/v2-pre/SquareImage.tsx b/src/components/v2/SquareImage.tsx similarity index 100% rename from src/components/v2-pre/SquareImage.tsx rename to src/components/v2/SquareImage.tsx diff --git a/src/components/v2-pre/StarIcon.tsx b/src/components/v2/StarIcon.tsx similarity index 96% rename from src/components/v2-pre/StarIcon.tsx rename to src/components/v2/StarIcon.tsx index 27226240..4fd342fa 100644 --- a/src/components/v2-pre/StarIcon.tsx +++ b/src/components/v2/StarIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { StarRank } from '../../lib/v2-pre/data/types' +import { StarRank } from '../../lib/v2/data/types' interface StarIconProps { star: StarRank diff --git a/src/components/v2-pre/StigmaFigureImage.tsx b/src/components/v2/StigmaFigureImage.tsx similarity index 100% rename from src/components/v2-pre/StigmaFigureImage.tsx rename to src/components/v2/StigmaFigureImage.tsx diff --git a/src/components/v2-pre/StigmaIcon.tsx b/src/components/v2/StigmaIcon.tsx similarity index 100% rename from src/components/v2-pre/StigmaIcon.tsx rename to src/components/v2/StigmaIcon.tsx diff --git a/src/components/v2-pre/StigmaTypeIcon.tsx b/src/components/v2/StigmaTypeIcon.tsx similarity index 92% rename from src/components/v2-pre/StigmaTypeIcon.tsx rename to src/components/v2/StigmaTypeIcon.tsx index 289ebaa4..4d5f0253 100644 --- a/src/components/v2-pre/StigmaTypeIcon.tsx +++ b/src/components/v2/StigmaTypeIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { StigmaType } from '../../lib/v2-pre/data/types' +import { StigmaType } from '../../lib/v2/data/types' interface StigmaTypeIconProps { type: StigmaType diff --git a/src/components/v2-pre/TagIcon.tsx b/src/components/v2/TagIcon.tsx similarity index 97% rename from src/components/v2-pre/TagIcon.tsx rename to src/components/v2/TagIcon.tsx index 1cee10b9..dd510306 100644 --- a/src/components/v2-pre/TagIcon.tsx +++ b/src/components/v2/TagIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { TagType } from '../../lib/v2-pre/data/types' +import { TagType } from '../../lib/v2/data/types' interface TagIconProps { type: TagType diff --git a/src/components/v2-pre/WeaponIcon.tsx b/src/components/v2/WeaponIcon.tsx similarity index 100% rename from src/components/v2-pre/WeaponIcon.tsx rename to src/components/v2/WeaponIcon.tsx diff --git a/src/components/v2-pre/WeaponTypeIcon.tsx b/src/components/v2/WeaponTypeIcon.tsx similarity index 94% rename from src/components/v2-pre/WeaponTypeIcon.tsx rename to src/components/v2/WeaponTypeIcon.tsx index b6feb820..e8060b7a 100644 --- a/src/components/v2-pre/WeaponTypeIcon.tsx +++ b/src/components/v2/WeaponTypeIcon.tsx @@ -1,6 +1,6 @@ import { Box } from 'theme-ui' import { assetsBucketBaseUrl } from '../../lib/consts' -import { WeaponType } from '../../lib/v2-pre/data/types' +import { WeaponType } from '../../lib/v2/data/types' interface WeaponTypeIconProps { type: WeaponType diff --git a/src/lib/v2-pre/data/er.ts b/src/lib/v2/data/er.ts similarity index 100% rename from src/lib/v2-pre/data/er.ts rename to src/lib/v2/data/er.ts diff --git a/src/lib/v2-pre/data/formatText.spec.ts b/src/lib/v2/data/formatText.spec.ts similarity index 100% rename from src/lib/v2-pre/data/formatText.spec.ts rename to src/lib/v2/data/formatText.spec.ts diff --git a/src/lib/v2-pre/data/formatText.ts b/src/lib/v2/data/formatText.ts similarity index 100% rename from src/lib/v2-pre/data/formatText.ts rename to src/lib/v2/data/formatText.ts diff --git a/src/lib/v2-pre/data/text.ts b/src/lib/v2/data/text.ts similarity index 100% rename from src/lib/v2-pre/data/text.ts rename to src/lib/v2/data/text.ts diff --git a/src/lib/v2-pre/data/types.ts b/src/lib/v2/data/types.ts similarity index 100% rename from src/lib/v2-pre/data/types.ts rename to src/lib/v2/data/types.ts diff --git a/src/lib/v2-pre/data/utils.ts b/src/lib/v2/data/utils.ts similarity index 100% rename from src/lib/v2-pre/data/utils.ts rename to src/lib/v2/data/utils.ts diff --git a/src/lib/v2-pre/formattedText/tokenize.spec.ts b/src/lib/v2/formattedText/tokenize.spec.ts similarity index 100% rename from src/lib/v2-pre/formattedText/tokenize.spec.ts rename to src/lib/v2/formattedText/tokenize.spec.ts diff --git a/src/lib/v2-pre/formattedText/tokenize.ts b/src/lib/v2/formattedText/tokenize.ts similarity index 100% rename from src/lib/v2-pre/formattedText/tokenize.ts rename to src/lib/v2/formattedText/tokenize.ts diff --git a/src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts b/src/lib/v2/server/compileData/compileBattlesuitData.spec.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileBattlesuitData.spec.ts rename to src/lib/v2/server/compileData/compileBattlesuitData.spec.ts diff --git a/src/lib/v2-pre/server/compileData/compileBattlesuitData.ts b/src/lib/v2/server/compileData/compileBattlesuitData.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileBattlesuitData.ts rename to src/lib/v2/server/compileData/compileBattlesuitData.ts diff --git a/src/lib/v2-pre/server/compileData/compileElfData.ts b/src/lib/v2/server/compileData/compileElfData.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileElfData.ts rename to src/lib/v2/server/compileData/compileElfData.ts diff --git a/src/lib/v2-pre/server/compileData/compileGodWarData.spec.ts b/src/lib/v2/server/compileData/compileGodWarData.spec.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileGodWarData.spec.ts rename to src/lib/v2/server/compileData/compileGodWarData.spec.ts diff --git a/src/lib/v2-pre/server/compileData/compileGodWarData.ts b/src/lib/v2/server/compileData/compileGodWarData.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileGodWarData.ts rename to src/lib/v2/server/compileData/compileGodWarData.ts diff --git a/src/lib/v2-pre/server/compileData/compileStigmataData.ts b/src/lib/v2/server/compileData/compileStigmataData.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileStigmataData.ts rename to src/lib/v2/server/compileData/compileStigmataData.ts diff --git a/src/lib/v2-pre/server/compileData/compileWeaponData.spec.ts b/src/lib/v2/server/compileData/compileWeaponData.spec.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileWeaponData.spec.ts rename to src/lib/v2/server/compileData/compileWeaponData.spec.ts diff --git a/src/lib/v2-pre/server/compileData/compileWeaponData.ts b/src/lib/v2/server/compileData/compileWeaponData.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/compileWeaponData.ts rename to src/lib/v2/server/compileData/compileWeaponData.ts diff --git a/src/lib/v2-pre/server/compileData/utils.ts b/src/lib/v2/server/compileData/utils.ts similarity index 100% rename from src/lib/v2-pre/server/compileData/utils.ts rename to src/lib/v2/server/compileData/utils.ts diff --git a/src/lib/v2-pre/server/fsUtils.spec.ts b/src/lib/v2/server/fsUtils.spec.ts similarity index 100% rename from src/lib/v2-pre/server/fsUtils.spec.ts rename to src/lib/v2/server/fsUtils.spec.ts diff --git a/src/lib/v2-pre/server/fsUtils.ts b/src/lib/v2/server/fsUtils.ts similarity index 100% rename from src/lib/v2-pre/server/fsUtils.ts rename to src/lib/v2/server/fsUtils.ts diff --git a/src/lib/v2-pre/server/loadData.ts b/src/lib/v2/server/loadData.ts similarity index 100% rename from src/lib/v2-pre/server/loadData.ts rename to src/lib/v2/server/loadData.ts diff --git a/src/lib/v2-pre/server/raw/avatarData.ts b/src/lib/v2/server/raw/avatarData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/avatarData.ts rename to src/lib/v2/server/raw/avatarData.ts diff --git a/src/lib/v2-pre/server/raw/avatarSkillData.ts b/src/lib/v2/server/raw/avatarSkillData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/avatarSkillData.ts rename to src/lib/v2/server/raw/avatarSkillData.ts diff --git a/src/lib/v2-pre/server/raw/avatarSubSkillData.ts b/src/lib/v2/server/raw/avatarSubSkillData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/avatarSubSkillData.ts rename to src/lib/v2/server/raw/avatarSubSkillData.ts diff --git a/src/lib/v2-pre/server/raw/avatarTagUnLockData.ts b/src/lib/v2/server/raw/avatarTagUnLockData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/avatarTagUnLockData.ts rename to src/lib/v2/server/raw/avatarTagUnLockData.ts diff --git a/src/lib/v2-pre/server/raw/elfData.ts b/src/lib/v2/server/raw/elfData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/elfData.ts rename to src/lib/v2/server/raw/elfData.ts diff --git a/src/lib/v2-pre/server/raw/elfSkillData.ts b/src/lib/v2/server/raw/elfSkillData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/elfSkillData.ts rename to src/lib/v2/server/raw/elfSkillData.ts diff --git a/src/lib/v2-pre/server/raw/equipmentSetData.ts b/src/lib/v2/server/raw/equipmentSetData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/equipmentSetData.ts rename to src/lib/v2/server/raw/equipmentSetData.ts diff --git a/src/lib/v2-pre/server/raw/equipmentSkillData.ts b/src/lib/v2/server/raw/equipmentSkillData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/equipmentSkillData.ts rename to src/lib/v2/server/raw/equipmentSkillData.ts diff --git a/src/lib/v2-pre/server/raw/godWarAvatarAbility.ts b/src/lib/v2/server/raw/godWarAvatarAbility.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarAvatarAbility.ts rename to src/lib/v2/server/raw/godWarAvatarAbility.ts diff --git a/src/lib/v2-pre/server/raw/godWarBuff.ts b/src/lib/v2/server/raw/godWarBuff.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarBuff.ts rename to src/lib/v2/server/raw/godWarBuff.ts diff --git a/src/lib/v2-pre/server/raw/godWarBuffSuit.ts b/src/lib/v2/server/raw/godWarBuffSuit.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarBuffSuit.ts rename to src/lib/v2/server/raw/godWarBuffSuit.ts diff --git a/src/lib/v2-pre/server/raw/godWarExxtraItem.ts b/src/lib/v2/server/raw/godWarExxtraItem.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarExxtraItem.ts rename to src/lib/v2/server/raw/godWarExxtraItem.ts diff --git a/src/lib/v2-pre/server/raw/godWarMainAvatar.ts b/src/lib/v2/server/raw/godWarMainAvatar.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarMainAvatar.ts rename to src/lib/v2/server/raw/godWarMainAvatar.ts diff --git a/src/lib/v2-pre/server/raw/godWarSupportAvatar.ts b/src/lib/v2/server/raw/godWarSupportAvatar.ts similarity index 100% rename from src/lib/v2-pre/server/raw/godWarSupportAvatar.ts rename to src/lib/v2/server/raw/godWarSupportAvatar.ts diff --git a/src/lib/v2-pre/server/raw/loadRawData.ts b/src/lib/v2/server/raw/loadRawData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/loadRawData.ts rename to src/lib/v2/server/raw/loadRawData.ts diff --git a/src/lib/v2-pre/server/raw/stigmataData.ts b/src/lib/v2/server/raw/stigmataData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/stigmataData.ts rename to src/lib/v2/server/raw/stigmataData.ts diff --git a/src/lib/v2-pre/server/raw/tagListData.ts b/src/lib/v2/server/raw/tagListData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/tagListData.ts rename to src/lib/v2/server/raw/tagListData.ts diff --git a/src/lib/v2-pre/server/raw/textMap.ts b/src/lib/v2/server/raw/textMap.ts similarity index 100% rename from src/lib/v2-pre/server/raw/textMap.ts rename to src/lib/v2/server/raw/textMap.ts diff --git a/src/lib/v2-pre/server/raw/weaponData.ts b/src/lib/v2/server/raw/weaponData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/weaponData.ts rename to src/lib/v2/server/raw/weaponData.ts diff --git a/src/lib/v2-pre/server/raw/weaponMainIdData.ts b/src/lib/v2/server/raw/weaponMainIdData.ts similarity index 100% rename from src/lib/v2-pre/server/raw/weaponMainIdData.ts rename to src/lib/v2/server/raw/weaponMainIdData.ts diff --git a/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx index 626bb87a..afcc89a9 100644 --- a/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx +++ b/src/pages/honkai3rd/v2/battlesuits/[battlesuitId].tsx @@ -1,27 +1,27 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading } from 'theme-ui' -import AttributeIcon from '../../../../components/v2-pre/AttributeIcon' -import AvatarFigureImage from '../../../../components/v2-pre/AvatarFigureImage' -import AvatarSkillIcon from '../../../../components/v2-pre/AvatarSkillIcon' -import AvatarSubSkillIcon from '../../../../components/v2-pre/AvatarSubSkillIcon' -import BattlesuitAvatarIcon from '../../../../components/v2-pre/BattlesuitAvatarIcon' -import FormattedText from '../../../../components/v2-pre/FormattedText' -import { formatSkillInfo, formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText' -import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../../lib/v2-pre/server/loadData' -import { Battlesuit, SkillTagItem } from '../../../../lib/v2-pre/data/types' +import AttributeIcon from '../../../../components/v2/AttributeIcon' +import AvatarFigureImage from '../../../../components/v2/AvatarFigureImage' +import AvatarSkillIcon from '../../../../components/v2/AvatarSkillIcon' +import AvatarSubSkillIcon from '../../../../components/v2/AvatarSubSkillIcon' +import BattlesuitAvatarIcon from '../../../../components/v2/BattlesuitAvatarIcon' +import FormattedText from '../../../../components/v2/FormattedText' +import { formatSkillInfo, formatSubSkillInfo } from '../../../../lib/v2/data/formatText' +import { loadBattlesuitCatalog, loadBattlesuitData } from '../../../../lib/v2/server/loadData' +import { Battlesuit, SkillTagItem } from '../../../../lib/v2/data/types' import { Fragment } from 'react' -import TagIcon from '../../../../components/v2-pre/TagIcon' +import TagIcon from '../../../../components/v2/TagIcon' import { getAttributeLabel, getCharacterTypeLabel, getSkillTypeLabel, getTagTypeLabel, getWeaponTypeLabel -} from '../../../../lib/v2-pre/data/text' -import StarIcon from '../../../../components/v2-pre/StarIcon' -import ChibiIcon from '../../../../components/v2-pre/ChibiIcon' -import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon' -import { sortBattlesuitSkill } from '../../../../lib/v2-pre/data/utils' +} from '../../../../lib/v2/data/text' +import StarIcon from '../../../../components/v2/StarIcon' +import ChibiIcon from '../../../../components/v2/ChibiIcon' +import WeaponTypeIcon from '../../../../components/v2/WeaponTypeIcon' +import { sortBattlesuitSkill } from '../../../../lib/v2/data/utils' interface BattlesuitShowPageProps { battlesuit: Battlesuit diff --git a/src/pages/honkai3rd/v2/battlesuits/index.tsx b/src/pages/honkai3rd/v2/battlesuits/index.tsx index 2306b736..fe9bf970 100644 --- a/src/pages/honkai3rd/v2/battlesuits/index.tsx +++ b/src/pages/honkai3rd/v2/battlesuits/index.tsx @@ -2,9 +2,9 @@ import { Box } from '@theme-ui/components' import { NextPageContext } from 'next' import { Flex, Link } from 'theme-ui' -import { loadBattlesuitCatalog } from '../../../../lib/v2-pre/server/loadData' -import { BattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types' -import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard' +import { loadBattlesuitCatalog } from '../../../../lib/v2/server/loadData' +import { BattlesuitCatalogItem } from '../../../../lib/v2/data/types' +import BattlesuitCatalogItemCard from '../../../../components/v2/BattlesuitCatalogItemCard' interface BattlesuitListPageProps { battlesuitCatalog: BattlesuitCatalogItem[] diff --git a/src/pages/honkai3rd/v2/elfs/[elfId].tsx b/src/pages/honkai3rd/v2/elfs/[elfId].tsx index 2280c8af..458299b4 100644 --- a/src/pages/honkai3rd/v2/elfs/[elfId].tsx +++ b/src/pages/honkai3rd/v2/elfs/[elfId].tsx @@ -1,14 +1,14 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading } from 'theme-ui' import { useMemo } from 'react' -import { Elf, ElfSkill } from '../../../../lib/v2-pre/data/types' -import { loadElfCatalog, loadElfData } from '../../../../lib/v2-pre/server/loadData' -import SquareImage from '../../../../components/v2-pre/SquareImage' -import TagIcon from '../../../../components/v2-pre/TagIcon' +import { Elf, ElfSkill } from '../../../../lib/v2/data/types' +import { loadElfCatalog, loadElfData } from '../../../../lib/v2/server/loadData' +import SquareImage from '../../../../components/v2/SquareImage' +import TagIcon from '../../../../components/v2/TagIcon' import { assetsBucketBaseUrl } from '../../../../lib/consts' import { ListMap } from '../../../../lib/utils' -import FormattedText from '../../../../components/v2-pre/FormattedText' -import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText' +import FormattedText from '../../../../components/v2/FormattedText' +import { formatSubSkillInfo } from '../../../../lib/v2/data/formatText' interface ElfShowPageProps { elf: Elf diff --git a/src/pages/honkai3rd/v2/elfs/index.tsx b/src/pages/honkai3rd/v2/elfs/index.tsx index 641e0030..d47398a7 100644 --- a/src/pages/honkai3rd/v2/elfs/index.tsx +++ b/src/pages/honkai3rd/v2/elfs/index.tsx @@ -2,10 +2,10 @@ import { Box, Card } from '@theme-ui/components' import { NextPageContext } from 'next' import { Flex, Link } from 'theme-ui' -import { ElfCatalogItem } from '../../../../lib/v2-pre/data/types' -import { loadElfCatalog } from '../../../../lib/v2-pre/server/loadData' -import RarityBar from '../../../../components/v2-pre/RarityBar' -import ElfIcon from '../../../../components/v2-pre/ElfIcon' +import { ElfCatalogItem } from '../../../../lib/v2/data/types' +import { loadElfCatalog } from '../../../../lib/v2/server/loadData' +import RarityBar from '../../../../components/v2/RarityBar' +import ElfIcon from '../../../../components/v2/ElfIcon' interface ElfListPageProps { elfs: ElfCatalogItem[] diff --git a/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx index 2a53a8d3..3d76cc50 100644 --- a/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx +++ b/src/pages/honkai3rd/v2/er/battlesuits/[battlesuitId].tsx @@ -1,12 +1,8 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading, Image } from 'theme-ui' -import AvatarFigureImage from '../../../../../components/v2-pre/AvatarFigureImage' -import { - loadBattlesuitData, - loadErBattlesuit, - loadErBattlesuitCatalog -} from '../../../../../lib/v2-pre/server/loadData' -import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../../lib/v2-pre/data/types' +import AvatarFigureImage from '../../../../../components/v2/AvatarFigureImage' +import { loadBattlesuitData, loadErBattlesuit, loadErBattlesuitCatalog } from '../../../../../lib/v2/server/loadData' +import { Battlesuit, ErBattlesuit, ErSignet } from '../../../../../lib/v2/data/types' import { Fragment, useMemo } from 'react' import { assetsBucketBaseUrl } from '../../../../../lib/consts' diff --git a/src/pages/honkai3rd/v2/er/index.tsx b/src/pages/honkai3rd/v2/er/index.tsx index c2d785e5..070504dd 100644 --- a/src/pages/honkai3rd/v2/er/index.tsx +++ b/src/pages/honkai3rd/v2/er/index.tsx @@ -6,15 +6,15 @@ import { loadErBattlesuitCatalog, loadErSigils, loadErSupports -} from '../../../../lib/v2-pre/server/loadData' -import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../../lib/v2-pre/data/types' +} from '../../../../lib/v2/server/loadData' +import { BattlesuitCatalogItem, ErBattlesuitCatalogItem } from '../../../../lib/v2/data/types' import { useMemo } from 'react' -import BattlesuitCatalogItemCard from '../../../../components/v2-pre/BattlesuitCatalogItemCard' +import BattlesuitCatalogItemCard from '../../../../components/v2/BattlesuitCatalogItemCard' import { assetsBucketBaseUrl } from '../../../../lib/consts' -import SquareImage from '../../../../components/v2-pre/SquareImage' -import { signetGroups } from '../../../../lib/v2-pre/data/er' -import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon' -import MaterialIcon from '../../../../components/v2-pre/MaterialIcon' +import SquareImage from '../../../../components/v2/SquareImage' +import { signetGroups } from '../../../../lib/v2/data/er' +import BattlesuitSmallIcon from '../../../../components/v2/BattlesuitSmallIcon' +import MaterialIcon from '../../../../components/v2/MaterialIcon' interface ErPageProps { erBattlesuitCatalog: ErBattlesuitCatalogItem[] diff --git a/src/pages/honkai3rd/v2/er/sigils.tsx b/src/pages/honkai3rd/v2/er/sigils.tsx index dcf2ad88..766dfe9f 100644 --- a/src/pages/honkai3rd/v2/er/sigils.tsx +++ b/src/pages/honkai3rd/v2/er/sigils.tsx @@ -1,8 +1,8 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading } from 'theme-ui' -import MaterialIcon from '../../../../components/v2-pre/MaterialIcon' -import { ErSigil } from '../../../../lib/v2-pre/data/types' -import { loadErSigils } from '../../../../lib/v2-pre/server/loadData' +import MaterialIcon from '../../../../components/v2/MaterialIcon' +import { ErSigil } from '../../../../lib/v2/data/types' +import { loadErSigils } from '../../../../lib/v2/server/loadData' interface SigilsPageProps { erSigils: ErSigil[] diff --git a/src/pages/honkai3rd/v2/er/signets/[groupId].tsx b/src/pages/honkai3rd/v2/er/signets/[groupId].tsx index a90b6af6..f3207d40 100644 --- a/src/pages/honkai3rd/v2/er/signets/[groupId].tsx +++ b/src/pages/honkai3rd/v2/er/signets/[groupId].tsx @@ -1,12 +1,12 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading } from 'theme-ui' -import { loadErSignets } from '../../../../../lib/v2-pre/server/loadData' -import { ErSignet, ErSignetGroup } from '../../../../../lib/v2-pre/data/types' +import { loadErSignets } from '../../../../../lib/v2/server/loadData' +import { ErSignet, ErSignetGroup } from '../../../../../lib/v2/data/types' import { Fragment, useMemo } from 'react' import { assetsBucketBaseUrl } from '../../../../../lib/consts' -import { signetGroups } from '../../../../../lib/v2-pre/data/er' -import SquareImage from '../../../../../components/v2-pre/SquareImage' -import { getErSignetTypeLabel } from '../../../../../lib/v2-pre/data/text' +import { signetGroups } from '../../../../../lib/v2/data/er' +import SquareImage from '../../../../../components/v2/SquareImage' +import { getErSignetTypeLabel } from '../../../../../lib/v2/data/text' interface BattlesuitShowPageProps { group: ErSignetGroup diff --git a/src/pages/honkai3rd/v2/er/supports.tsx b/src/pages/honkai3rd/v2/er/supports.tsx index efd5a475..251690d1 100644 --- a/src/pages/honkai3rd/v2/er/supports.tsx +++ b/src/pages/honkai3rd/v2/er/supports.tsx @@ -1,9 +1,9 @@ import { NextPageContext } from 'next' import { useMemo } from 'react' import { Box, Card, Flex, Heading } from 'theme-ui' -import BattlesuitSmallIcon from '../../../../components/v2-pre/BattlesuitSmallIcon' -import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../../lib/v2-pre/data/types' -import { loadBattlesuitCatalog, loadErSupports } from '../../../../lib/v2-pre/server/loadData' +import BattlesuitSmallIcon from '../../../../components/v2/BattlesuitSmallIcon' +import { BattlesuitCatalogItem, ErSupportBattlesuit } from '../../../../lib/v2/data/types' +import { loadBattlesuitCatalog, loadErSupports } from '../../../../lib/v2/server/loadData' interface SupportsPageProps { battlesuitCatalog: BattlesuitCatalogItem[] diff --git a/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx b/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx index d2a42d96..77ab7860 100644 --- a/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx +++ b/src/pages/honkai3rd/v2/stigmata-sets/[stigmataSetId].tsx @@ -1,12 +1,12 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading, Link } from 'theme-ui' -import FormattedText from '../../../../components/v2-pre/FormattedText' -import { formatSubSkillInfo } from '../../../../lib/v2-pre/data/formatText' -import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData' -import { RootStigma, StigmataSet } from '../../../../lib/v2-pre/data/types' +import FormattedText from '../../../../components/v2/FormattedText' +import { formatSubSkillInfo } from '../../../../lib/v2/data/formatText' +import { loadStigmaData, loadStigmataSetCatalog, loadStigmataSetData } from '../../../../lib/v2/server/loadData' +import { RootStigma, StigmataSet } from '../../../../lib/v2/data/types' import { Fragment } from 'react' -import StigmaIcon from '../../../../components/v2-pre/StigmaIcon' -import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage' +import StigmaIcon from '../../../../components/v2/StigmaIcon' +import StigmaFigureImage from '../../../../components/v2/StigmaFigureImage' interface StigmataSetShowPage { stigmataSet: StigmataSet diff --git a/src/pages/honkai3rd/v2/stigmata-sets/index.tsx b/src/pages/honkai3rd/v2/stigmata-sets/index.tsx index df1f0f3f..a9dab410 100644 --- a/src/pages/honkai3rd/v2/stigmata-sets/index.tsx +++ b/src/pages/honkai3rd/v2/stigmata-sets/index.tsx @@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components' import { NextPageContext } from 'next' import { Flex, Link } from 'theme-ui' -import { StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types' -import { loadStigmataSetCatalog } from '../../../../lib/v2-pre/server/loadData' -import StigmaIcon from '../../../../components/v2-pre/StigmaIcon' +import { StigmataSetCatalogItem } from '../../../../lib/v2/data/types' +import { loadStigmataSetCatalog } from '../../../../lib/v2/server/loadData' +import StigmaIcon from '../../../../components/v2/StigmaIcon' interface StigmataSetListPageProps { stigmataSetCatalog: StigmataSetCatalogItem[] diff --git a/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx b/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx index a47b719c..83cf088a 100644 --- a/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx +++ b/src/pages/honkai3rd/v2/stigmata/[stigmaId].tsx @@ -1,14 +1,14 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading, Link } from 'theme-ui' -import FormattedText from '../../../../components/v2-pre/FormattedText' -import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText' -import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../../lib/v2-pre/server/loadData' -import { RootStigma, StigmataSetCatalogItem } from '../../../../lib/v2-pre/data/types' +import FormattedText from '../../../../components/v2/FormattedText' +import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2/data/formatText' +import { loadStigmaData, loadStigmataCatalog, loadStigmataSetData } from '../../../../lib/v2/server/loadData' +import { RootStigma, StigmataSetCatalogItem } from '../../../../lib/v2/data/types' import { Fragment } from 'react' -import { getStigmaTypeLabel } from '../../../../lib/v2-pre/data/text' -import StigmaTypeIcon from '../../../../components/v2-pre/StigmaTypeIcon' -import StigmaIcon from '../../../../components/v2-pre/StigmaIcon' -import StigmaFigureImage from '../../../../components/v2-pre/StigmaFigureImage' +import { getStigmaTypeLabel } from '../../../../lib/v2/data/text' +import StigmaTypeIcon from '../../../../components/v2/StigmaTypeIcon' +import StigmaIcon from '../../../../components/v2/StigmaIcon' +import StigmaFigureImage from '../../../../components/v2/StigmaFigureImage' interface StigmaShowPageProps { rootStigma: RootStigma diff --git a/src/pages/honkai3rd/v2/stigmata/index.tsx b/src/pages/honkai3rd/v2/stigmata/index.tsx index ad20e7fd..44b0603a 100644 --- a/src/pages/honkai3rd/v2/stigmata/index.tsx +++ b/src/pages/honkai3rd/v2/stigmata/index.tsx @@ -3,9 +3,9 @@ import { Box, Card } from '@theme-ui/components' import { NextPageContext } from 'next' import { Flex, Link } from 'theme-ui' -import { StigmataCatalogItem } from '../../../../lib/v2-pre/data/types' -import { loadStigmataCatalog } from '../../../../lib/v2-pre/server/loadData' -import StigmaIcon from '../../../../components/v2-pre/StigmaIcon' +import { StigmataCatalogItem } from '../../../../lib/v2/data/types' +import { loadStigmataCatalog } from '../../../../lib/v2/server/loadData' +import StigmaIcon from '../../../../components/v2/StigmaIcon' interface StigmataListPageProps { stigmataCatalog: StigmataCatalogItem[] diff --git a/src/pages/honkai3rd/v2/weapons/[weaponId].tsx b/src/pages/honkai3rd/v2/weapons/[weaponId].tsx index 4003cb08..a6721620 100644 --- a/src/pages/honkai3rd/v2/weapons/[weaponId].tsx +++ b/src/pages/honkai3rd/v2/weapons/[weaponId].tsx @@ -1,13 +1,13 @@ import { NextPageContext } from 'next' import { Box, Card, Flex, Heading } from 'theme-ui' -import FormattedText from '../../../../components/v2-pre/FormattedText' -import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2-pre/data/formatText' -import { loadWeaponCatalog, loadWeaponData } from '../../../../lib/v2-pre/server/loadData' -import { RootWeaponData } from '../../../../lib/v2-pre/data/types' +import FormattedText from '../../../../components/v2/FormattedText' +import { formatSubSkillInfo, replaceNewLine } from '../../../../lib/v2/data/formatText' +import { loadWeaponCatalog, loadWeaponData } from '../../../../lib/v2/server/loadData' +import { RootWeaponData } from '../../../../lib/v2/data/types' import { Fragment } from 'react' -import { getWeaponTypeLabel } from '../../../../lib/v2-pre/data/text' -import WeaponTypeIcon from '../../../../components/v2-pre/WeaponTypeIcon' -import WeaponIcon from '../../../../components/v2-pre/WeaponIcon' +import { getWeaponTypeLabel } from '../../../../lib/v2/data/text' +import WeaponTypeIcon from '../../../../components/v2/WeaponTypeIcon' +import WeaponIcon from '../../../../components/v2/WeaponIcon' interface WeaponShowPageProps { rootWeapon: RootWeaponData diff --git a/src/pages/honkai3rd/v2/weapons/index.tsx b/src/pages/honkai3rd/v2/weapons/index.tsx index 16d0e3f7..c1dcf1fc 100644 --- a/src/pages/honkai3rd/v2/weapons/index.tsx +++ b/src/pages/honkai3rd/v2/weapons/index.tsx @@ -2,9 +2,9 @@ import { Box, Card } from '@theme-ui/components' import { NextPageContext } from 'next' import { Flex, Link } from 'theme-ui' -import { loadWeaponCatalog } from '../../../../lib/v2-pre/server/loadData' -import { WeaponCatalogItem } from '../../../../lib/v2-pre/data/types' -import WeaponIcon from '../../../../components/v2-pre/WeaponIcon' +import { loadWeaponCatalog } from '../../../../lib/v2/server/loadData' +import { WeaponCatalogItem } from '../../../../lib/v2/data/types' +import WeaponIcon from '../../../../components/v2/WeaponIcon' interface WeaponListPageProps { weaponCatalog: WeaponCatalogItem[] diff --git a/src/scripts/compileRawData.ts b/src/scripts/compileRawData.ts index 7bd55c83..2ded1f7f 100644 --- a/src/scripts/compileRawData.ts +++ b/src/scripts/compileRawData.ts @@ -1,5 +1,5 @@ import path from 'path' -import { createDirIfNotExist } from '../lib/v2-pre/server/fsUtils' +import { createDirIfNotExist } from '../lib/v2/server/fsUtils' import fs from 'fs' import YAML from 'yaml' import { runScript } from './lib/utils' @@ -20,19 +20,19 @@ import { stigmataSetsDir, weaopnCatalogPath, weaponsDir -} from '../lib/v2-pre/server/loadData' +} from '../lib/v2/server/loadData' import { BattlesuitCatalogItem, ElfCatalogItem, StigmataCatalogItem, StigmataSetCatalogItem, WeaponCatalogItem -} from '../lib/v2-pre/data/types' -import { compileBattlesuitData } from '../lib/v2-pre/server/compileData/compileBattlesuitData' -import { compileWeaponData } from '../lib/v2-pre/server/compileData/compileWeaponData' -import { compileStigmataData } from '../lib/v2-pre/server/compileData/compileStigmataData' -import { compileGodWarData } from '../lib/v2-pre/server/compileData/compileGodWarData' -import { compileElfData } from '../lib/v2-pre/server/compileData/compileElfData' +} from '../lib/v2/data/types' +import { compileBattlesuitData } from '../lib/v2/server/compileData/compileBattlesuitData' +import { compileWeaponData } from '../lib/v2/server/compileData/compileWeaponData' +import { compileStigmataData } from '../lib/v2/server/compileData/compileStigmataData' +import { compileGodWarData } from '../lib/v2/server/compileData/compileGodWarData' +import { compileElfData } from '../lib/v2/server/compileData/compileElfData' runScript(async () => { createDirIfNotExist(dataDir)