First steps of license store system
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 677 KiB After Width: | Height: | Size: 599 KiB |
@@ -24,7 +24,9 @@ files.get("/folders", async (req: Request, res: Response) => {
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all uploaded file names by file name
|
* Get all uploaded file names by folder name
|
||||||
|
*
|
||||||
|
* @param folder Name of folder on server
|
||||||
*/
|
*/
|
||||||
files.get("/:folder", async (req: Request, res: Response) => {
|
files.get("/:folder", async (req: Request, res: Response) => {
|
||||||
let result = []
|
let result = []
|
||||||
@@ -34,11 +36,13 @@ files.get("/:folder", async (req: Request, res: Response) => {
|
|||||||
fileNames.forEach(file => {
|
fileNames.forEach(file => {
|
||||||
let resData = fs.readFileSync("./backend/images/" + req.params.folder + "/" + file, "utf8")
|
let resData = fs.readFileSync("./backend/images/" + req.params.folder + "/" + file, "utf8")
|
||||||
|
|
||||||
|
// todo License, Author, URL
|
||||||
result.push({
|
result.push({
|
||||||
name: file,
|
name: file,
|
||||||
size: fs.statSync("./backend/images/" + req.params.folder + "/" + file).size,
|
size: fs.statSync("./backend/images/" + req.params.folder + "/" + file).size,
|
||||||
content: resData,
|
content: resData,
|
||||||
url: "http://localhost:3000/static/" + req.params.folder + "/" + file
|
url: "http://localhost:3000/static/" + req.params.folder + "/" + file,
|
||||||
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
28
package-lock.json
generated
28
package-lock.json
generated
@@ -14,6 +14,8 @@
|
|||||||
"axios": "^1.7.7",
|
"axios": "^1.7.7",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
"exif-js": "^2.3.0",
|
||||||
|
"exifreader": "^4.25.0",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"jspdf": "^2.5.2",
|
"jspdf": "^2.5.2",
|
||||||
@@ -5023,6 +5025,32 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/exif-js": {
|
||||||
|
"version": "2.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/exif-js/-/exif-js-2.3.0.tgz",
|
||||||
|
"integrity": "sha512-1Og9pAzG2FZRVlaavH8bB8BTeHcjMdJhKmeQITkX+uLRCD0xPtKAdZ2clZmQdJ56p9adXtJ8+jwrGp/4505lYg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/exifreader": {
|
||||||
|
"version": "4.25.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/exifreader/-/exifreader-4.25.0.tgz",
|
||||||
|
"integrity": "sha512-lPyPXWTUuYgoKdKf3rw2EDoE9Zl7xHoy/ehPNeQ4gFVNLzfLyNMP4oEI+sP0/Czp5r/2i7cFhqg5MHsl4FYtyw==",
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"license": "MPL-2.0",
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@xmldom/xmldom": "^0.9.4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/exifreader/node_modules/@xmldom/xmldom": {
|
||||||
|
"version": "0.9.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.9.5.tgz",
|
||||||
|
"integrity": "sha512-6g1EwSs8cr8JhP1iBxzyVAWM6BIDvx9Y3FZRIQiMDzgG43Pxi8YkWOZ0nQj2NHgNzgXDZbJewFx/n+YAvMZrfg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/expand-template": {
|
"node_modules/expand-template": {
|
||||||
"version": "2.0.3",
|
"version": "2.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
|
||||||
|
|||||||
@@ -38,6 +38,8 @@
|
|||||||
"axios": "^1.7.7",
|
"axios": "^1.7.7",
|
||||||
"body-parser": "^1.20.2",
|
"body-parser": "^1.20.2",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
"exif-js": "^2.3.0",
|
||||||
|
"exifreader": "^4.25.0",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"jspdf": "^2.5.2",
|
"jspdf": "^2.5.2",
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
defineProps({
|
import { loadLicense } from '@/scripts/imageScripts';
|
||||||
|
import { ref, watch } from 'vue';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
image: String,
|
image: String,
|
||||||
errorImage: {
|
errorImage: {
|
||||||
type: String,
|
type: String,
|
||||||
@@ -16,12 +19,27 @@ defineProps({
|
|||||||
},
|
},
|
||||||
loading: Boolean
|
loading: Boolean
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const license = ref("")
|
||||||
|
|
||||||
|
loadLicense(props.image)
|
||||||
|
.then(result => {
|
||||||
|
console.log(result)
|
||||||
|
license.value = result
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<v-tooltip
|
||||||
|
:text="license"
|
||||||
|
location="top"
|
||||||
|
open-delay="200"
|
||||||
|
>
|
||||||
|
<template #activator="{ props }">
|
||||||
<v-card
|
<v-card
|
||||||
variant="tonal"
|
variant="tonal"
|
||||||
:link="link"
|
:link="link"
|
||||||
|
v-bind="props"
|
||||||
>
|
>
|
||||||
<v-skeleton-loader
|
<v-skeleton-loader
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
@@ -74,3 +92,5 @@ defineProps({
|
|||||||
</v-card-actions>
|
</v-card-actions>
|
||||||
</v-card>
|
</v-card>
|
||||||
</template>
|
</template>
|
||||||
|
</v-tooltip>
|
||||||
|
</template>
|
||||||
@@ -50,7 +50,7 @@ filesStore.getStaticFolders()
|
|||||||
|
|
||||||
<v-col class="border">
|
<v-col class="border">
|
||||||
<v-row>
|
<v-row>
|
||||||
<v-col>
|
<v-col v-if="filesStore.selectedFile != undefined">
|
||||||
{{ filesStore.selectedFile.url }}
|
{{ filesStore.selectedFile.url }}
|
||||||
</v-col>
|
</v-col>
|
||||||
</v-row>
|
</v-row>
|
||||||
|
|||||||
12
src/pages/misc/imageLicensePage/index.vue
Normal file
12
src/pages/misc/imageLicensePage/index.vue
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { useFilesStore } from '@/stores/files.store';
|
||||||
|
|
||||||
|
|
||||||
|
const filesStore = useFilesStore()
|
||||||
|
|
||||||
|
filesStore.getStaticFiles()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<v-img v-for="image of filesStore.staticFiles" :src="image.url"/>
|
||||||
|
</template>
|
||||||
@@ -15,6 +15,7 @@ import LoginPage from "@/pages/account/loginPage/index.vue"
|
|||||||
import PreferencesPage from "@/pages/misc/preferencesPage/index.vue";
|
import PreferencesPage from "@/pages/misc/preferencesPage/index.vue";
|
||||||
import HelpPage from "@/pages/misc/helpPage/index.vue"
|
import HelpPage from "@/pages/misc/helpPage/index.vue"
|
||||||
import ErrorPage from "@/pages/misc/errorPage/index.vue"
|
import ErrorPage from "@/pages/misc/errorPage/index.vue"
|
||||||
|
import ImageLicensePage from "@/pages/misc/imageLicensePage/index.vue"
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
// Main page
|
// Main page
|
||||||
@@ -52,6 +53,7 @@ const routes = [
|
|||||||
{ path: '/basket', component: BasketPage },
|
{ path: '/basket', component: BasketPage },
|
||||||
{ path: '/preferences', component: PreferencesPage },
|
{ path: '/preferences', component: PreferencesPage },
|
||||||
{ path: '/help', component: HelpPage },
|
{ path: '/help', component: HelpPage },
|
||||||
|
{ path: '/license', component: ImageLicensePage },
|
||||||
|
|
||||||
// Error Page
|
// Error Page
|
||||||
{ path: "/404", component: ErrorPage }
|
{ path: "/404", component: ErrorPage }
|
||||||
|
|||||||
13
src/scripts/imageScripts.ts
Normal file
13
src/scripts/imageScripts.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import { load } from "exifreader"
|
||||||
|
|
||||||
|
export async function loadLicense(url: string){
|
||||||
|
let result = ""
|
||||||
|
|
||||||
|
await load(url)
|
||||||
|
.then(tags => {
|
||||||
|
result = tags["Copyright"]["description"] + " by " + tags["Artist"]["description"]
|
||||||
|
})
|
||||||
|
.catch(e => {})
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
@@ -35,7 +35,7 @@ export const useFilesStore = defineStore('filesStore', {
|
|||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Request all available static files on server
|
* Request static files on server by selected folder
|
||||||
*/
|
*/
|
||||||
async getStaticFiles() {
|
async getStaticFiles() {
|
||||||
this.fetchInProgress = true
|
this.fetchInProgress = true
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { CityModel } from "../data/models/locations/cityModel";
|
|||||||
import { fetchAllCities } from "../data/api/cityApi";
|
import { fetchAllCities } from "../data/api/cityApi";
|
||||||
import { LocationDetailsApiModel } from "@/data/models/locations/locationDetailsApiModel";
|
import { LocationDetailsApiModel } from "@/data/models/locations/locationDetailsApiModel";
|
||||||
import { useFeedbackStore } from "./feedback.store";
|
import { useFeedbackStore } from "./feedback.store";
|
||||||
|
import { getData, getTag } from "exif-js";
|
||||||
|
|
||||||
export const useLocationStore = defineStore("locationStore", {
|
export const useLocationStore = defineStore("locationStore", {
|
||||||
state: () => ({
|
state: () => ({
|
||||||
|
|||||||
Reference in New Issue
Block a user