Merge branch 'bugfix/23-broken-build' into dev

close #23

src/App.vue

@@ -1,8 +1,9 @@
 <template>
-  <router-view></router-view>
+  <main>
+    <router-view></router-view>
+  </main>
 </template>
 
 <script setup>
-console.log(config.baseurl_selfservice);
 config.baseurl_selfservice = (config.baseurl_selfservice || "/selfservice");
 </script>

src/main.js

@@ -1,10 +1,21 @@
 import { createApp } from 'vue';
-import App from './App.vue';
-import Toast from 'vue-toastification';
-import 'windi.css';
+import './tailwind.css';
 import 'toastify-js/src/toastify.css';
 import 'vue-toastification/dist/index.css';
-import { router } from './router';
+import App from './App.vue';
+import { routes } from './routes.js';
+import { createRouter, createWebHistory } from 'vue-router';
 import { i18n } from './language';
+import Toast from 'vue-toastification';
 
-createApp(App).use(Toast).use(i18n).use(router).mount('#app');
+const app = createApp(App);
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes
+});
+
+app.use(router);
+app.use(i18n);
+app.use(Toast);
+app.mount('#app');

src/router.js

@@ -1,26 +0,0 @@
-import { createWebHistory, createRouter } from 'vue-router';
-// ------------
-const EnvError = import('./components/EnvError.vue');
-const Home = import('./components/Home.vue');
-const Imprint = import('./components/Imprint.vue');
-const Privacy = import('./components/Privacy.vue');
-const Register = () => import('./components/Register.vue');
-const Profile = () => import('./components/Profile.vue');
-//
-let routes = [ { path: '/:pathMatch(.*)*', component: EnvError } ];
-if (typeof config !== 'undefined') {
-	if (config.baseurl && config.documentserver_key) {
-		routes = [
-			{ path: '/', component: Home },
-			{ path: '/imprint', component: Imprint },
-			{ path: '/privacy', component: Privacy },
-			{ path: '/register', component: Register },
-			{ path: '/register/:token', component: Register, props: true },
-			{ path: '/profile/:token', component: Profile, props: true }
-		];
-	}
-}
-export const router = createRouter({
-	history: createWebHistory(),
-	routes
-});

src/routes.js

@@ -0,0 +1,16 @@
+import EnvError from './components/EnvError.vue';
+import Home from './views/Home.vue';
+import Imprint from './views/Imprint.vue';
+import Privacy from './views/Privacy.vue';
+import Register from './views/Register.vue';
+import Profile from './views/Profile.vue';
+
+/** @type {import('vue-router').RouterOptions['routes']} */
+export const routes = [
+	{ path: '/', component: Home },
+	{ path: '/imprint', component: Imprint },
+	{ path: '/privacy', component: Privacy },
+	{ path: '/register', component: Register },
+	{ path: '/register/:token', component: Register, props: true },
+	{ path: '/profile/:token', component: Profile, props: true }
+];

src/tailwind.css

@@ -0,0 +1,3 @@
+@import 'tailwindcss/base';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';

src/views/Home.vue

@@ -25,6 +25,5 @@
 </template>
 
 <script setup>
-import LoginForm from "./LoginForm.vue";
-import Footer from "./Footer.vue";
+import Footer from "@/components/Footer.vue";
 </script>

src/views/Imprint.vue

@@ -10,7 +10,7 @@
     </div>
   </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";

src/views/Privacy.vue

@@ -10,7 +10,7 @@
     </div>
   </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";

src/views/Profile.vue

@@ -165,13 +165,10 @@
 </template>
 
 <script setup>
-import { ref, reactive } from "vue";
+import { reactive } from "vue";
 import { useToast } from "vue-toastification";
 import axios from "redaxios";
-// import isEmail from 'validator/es/lib/isEmail';
-// import isMobilePhone from 'validator/es/lib/isMobilePhone';
-// import isPostalCode from 'validator/es/lib/isPostalCode';
-// 
+
 const state = reactive({
   phone: "",
   email: "",
@@ -187,7 +184,7 @@ const props = defineProps({
   token: String
 })
 const accesstoken = atob(props.token);
-axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
+axios.get(`${config.baseurl_selfservice}/api/runners/me/${accesstoken}`)
   .then(({ data }) => {
     state.phone = data.phone;
     state.email = data.email;

src/views/Register.vue

@@ -261,7 +261,7 @@ import isEmail from 'validator/es/lib/isEmail';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isPostalCode from 'validator/es/lib/isPostalCode';
 import { useToast } from "vue-toastification";
-import { router } from '../router';
+// import { router } from '../router';
 import { i18n } from '../language';
 
 const props = defineProps({
@@ -328,7 +328,7 @@ function login() {
       axios.post(url, postdata)
         .then(({ data }) => {
           const token = btoa(data.token);
-          router.push(`${config.baseurl_selfservice}/profile/${token}`);
+          // router.push(`${config.baseurl_selfservice}/profile/${token}`);
         })
         .catch((error) => {
           console.log(error);