Page and other frontend fixes

oreClient/package.json

@@ -2,6 +2,7 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
+    "build": "webpack --config webpack.config.prod.js",
     "builddev": "webpack --config webpack.config.dev.js",
     "start": "webpack-dev-server --open --hot --config webpack.config.dev.js",
     "lint:js": "eslint --ext .js,.mjs,.vue .",

oreClient/src/main/assets/api.js

@@ -77,6 +77,12 @@ export class API {
           level: 'error',
           messages: jsonError.api_errors,
         })
+      } else if (jsonError.error) {
+        store.commit({
+          type: 'addAlert',
+          level: 'error',
+          message: jsonError.error,
+        })
       }
 
       throw res.status

oreClient/src/main/assets/components/PageLink.vue

@@ -1,7 +1,7 @@
 <template>
   <li class="list-group-item">
     <a
-      v-if="page.children"
+      v-if="hasChildren"
       :class="expandedChildren ? 'page-collapse' : 'page-expand'"
       @click="expandedChildren = !expandedChildren"
     >
@@ -10,15 +10,15 @@
     <router-link
       v-if="!page.navigational"
       v-slot="{ href, navigate }"
-      :to="{ name: 'pages', params: { page: page.slug } }"
+      :to="page.isHome ? { name: 'project_home' } : { name: 'pages', params: { page: page.slug } }"
     >
       <a :href="href" @click="navigate">{{ page.name[page.name.length - 1] }}</a>
     </router-link>
     <span v-else>
       {{ page.name[page.name.length - 1] }}
     </span>
 
-    <div v-if="permissions.includes('edit_page')" class="pull-right">
+    <div v-if="permissions.includes('edit_page') && !page.isHome" class="pull-right">
       <a href="#" @click="$emit('edit-page', page)">
         <FontAwesomeIcon style="padding-left: 5px" :icon="['fas', 'edit']" />
       </a>
@@ -50,6 +50,11 @@ export default {
       expandedChildren: false,
     }
   },
-  computed: mapState('project', ['permissions']),
+  computed: {
+    ...mapState('project', ['permissions']),
+    hasChildren() {
+      return Object.entries(this.page.children).length > 0
+    },
+  },
 }
 </script>

oreClient/src/main/assets/components/PageList.vue

@@ -1,11 +1,5 @@
 <template>
   <ul class="list-group" style="margin-bottom: 0px">
-    <li v-if="includeHome" class="list-group-item">
-      <router-link v-slot="{ href, navigate }" :to="{ name: 'project_home' }">
-        <a :href="href" @click="navigate">Home</a>
-      </router-link>
-    </li>
-
     <li
       is="page-link"
       v-for="page in pages"

oreClient/src/main/assets/config.json5

@@ -17,7 +17,8 @@
   },
   security: {
     api: {
-      avatarUrl: "https://auth.spongepowered.org/avatar/{0}?size=120x120"
+      avatarUrl: "https://auth.spongepowered.org/avatar/{0}?size=120x120",
+      url: ""
     }
   },
   discourse: {

oreClient/src/main/assets/config.json5.template

@@ -18,6 +18,7 @@
   security: {
     api: {
       avatarUrl: "http://localhost:8000/avatar/{0}?size=120x120"
+      url: ""
     }
   },
   discourse: {

oreClient/src/main/assets/pages/project/ProjectDocs.vue

@@ -166,7 +166,7 @@
           </template>
         </div>
 
-        <page-list :pages="groupedPages" :include-home="true" @edit-page="startEditPage" />
+        <page-list :pages="groupedPages" @edit-page="startEditPage" />
       </div>
 
       <member-list
@@ -217,33 +217,34 @@ export default {
       return jsRoutes.controllers.project
     },
     groupedPages() {
-      const nonHome = this.pages.filter((p) => p.slug.length !== 1 || p.slug[0].toLowerCase() !== 'home')
       const acc = {}
 
-      for (const page of nonHome) {
+      for (const page of this.pages) {
         let obj = acc
 
-        for (let i = 0; i < page.slug.length - 1; i++) {
-          const k = page.slug[i]
+        for (const k of page.slug.slice(0, -1)) {
           if (typeof obj[k] === 'undefined') {
-            obj[k] = {}
+            obj[k] = {
+              children: {},
+              navigational: false,
+              slug: [],
+              name: '',
+            }
           }
 
-          if (typeof obj[k].children === 'undefined') {
-            obj[k].children = {}
-          }
-
-          obj = obj[k].children
+          obj = acc[k].children
         }
 
         const key = page.slug[page.slug.length - 1]
-        if (typeof obj[key] === 'undefined') {
-          obj[key] = {}
+        const oldChildren = obj[key]?.children ?? {}
+        const isHome = page.slug.length === 1 && page.slug[0] === 'home'
+        obj[key] = {
+          slug: page.slug,
+          name: page.name,
+          navigational: page.navigational,
+          children: oldChildren,
+          isHome,
         }
-
-        obj[key].slug = page.slug
-        obj[key].name = page.name
-        obj[key].navigational = page.navigational
       }
 
       return acc