diff --git a/src/ProjectViewApp.vue b/src/ProjectViewApp.vue index 103b397154331c57d0c4225f33a8d1051aee50b3..49fa406ffb019283328dd354e9b30f5b574e3c36 100644 --- a/src/ProjectViewApp.vue +++ b/src/ProjectViewApp.vue @@ -34,44 +34,40 @@ <script lang="ts"> import Vue from 'vue'; -import { LanguageUtil, GuidUtil } from '@coscine/app-util'; +import { LanguageUtil, GuidUtil, LinkUtil } from '@coscine/app-util'; -import { SubProjectApi, redirectToProject } from '@coscine/api-connection'; +import { SubProjectApi } from '@coscine/api-connection'; import projectImagePath from './assets/RWTH_Piktogramm_Projekte.png'; import zusatzImagePath from './assets/RWTH_Piktogramm_Zusatzangebot.png'; -let scriptPath = ''; +let pathToAppJs = ''; if (document.currentScript !== undefined) { - scriptPath = (document.currentScript as any).src as string; + pathToAppJs = (document.currentScript as any).src as string; } -const scriptUrl = scriptPath === '' ? '/' : scriptPath.substring(0, scriptPath.indexOf('app.js')); -const rootUrl = scriptPath.indexOf('/js') !== -1 ? scriptUrl.replace('/js', '') : scriptUrl; export default Vue.extend({ name: 'project', data() { return { - projectId: '', - selectedProjectId: '', - language: LanguageUtil.getLanguage(), subProjects: [] as object[], - projectImage: rootUrl + projectImagePath, - zusatzImage: rootUrl + zusatzImagePath, + projectImage: '', + zusatzImage: '', }; }, methods: { openCreate() { - window.location.href = window.location.origin + '/p/' + this.projectId + '/SitePages/CreateProject.aspx'; + LinkUtil.redirectToProject('CreateProject'); }, redirect(project: any) { - redirectToProject(project); + LinkUtil.redirectToExternalProject(project.slug.toLowerCase()); }, }, created() { - this.projectId = GuidUtil.getProjectId(); + this.projectImage = LinkUtil.getScriptPath(pathToAppJs) + projectImagePath; + this.zusatzImage = LinkUtil.getScriptPath(pathToAppJs) + zusatzImagePath; SubProjectApi.getSubProjects( - this.projectId, + GuidUtil.getProjectId(), (response: any) => { for (const datum of response.data) { this.subProjects.push(datum); } }); }, });