Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,35 @@ services:
- "traefik.http.services.meilisearch-manager.loadbalancer.server.port=${VITE_APP_PORT:-5173}"
networks:
- proxy

meilisearch:
image: "getmeili/meilisearch:latest"
ports:
- "${FORWARD_MEILISEARCH_PORT:-7700}:7700"
environment:
MEILI_NO_ANALYTICS: "${MEILISEARCH_NO_ANALYTICS:-true}"
MEILI_MASTER_KEY: '${MEILISEARCH_MASTER_KEY:-masterKey}'
MEILI_ENV: development
volumes:
- "meilisearch-data:/meili_data"
labels:
- "traefik.enable=true"
- "traefik.http.routers.meilisearch-manager-test-instance.rule=Host(`test-instance.meilisearch-manager.localhost`)"
- "traefik.http.services.meilisearch-manager-test-instance.server.port=7700"
networks:
- proxy
healthcheck:
test:
- CMD
- wget
- "--no-verbose"
- "--spider"
- "http://127.0.0.1:7700/health"
retries: 3
timeout: 5s

volumes:
meilisearch-data:

networks:
proxy: # setup in separate container
Expand Down
2,075 changes: 861 additions & 1,214 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"lint": "eslint . --fix"
},
"dependencies": {
"@primeuix/themes": "^1.2.3",
"@primeuix/themes": "^2.0.0",
"@primevue/forms": "^4.3.9",
"@tailwindcss/vite": "^4.1.12",
"@types/lodash": "^4.17.20",
Expand All @@ -39,7 +39,7 @@
"zod": "^4.1.8"
},
"devDependencies": {
"@primevue/auto-import-resolver": "^4.3.9",
"@primevue/auto-import-resolver": "^4.5.0",
"@tsconfig/node22": "^22.0.2",
"@types/node": "^22.16.5",
"@vitejs/plugin-vue": "^6.0.1",
Expand Down
1 change: 1 addition & 0 deletions src/assets/css/app.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
html {
/* font size will determine the component/utility scaling */
font-size: 14px;
line-height: 1.15;
}

body {
Expand Down
285 changes: 0 additions & 285 deletions src/assets/css/custom-preflight.css

This file was deleted.

9 changes: 2 additions & 7 deletions src/assets/css/tailwind.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
@layer theme, base, primevue, utilities;

@import 'tailwindcss/theme.css' layer(theme);
/* Custom Preflight implementation that plays nice with PrimeVue component styling */
@import './custom-preflight.css' layer(base);
@import 'tailwindcss/utilities.css' layer(utilities);
@import 'tailwindcss-primeui';
@import "tailwindcss";
@import "tailwindcss-primeui";

@custom-variant dark (&:where(.dark, .dark *));

Expand Down
Loading