diff --git a/.eslintrc.json b/.eslintrc.json index 9638426..d79f168 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -84,7 +84,8 @@ // Imports and exports order. "simple-import-sort/imports": 2, - "simple-import-sort/exports": 2 + "simple-import-sort/exports": 2, + "import/order": 0 } } ] diff --git a/src/components/atoms/button.astro b/src/components/button.astro similarity index 100% rename from src/components/atoms/button.astro rename to src/components/button.astro diff --git a/src/components/atoms/divided-list.astro b/src/components/divided-list.astro similarity index 100% rename from src/components/atoms/divided-list.astro rename to src/components/divided-list.astro diff --git a/src/components/atoms/divider.astro b/src/components/divider.astro similarity index 100% rename from src/components/atoms/divider.astro rename to src/components/divider.astro diff --git a/src/components/atoms/icon-button.astro b/src/components/icon-button.astro similarity index 96% rename from src/components/atoms/icon-button.astro rename to src/components/icon-button.astro index 74c2dc2..fb4c280 100644 --- a/src/components/atoms/icon-button.astro +++ b/src/components/icon-button.astro @@ -1,7 +1,8 @@ --- -import Icon from '@/atoms/icon'; import type { IconName } from '@/types/icon'; +import Icon from './icon'; + type IconButtonSize = 'small' | 'large'; export interface Props { diff --git a/src/components/atoms/icon-with-tooltip.tsx b/src/components/icon-with-tooltip.tsx similarity index 84% rename from src/components/atoms/icon-with-tooltip.tsx rename to src/components/icon-with-tooltip.tsx index 5e5d72a..287a3df 100644 --- a/src/components/atoms/icon-with-tooltip.tsx +++ b/src/components/icon-with-tooltip.tsx @@ -1,5 +1,4 @@ -import type { IconProps } from './icon'; -import Icon from './icon'; +import Icon, { IconProps } from './icon'; import Tooltip, { TooltipProps } from './tooltip'; type Props = IconProps & Omit; diff --git a/src/components/atoms/icon.tsx b/src/components/icon.tsx similarity index 100% rename from src/components/atoms/icon.tsx rename to src/components/icon.tsx diff --git a/src/components/atoms/labelled-value.astro b/src/components/labelled-value.astro similarity index 100% rename from src/components/atoms/labelled-value.astro rename to src/components/labelled-value.astro diff --git a/src/components/atoms/section-card.astro b/src/components/section-card.astro similarity index 100% rename from src/components/atoms/section-card.astro rename to src/components/section-card.astro diff --git a/src/components/atoms/sidebar-item.tsx b/src/components/sidebar-item.tsx similarity index 97% rename from src/components/atoms/sidebar-item.tsx rename to src/components/sidebar-item.tsx index 47f631a..e3ba5ca 100644 --- a/src/components/atoms/sidebar-item.tsx +++ b/src/components/sidebar-item.tsx @@ -1,9 +1,9 @@ import { useLocation } from 'react-use'; -import Icon from '@/atoms/icon'; import type { Section } from '@/types/data'; import type { IconName } from '@/types/icon'; +import Icon from './icon'; import Tooltip from './tooltip'; export interface SidebarItemProps { diff --git a/src/components/organisms/sidebar.astro b/src/components/sidebar.astro similarity index 100% rename from src/components/organisms/sidebar.astro rename to src/components/sidebar.astro diff --git a/src/components/atoms/tag.astro b/src/components/tag.astro similarity index 92% rename from src/components/atoms/tag.astro rename to src/components/tag.astro index eb1c835..ffd79c1 100644 --- a/src/components/atoms/tag.astro +++ b/src/components/tag.astro @@ -1,7 +1,8 @@ --- -import Icon from '@/atoms/icon'; import type { IconName } from '@/types/icon'; +import Icon from './icon'; + export interface Props { name?: IconName; color?: string; diff --git a/src/components/molecules/tags-list.astro b/src/components/tags-list.astro similarity index 92% rename from src/components/molecules/tags-list.astro rename to src/components/tags-list.astro index 4123505..bccf614 100644 --- a/src/components/molecules/tags-list.astro +++ b/src/components/tags-list.astro @@ -1,7 +1,8 @@ --- -import TagComponent from '@/atoms/tag.astro'; import type { Tag } from '@/types/common'; +import TagComponent from './tag.astro'; + export interface Props { tags: Tag[]; } diff --git a/src/components/atoms/theme-icon.tsx b/src/components/theme-icon.tsx similarity index 100% rename from src/components/atoms/theme-icon.tsx rename to src/components/theme-icon.tsx diff --git a/src/components/atoms/timestamp.astro b/src/components/timestamp.astro similarity index 90% rename from src/components/atoms/timestamp.astro rename to src/components/timestamp.astro index 53adf7a..b53652f 100644 --- a/src/components/atoms/timestamp.astro +++ b/src/components/timestamp.astro @@ -1,5 +1,5 @@ --- -import Typography from '@/atoms/typography.astro'; +import Typography from './typography.astro'; export interface Props { startDate: Date; diff --git a/src/components/atoms/tooltip.tsx b/src/components/tooltip.tsx similarity index 100% rename from src/components/atoms/tooltip.tsx rename to src/components/tooltip.tsx diff --git a/src/components/atoms/typography.astro b/src/components/typography.astro similarity index 100% rename from src/components/atoms/typography.astro rename to src/components/typography.astro diff --git a/src/pages/_playground/button.astro b/src/pages/_playground/button.astro index 9941cfd..72f6b84 100644 --- a/src/pages/_playground/button.astro +++ b/src/pages/_playground/button.astro @@ -1,5 +1,5 @@ --- -import Button from '@/atoms/button.astro'; +import Button from '@/components/button.astro'; ---
diff --git a/src/pages/_playground/favorites.astro b/src/pages/_playground/favorites.astro index faa065d..594808e 100644 --- a/src/pages/_playground/favorites.astro +++ b/src/pages/_playground/favorites.astro @@ -1,9 +1,9 @@ --- -import BookTile from '@/atoms/book-tile.astro'; -import MediaTile from '@/atoms/media-tile.astro'; -import PersonTile from '@/atoms/person-tile.astro'; -import Typography from '@/atoms/typography.astro'; -import VideoTile from '@/atoms/video-tile.astro'; +import Typography from '@/components/typography.astro'; +import BookTile from '@/sections/favorites/book-tile.astro'; +import MediaTile from '@/sections/favorites/media-tile.astro'; +import PersonTile from '@/sections/favorites/person-tile.astro'; +import VideoTile from '@/sections/favorites/video-tile.astro'; import type { Book, Media, Person, Video } from '@/types/favorites-section'; const book: Book = { diff --git a/src/pages/_playground/icon-button.astro b/src/pages/_playground/icon-button.astro index 4dfcec9..6d5f3e6 100644 --- a/src/pages/_playground/icon-button.astro +++ b/src/pages/_playground/icon-button.astro @@ -1,5 +1,5 @@ --- -import IconButton from '@/atoms/icon-button.astro'; +import IconButton from '@/components/icon-button.astro'; ---
diff --git a/src/pages/_playground/icon.astro b/src/pages/_playground/icon.astro index dc18b29..046af09 100644 --- a/src/pages/_playground/icon.astro +++ b/src/pages/_playground/icon.astro @@ -1,5 +1,5 @@ --- -import Icon from '@/atoms/icon'; +import Icon from '@/components/icon'; ---
diff --git a/src/pages/_playground/labelled-value.astro b/src/pages/_playground/labelled-value.astro index 63bfa65..56f1abf 100644 --- a/src/pages/_playground/labelled-value.astro +++ b/src/pages/_playground/labelled-value.astro @@ -1,5 +1,5 @@ --- -import LabelledValue from '@/atoms/labelled-value.astro'; +import LabelledValue from '@/components/labelled-value.astro'; ---
diff --git a/src/pages/_playground/main-section.astro b/src/pages/_playground/main-section.astro index 5235be6..6b63a60 100644 --- a/src/pages/_playground/main-section.astro +++ b/src/pages/_playground/main-section.astro @@ -1,8 +1,12 @@ --- -import MainSection from '@/sections/main-section.astro'; +import MainSection from '@/sections/main/main-section.astro'; import type { MainSection as MainSectionData } from '@/types/main-section'; const mainSectionData: MainSectionData = { + config: { + icon: 'fa6-solid:user', + title: 'About me', + }, image: import('@/assets/my-image.jpeg'), fullName: 'Mark Freeman', role: 'Senior React Developer', diff --git a/src/pages/_playground/projects-timeline.astro b/src/pages/_playground/projects-timeline.astro index 028b131..cf544df 100644 --- a/src/pages/_playground/projects-timeline.astro +++ b/src/pages/_playground/projects-timeline.astro @@ -1,5 +1,5 @@ --- -import ProjectTimelineItem from '@/organisms/project-timeline-item.astro'; +import ProjectTimelineItem from '@/sections/portfolio/project-timeline-item.astro'; import type { I18n } from '@/types/i18n'; import type { Project } from '@/types/portfolio-section'; diff --git a/src/pages/_playground/section-card.astro b/src/pages/_playground/section-card.astro index 8d30b5d..33b3150 100644 --- a/src/pages/_playground/section-card.astro +++ b/src/pages/_playground/section-card.astro @@ -1,7 +1,7 @@ --- -import SectionCard from '@/atoms/section-card.astro'; +import SectionCard from '@/components/section-card.astro'; ---
- SectionCard text + SectionCard text
diff --git a/src/pages/_playground/sidebar-item.astro b/src/pages/_playground/sidebar-item.astro index 46a5670..d7f1198 100644 --- a/src/pages/_playground/sidebar-item.astro +++ b/src/pages/_playground/sidebar-item.astro @@ -1,5 +1,5 @@ --- -import SidebarItem from '@/atoms/sidebar-item'; +import SidebarItem from '@/components/sidebar-item'; ---
diff --git a/src/pages/_playground/sidebar.astro b/src/pages/_playground/sidebar.astro index cfe7c4a..d9edd82 100644 --- a/src/pages/_playground/sidebar.astro +++ b/src/pages/_playground/sidebar.astro @@ -1,6 +1,6 @@ --- -import SidebarItem from '@/atoms/sidebar-item'; -import Sidebar from '@/organisms/sidebar.astro'; +import Sidebar from '@/components/sidebar.astro'; +import SidebarItem from '@/components/sidebar-item'; ---
diff --git a/src/pages/_playground/skill.astro b/src/pages/_playground/skill.astro index 1f8e325..eaae15e 100644 --- a/src/pages/_playground/skill.astro +++ b/src/pages/_playground/skill.astro @@ -1,5 +1,5 @@ --- -import Skill from '@/organisms/skill.astro'; +import Skill from '@/sections/skills/skill.astro'; import type { LevelledSkill } from '@/types/skills-section'; const levelledSkill: LevelledSkill = { diff --git a/src/pages/_playground/skills-section.astro b/src/pages/_playground/skills-section.astro index bad3ab8..ea124eb 100644 --- a/src/pages/_playground/skills-section.astro +++ b/src/pages/_playground/skills-section.astro @@ -1,5 +1,5 @@ --- -import SkillsSection from '@/sections/skills-section.astro'; +import SkillsSection from '@/sections/skills/skills-section.astro'; import type { SkillsSection as SkillsSectionData } from '@/types/skills-section'; const skills: SkillsSectionData = { diff --git a/src/pages/_playground/tag.astro b/src/pages/_playground/tag.astro index b393b70..f0e0d90 100644 --- a/src/pages/_playground/tag.astro +++ b/src/pages/_playground/tag.astro @@ -1,5 +1,5 @@ --- -import Tag from '@/atoms/tag.astro'; +import Tag from '@/components/tag.astro'; ---
diff --git a/src/pages/_playground/testimonial.astro b/src/pages/_playground/testimonial.astro index cdc070e..d82c23e 100644 --- a/src/pages/_playground/testimonial.astro +++ b/src/pages/_playground/testimonial.astro @@ -1,5 +1,5 @@ --- -import Testimonial from '@/organisms/testimonial.astro'; +import Testimonial from '@/sections/testimonials/testimonial.astro'; import type { Testimonial as TestimonialData } from '@/types/testimonials-section'; const testimonial: TestimonialData = { diff --git a/src/pages/_playground/testimonials-section.astro b/src/pages/_playground/testimonials-section.astro index 602a293..19bdfef 100644 --- a/src/pages/_playground/testimonials-section.astro +++ b/src/pages/_playground/testimonials-section.astro @@ -1,5 +1,5 @@ --- -import TestimonialsSection from '@/sections/testimonials-section.astro'; +import TestimonialsSection from '@/sections/testimonials/testimonials-section.astro'; import type { Testimonial } from '@/types/testimonials-section'; const testimonials: Testimonial[] = [ diff --git a/src/pages/_playground/typography.astro b/src/pages/_playground/typography.astro index c855488..24978a7 100644 --- a/src/pages/_playground/typography.astro +++ b/src/pages/_playground/typography.astro @@ -1,5 +1,5 @@ --- -import Typography from '@/atoms/typography.astro'; +import Typography from '@/components/typography.astro'; const text = 'A quick brown fox jumps over the lazy dog'; --- diff --git a/src/pages/_playground/work-timeline.astro b/src/pages/_playground/work-timeline.astro index 93a25f1..73c2e96 100644 --- a/src/pages/_playground/work-timeline.astro +++ b/src/pages/_playground/work-timeline.astro @@ -1,5 +1,5 @@ --- -import WorkTimelineItem from '@/organisms/work-timeline-item.astro'; +import WorkTimelineItem from '@/sections/experience/work-timeline-item.astro'; import type { Job } from '@/types/experience-section'; import type { I18n } from '@/types/i18n'; diff --git a/src/pages/index.astro b/src/pages/index.astro index 74e9ff8..dff3d1d 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,13 +1,13 @@ --- -import SidebarItem from '@/atoms/sidebar-item'; -import ThemeToggle from '@/atoms/theme-icon'; -import Sidebar from '@/organisms/sidebar.astro'; -import ExperienceSection from '@/sections/experience-section.astro'; -import FavoritesSection from '@/sections/favorites-section.astro'; -import MainSection from '@/sections/main-section.astro'; -import PortfolioSection from '@/sections/portfolio-section.astro'; -import SkillsSection from '@/sections/skills-section.astro'; -import TestimonialsSection from '@/sections/testimonials-section.astro'; +import Sidebar from '@/components/sidebar.astro'; +import SidebarItem from '@/components/sidebar-item'; +import ThemeToggle from '@/components/theme-icon'; +import ExperienceSection from '@/sections/experience/experience-section.astro'; +import FavoritesSection from '@/sections/favorites/favorites-section.astro'; +import MainSection from '@/sections/main/main-section.astro'; +import PortfolioSection from '@/sections/portfolio/portfolio-section.astro'; +import SkillsSection from '@/sections/skills/skills-section.astro'; +import TestimonialsSection from '@/sections/testimonials/testimonials-section.astro'; import getObjectKeys from '@/utils/getObjectKeys'; import data from '../data'; diff --git a/src/components/sections/experience-section.astro b/src/sections/experience/experience-section.astro similarity index 72% rename from src/components/sections/experience-section.astro rename to src/sections/experience/experience-section.astro index aa7855d..66b6e42 100644 --- a/src/components/sections/experience-section.astro +++ b/src/sections/experience/experience-section.astro @@ -1,13 +1,14 @@ --- -import DividedList from '@/atoms/divided-list.astro'; -import Divider from '@/atoms/divider.astro'; -import SectionCard from '@/atoms/section-card.astro'; -import WorkTimelineItem from '@/organisms/work-timeline-item.astro'; +import DividedList from '@/components/divided-list.astro'; +import Divider from '@/components/divider.astro'; +import SectionCard from '@/components/section-card.astro'; import type { Section } from '@/types/data'; import type { ExperienceSection, Job } from '@/types/experience-section'; import type { I18n } from '@/types/i18n'; import removeLast from '@/utils/remove-last'; +import WorkTimelineItem from './work-timeline-item.astro'; + export interface Props extends ExperienceSection { jobs: Job[]; i18n: I18n; diff --git a/src/components/organisms/work-timeline-item.astro b/src/sections/experience/work-timeline-item.astro similarity index 85% rename from src/components/organisms/work-timeline-item.astro rename to src/sections/experience/work-timeline-item.astro index 098997a..809e5a1 100644 --- a/src/components/organisms/work-timeline-item.astro +++ b/src/sections/experience/work-timeline-item.astro @@ -1,12 +1,11 @@ --- -import IconButton from '@/atoms/icon-button.astro'; -import Timestamp from '@/atoms/timestamp.astro'; -import Typography from '@/atoms/typography.astro'; +import IconButton from '@/components/icon-button.astro'; +import TagsList from '@/components/tags-list.astro'; +import Timestamp from '@/components/timestamp.astro'; +import Typography from '@/components/typography.astro'; import type { Job } from '@/types/experience-section'; import type { I18n } from '@/types/i18n'; -import TagsList from '../molecules/tags-list.astro'; - export interface Props { job: Job; i18n: I18n; diff --git a/src/components/atoms/book-tile.astro b/src/sections/favorites/book-tile.astro similarity index 92% rename from src/components/atoms/book-tile.astro rename to src/sections/favorites/book-tile.astro index ed14810..88c995a 100644 --- a/src/components/atoms/book-tile.astro +++ b/src/sections/favorites/book-tile.astro @@ -1,7 +1,7 @@ --- import { Image } from '@astrojs/image/components'; -import Typography from '@/atoms/typography.astro'; +import Typography from '@/components/typography.astro'; import type { Book } from '@/types/favorites-section'; export interface Props { diff --git a/src/components/sections/favorites-section.astro b/src/sections/favorites/favorites-section.astro similarity index 87% rename from src/components/sections/favorites-section.astro rename to src/sections/favorites/favorites-section.astro index 9409443..3dca2c1 100644 --- a/src/components/sections/favorites-section.astro +++ b/src/sections/favorites/favorites-section.astro @@ -1,15 +1,16 @@ --- import type { ComponentInstance } from 'astro'; -import BookTile from '@/atoms/book-tile.astro'; -import MediaTile from '@/atoms/media-tile.astro'; -import PersonTile from '@/atoms/person-tile.astro'; -import SectionCard from '@/atoms/section-card.astro'; -import Typography from '@/atoms/typography.astro'; -import VideoTile from '@/atoms/video-tile.astro'; +import SectionCard from '@/components/section-card.astro'; +import Typography from '@/components/typography.astro'; import type { Section } from '@/types/data'; import type { Book, FavoritesSection, Media, Person, Video } from '@/types/favorites-section'; +import BookTile from './book-tile.astro'; +import MediaTile from './media-tile.astro'; +import PersonTile from './person-tile.astro'; +import VideoTile from './video-tile.astro'; + export interface Props extends FavoritesSection {} const { diff --git a/src/components/atoms/media-tile.astro b/src/sections/favorites/media-tile.astro similarity index 92% rename from src/components/atoms/media-tile.astro rename to src/sections/favorites/media-tile.astro index a478809..725e80c 100644 --- a/src/components/atoms/media-tile.astro +++ b/src/sections/favorites/media-tile.astro @@ -1,7 +1,7 @@ --- import { Image } from '@astrojs/image/components'; -import Typography from '@/atoms/typography.astro'; +import Typography from '@/components/typography.astro'; import type { Media } from '@/types/favorites-section'; export interface Props { diff --git a/src/components/atoms/person-tile.astro b/src/sections/favorites/person-tile.astro similarity index 91% rename from src/components/atoms/person-tile.astro rename to src/sections/favorites/person-tile.astro index 4e0b0a8..6789970 100644 --- a/src/components/atoms/person-tile.astro +++ b/src/sections/favorites/person-tile.astro @@ -1,7 +1,7 @@ --- import { Image } from '@astrojs/image/components'; -import Typography from '@/atoms/typography.astro'; +import Typography from '@/components/typography.astro'; import type { Person } from '@/types/favorites-section'; export interface Props { diff --git a/src/components/atoms/video-tile.astro b/src/sections/favorites/video-tile.astro similarity index 91% rename from src/components/atoms/video-tile.astro rename to src/sections/favorites/video-tile.astro index 9c35492..4f70df9 100644 --- a/src/components/atoms/video-tile.astro +++ b/src/sections/favorites/video-tile.astro @@ -1,7 +1,7 @@ --- import { Image } from '@astrojs/image/components'; -import Typography from '@/atoms/typography.astro'; +import Typography from '@/components/typography.astro'; import type { Video } from '@/types/favorites-section'; export interface Props { diff --git a/src/components/sections/main-section.astro b/src/sections/main/main-section.astro similarity index 88% rename from src/components/sections/main-section.astro rename to src/sections/main/main-section.astro index 64c82b8..69aefed 100644 --- a/src/components/sections/main-section.astro +++ b/src/sections/main/main-section.astro @@ -1,15 +1,14 @@ --- import { Image } from '@astrojs/image/components'; -import Button from '@/atoms/button.astro'; -import IconButton from '@/atoms/icon-button.astro'; -import SectionCard from '@/atoms/section-card.astro'; -import Typography from '@/atoms/typography.astro'; +import Button from '@/components/button.astro'; +import IconButton from '@/components/icon-button.astro'; +import SectionCard from '@/components/section-card.astro'; +import TagsList from '@/components/tags-list.astro'; +import Typography from '@/components/typography.astro'; import type { Section } from '@/types/data'; import type { MainSection } from '@/types/main-section'; -import TagsList from '../molecules/tags-list.astro'; - export interface Props extends MainSection {} const { diff --git a/src/components/sections/portfolio-section.astro b/src/sections/portfolio/portfolio-section.astro similarity index 71% rename from src/components/sections/portfolio-section.astro rename to src/sections/portfolio/portfolio-section.astro index 81e7b9e..235009b 100644 --- a/src/components/sections/portfolio-section.astro +++ b/src/sections/portfolio/portfolio-section.astro @@ -1,13 +1,14 @@ --- -import DividedList from '@/atoms/divided-list.astro'; -import Divider from '@/atoms/divider.astro'; -import SectionCard from '@/atoms/section-card.astro'; -import ProjectTimelineItem from '@/organisms/project-timeline-item.astro'; +import DividedList from '@/components/divided-list.astro'; +import Divider from '@/components/divider.astro'; +import SectionCard from '@/components/section-card.astro'; import type { Section } from '@/types/data'; import type { I18n } from '@/types/i18n'; import type { PortfolioSection } from '@/types/portfolio-section'; import removeLast from '@/utils/remove-last'; +import ProjectTimelineItem from './project-timeline-item.astro'; + export interface Props extends PortfolioSection { i18n: I18n; } diff --git a/src/components/organisms/project-timeline-item.astro b/src/sections/portfolio/project-timeline-item.astro similarity index 88% rename from src/components/organisms/project-timeline-item.astro rename to src/sections/portfolio/project-timeline-item.astro index 6947998..a2fa05a 100644 --- a/src/components/organisms/project-timeline-item.astro +++ b/src/sections/portfolio/project-timeline-item.astro @@ -1,15 +1,14 @@ --- import { Image } from '@astrojs/image/components'; -import IconButton from '@/atoms/icon-button.astro'; -import LabelledValue from '@/atoms/labelled-value.astro'; -import Timestamp from '@/atoms/timestamp.astro'; -import Typography from '@/atoms/typography.astro'; +import IconButton from '@/components/icon-button.astro'; +import LabelledValue from '@/components/labelled-value.astro'; +import TagsList from '@/components/tags-list.astro'; +import Timestamp from '@/components/timestamp.astro'; +import Typography from '@/components/typography.astro'; import type { I18n } from '@/types/i18n'; import type { Project } from '@/types/portfolio-section'; -import TagsList from '../molecules/tags-list.astro'; - export interface Props { project: Project; i18n: I18n; diff --git a/src/components/organisms/levelled-skill-subsection.astro b/src/sections/skills/levelled-skill-subsection.astro similarity index 100% rename from src/components/organisms/levelled-skill-subsection.astro rename to src/sections/skills/levelled-skill-subsection.astro diff --git a/src/components/atoms/skill-level-tile.astro b/src/sections/skills/skill-level-tile.astro similarity index 100% rename from src/components/atoms/skill-level-tile.astro rename to src/sections/skills/skill-level-tile.astro diff --git a/src/components/organisms/skill-level.astro b/src/sections/skills/skill-level.astro similarity index 80% rename from src/components/organisms/skill-level.astro rename to src/sections/skills/skill-level.astro index a5426eb..bea3e63 100644 --- a/src/components/organisms/skill-level.astro +++ b/src/sections/skills/skill-level.astro @@ -1,5 +1,5 @@ --- -import SkillLevelTile from '@/atoms/skill-level-tile.astro'; +import SkillLevelTile from './skill-level-tile.astro'; export interface Props { skillLevel: number; diff --git a/src/components/organisms/skill-subsection.astro b/src/sections/skills/skill-subsection.astro similarity index 88% rename from src/components/organisms/skill-subsection.astro rename to src/sections/skills/skill-subsection.astro index 4b74017..c608fdd 100644 --- a/src/components/organisms/skill-subsection.astro +++ b/src/sections/skills/skill-subsection.astro @@ -1,9 +1,9 @@ --- -import Typography from '@/atoms/typography.astro'; +import TagsList from '@/components/tags-list.astro'; +import Typography from '@/components/typography.astro'; import type { Tag } from '@/types/common'; import type { LevelledSkill, SkillSet } from '@/types/skills-section'; -import TagsList from '../molecules/tags-list.astro'; import LevelledSkillSubsection from './levelled-skill-subsection.astro'; export interface Props { diff --git a/src/components/organisms/skill.astro b/src/sections/skills/skill.astro similarity index 86% rename from src/components/organisms/skill.astro rename to src/sections/skills/skill.astro index ab93c82..ed8f392 100644 --- a/src/components/organisms/skill.astro +++ b/src/sections/skills/skill.astro @@ -1,10 +1,10 @@ --- -import Icon from '@/atoms/icon'; -import IconWithTooltip from '@/atoms/icon-with-tooltip'; -import Typography from '@/atoms/typography.astro'; +import IconWithTooltip from '@/components/icon-with-tooltip'; +import Typography from '@/components/typography.astro'; import type { IconName } from '@/types/icon'; import type { LevelledSkill } from '@/types/skills-section'; +import Icon from '../../components/icon'; import SkillLevel from './skill-level.astro'; export interface Props extends LevelledSkill {} diff --git a/src/components/sections/skills-section.astro b/src/sections/skills/skills-section.astro similarity index 78% rename from src/components/sections/skills-section.astro rename to src/sections/skills/skills-section.astro index b97c8be..114b3ae 100644 --- a/src/components/sections/skills-section.astro +++ b/src/sections/skills/skills-section.astro @@ -1,9 +1,10 @@ --- -import SectionCard from '@/atoms/section-card.astro'; -import SkillSubsection from '@/organisms/skill-subsection.astro'; +import SectionCard from '@/components/section-card.astro'; import type { Section } from '@/types/data'; import type { SkillsSection } from '@/types/skills-section'; +import SkillSubsection from './skill-subsection.astro'; + export interface Props extends SkillsSection {} const { diff --git a/src/components/organisms/testimonial.astro b/src/sections/testimonials/testimonial.astro similarity index 89% rename from src/components/organisms/testimonial.astro rename to src/sections/testimonials/testimonial.astro index 4448a3a..8c665f4 100644 --- a/src/components/organisms/testimonial.astro +++ b/src/sections/testimonials/testimonial.astro @@ -1,8 +1,8 @@ --- import { Image } from '@astrojs/image/components'; -import IconButton from '@/atoms/icon-button.astro'; -import Typography from '@/atoms/typography.astro'; +import IconButton from '@/components/icon-button.astro'; +import Typography from '@/components/typography.astro'; import type { Testimonial } from '@/types/testimonials-section'; export interface Props { diff --git a/src/components/sections/testimonials-section.astro b/src/sections/testimonials/testimonials-section.astro similarity index 71% rename from src/components/sections/testimonials-section.astro rename to src/sections/testimonials/testimonials-section.astro index 0529b0a..152f60e 100644 --- a/src/components/sections/testimonials-section.astro +++ b/src/sections/testimonials/testimonials-section.astro @@ -1,12 +1,13 @@ --- -import DividedList from '@/atoms/divided-list.astro'; -import Divider from '@/atoms/divider.astro'; -import SectionCard from '@/atoms/section-card.astro'; -import Testimonial from '@/organisms/testimonial.astro'; +import DividedList from '@/components/divided-list.astro'; +import Divider from '@/components/divider.astro'; +import SectionCard from '@/components/section-card.astro'; import type { Section } from '@/types/data'; import type { TestimonialsSection } from '@/types/testimonials-section'; import removeLast from '@/utils/remove-last'; +import Testimonial from './testimonial.astro'; + export interface Props extends TestimonialsSection {} const { diff --git a/tsconfig.json b/tsconfig.json index 6692f33..341e346 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -32,13 +32,7 @@ // Add aliases for common paths. "baseUrl": ".", "paths": { - "@/atoms/*": ["src/components/atoms/*"], - "@/organisms/*": ["src/components/organisms/*"], - "@/sections/*": ["src/components/sections/*"], - "@/assets/*": ["src/assets/*"], - "@/types/*": ["src/types/*"], - "@/constants/*": ["src/constants/*"], - "@/utils/*": ["src/utils/*"] + "@/*": ["src/*"] } }, "include": ["**/*.ts", "**/*.tsx", "**/*.cjs", "**/*.astro"]