diff --git a/backend/images/scripts/test.js b/backend/images/scripts/test.js
new file mode 100644
index 0000000..749b3a3
--- /dev/null
+++ b/backend/images/scripts/test.js
@@ -0,0 +1,25 @@
+let username = document.getElementById("txt-username")
+let password = document.getElementById("txt-password")
+let loginBtn = document.getElementById("btn-login")
+
+console.log("Active")
+
+function grabData() {
+ console.log("Grabbed Username: " + username?.value + ", grabbed password: " + password?.value)
+}
+
+username?.addEventListener("keypress", (event) => {
+ if (event.key === "Enter") {
+ grabData()
+ }
+})
+
+password?.addEventListener("keypress", (event) => {
+ if (event.key === "Enter") {
+ grabData()
+ }
+})
+
+loginBtn?.addEventListener("click", (event) => {
+ grabData()
+})
\ No newline at end of file
diff --git a/backend/routes/files.routes.ts b/backend/routes/files.routes.ts
index 71b8bfb..379a6ce 100644
--- a/backend/routes/files.routes.ts
+++ b/backend/routes/files.routes.ts
@@ -30,10 +30,14 @@ files.get("/:folder", async (req: Request, res: Response) => {
let result = []
let fileNames = fs.readdirSync("./backend/images/" + req.params.folder + "/")
+
fileNames.forEach(file => {
+ let resData = fs.readFileSync("./backend/images/" + req.params.folder + "/" + file, "utf8")
+
result.push({
name: file,
size: fs.statSync("./backend/images/" + req.params.folder + "/" + file).size,
+ content: resData,
url: "http://localhost:3000/static/" + req.params.folder + "/" + file
})
})
diff --git a/src/components/navigation/companyFooter.vue b/src/components/navigation/companyFooter.vue
index cc4f4eb..388dbe2 100644
--- a/src/components/navigation/companyFooter.vue
+++ b/src/components/navigation/companyFooter.vue
@@ -52,9 +52,13 @@ watch(() => route.path, () => {
-
+
{{ exerciseStore.solveExercise(3, 1) }}
+
+
+ {{ exerciseStore.solveExercise(3, 2) }}
+
diff --git a/src/components/navigation/urlBar.vue b/src/components/navigation/urlBar.vue
index 34ed08c..83e4b3b 100644
--- a/src/components/navigation/urlBar.vue
+++ b/src/components/navigation/urlBar.vue
@@ -10,6 +10,10 @@ function navigate() {
router.push(newPath)
}
+function refreshPage() {
+ window.location.reload()
+}
+
watch(() => router.currentRoute.value.fullPath, () => {
path.value = "https://www.eventmaster.com" + router.currentRoute.value.fullPath
})
@@ -61,7 +65,7 @@ watch(() => router.currentRoute.value.fullPath, () => {
diff --git a/src/pages/account/loginPage/loginForm.vue b/src/pages/account/loginPage/loginForm.vue
index 9a97af7..0d45411 100644
--- a/src/pages/account/loginPage/loginForm.vue
+++ b/src/pages/account/loginPage/loginForm.vue
@@ -2,6 +2,7 @@
import cardView from '@/components/basics/cardView.vue';
import outlinedButton from '@/components/basics/outlinedButton.vue';
import { useAccountStore } from '@/stores/account.store';
+import { watch } from 'vue';
import { useRouter } from 'vue-router';
const accountStore = useAccountStore()
@@ -33,6 +34,7 @@ async function startLogin() {
variant="outlined"
clearable
@keyup.enter="startLogin"
+ id="txt-username"
/>
@@ -47,6 +49,7 @@ async function startLogin() {
v-model="accountStore.loginData.password"
clearable
@keyup.enter="startLogin"
+ id="txt-password"
/>
@@ -65,6 +68,7 @@ async function startLogin() {
@click="startLogin"
:loading="accountStore.fetchInProgress"
color="green"
+ id="btn-login"
>
{{ $t('account.login.login') }}
diff --git a/src/pages/admin/filesAdminPage/index.vue b/src/pages/admin/filesAdminPage/index.vue
index d904a83..0a71014 100644
--- a/src/pages/admin/filesAdminPage/index.vue
+++ b/src/pages/admin/filesAdminPage/index.vue
@@ -16,6 +16,7 @@ filesStore.getStaticFolders()
:add-button-string="$t('misc.uploadFile')"
:fetch-in-progress="filesStore.fetchInProgress"
:on-add-click="() => { filesStore.showFileUploadDialog = true }"
+ :hide-add-button="true"
>
@@ -48,9 +49,28 @@ filesStore.getStaticFolders()
-
+
+
+ {{ filesStore.selectedFile.url }}
+
+
+
+
+
+
+
+
+
diff --git a/src/stores/files.store.ts b/src/stores/files.store.ts
index 64140b8..9f04d63 100644
--- a/src/stores/files.store.ts
+++ b/src/stores/files.store.ts
@@ -12,9 +12,9 @@ export const useFilesStore = defineStore('filesStore', {
selectedFolder: ref<{name: string, nrOfItems: number}>(),
/** List of files on the server */
- staticFiles: ref>([]),
+ staticFiles: ref>([]),
- selectedFile: ref<{name: string, size: number, url: string}>(),
+ selectedFile: ref<{name: string, size: number, content: string, url: string}>(),
showFileUploadDialog: ref(false),