diff --git a/app/brandbook/page.tsx b/app/brandbook/page.tsx index bc1bd0e..0306a67 100644 --- a/app/brandbook/page.tsx +++ b/app/brandbook/page.tsx @@ -9,7 +9,7 @@ import MessageBanner from '@components/molecules/MessageBanner'; import SplitSection from './SplitSection'; import TechItem from '../components/atoms/TechItem'; -import ProjectTypeLabel from '../components/atoms/ProjectTypeLabel'; +import HistoryItemTypeLabel from '../components/atoms/HistoryItemTypeLabel'; export const metadata: Metadata = { title: 'Brandbook – Manuel Schächinger', @@ -80,10 +80,10 @@ const BrandBook = () => { diff --git a/app/components/atoms/ProjectTypeLabel.tsx b/app/components/atoms/HistoryItemTypeLabel.tsx similarity index 69% rename from app/components/atoms/ProjectTypeLabel.tsx rename to app/components/atoms/HistoryItemTypeLabel.tsx index 3bf1b45..90daaf0 100644 --- a/app/components/atoms/ProjectTypeLabel.tsx +++ b/app/components/atoms/HistoryItemTypeLabel.tsx @@ -1,21 +1,24 @@ +import clsx from 'clsx'; +import { useTranslations } from 'next-intl'; + import Banknotes from '@components/icons/Banknotes'; import BuildingsCity from '@components/icons/BuildingsCity'; +import Education from '@components/icons/Education'; import HeartEmpty from '@components/icons/HeartEmpty'; import Knight from '@components/icons/Knight'; -import { type ProjectType } from '@models/project'; -import clsx from 'clsx'; -import { useTranslations } from 'next-intl'; +import { type HistoryType } from '@models/history'; type Props = { - type: ProjectType; + type: HistoryType; colored?: boolean; label?: boolean; } -const ProjectTypeLabel = ({ colored, label, type }: Props) => { - const t = useTranslations('pages.projects.types') +const HistoryItemTypeLabel = ({ colored, label, type }: Props) => { + const t = useTranslations('general.history.types') const TypeIcon = { + education: Education, employee: BuildingsCity, founder: HeartEmpty, freelance: Banknotes, @@ -34,4 +37,4 @@ const ProjectTypeLabel = ({ colored, label, type }: Props) => { ); }; -export default ProjectTypeLabel; +export default HistoryItemTypeLabel; diff --git a/app/components/icons/Education.tsx b/app/components/icons/Education.tsx new file mode 100644 index 0000000..d631212 --- /dev/null +++ b/app/components/icons/Education.tsx @@ -0,0 +1,9 @@ +import Icon, { type IconProps } from './Icon'; + +const Education = (props: IconProps) => ( + + + +) + +export default Education; diff --git a/app/components/molecules/HistoryItemCompany.tsx b/app/components/molecules/HistoryItemCompany.tsx index 2290a3e..9865ce3 100644 --- a/app/components/molecules/HistoryItemCompany.tsx +++ b/app/components/molecules/HistoryItemCompany.tsx @@ -1,16 +1,15 @@ import CompanyLink from '@components/atoms/CompanyLink'; -import ProjectTypeLabel from '@components/atoms/ProjectTypeLabel'; -import type { Company } from '@models/history'; -import { ProjectType } from '@models/project'; +import HistoryItemTypeLabel from '@/app/components/atoms/HistoryItemTypeLabel'; +import type { Company, HistoryType } from '@models/history'; type Props = { company?: Company; - type?: ProjectType; + type?: HistoryType; }; const HistoryItemCompany = ({ company, type }: Props) => ( (company || type) &&
- {type && } + {type && } {company && }
); diff --git a/app/components/molecules/ProjectMasterData.tsx b/app/components/molecules/ProjectMasterData.tsx index 19dbeb0..b9eeb14 100644 --- a/app/components/molecules/ProjectMasterData.tsx +++ b/app/components/molecules/ProjectMasterData.tsx @@ -3,7 +3,7 @@ import { useTranslations } from 'next-intl'; import Breadcrumbs from '@components/atoms/Breadcumbs'; import CompanyLink from '@components/atoms/CompanyLink'; -import ProjectTypeLabel from '@components/atoms/ProjectTypeLabel'; +import HistoryItemTypeLabel from '@/app/components/atoms/HistoryItemTypeLabel'; import TechItem from '@components/atoms/TechItem'; import TimeSpan from '@components/atoms/TimeSpan'; import PageSection from '@components/organisms/PageSection'; @@ -32,7 +32,7 @@ const ProjectMasterData = ({ project }: Props) => {

- {t('details.type')}: + {t('details.type')}:

{ project.company diff --git a/app/components/molecules/ThemeToggle.tsx b/app/components/molecules/ThemeToggle.tsx index b263fe1..31e4b42 100644 --- a/app/components/molecules/ThemeToggle.tsx +++ b/app/components/molecules/ThemeToggle.tsx @@ -20,7 +20,7 @@ const ThemeToggle = ({ translations }: Props) => { return (