Merge branch 'dsf.dev_restructuring_2.0' of https://github.com/datasharingframework/datasharingframework.github.io into dsf.dev_restructuring_2.0

Author: jaboehri

README.md

@@ -8,6 +8,8 @@
 
 ### Move into docs folder
 cd docs
+### Install dependencies
+npm i
 ### Build 
 npm run docs:build
 ### Run

docs/src/.vuepress/client.ts

@@ -1,11 +1,13 @@
 import { defineClientConfig } from 'vuepress/client'
-import { Layout as ParentLayout, NotFound } from "vuepress-theme-hope/client";
+import { Layout as ParentLayout } from "vuepress-theme-hope/client";
 
 import Layout from './layouts/PageLayout.vue'
+import NotFoundLayout from './layouts/NotFoundLayout.vue'
 
 export default defineClientConfig({
   layouts: {
-    //ParentLayout,
-    Layout
+    ParentLayout,
+    Layout,
+    NotFound: NotFoundLayout
   },
 })

docs/src/.vuepress/layouts/NotFoundLayout.vue

@@ -0,0 +1,46 @@
+<script setup lang="ts">
+// import ParentLayout from '@vuepress/theme-default/layouts/Layout.vue'
+import { NotFound as ParentLayout, PageContent } from 'vuepress-theme-hope/client'
+import { useRoute, useRouter } from "vue-router";
+import { ref } from 'vue'
+
+const route = useRoute();
+const router = useRouter();
+
+function removeLastPathComponent(path) {
+  const parts = path.replace(/\/+$/, '').split('/');
+  parts.pop(); // Remove the last component
+  const newPath = parts.join('/');
+  return (newPath ? newPath : '') + '/';
+}
+
+function redirectToParentDirectoryIfInOperations() : void {
+    if (route.path.startsWith('/operations/')) {
+        router.push(removeLastPathComponent(route.path));
+
+    }
+}
+
+
+redirectToParentDirectoryIfInOperations();
+
+/*router.afterEach((_to, _from) => {
+    redirectToParentDirectoryIfInOperations();
+
+});*/
+
+</script>
+
+<template>
+  <ParentLayout>
+    <template #default>
+      <div class="not-found-hint"><p class="error-code">404</p><h1 class="error-title">Page not found</h1><p class="error-hint">That’s a Four-Oh-Four.</p></div><div class="actions"><button type="button" class="action-button">Go back</button><button type="button" class="action-button">Take me home</button></div>
+    </template>
+  </ParentLayout>
+</template>
+
+<style lang="css">
+.version-selector {
+    margin-top: 20px;
+}
+</style>

docs/src/.vuepress/layouts/PageLayout.vue

@@ -1,19 +1,20 @@
 <script setup lang="ts">
-// import ParentLayout from '@vuepress/theme-default/layouts/Layout.vue'
 import { Layout as ParentLayout, PageContent } from 'vuepress-theme-hope/client'
 import { useRoute, useRouter } from "vue-router";
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 
 const version = ref("");
+const latestVersion = "v1.8.0";
 
 
 function setVersionBasedOnCurrentPath() : void {
     if (route.path.startsWith('/operations/')) {
         const input = route.path.substring('/operations/'.length);
         const firstSlash = input.indexOf("/");
-        const secondSlash = input.indexOf("/", firstSlash + 1);
-        const result = secondSlash !== -1 ? input.slice(0, secondSlash) : input;
-
+        var result = firstSlash !== -1 ? input.slice(0, firstSlash) : input;
+        if (result === "latest") {
+          result = latestVersion;
+        }
         version.value = result;
 
 
@@ -30,14 +31,20 @@ router.afterEach((_to, _from) => {
     setVersionBasedOnCurrentPath();
 });
 
-setVersionBasedOnCurrentPath();
+onMounted(() => {
+  setVersionBasedOnCurrentPath();
+})
 
 function navigateToNewVersion() {
     const input = route.path.substring('/operations/'.length);
     const firstSlash = input.indexOf("/");
-    const secondSlash = input.indexOf("/", firstSlash + 1);
-    const result = secondSlash !== -1 ? input.slice(secondSlash + 1) : "";
-    router.push('/operations/' + version.value + "/" + result);
+    const result = firstSlash !== -1 ? input.slice(firstSlash + 1) : "";
+    if (version.value === latestVersion) {
+      router.push('/operations/' + "latest" + "/" + result);
+    } else {
+      router.push('/operations/' + version.value + "/" + result);
+
+    }
 }
 
 </script>
@@ -46,22 +53,23 @@ function navigateToNewVersion() {
   <ParentLayout>
     <template #sidebarTop>
       <div class="version-selector" v-if="route.path.startsWith('/operations/')">
-        <label class="vp-sidebar-header" for="version-select">Version: </label>
+        <label class="vp-sidebar-header" for="version-select"><strong>Version:</strong> </label>
         <select id="version-select" class="vp-sidebar-header" v-model="version" @change="navigateToNewVersion">
-        <option value="v2/latest">next (v2.0.0-M2)</option>
-        <option value="v1/latest">latest (v1.7.1)</option>
-        <option value="v1/v1.7.0">v1.7.0</option>
-        <option value="v1/v1.6.0">v1.6.0</option>
-        <option value="v1/v1.5.2">v1.5.2</option>
-        <option value="v1/v1.5.1">v1.5.1</option>
-        <option value="v1/v1.5.0">v1.5.0</option>
-        <option value="v1/v1.4.0">v1.4.0</option>
-        <option value="v1/v1.3.2">v1.3.2</option>
-        <option value="v1/v1.3.1">v1.3.1</option>
-        <option value="v1/v1.3.0">v1.3.0</option>
-        <option value="v1/v1.2.0">v1.2.0</option>
-        <option value="v1/v1.1.0">v1.1.0</option>
-        <option value="v1/v1.0.0">v1.0.0</option>
+        <option value="v1.8.0">latest (1.8.0)</option>
+        <option value="v1.7.1">1.7.1</option>
+        <option value="v1.7.0">1.7.0</option>
+        <option value="v1.6.0">1.6.0</option>
+        <option value="v1.5.2">1.5.2</option>
+        <option value="v1.5.1">1.5.1</option>
+        <option value="v1.5.0">1.5.0</option>
+        <option value="v1.4.0">1.4.0</option>
+        <option value="v1.3.2">1.3.2</option>
+        <option value="v1.3.1">1.3.1</option>
+        <option value="v1.3.0">1.3.0</option>
+        <option value="v1.2.0">1.2.0</option>
+        <option value="v1.1.0">1.1.0</option>
+        <option value="v1.0.0">1.0.0</option>
+        <option value="v2.0.0-M3">2.0.0-M3</option>
       </select></div>
     </template>
     <PageContent id="main-content" class="vp-page"/>

docs/src/.vuepress/public/assets/javadoc/api-v1/META-INF/MANIFEST.MF

@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: Maven Javadoc Plugin 3.11.2
+Build-Jdk-Spec: 21
+