added env config instructions

ref #27
Home - route fixes
2021-03-31 19:03:07 +02:00 · 2021-03-31 18:56:34 +02:00 · 2021-03-31 18:55:30 +02:00 · 2021-03-31 18:55:00 +02:00 · 2021-03-31 18:45:23 +02:00 · 2021-03-31 18:45:04 +02:00
20 changed files with 167 additions and 128 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,25 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.3.1](https://git.odit.services/lfk/selfservice/compare/0.3.0...0.3.1)
 - 🐞 fixed Vite/ Tailwind build [`27b81d8`](https://git.odit.services/lfk/selfservice/commit/27b81d87aeb907f6c3d35ea6f55b4fe56c1e79b4)
 #### [0.3.0](https://git.odit.services/lfk/selfservice/compare/0.2.0...0.3.0)
 > 30 March 2021
 - Merge branch 'bugfix/23-broken-build' into dev [`#23`](https://git.odit.services/lfk/selfservice/issues/23)
 - migrate to Tailwind JIT + views + router/ build fix [`15b60f6`](https://git.odit.services/lfk/selfservice/commit/15b60f60b5d4f3c4035460f25807c5f5f2f19578)
 - 🚀Bumped version to v0.3.0 [`cb5f48d`](https://git.odit.services/lfk/selfservice/commit/cb5f48d913b8aff2b138c93c4e29a2b8a553529d)
 - 🐞 fix release config [`ae44d7e`](https://git.odit.services/lfk/selfservice/commit/ae44d7e2e86b9bee74d453301846d02b29c632f2)
 - 🚀Bumped version to v0.1.2 [`5253fb1`](https://git.odit.services/lfk/selfservice/commit/5253fb18325ce9069e84180b30110ae97752ef20)
 #### [0.2.0](https://git.odit.services/lfk/selfservice/compare/0.1.1...0.2.0)
 > 27 March 2021
 - 🚀Bumped version to v0.2.0 [`83924a9`](https://git.odit.services/lfk/selfservice/commit/83924a9416dc966a417b32fa19b5fb725181e5ee)
 - Added ci to build dev and tags [`a174df1`](https://git.odit.services/lfk/selfservice/commit/a174df19ddbf65b0229af38947a9416b1bcd0703)
 - Now building latest from main [ci-skip] [`323ddc1`](https://git.odit.services/lfk/selfservice/commit/323ddc1c3d91ffa74200ed9250b891d2fe4da78d)
 - Added releaseit config [`eec6a35`](https://git.odit.services/lfk/selfservice/commit/eec6a358d899a40eb6bac92bb3af37b2d37a5d91)
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ runner selfservice portal
 ## ⚡ Development
 ### Requirements
- Node.js v14.15.0 or newer
+- Node.js v14.16.0 or newer
 - yarn package manager >= v1.22.10 < 2
 ### Recommended Extensions
@@ -14,9 +14,17 @@ runner selfservice portal
 ### Fastest Dev Environment
 - You can install the [Remote - Containers](https://github.com/Microsoft/vscode-remote-release) extension and use all recommended extensions and editor settings via the provided `./devcontainer/` config
-## 🔨 environment config
+### Manual Dev Environment
 ```
 yarn && yarn dev --open
 ```
 ## 🔨 Environment config
 - copy the `/public/env.sample.js` file to `/public/env.js`
 - set the required environment variables
  - `documentserver_key`: url to the [document server](https://git.odit.services/lfk/document-server) instance
-  - `baseurl`: url to the main instance
+  - `baseurl`: url to the main lfk instance - WITH TRAILING SLASH
-  - see [@lfk/deployment](https://git.odit.services/lfk/deployment) for a complete deployment guide
+  - see [@lfk/deployment](https://git.odit.services/lfk/deployment) for a complete deployment guide
  - `baseurl_selfservice`: location of the selfservice instance - WITH TRAILING SLASH
    - e.g. path: `/selfservice/`
    - e.g. url: `https://example.com/selfservice/`
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
 <body class="dark:bg-gray-900 text-black dark:text-white p-0">
  <div id="app"></div>
  <script src="/env.js"></script>
-  <script type="module" src="/src/main.js"></script>
+  <script defer type="module" src="/src/main.js"></script>
 </body>
 </html>
--- a/package.json
+++ b/package.json
@@ -1,47 +1,50 @@
 {
-  "name": "@odit/lfk-selfservice",
+	"name": "@odit/lfk-selfservice",
-  "version": "0.2.0",
+	"version": "0.3.1",
-  "scripts": {
+	"scripts": {
-    "dev": "vite",
+		"dev": "vite",
-    "build": "vite build",
+		"build": "vite build",
-    "release": "release-it --only-version"
+		"release": "release-it --only-version"
-  },
+	},
-  "dependencies": {
+	"dependencies": {
-    "marked": "^2.0.1",
+		"marked": "2.0.1",
-    "redaxios": "^0.4.1",
+		"redaxios": "0.4.1",
-    "toastify-js": "^1.10.0",
+		"toastify-js": "1.10.0",
-    "validator": "^13.5.2",
+		"validator": "13.5.2",
-    "vue": "^3.0.5",
+		"vue-i18n": "9.0.0",
-    "vue-i18n": "^9.0.0",
+		"vue-toastification": "2.0.0-rc.1",
-    "vue-router": "4",
+		"vue": "3.0.9",
-    "vue-toastification": "^2.0.0-rc.1"
+		"vue-router": "4.0.5"
-  },
+	},
-  "devDependencies": {
+	"devDependencies": {
-    "@vitejs/plugin-vue": "^1.1.5",
+		"@tailwindcss/jit": "0.1.18",
-    "@vue/compiler-sfc": "^3.0.7",
+		"@tailwindcss/aspect-ratio": "0.2.0",
-    "autoprefixer": "^10.2.5",
+		"@tailwindcss/forms": "0.3.2",
-    "postcss": "^8.2.8",
+		"@tailwindcss/line-clamp": "0.2.0",
-    "release-it": "^14.5.0",
+		"@tailwindcss/typography": "0.4.0",
-    "tailwindcss": "^2.0.4",
+		"@vitejs/plugin-vue": "1.2.1",
-    "vite": "^2.1.3",
+		"@vue/compiler-sfc": "3.0.10",
-    "vite-plugin-windicss": "^0.10.2"
+		"autoprefixer": "10.2.5",
-  },
+		"tailwindcss": "2.0.4",
-  "release-it": {
+		"release-it": "14.5.0",
-    "git": {
+		"vite": "2.1.5"
-      "commit": true,
+	},
-      "requireCleanWorkingDir": false,
+	"release-it": {
-      "commitMessage": "🚀Bumped version to v${version}",
+		"git": {
-      "requireBranch": "dev",
+			"commit": true,
-      "push": false,
+			"requireCleanWorkingDir": false,
-      "tag": true,
+			"commitMessage": "🚀Bumped version to v${version}",
-      "tagName": null,
+			"requireBranch": "dev",
-      "tagAnnotation": "v${version}"
+			"push": false,
-    },
+			"tag": true,
-    "npm": {
+			"tagName": null,
-      "publish": false
+			"tagAnnotation": "v${version}"
-    },
+		},
-    "hooks": {
+		"npm": {
-      "after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
+			"publish": false
-    }
+		},
-  }
+		"hooks": {
 			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node order_i18n.js  && git add src/locales"
 		}
 	}
 }
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,6 @@
 module.exports = {
  plugins: {
-    tailwindcss: {},
+    '@tailwindcss/jit': {},
    autoprefixer: {},
  },
 }
--- a/public/env.sample.js
+++ b/public/env.sample.js
@@ -1,10 +1,10 @@
 const config = {
 	// required
 	documentserver_key: '',
-	// required
+	// required, with trailing slash
 	baseurl: '',
-	// optional, will fallback to /selfservice
+	// optional, will fallback to /selfservice/
-	baseurl_selfservice: '/selfservice',
+	baseurl_selfservice: '/selfservice/',
 	// optional, will fallback to /imprint
 	url_imprint: '',
 	// optional, will fallback to /privacy
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,5 @@
 <template>
-  <router-view></router-view>
+  <main>
-</template>
+    <router-view></router-view>
-
+  </main>
-<script setup>
+</template>
 console.log(config.baseurl_selfservice);
 config.baseurl_selfservice = (config.baseurl_selfservice || "/selfservice");
 </script>
--- a/src/main.js
+++ b/src/main.js
@@ -1,10 +1,21 @@
 import { createApp } from 'vue';
-import App from './App.vue';
+import './tailwind.css';
 import Toast from 'vue-toastification';
 import 'windi.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');
--- a/src/router.js
+++ b/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
 });
--- a/src/routes.js
+++ b/src/routes.js
@@ -0,0 +1,24 @@
 // 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';
 import ProfileNone from './views/ProfileNone.vue';
 console.log(config);
 /** @type {import('vue-router').RouterOptions['routes']} */
 export const routes = [
 	{ path: config.baseurl_selfservice + '', component: Home },
 	{ path: config.baseurl_selfservice + 'imprint', component: Imprint },
 	{ path: config.baseurl_selfservice + 'imprint/', component: Imprint },
 	{ path: config.baseurl_selfservice + 'privacy', component: Privacy },
 	{ path: config.baseurl_selfservice + 'privacy/', component: Privacy },
 	{ path: config.baseurl_selfservice + 'register', component: Register },
 	{ path: config.baseurl_selfservice + 'register/', component: Register },
 	{ path: config.baseurl_selfservice + 'register/:token', component: Register, props: true },
 	{ path: config.baseurl_selfservice + 'profile', component: Profile },
 	{ path: config.baseurl_selfservice + 'profile/', component: ProfileNone },
 	{ path: config.baseurl_selfservice + 'profile/:token', component: Profile, props: true }
 ];
--- a/src/components/simple.css
+++ b/src/components/simple.css
--- a/src/tailwind.css
+++ b/src/tailwind.css
@@ -0,0 +1,3 @@
@import 'tailwindcss/base';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-cover bg-fixed m-0 h-screen" style="background-image: url('/background.jpg');">
+  <div class="bg-cover bg-fixed m-0 h-screen" style="background-image: url('./background.jpg');">
    <section class="container px-4 py-24 mx-auto">
      <div class="w-full mx-auto text-center">
        <img src="/favicon.png" class="h-32 mx-auto" />
@@ -9,14 +9,14 @@
        <p class="px-0 mb-6 text-lg text-gray-100 md:text-xl lg:px-24">Selfservice Portal</p>
        <p class="px-0 mb-6 text-md text-gray-100 lg:px-24">{{ $t('main_page_text') }}</p>
        <div class="mt-6 sm:flex place-content-center">
-          <router-link
+          <a
            class="w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-gray-900 bg-white shadow-sm hover:text-gray-600 focus:outline-none focus:text-gray-600 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-            to="/register"
+            href="./register/"
-          >{{ $t('register_now') }}</router-link>
+          >{{ $t('register_now') }}</a>
-          <router-link
+          <a
-            to="/profile"
+            href="./profile/"
            class="mt-4 sm:ml-4 sm:mt-0 w-full sm:w-auto inline-flex px-6 py-3 border border-transparent text-base font-semibold rounded-md text-white bg-gray-800 shadow-sm hover:bg-gray-700 focus:outline-none focus:bg-gray-700 transition ease-in-out duration-150 xl:text-lg xl:py-4"
-          >{{ $t('view_my_data') }}</router-link>
+          >{{ $t('view_my_data') }}</a>
        </div>
      </div>
    </section>
@@ -25,6 +25,6 @@
 </template>
 <script setup>
-import LoginForm from "./LoginForm.vue";
+import Footer from "@/components/Footer.vue";
-import Footer from "./Footer.vue";
+console.log(config);
 </script>
--- a/src/components/Imprint.vue
+++ b/src/components/Imprint.vue
@@ -10,7 +10,7 @@
    </div>
  </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
--- a/src/components/Privacy.vue
+++ b/src/components/Privacy.vue
@@ -10,7 +10,7 @@
    </div>
  </section>
 </template>
-<style src="./simple.css">
+<style src="../simple.css">
 </style>
 <script>
 import marked from "marked";
--- a/src/components/Profile.vue
+++ b/src/components/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;
--- a/src/views/ProfileNone.vue
+++ b/src/views/ProfileNone.vue
@@ -0,0 +1 @@
 <template>You have not provided a valid access key...</template>
--- a/src/components/Register.vue
+++ b/src/components/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);
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,11 +1,11 @@
 module.exports = {
-  purge: [],
+	purge: [ './index.html', './src/**/*.{vue,js,ts,jsx,tsx}' ],
-  darkMode: "media", // or 'media' or 'class'
+	darkMode: 'media', // or 'media' or 'class'
-  theme: {
+	theme: {
-    extend: {},
+		extend: {}
-  },
+	},
-  variants: {
+	variants: {
-    extend: {},
+		extend: {}
-  },
+	},
-  plugins: [],
+	plugins: []
-}
+};
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,9 +1,13 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import WindiCSS from 'vite-plugin-windicss';
+import path from 'path';
-/**
+export default defineConfig({
- * @type {import('vite').UserConfig}
+	plugins: [ vue() ],
- */
+	base: './',
-export default {
+	resolve: {
-	plugins: [ vue(), WindiCSS() ]
+		alias: {
-};
+			'@': path.resolve(__dirname, '/src')
 		}
 	}
 });
Author	SHA1	Message	Date
Philipp Dormann	ba604f77e9	added env config instructions ref #27	2021-03-31 19:03:07 +02:00
Philipp Dormann	c178932d94	Home - route fixes ref #27	2021-03-31 18:56:34 +02:00
Philipp Dormann	63d9ee2f86	favicon fix ref #27	2021-03-31 18:55:30 +02:00
Philipp Dormann	106bf4c0ff	route fix for favicon + background ref #27	2021-03-31 18:55:00 +02:00
Philipp Dormann	2e7a718daa	load main.js as deferred ref #27	2021-03-31 18:45:23 +02:00
Philipp Dormann	f603e53151	added missing routes ref #27	2021-03-31 18:45:04 +02:00
Philipp Dormann	6e0bf56289	🚀Bumped version to v0.3.1 All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-31 17:14:20 +02:00
Philipp Dormann	27b81d87ae	🐞 fixed Vite/ Tailwind build	2021-03-31 17:13:57 +02:00
Philipp Dormann	cb5f48d913	🚀Bumped version to v0.3.0 All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-30 18:17:31 +02:00
Philipp Dormann	ae44d7e2e8	🐞 fix release config	2021-03-30 18:17:09 +02:00
Philipp Dormann	69bfe9e585	Merge branch 'bugfix/23-broken-build' into dev All checks were successful continuous-integration/drone/push Build is passing Details close #23	2021-03-30 18:12:04 +02:00
Philipp Dormann	15b60f60b5	migrate to Tailwind JIT + views + router/ build fix ref #23	2021-03-30 18:05:55 +02:00
Philipp Dormann	5253fb1832	🚀Bumped version to v0.1.2	2021-03-27 19:02:19 +01:00
		`@@ -0,0 +1 @@`
							`<template>You have not provided a valid access key...</template>`