Skip to content

Commit

Permalink
Merge pull request #10 from Lifemap-ToL/7-setup-general-public-page
Browse files Browse the repository at this point in the history
Major redesign
  • Loading branch information
joamartin authored Sep 11, 2024
2 parents d12de30 + 126955e commit 1cab5b3
Show file tree
Hide file tree
Showing 338 changed files with 12,685 additions and 1,347 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VITE_LIFEMAP_API_BASE_URL=https://lifemap-back.univ-lyon1.fr
VITE_WIKIDATA_QUERY_SERVICE_API_BASE_URL=https://query.wikidata.org
VITE_ENABLE_MATOMO_TRACKING=true
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_ENABLE_MATOMO_TRACKING=false
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.png">
<link rel="icon" href="/lifemap-favicon.png">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@5.8.55/css/materialdesignicons.min.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Lifemap</title>
Expand Down
1,411 changes: 934 additions & 477 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@
"private": true,
"scripts": {
"dev": "vite",
"build": "run-p type-check build-only",
"build": "vite build",
"build:type:check": "run-p type-check build-only",
"preview": "vite preview",
"test:unit": "vitest",
"test:unit:coverage": "vitest run --coverage",
"test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'",
"test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'",
"build-only": "vite build",
"type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"format": "prettier --write src/"
},
"dependencies": {
"axios": "^1.4.0",
"mitt": "^2.1.0",
"ol": "^7.4.0",
"ts-custom-error": "^3.3.1",
"vue": "^3.3.4",
"vue-facing-decorator": "^2.1.20",
"vue-facing-decorator": "^3.0.4",
"vue-i18n": "^9.13.1",
"vue-matomo": "^4.2.0",
"vue-router": "^4.2.2"
},
"devDependencies": {
Expand All @@ -36,12 +41,12 @@
"eslint": "^8.39.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-cypress": "^2.13.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-vue": "^9.11.0",
"jsdom": "^22.1.0",
"npm-run-all": "^4.1.2",
"prettier": "^2.8.8",
"sass": "^1.63.4",
"sass": "^1.64.2",
"start-server-and-test": "^2.0.0",
"typescript": "~5.0.4",
"vite": "^4.3.9",
Expand Down
6 changes: 6 additions & 0 deletions public/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
RewriteEngine On
RewriteBase /
RewriteRule ^index\.html$ - [L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule . /index.html [L]
Binary file added public/lifemap-favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
187 changes: 187 additions & 0 deletions src/assets/images/CR_EN.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1cab5b3

Please sign in to comment.