From 1b41651ba161335c8938e15b037c1cbec9564c9b Mon Sep 17 00:00:00 2001 From: Krsiak Daniel Date: Sun, 15 Dec 2024 22:22:34 +0100 Subject: [PATCH] =?UTF-8?q?refactor(constants):=20=F0=9F=91=B7=20urls-text?= =?UTF-8?q?s-emoji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - __tests__/playwright/about-me/aboutMe.spec.ts | 6 ++- app/about-me/page.tsx | 10 ++--- app/page.tsx | 9 ++-- app/personal-projects/cryptomania/page.tsx | 9 ++-- app/personal-projects/krsiak/page.tsx | 12 +++--- app/personal-projects/page.tsx | 10 ++--- app/resume/page.tsx | 10 ++--- app/work-experience/groupon/page.tsx | 12 +++--- app/work-experience/komercni-banka/page.tsx | 12 +++--- app/work-experience/kooperativa/page.tsx | 12 +++--- app/work-experience/moravia/page.tsx | 8 ++-- app/work-experience/page.tsx | 10 ++--- .../smartsupp-dashboard/page.tsx | 12 +++--- app/work-experience/smartsupp-help/page.tsx | 12 +++--- app/work-experience/smartsupp-web/page.tsx | 12 +++--- components/footer/ScrollToTopButton.tsx | 4 +- components/shared/Breadcrumbs.tsx | 5 +-- .../work/projectsOverview/workFrontEnd.ts | 2 +- .../work/projectsOverview/workLocalization.ts | 2 +- localization/texts_en.ts | 42 ++++++++++++++++--- 21 files changed, 123 insertions(+), 89 deletions(-) diff --git a/README.md b/README.md index 2a8f4227..18fcb846 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,6 @@ I follow a structured approach to identify and resolve unexpected issues. Explore the linked issue to see how I apply this in practice: [Fix(Heading1)!: πŸ› Incorrect Text Size on Production Compared to Localhost](https://github.com/users/krsiakdaniel/projects/6/views/1?pane=issue&itemId=90896673&issue=krsiakdaniel%7Cportfolio-website-krsiak-cz%7C163) - ## 🚦 Project Status The current status of the project is continuously monitored. diff --git a/__tests__/playwright/about-me/aboutMe.spec.ts b/__tests__/playwright/about-me/aboutMe.spec.ts index 251fad29..d6b6f608 100644 --- a/__tests__/playwright/about-me/aboutMe.spec.ts +++ b/__tests__/playwright/about-me/aboutMe.spec.ts @@ -1,16 +1,18 @@ import { getDataTestId } from '@/__tests__/playwright/utils/getDataTestId' +import { TEXT } from '@/localization/texts_en' +import { PAGES_URL } from '@/utils/constants' import { DATA_TEST_IDS } from '@/utils/dataTestIds' import { expect, test } from '@playwright/test' test.describe('About Me Page - Tests', () => { test('Heading + text', async ({ page }) => { await test.step('Go to page About me', async () => { - await page.goto('/about-me') + await page.goto(PAGES_URL.aboutMe) }) await test.step('Check that the Heading text is correct', async () => { const heading = await page.textContent('h1') - expect(heading).toBe('πŸ‘¨β€πŸ’» About Me') + expect(heading).toBe(TEXT.aboutMe) }) await test.step('Check that the paragraph text is correct', async () => { diff --git a/app/about-me/page.tsx b/app/about-me/page.tsx index db822e22..10e22731 100644 --- a/app/about-me/page.tsx +++ b/app/about-me/page.tsx @@ -37,7 +37,7 @@ export const metadata: Metadata = { const About = () => { return ( - +
@@ -46,11 +46,11 @@ const About = () => {
diff --git a/app/page.tsx b/app/page.tsx index 01f69a13..89e3dfc0 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -5,7 +5,7 @@ import WhatIDoMindset from '@/components/homepage/WhatIDoMindset' import PageContainer from '@/components/layout/PageContainer' import PageNavigation from '@/components/pageNavigation/PageNavigation' import { TEXT } from '@/localization/texts_en' -import { ID } from '@/utils/constants' +import { ID, PAGES_URL } from '@/utils/constants' import { DATA_TEST_IDS } from '@/utils/dataTestIds' import { Metadata } from 'next' @@ -41,8 +41,11 @@ const Page = () => { - {/* TODO: refactor for all pages into constants, urls, text, test IDs */} - + ) } diff --git a/app/personal-projects/cryptomania/page.tsx b/app/personal-projects/cryptomania/page.tsx index cbe9b3c7..d02fc383 100644 --- a/app/personal-projects/cryptomania/page.tsx +++ b/app/personal-projects/cryptomania/page.tsx @@ -27,9 +27,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_PERSONAL_PROJECTS, - textLevel1: 'Personal Projects', + textLevel1: TEXT.personalProjects, linkLevel2: PAGES_URL.personal.cryptoMania, - textLevel2: 'Cryptomania', + textLevel2: TEXT.cryptoMania, } const ProjectPersonalCryptomania = () => { @@ -52,10 +52,9 @@ const ProjectPersonalCryptomania = () => { imageShowcase={imageShowcase} PageNavigation={ } /> diff --git a/app/personal-projects/krsiak/page.tsx b/app/personal-projects/krsiak/page.tsx index 11fe7d86..16ca7a2a 100644 --- a/app/personal-projects/krsiak/page.tsx +++ b/app/personal-projects/krsiak/page.tsx @@ -30,9 +30,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_PERSONAL_PROJECTS, - textLevel1: 'Personal Projects', + textLevel1: TEXT.personalProjects, linkLevel2: PAGES_URL.personal.krsiak, - textLevel2: 'Portfolio Website', + textLevel2: TEXT.portfolioWebsite, } const ProjectPersonalKrsiak = () => { @@ -55,11 +55,11 @@ const ProjectPersonalKrsiak = () => { imageShowcase={imageShowcase} PageNavigation={ } diff --git a/app/personal-projects/page.tsx b/app/personal-projects/page.tsx index 4f021535..a760046a 100644 --- a/app/personal-projects/page.tsx +++ b/app/personal-projects/page.tsx @@ -27,18 +27,18 @@ export const metadata: Metadata = { const ProjectsPersonal = () => { return ( - + - - + +
diff --git a/app/resume/page.tsx b/app/resume/page.tsx index fc1213f6..9b2f40ed 100644 --- a/app/resume/page.tsx +++ b/app/resume/page.tsx @@ -59,7 +59,7 @@ const ResumePreviewEmbed = () => { const Resume = () => { return ( - +
@@ -73,11 +73,11 @@ const Resume = () => {
diff --git a/app/work-experience/groupon/page.tsx b/app/work-experience/groupon/page.tsx index 6149cc31..3bcc25cf 100644 --- a/app/work-experience/groupon/page.tsx +++ b/app/work-experience/groupon/page.tsx @@ -35,9 +35,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.groupon, - textLevel2: 'Groupon', + textLevel2: TEXT.groupon, } const ProjectWorkGroupon = () => { @@ -51,11 +51,11 @@ const ProjectWorkGroupon = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/komercni-banka/page.tsx b/app/work-experience/komercni-banka/page.tsx index 87cb3d52..6599c101 100644 --- a/app/work-experience/komercni-banka/page.tsx +++ b/app/work-experience/komercni-banka/page.tsx @@ -26,9 +26,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.komercniBanka, - textLevel2: 'Komerční banka', + textLevel2: TEXT.komercniBanka, } const ProjectWorkKomercniBanka = () => { @@ -42,11 +42,11 @@ const ProjectWorkKomercniBanka = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/kooperativa/page.tsx b/app/work-experience/kooperativa/page.tsx index 685c5116..7b4def75 100644 --- a/app/work-experience/kooperativa/page.tsx +++ b/app/work-experience/kooperativa/page.tsx @@ -29,9 +29,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.kooperativa, - textLevel2: 'Kooperativa', + textLevel2: TEXT.kooperativa, } const ProjectWorkKooperativa = () => { @@ -45,11 +45,11 @@ const ProjectWorkKooperativa = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/moravia/page.tsx b/app/work-experience/moravia/page.tsx index 1d494ecd..f781dc4b 100644 --- a/app/work-experience/moravia/page.tsx +++ b/app/work-experience/moravia/page.tsx @@ -30,9 +30,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.moravia, - textLevel2: 'Moravia', + textLevel2: TEXT.moravia, } const ProjectWorkMoravia = () => { @@ -46,8 +46,8 @@ const ProjectWorkMoravia = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/page.tsx b/app/work-experience/page.tsx index c43b8896..02f23e91 100644 --- a/app/work-experience/page.tsx +++ b/app/work-experience/page.tsx @@ -45,7 +45,7 @@ export const metadata: Metadata = { const ProjectsWork = () => { return ( - + {
diff --git a/app/work-experience/smartsupp-dashboard/page.tsx b/app/work-experience/smartsupp-dashboard/page.tsx index c6eb3143..509be4d5 100644 --- a/app/work-experience/smartsupp-dashboard/page.tsx +++ b/app/work-experience/smartsupp-dashboard/page.tsx @@ -30,9 +30,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.smartsupp.dashboard, - textLevel2: 'Smartsupp Dashboard', + textLevel2: TEXT.smartsuppDashboard, } const ProjectWorkSmartsuppDashboard = () => { @@ -46,11 +46,11 @@ const ProjectWorkSmartsuppDashboard = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/smartsupp-help/page.tsx b/app/work-experience/smartsupp-help/page.tsx index 86167a4f..c3d542ff 100644 --- a/app/work-experience/smartsupp-help/page.tsx +++ b/app/work-experience/smartsupp-help/page.tsx @@ -25,9 +25,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.smartsupp.help, - textLevel2: 'Smartsupp Help', + textLevel2: TEXT.smartsuppHELP, } const ProjectWorkSmartsuppHelp = () => { @@ -41,11 +41,11 @@ const ProjectWorkSmartsuppHelp = () => { sections={sections} PageNavigation={ } diff --git a/app/work-experience/smartsupp-web/page.tsx b/app/work-experience/smartsupp-web/page.tsx index 5fce9d01..fdafc9af 100644 --- a/app/work-experience/smartsupp-web/page.tsx +++ b/app/work-experience/smartsupp-web/page.tsx @@ -28,9 +28,9 @@ export const metadata: Metadata = { const breadCrumbs: BreadCrumbsType = { linkLevel1: URL_WORK_EXPERIENCE, - textLevel1: 'Work Experience', + textLevel1: TEXT.workExperience, linkLevel2: PAGES_URL.work.smartsupp.web, - textLevel2: 'Smartsupp Web', + textLevel2: TEXT.smartsuppWeb, } const ProjectWorkSmartsuppWeb = () => { @@ -44,11 +44,11 @@ const ProjectWorkSmartsuppWeb = () => { sections={sections} PageNavigation={ } diff --git a/components/footer/ScrollToTopButton.tsx b/components/footer/ScrollToTopButton.tsx index b32d04a1..f61d438c 100644 --- a/components/footer/ScrollToTopButton.tsx +++ b/components/footer/ScrollToTopButton.tsx @@ -1,7 +1,7 @@ 'use client' -import { DATA_TEST_IDS } from "@/utils/dataTestIds" +import { DATA_TEST_IDS } from '@/utils/dataTestIds' - // If you need to add an onClick event handler to a component, you should make sure that component is a Client Component. +// If you need to add an onClick event handler to a component, you should make sure that component is a Client Component. export const scrollToTop = () => { window.scrollTo({ diff --git a/components/shared/Breadcrumbs.tsx b/components/shared/Breadcrumbs.tsx index f8079e2b..644f4211 100644 --- a/components/shared/Breadcrumbs.tsx +++ b/components/shared/Breadcrumbs.tsx @@ -1,4 +1,4 @@ -import { IconCaretRight, IconHome } from '@/components/icons' +import { IconCaretRight } from '@/components/icons' import { DATA_TEST_IDS } from '@/utils/dataTestIds' import { BreadCrumbsType } from '@/utils/types' import Link from 'next/link' @@ -15,8 +15,7 @@ const BreadCrumbs = ({ linkLevel1, textLevel1, linkLevel2, textLevel2 }: BreadCr href="/" className="inline-flex items-center text-sm font-medium text-neutral-700 hover:text-violet-600" > - - Home + 🏠 Home {linkLevel1 && textLevel1 && ( diff --git a/data/projects/work/projectsOverview/workFrontEnd.ts b/data/projects/work/projectsOverview/workFrontEnd.ts index c08d8291..4f4b0c7c 100644 --- a/data/projects/work/projectsOverview/workFrontEnd.ts +++ b/data/projects/work/projectsOverview/workFrontEnd.ts @@ -20,7 +20,7 @@ export const projectsWorkFrontEnd: Project[] = [ { id: 3, src: smartsuppWeb3.src }, { id: 4, src: smartsuppWeb4.src }, ], - title: 'πŸ–₯️ SaaS Company - Website', + title: 'πŸ’» SaaS Company - Website', company: 'Smartsupp', role: 'Front End Developer', years: '1\u00A0year', diff --git a/data/projects/work/projectsOverview/workLocalization.ts b/data/projects/work/projectsOverview/workLocalization.ts index 319e94e3..372ff19e 100644 --- a/data/projects/work/projectsOverview/workLocalization.ts +++ b/data/projects/work/projectsOverview/workLocalization.ts @@ -18,7 +18,7 @@ export const projectsWorkLocalization: Project[] = [ { id: 2, src: moravia2.src }, { id: 3, src: moravia3.src }, ], - title: 'πŸ–₯️ Windows', + title: '🌎 Windows', company: 'RWS - Moravia IT', role: 'QA Automation - Team Leader', years: '1 year', diff --git a/localization/texts_en.ts b/localization/texts_en.ts index af4c0473..1c2cf990 100644 --- a/localization/texts_en.ts +++ b/localization/texts_en.ts @@ -1,11 +1,43 @@ -export const TEXT = { - logo: 'krsiak.cz', +const ABOUT = { + aboutMe: 'πŸ‘¨β€πŸ’» About Me', nameDanielKrsiak: 'Daniel KrΕ‘iak', reactDeveloper: 'React Developer', heroText: 'Hi πŸ‘‹ I am React Developer based in Brno, Czech\u00A0Republic πŸ‡¨πŸ‡Ώ', - aboutMe: 'πŸ‘¨β€πŸ’» About Me', +} + +const RESUME = { resume: 'πŸ“ Resume', - workExperience: 'πŸ–₯️ Work Experience', - personalProjects: 'πŸš€ Personal Projects', resumePDF: 'Resume in PDF', } + +const PROJECTS = { + cryptoMania: 'πŸ’° CryptoMania', + personalProjects: 'πŸš€ Personal Projects', + portfolioWebsite: 'πŸ‘¨β€πŸ’» Portfolio Website', + next: 'Next', + react: 'React', + workExperience: 'πŸ–₯️ Work Experience', +} + +const HOME = { + home: '🏠 Home', + logo: 'krsiak.cz', +} + +const COMPANIES = { + smartsuppDashboard: 'πŸ’¬ Smartsupp Dashboard', + komercniBanka: '🏦 KomerčnΓ­ banka', + kooperativa: 'β˜” Kooperativa', + smartsuppWeb: 'πŸ’» Smartsupp Web', + smartsuppHELP: 'πŸ“š Smartsupp HELP', + groupon: 'πŸ›’ Groupon', + moravia: '🌎 Moravia IT', +} + +export const TEXT = { + ...ABOUT, + ...RESUME, + ...PROJECTS, + ...HOME, + ...COMPANIES, +}