admin/apollo-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'featureApollo'

Browse Source 
# Conflicts:
#   src/router/index.js
#   src/views/pages/KsSimilaritySearch.vue
This commit is contained in:
Sumedh
2024-08-09 03:58:23 +00:00
parent 2a048c9932 55dd8ce8a3
commit 87d7185eb5
16 changed files with 875 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
package-lock.json generated
View File

@@ -9,12 +9,15 @@
"version": "4.0.0",
"dependencies": {
"@primevue/themes": "^4.0.0",
"@websanova/vue-auth": "^4.2.1",
"axios": "^1.7.2",
"chart.js": "3.3.2",
"moment": "^2.30.1",
"primeicons": "^6.0.1",
"primevue": "^4.0.0",
"prismjs": "^1.29.0",
"vue": "^3.4.34",
"vue-authenticate-2": "^2.2.0",
"vue-router": "^4.4.0"
},
"devDependencies": {
@@ -955,7 +958,6 @@
"cpu": [
"x64"
],
"dev": true,
"optional": true,
"os": [
"linux"
@@ -1154,6 +1156,11 @@
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.35.tgz",
"integrity": "sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ=="
},
"node_modules/@websanova/vue-auth": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/@websanova/vue-auth/-/vue-auth-4.2.1.tgz",
"integrity": "sha512-gc4WL3WzJMkj3wZmrBAP7U7WBAcVY0/a/YhCzMVR/iA1u/8QJlugq/320CRRbZ0Acz+qbGPhdm07IRE3U053yg=="
},
"node_modules/acorn": {
"version": "8.12.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
@@ -3039,6 +3046,15 @@
"node": ">=12.11.0"
}
},
"node_modules/prismjs": {
"version": "1.29.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
"license": "MIT",
"engines": {
"node": ">=6"
}
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -3807,6 +3823,18 @@
}
}
},
"node_modules/vue-authenticate-2": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/vue-authenticate-2/-/vue-authenticate-2-2.2.0.tgz",
"integrity": "sha512-4jk9Wv/bV6Bfk6LWQp5WESCe6hxkBrCQThFYqkg9F70q6auEDcdwzo2cVYWPFTwQE5UFX8C9MJUC2Wx6OYwdhw==",
"optionalDependencies": {
"@rollup/rollup-linux-x64-gnu": "^4.9.5"
},
"peerDependencies": {
"axios": "^1.6.7",
"vue": "^3.4.21"
}
},
"node_modules/vue-eslint-parser": {
"version": "9.4.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",