UXIT-1556 - Cleaning: move files, rename files and update generate pa…

…ge (#707)

* move files, rename files and update generate page

* clean imports, remove _

* fix import allocator schema

* fix imports

* let git know I renamed the file

* use git mv to rename the files

* Apply suggestions from code review

---------

Co-authored-by: Mirha Masala <[email protected]>

src/app/_components/AlternatingImageCard.tsx

@@ -2,7 +2,7 @@ import Image from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { buildImageSizeProp } from '@/utils/buildImageSizeProp'
 

src/app/_components/ArticleHeader.tsx

@@ -1,4 +1,4 @@
-import type { ImageProps } from '@/types/sharedProps/imageType'
+import type { ImageProps } from '@/types/imageType'
 
 import { graphicsData } from '@/data/graphicsData'
 

src/app/_components/CTAButtonGroup.tsx

@@ -1,6 +1,6 @@
 import { clsx } from 'clsx'
 
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Button } from '@/components/Button'
 

src/app/_components/Card.tsx

@@ -2,7 +2,7 @@ import { ArrowUpRight } from '@phosphor-icons/react/dist/ssr'
 import { clsx } from 'clsx'
 import theme from 'tailwindcss/defaultTheme'
 
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import { type CTAProps } from '@/types/ctaType'
 
 import { isExternalLink } from '@/utils/linkUtils'
 

src/app/_components/DesktopNavigation.tsx

@@ -9,7 +9,7 @@ import type { Route } from 'next'
 
 import { PATHS } from '@/constants/paths'
 
-import { desktopNavigationItems } from '@/data/components/navigationData'
+import { desktopNavigationItems } from '@/data/navigationData'
 
 import { useNavigationItems } from '@/hooks/useNavigationItems'
 

src/app/_components/DynamicImage.tsx

@@ -2,7 +2,7 @@ import Image, { type ImageProps } from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { ImageObjectFit } from '@/types/sharedProps/imageType'
+import type { ImageObjectFit } from '@/types/imageType'
 
 import { StaticImage, type StaticImageProps } from '@/components/StaticImage'
 

src/app/_components/ErrorMessage.tsx

@@ -1,4 +1,4 @@
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import { type CTAProps } from '@/types/ctaType'
 
 import { PATHS } from '@/constants/paths'
 

src/app/_components/FocusAreaCard.tsx

@@ -1,6 +1,6 @@
 import Image from 'next/image'
 
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { buildImageSizeProp } from '@/utils/buildImageSizeProp'
 

src/app/_components/HomeExploreSectionCard.tsx

@@ -1,6 +1,6 @@
 import { clsx } from 'clsx'
 
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Card } from '@/components/Card'
 import { type HeadingProps, Heading } from '@/components/Heading'

src/app/_components/NoResultsMessage.tsx

@@ -1,4 +1,4 @@
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Button } from '@/components/Button'
 import { Heading } from '@/components/Heading'

src/app/_components/StaticImage.tsx

@@ -2,7 +2,7 @@ import Image, { type StaticImageData, type ImageProps } from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { ImageObjectFit } from '@/types/sharedProps/imageType'
+import type { ImageObjectFit } from '@/types/imageType'
 
 export type StaticImageProps = {
   data: StaticImageData

src/app/_schemas/blogPostFrontMatterSchema.ts → src/app/_schemas/BlogPostFrontMatterSchema.ts

@@ -1,11 +1,11 @@
 import { z } from 'zod'
 
 import {
-  getCategorySettings,
   createCategorySchema,
+  getCategorySettings,
 } from '@/utils/categoryUtils'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
 
 const { validCategoryIds } = getCategorySettings('blog_posts')
 

src/app/_schemas/digestArticleFrontMatterSchema.ts → src/app/_schemas/DigestArticleFrontMatterSchema.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 export const DigestArticleFrontMatterSchema = DynamicBaseDataSchema.extend({
   title: z.string(),

src/app/_schemas/dynamicDataBaseSchema.ts → src/app/_schemas/DynamicDataBaseSchema.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
-import { SeoMetadataSchema } from '@/schemas/seoMetadataSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
+import { SeoMetadataSchema } from '@/schemas/SeoMetadataSchema'
 
 export const DynamicBaseDataSchema = z.object({
   createdOn: z.coerce.date(),

src/app/_schemas/ecosystemProject/FrontMatterSchema.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { BaseDataSchemaKebabCase } from '@/schemas/dynamicDataBaseSchema'
+import { BaseDataSchemaKebabCase } from '@/schemas/DynamicDataBaseSchema'
 
 import { CategorySchema, SubcategorySchema } from './CategorySchemas'
 

src/app/_schemas/event/FrontMatterSchema.ts

@@ -1,11 +1,11 @@
 import { z } from 'zod'
 
 import {
-  getEventsCategorySettings,
   createCategorySchema,
+  getEventsCategorySettings,
 } from '@/utils/categoryUtils'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
 import { SpeakersSchema } from '@/schemas/event/SpeakerSchema'
 import { SponsorsSchema } from '@/schemas/event/SponsorSchema'
 

src/app/_schemas/event/SpeakerSchema.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 const speakerSchema = z.object({
   name: z.string(),

src/app/_schemas/event/SponsorSchema.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 const sponsorSchema = z.object({
   name: z.string(),

src/app/_types/attributesTypes.ts

@@ -1,4 +1,4 @@
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export type PageAttributes = {
   header: {

src/app/_types/sortTypes.ts

@@ -2,7 +2,7 @@ import type { Event } from '@/types/eventType'
 
 import { DEFAULT_SORT_OPTION, SORT_TYPES } from '@/constants/sortConstants'
 
-import type { DynamicBaseData } from '@/schemas/dynamicDataBaseSchema'
+import type { DynamicBaseData } from '@/schemas/DynamicDataBaseSchema'
 
 type BaseSortType = typeof SORT_TYPES
 

src/app/_utils/convertMarkdownToDigestArticleData.ts

@@ -1,6 +1,6 @@
 import removeMarkdown from 'remove-markdown'
 
-import { DigestArticleFrontMatterSchema } from '@/schemas/digestArticleFrontMatterSchema'
+import { DigestArticleFrontMatterSchema } from '@/schemas/DigestArticleFrontMatterSchema'
 
 const CONTENT_PREVIEW_CHARACTER_LENGTH = 220
 

src/app/_utils/covertMarkdowntoBlogPostData.ts → src/app/_utils/convertMarkdowntoBlogPostData.ts

@@ -1,4 +1,4 @@
-import { BlogPostFrontMatterSchema } from '@/schemas/blogPostFrontMatterSchema'
+import { BlogPostFrontMatterSchema } from '@/schemas/BlogPostFrontMatterSchema'
 
 export function convertMarkdownToBlogPostData(data: Record<string, any>) {
   return BlogPostFrontMatterSchema.parse({

src/app/_utils/createMetadata.ts

@@ -8,7 +8,7 @@ import { graphicsData } from '@/data/graphicsData'
 import {
   type SeoMetadata,
   SeoMetadataSchema,
-} from '@/schemas/seoMetadataSchema'
+} from '@/schemas/SeoMetadataSchema'
 
 type CreateMetadataProps = {
   seo: SeoMetadata

src/app/_utils/generateWebPageStructuredData.ts

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
-import { type PathValues, type DynamicPathValues } from '@/constants/paths'
+import { type DynamicPathValues, type PathValues } from '@/constants/paths'
 import { BASE_URL } from '@/constants/siteMetadata'
 import { SCHEMA_CONTEXT_URL } from '@/constants/structuredDataConstants'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 type GenerateWebPageStructuredDataProps = {
   title: SeoMetadata['title']

src/app/_utils/getBlogPostData.ts

@@ -1,7 +1,7 @@
 import { PATHS } from '@/constants/paths'
 
-import { convertMarkdownToBlogPostData } from '@/utils/covertMarkdowntoBlogPostData'
-import { getData, getAllData } from '@/utils/getData'
+import { convertMarkdownToBlogPostData } from '@/utils/convertMarkdowntoBlogPostData'
+import { getAllData, getData } from '@/utils/getData'
 
 const BLOG_DIRECTORY_PATH = PATHS.BLOG.entriesContentPath as string
 

src/app/about/data/focusAreasData.ts

@@ -1,4 +1,4 @@
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { graphicsData } from '@/data/graphicsData'
 

src/app/about/utils/generateStructuredData.ts

@@ -1,12 +1,11 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   const baseData = generateWebPageStructuredData({

src/app/blog/utils/generateStructuredData.ts

@@ -2,14 +2,13 @@ import type { WebPage, WithContext } from 'schema-dts'
 
 import type { BlogPost } from '@/types/blogPostType'
 
-
 import { PATHS } from '@/constants/paths'
 import { BASE_URL, ORGANIZATION_NAME } from '@/constants/siteMetadata'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(
   posts: Array<BlogPost>,

src/app/digest/utils/generateStructuredData.tsx

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/ecosystem-explorer/project-form/components/EcosystemProjectForm.tsx

@@ -24,7 +24,7 @@ import {
   NETWORK_USE_CASE_CHARACTER_LIMIT,
 } from '../constants'
 import { useSubmitEcosystemProjectForm } from '../hooks/useSubmitEcosystemProjectForm'
-import { EcosystemProjectFormSchema } from '../schema/form'
+import { EcosystemProjectFormSchema } from '../schema/EcosystemProjectFormSchema'
 import { getOptionsFromObject } from '../utils/getOptionsFromObject'
 import { getYearOptions } from '../utils/getYearOptions'
 

src/app/ecosystem-explorer/project-form/page.tsx

@@ -19,7 +19,7 @@ import { StructuredDataScript } from '@/components/StructuredDataScript'
 import { EcosystemProjectForm } from './components/EcosystemProjectForm'
 import { ErrorNotification } from './components/ErrorNotification'
 import { SuccessMessage } from './components/SuccessMessage'
-import { SearchParamsSchema } from './schema/searchParams'
+import { SearchParamsSchema } from './schema/SearchParamsSchema'
 import { generateStructuredData } from './utils/generateStructuredData'
 import { getFormInitialValue } from './utils/getFormInitialValue'
 

src/app/ecosystem-explorer/project-form/utils/generateStructuredData.tsx

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/ecosystem-explorer/utils/generateStructuredData.ts

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/employee-privacy-policy/utils/generateStructuredData.ts

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/events/[slug]/utils/buildCtaArray.ts

@@ -1,5 +1,5 @@
+import type { CTAProps } from '@/types/ctaType'
 import type { Event } from '@/types/eventType'
-import type { CTAProps } from '@/types/sharedProps/ctaType'
 
 type ctaArrayProps = {
   externalLink?: Event['externalLink']

src/app/events/utils/generateStructuredData.ts

@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/filecoin-plus/allocators/components/AllocatorsTable.tsx

@@ -9,7 +9,7 @@ import {
 import { TableBody } from '@/components/Table/TableBody'
 import { TableHead } from '@/components/Table/TableHead'
 
-import type { Allocator } from '../schemas/allocatorSchema'
+import { type Allocator } from '../schemas/AllocatorSchema'
 
 import { AllocatorsTableColumns } from './AllocatorsTableColumns'
 

src/app/filecoin-plus/allocators/components/AllocatorsTableColumns.tsx

@@ -4,7 +4,7 @@ import { createColumnHelper } from '@tanstack/react-table'
 import { CustomLink } from '@/components/CustomLink'
 import { Icon } from '@/components/Icon'
 
-import type { Allocator } from '../schemas/allocatorSchema'
+import type { Allocator } from '../schemas/AllocatorSchema'
 
 const columnHelper = createColumnHelper<Allocator>()
 

src/app/filecoin-plus/allocators/utils/extractAllocators.ts

@@ -1,7 +1,7 @@
 import {
   type AllocatorFileMetaData,
   AllocatorSchema,
-} from '../schemas/allocatorSchema'
+} from '../schemas/AllocatorSchema'
 
 export function extractAllocators(
   allocatorFileMetaData: Array<AllocatorFileMetaData | null>,

src/app/filecoin-plus/allocators/utils/generateStructuredData.ts

@@ -4,7 +4,7 @@ import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({

src/app/filecoin-plus/allocators/utils/getAllocatorUrlList.ts

@@ -1,7 +1,7 @@
 import {
   AllocatorFileListMetaDataBaseSchema,
   type AllocatorFileMetaDataBase,
-} from '../schemas/allocatorSchema'
+} from '../schemas/AllocatorSchema'
 
 const GITHUB_ALLOCATORS_REPO =
   'https://api.github.com/repos/filecoin-project/Allocator-Registry/contents/Allocators'