From 18a71bdacf579fa98c90ef70af601275e78b6275 Mon Sep 17 00:00:00 2001 From: Alexis Date: Wed, 25 Mar 2026 18:51:52 +0100 Subject: [PATCH] Color theme for different types --- package.json | 2 ++ pnpm-lock.yaml | 17 ++++++++++++ public/korrigo-logo.webp | Bin 0 -> 3320 bytes src/components/BikeMarker.vue | 49 ++++++++++++++++++++++++++++++++-- src/components/Map.vue | 26 +----------------- src/utils/cn.ts | 4 +++ 6 files changed, 71 insertions(+), 27 deletions(-) create mode 100644 public/korrigo-logo.webp create mode 100644 src/utils/cn.ts diff --git a/package.json b/package.json index 0061da3..2e975e0 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@vitejs/plugin-vue": "^6.0.4", "@vue/eslint-config-typescript": "^14.7.0", "@vue/tsconfig": "^0.9.0", + "clsx": "^2.1.1", "eslint": "^10.0.3", "eslint-config-prettier": "^10.1.8", "eslint-plugin-oxlint": "~1.51.0", @@ -43,6 +44,7 @@ "oxfmt": "^0.37.0", "oxlint": "~1.51.0", "sass-embedded": "^1.98.0", + "tailwind-merge": "^3.5.0", "typescript": "~5.9.3", "vite": "^7.3.1", "vite-plugin-vue-devtools": "^8.0.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa4f5a9..fccd3c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,9 @@ importers: '@vue/tsconfig': specifier: ^0.9.0 version: 0.9.0(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3)) + clsx: + specifier: ^2.1.1 + version: 2.1.1 eslint: specifier: ^10.0.3 version: 10.1.0(jiti@2.6.1) @@ -87,6 +90,9 @@ importers: sass-embedded: specifier: ^1.98.0 version: 1.98.0 + tailwind-merge: + specifier: ^3.5.0 + version: 3.5.0 typescript: specifier: ~5.9.3 version: 5.9.3 @@ -1355,6 +1361,10 @@ packages: resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==} engines: {node: '>= 20.19.0'} + clsx@2.1.1: + resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} + engines: {node: '>=6'} + colorjs.io@0.5.2: resolution: {integrity: sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==} @@ -2143,6 +2153,9 @@ packages: resolution: {integrity: sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==} engines: {node: '>=16.0.0'} + tailwind-merge@3.5.0: + resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==} + tailwindcss@4.2.2: resolution: {integrity: sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==} @@ -3424,6 +3437,8 @@ snapshots: dependencies: readdirp: 5.0.0 + clsx@2.1.1: {} + colorjs.io@0.5.2: {} confbox@0.1.8: {} @@ -4166,6 +4181,8 @@ snapshots: sync-message-port@1.2.0: {} + tailwind-merge@3.5.0: {} + tailwindcss@4.2.2: {} tapable@2.3.1: {} diff --git a/public/korrigo-logo.webp b/public/korrigo-logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..26482a6983f424444828c93bf1629e2c69ddecd1 GIT binary patch literal 3320 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 C`<1%@ literal 0 HcmV?d00001 diff --git a/src/components/BikeMarker.vue b/src/components/BikeMarker.vue index 3b2a06b..4e917ac 100644 --- a/src/components/BikeMarker.vue +++ b/src/components/BikeMarker.vue @@ -1,4 +1,5 @@