diff --git a/package-lock.json b/package-lock.json index acb5cfe..cde7c85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ }, "devDependencies": { "@tauri-apps/cli": "^2", + "@types/jquery": "^3.5.32", "@vitejs/plugin-vue": "^5.2.1", "sass-embedded": "^1.86.3", "typescript": "~5.6.2", @@ -1034,6 +1035,23 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/jquery": { + "version": "3.5.32", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz", + "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/sizzle": "*" + } + }, + "node_modules/@types/sizzle": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz", + "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==", + "dev": true, + "license": "MIT" + }, "node_modules/@vitejs/plugin-vue": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz", diff --git a/package.json b/package.json index 14f7d78..ca026f4 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ }, "devDependencies": { "@tauri-apps/cli": "^2", + "@types/jquery": "^3.5.32", "@vitejs/plugin-vue": "^5.2.1", "sass-embedded": "^1.86.3", "typescript": "~5.6.2", diff --git a/src/components/Modal.vue b/src/components/Modal.vue index 370b78d..a8f2413 100644 --- a/src/components/Modal.vue +++ b/src/components/Modal.vue @@ -1,19 +1,27 @@ \ No newline at end of file +@import "../assets/modal"; + diff --git a/src/components/startseite/Events.vue b/src/components/startseite/Events.vue index 1ff1061..19bf767 100644 --- a/src/components/startseite/Events.vue +++ b/src/components/startseite/Events.vue @@ -3,6 +3,8 @@ import RitzenbergenLib from "../../ritzenbergenlib.ts"; import striptags from "striptags"; import moment, { Moment } from "moment"; import Modal from "../Modal.vue"; +import $ from "jquery"; + export default { data() { let openedModals: number[] = []; @@ -14,7 +16,20 @@ export default { }, computed: { events() { - return [ + let result: any[]=[]; + + $.ajax(RitzenbergenLib.api("get_events.php"),{ + crossDomain: true, + async: false, + success: function (data:string) { + result = JSON.parse(data); + }, + }); + console.log(result); + return result; + /* + Beispiel-Event-Array: + [ { id: 0, eventname: "Eventname", @@ -60,7 +75,7 @@ export default { link: undefined, foto: "erntefest/2011/pic08.jpg", }, - ]; + ];*/ }, }, methods:{ @@ -74,11 +89,9 @@ export default { } }, format_date(date: string){ - let mymoment:Moment=moment(); - mymoment.set("year",parseInt(date.split("-")[0])); - mymoment.set("month",parseInt(date.split("-")[2])-1); - mymoment.set("day",parseInt(date.split("-")[1])); - return mymoment.format("DD.MM.YYYY") + let mymoment:Moment=moment(date); + + return mymoment.format("DD.MM.YYYY"); } }, components: { diff --git a/src/jquery.d.ts b/src/jquery.d.ts new file mode 100644 index 0000000..1fc6d57 --- /dev/null +++ b/src/jquery.d.ts @@ -0,0 +1 @@ +declare module 'jquery'; \ No newline at end of file diff --git a/src/ritzenbergenlib.ts b/src/ritzenbergenlib.ts index 5275c20..342f12e 100644 --- a/src/ritzenbergenlib.ts +++ b/src/ritzenbergenlib.ts @@ -4,7 +4,7 @@ export default class RitzenbergenLib { else return "http://bilder.ritzenbergen.de/"+mypath; } static api(path:string){ - if(path.startsWith("/")) return "http://api.ritzenbergen.de"+path; - else return "http://api.ritzenbergen.de/"+path; + if(path.startsWith("/")) return "http://192.168.188.38/Jonas/ritzenbergenapi"+path; + else return "http://192.168.188.38/Jonas/ritzenbergenapi/"+path; } } \ No newline at end of file