From 80932eb80cc42b506f788b913d7a2c3a6656cfd7 Mon Sep 17 00:00:00 2001 From: Amruth Pillai Date: Tue, 4 Nov 2025 18:31:47 +0100 Subject: [PATCH] Fix bug: links/urls don't fit inside the page --- .eslintrc.json | 9 --------- apps/artboard/.eslintrc.json | 12 +----------- apps/artboard/src/templates/azurill.tsx | 6 +++--- apps/artboard/src/templates/bronzor.tsx | 6 +++--- apps/artboard/src/templates/chikorita.tsx | 8 ++++---- apps/artboard/src/templates/ditto.tsx | 10 +++++----- apps/artboard/src/templates/gengar.tsx | 14 +++++++------- apps/artboard/src/templates/glalie.tsx | 8 ++++---- apps/artboard/src/templates/kakuna.tsx | 6 +++--- apps/artboard/src/templates/leafish.tsx | 10 +++++----- apps/artboard/src/templates/nosepass.tsx | 6 +++--- apps/artboard/src/templates/onyx.tsx | 6 +++--- apps/artboard/src/templates/pikachu.tsx | 12 ++++-------- apps/artboard/src/templates/rhyhorn.tsx | 6 +++--- apps/client/.eslintrc.json | 12 +----------- apps/client/src/pages/auth/layout.tsx | 1 - .../sidebars/left/sections/custom/section.tsx | 6 +++++- apps/client/vite.config.ts | 7 +++++++ libs/ui/.eslintrc.json | 7 ------- 19 files changed, 61 insertions(+), 91 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index f1102db1..3f6167f7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,6 @@ "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "extends": ["plugin:prettier/recommended"], "plugins": ["simple-import-sort", "unused-imports"], "rules": { // eslint @@ -42,14 +41,6 @@ } ] } - ], - - // prettier - "prettier/prettier": [ - "warn", - { - "endOfLine": "auto" - } ] } }, diff --git a/apps/artboard/.eslintrc.json b/apps/artboard/.eslintrc.json index c4390f16..257e8a3e 100644 --- a/apps/artboard/.eslintrc.json +++ b/apps/artboard/.eslintrc.json @@ -4,13 +4,6 @@ "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "extends": ["plugin:tailwindcss/recommended"], - "settings": { - "tailwindcss": { - "callees": ["cn", "clsx", "cva"], - "config": "tailwind.config.js" - } - }, "rules": { // eslint "@typescript-eslint/no-require-imports": "off", @@ -28,10 +21,7 @@ ], // react-hooks - "react-hooks/exhaustive-deps": "off", - - // tailwindcss - "tailwindcss/no-custom-classname": "off" + "react-hooks/exhaustive-deps": "off" } }, { diff --git a/apps/artboard/src/templates/azurill.tsx b/apps/artboard/src/templates/azurill.tsx index 1d278886..d4978098 100644 --- a/apps/artboard/src/templates/azurill.tsx +++ b/apps/artboard/src/templates/azurill.tsx @@ -131,13 +131,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -553,7 +553,7 @@ export const Azurill = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage &&
}
diff --git a/apps/artboard/src/templates/bronzor.tsx b/apps/artboard/src/templates/bronzor.tsx index 1033b0c8..351f3e54 100644 --- a/apps/artboard/src/templates/bronzor.tsx +++ b/apps/artboard/src/templates/bronzor.tsx @@ -122,13 +122,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -568,7 +568,7 @@ export const Bronzor = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage &&
}
diff --git a/apps/artboard/src/templates/chikorita.tsx b/apps/artboard/src/templates/chikorita.tsx index 34a4e489..80873053 100644 --- a/apps/artboard/src/templates/chikorita.tsx +++ b/apps/artboard/src/templates/chikorita.tsx @@ -125,14 +125,14 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -571,7 +571,7 @@ export const Chikorita = ({ columns, isFirstPage = false }: TemplateProps) => {
0 ? "col-span-2" : "col-span-3", )} > @@ -584,7 +584,7 @@ export const Chikorita = ({ columns, isFirstPage = false }: TemplateProps) => {
diff --git a/apps/artboard/src/templates/ditto.tsx b/apps/artboard/src/templates/ditto.tsx index a1f1e6ce..9f5482ef 100644 --- a/apps/artboard/src/templates/ditto.tsx +++ b/apps/artboard/src/templates/ditto.tsx @@ -28,7 +28,7 @@ const Header = () => { const basics = useArtboardStore((state) => state.resume.basics); return ( -
+
@@ -142,13 +142,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -604,7 +604,7 @@ export const Ditto = ({ columns, isFirstPage = false }: TemplateProps) => { )}
-
+
{sidebar.map((section) => ( {mapSectionToComponent(section)} ))} @@ -612,7 +612,7 @@ export const Ditto = ({ columns, isFirstPage = false }: TemplateProps) => {
0 ? "col-span-2" : "col-span-3", )} > diff --git a/apps/artboard/src/templates/gengar.tsx b/apps/artboard/src/templates/gengar.tsx index b1948c45..d0e9cc74 100644 --- a/apps/artboard/src/templates/gengar.tsx +++ b/apps/artboard/src/templates/gengar.tsx @@ -28,7 +28,7 @@ const Header = () => { const basics = useArtboardStore((state) => state.resume.basics); return ( -
+
@@ -86,7 +86,7 @@ const Summary = () => { if (!section.visible || isEmptyString(section.content)) return null; return ( -
+
{ if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? ( @@ -132,7 +132,7 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { href={url.href} target="_blank" rel="noreferrer noopener nofollow" - className={cn("inline-block", className)} + className={cn("line-clamp-1 max-w-fit", className)} > {label ?? (url.label || url.href)} @@ -531,7 +531,7 @@ const mapSectionToComponent = (section: SectionKey) => { case "education": { return ; } - + case "summary": { return ; } @@ -587,7 +587,7 @@ export const Gengar = ({ columns, isFirstPage = false }: TemplateProps) => { {isFirstPage &&
}
{sidebar.map((section) => ( @@ -597,7 +597,7 @@ export const Gengar = ({ columns, isFirstPage = false }: TemplateProps) => {
0 ? "col-span-2" : "col-span-3")}> -
+
{main.map((section) => ( {mapSectionToComponent(section)} ))} diff --git a/apps/artboard/src/templates/glalie.tsx b/apps/artboard/src/templates/glalie.tsx index c95f8739..10c3eb04 100644 --- a/apps/artboard/src/templates/glalie.tsx +++ b/apps/artboard/src/templates/glalie.tsx @@ -135,14 +135,14 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -587,7 +587,7 @@ export const Glalie = ({ columns, isFirstPage = false }: TemplateProps) => { return (
{isFirstPage &&
} @@ -599,7 +599,7 @@ export const Glalie = ({ columns, isFirstPage = false }: TemplateProps) => {
0 ? "col-span-2" : "col-span-3", )} > diff --git a/apps/artboard/src/templates/kakuna.tsx b/apps/artboard/src/templates/kakuna.tsx index 788f0a0f..0db80f3d 100644 --- a/apps/artboard/src/templates/kakuna.tsx +++ b/apps/artboard/src/templates/kakuna.tsx @@ -141,13 +141,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -524,7 +524,7 @@ export const Kakuna = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage &&
}
diff --git a/apps/artboard/src/templates/leafish.tsx b/apps/artboard/src/templates/leafish.tsx index b969d263..65df7942 100644 --- a/apps/artboard/src/templates/leafish.tsx +++ b/apps/artboard/src/templates/leafish.tsx @@ -32,7 +32,7 @@ const Header = () => { return (
@@ -51,7 +51,7 @@ const Header = () => {
-
+
{basics.location && (
@@ -136,13 +136,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -519,7 +519,7 @@ export const Leafish = ({ columns, isFirstPage = false }: TemplateProps) => {
{isFirstPage &&
} -
+
{main.map((section) => ( {mapSectionToComponent(section)} diff --git a/apps/artboard/src/templates/nosepass.tsx b/apps/artboard/src/templates/nosepass.tsx index f179202d..86e2af97 100644 --- a/apps/artboard/src/templates/nosepass.tsx +++ b/apps/artboard/src/templates/nosepass.tsx @@ -126,13 +126,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -575,7 +575,7 @@ export const Nosepass = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
Europass Logo diff --git a/apps/artboard/src/templates/onyx.tsx b/apps/artboard/src/templates/onyx.tsx index 7157b6e0..c566d824 100644 --- a/apps/artboard/src/templates/onyx.tsx +++ b/apps/artboard/src/templates/onyx.tsx @@ -142,13 +142,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -564,7 +564,7 @@ export const Onyx = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage &&
} {main.map((section) => ( diff --git a/apps/artboard/src/templates/pikachu.tsx b/apps/artboard/src/templates/pikachu.tsx index 69692df9..eb023c9a 100644 --- a/apps/artboard/src/templates/pikachu.tsx +++ b/apps/artboard/src/templates/pikachu.tsx @@ -126,15 +126,11 @@ const Rating = ({ level }: RatingProps) => ( index && "ph-fill", level <= index && "ph-bold", )} /> - //
index && "bg-primary")} - // /> ))}
); @@ -151,7 +147,7 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? ( @@ -160,7 +156,7 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { href={url.href} target="_blank" rel="noreferrer noopener nofollow" - className={cn("inline-block", className)} + className={cn("line-clamp-1 max-w-fit", className)} > {label ?? (url.label || url.href)} @@ -601,7 +597,7 @@ export const Pikachu = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage && } diff --git a/apps/artboard/src/templates/rhyhorn.tsx b/apps/artboard/src/templates/rhyhorn.tsx index 75176410..b239b128 100644 --- a/apps/artboard/src/templates/rhyhorn.tsx +++ b/apps/artboard/src/templates/rhyhorn.tsx @@ -123,13 +123,13 @@ const Link = ({ url, icon, iconOnRight, label, className }: LinkProps) => { if (!isUrl(url.href)) return null; return ( -
+
{!iconOnRight && (icon ?? )} {label ?? (url.label || url.href)} @@ -567,7 +567,7 @@ export const Rhyhorn = ({ columns, isFirstPage = false }: TemplateProps) => { const [main, sidebar] = columns; return ( -
+
{isFirstPage &&
} {main.map((section) => ( diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json index cbc1afc5..990d4408 100644 --- a/apps/client/.eslintrc.json +++ b/apps/client/.eslintrc.json @@ -4,20 +4,10 @@ "overrides": [ { "files": ["*.ts", "*.tsx"], - "extends": [ - "plugin:tailwindcss/recommended", - "plugin:@tanstack/eslint-plugin-query/recommended" - ], + "extends": ["plugin:@tanstack/eslint-plugin-query/recommended"], "parserOptions": { "projectService": "./apps/client/tsconfig.json" }, - "settings": { - "tailwindcss": { - "callees": ["cn", "clsx", "cva"], - "config": "tailwind.config.js", - "whitelist": ["ph", "ph\\-.*", "si", "si\\-.*"] - } - }, "plugins": ["lingui"], "rules": { // eslint diff --git a/apps/client/src/pages/auth/layout.tsx b/apps/client/src/pages/auth/layout.tsx index 4a23e2d6..d7f7912d 100644 --- a/apps/client/src/pages/auth/layout.tsx +++ b/apps/client/src/pages/auth/layout.tsx @@ -23,7 +23,6 @@ export const AuthLayout = () => { const hideDivider = !providers.includes("email") || providers.length === 1; return ( - // eslint-disable-next-line tailwindcss/enforces-shorthand -- size-screen not implemented yet
diff --git a/apps/client/src/pages/builder/sidebars/left/sections/custom/section.tsx b/apps/client/src/pages/builder/sidebars/left/sections/custom/section.tsx index 2dc25858..31a6b90f 100644 --- a/apps/client/src/pages/builder/sidebars/left/sections/custom/section.tsx +++ b/apps/client/src/pages/builder/sidebars/left/sections/custom/section.tsx @@ -53,7 +53,11 @@ export const CustomField = ({ field, onChange, onRemove }: CustomFieldProps) => diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts index 54d1cdfd..6c73b364 100644 --- a/apps/client/vite.config.ts +++ b/apps/client/vite.config.ts @@ -21,6 +21,13 @@ export default defineConfig({ host: true, port: 5173, fs: { allow: [searchForWorkspaceRoot(process.cwd())] }, + + proxy: { + "/artboard": { + target: "http://localhost:6173", + changeOrigin: true, + }, + }, }, optimizeDeps: { diff --git a/libs/ui/.eslintrc.json b/libs/ui/.eslintrc.json index acf44b00..3a90371b 100644 --- a/libs/ui/.eslintrc.json +++ b/libs/ui/.eslintrc.json @@ -4,13 +4,6 @@ "overrides": [ { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "extends": ["plugin:tailwindcss/recommended"], - "settings": { - "tailwindcss": { - "callees": ["cn", "clsx", "cva"], - "config": "tailwind.config.js" - } - }, "rules": { // eslint "@typescript-eslint/no-require-imports": "off",