Merge pull request #31 from TranslatorSRI/fix-website-deployment

Fix website deployment
TranslatorSRI · Jan 4, 2024 · c2a8517 · c2a8517
2 parents 5d40301 + 2f9ed79
commit c2a8517
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/deploy-website-to-gh-pages.yaml b/.github/workflows/deploy-website-to-gh-pages.yaml
@@ -21,4 +21,4 @@ jobs:
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: website/dist # The folder the action should deploy.
+          folder: website/dist # The folder the action should deploy.
diff --git a/website/src/router/index.js b/website/src/router/index.js
@@ -11,25 +11,25 @@ const router = createRouter({
     {
       path: "/",
       name: "home",
-      component: HomeView,
+      component: () => import("../views/HomeView.vue"),
     },
     {
-      path: "/nodenorm",
+      path: "/nodenorm/",
       name: "Node Normalization Validator",
-      component: NodeNormValidator,
+      component: () => import("../views/NodeNormValidator.vue"),
     },
     {
-      path: "/nameres",
+      path: "/nameres/",
       name: "Name Resolver Validator",
-      component: NameResValidator,
+      component: () => import("../views/NameResValidator.vue"),
     },
     {
-      path: "/autocomplete",
+      path: "/autocomplete/",
       name: "Autocomplete Validator",
-      component: AutocompleteValidator,
+      component: () => import("../views/AutocompleteValidator.vue"),
     },
     {
-      path: "/about",
+      path: "/about/",
       name: "about",
       // route level code-splitting
       // this generates a separate chunk (About.[hash].js) for this route

diff --git a/website/src/views/AutocompleteValidator.vue b/website/src/views/AutocompleteValidator.vue
@@ -1,5 +1,5 @@
 <template>
-  <small><a href="/babel-validation/">Return to front page</a></small>
+  <small><router-link to="/">Return to front page</router-link></small>
 
   <h1>Autocomplete Validation</h1>
   <p>
@@ -92,14 +92,15 @@ import Bottleneck from "bottleneck";
 import TextWithURLs from "@/components/TextWithURLs.vue";
 import TestResult from "@/components/TestResult.vue";
 import { lookupNameRes } from "@/models/NameResTest";
+import {RouterLink} from "vue-router";
 
 const nameResBottleneck = new Bottleneck({
   maxConcurrent: 10,
   minTime: 333,
 });
 
 export default {
-  components: {TestResult, BTable, TextWithURLs},
+  components: {TestResult, BTable, TextWithURLs, RouterLink},
   props: {
     minimumAutocompleteChars: {
       type: Number,

diff --git a/website/src/views/HomeView.vue b/website/src/views/HomeView.vue
@@ -9,11 +9,16 @@
   </p>
 
   <ul>
-    <li><a href="/babel-validation/nodenorm">Node Normalization Validator</a></li>
-    <li><a href="/babel-validation/nameres">Name Resolver Validator</a></li>
-    <li><a href="/babel-validation/autocomplete">Autocomplete Validator</a></li>
+    <li><router-link to="/nodenorm/">Node Normalization Validator</router-link></li>
+    <li><router-link to="/nameres/">Name Resolver Validator</router-link></li>
+    <li><router-link to="/autocomplete/">Autocomplete Validator</router-link></li>
   </ul>
 </template>
 
-<script setup>
+<script>
+import {RouterLink} from "vue-router";
+
+export default {
+  components: {RouterLink},
+}
 </script>
diff --git a/website/src/views/NameResValidator.vue b/website/src/views/NameResValidator.vue
@@ -1,5 +1,5 @@
 <template>
-  <small><a href="/babel-validation/">Return to front page</a></small>
+  <small><router-link to="/">Return to front page</router-link></small>
 
   <h1>Name Resolver Validation</h1>
   <p>
@@ -49,9 +49,10 @@ import Papa from 'papaparse';
 import TextWithURLs from "@/components/TextWithURLs.vue";
 import { NameResTest } from '@/models/NameResTest';
 import TestResult from "@/components/TestResult.vue";
+import {RouterLink} from "vue-router";
 
 export default {
-  components: {TestResult, BTable, TextWithURLs},
+  components: {TestResult, BTable, TextWithURLs, RouterLink},
   data () {
     return {
       nameResEndpoints: {

diff --git a/website/src/views/NodeNormValidator.vue b/website/src/views/NodeNormValidator.vue
@@ -1,5 +1,5 @@
 <template>
-  <small><a href="/babel-validation/">Return to front page</a></small>
+  <small><router-link to="/">Return to front page</router-link></small>
   <h1>Node Normalization Validation</h1>
   <p>
     <a href="https://github.com/TranslatorSRI/babel">Babel</a> is the program that generates the datasets of
@@ -48,9 +48,10 @@ import Papa from 'papaparse';
 import TextWithURLs from "@/components/TextWithURLs.vue";
 import { NodeNormTest } from '@/models/NodeNormTest';
 import TestResult from "@/components/TestResult.vue";
+import {RouterLink} from "vue-router";
 
 export default {
-  components: {TestResult, BTable, TextWithURLs},
+  components: {TestResult, BTable, TextWithURLs, RouterLink},
   data () {
     return {
       nodeNormEndpoints: {