Update documentation

.github/workflows/DevelopServerDeploy.yml

@@ -58,11 +58,10 @@ jobs:
     - name: Build hugo docs
       run: |
         docker run \
-        -v "${GITHUB_WORKSPACE}/doc:/site/doc" \
-        -v "${GITHUB_WORKSPACE}/themes:/site/themes" \
-        -v "${GITHUB_WORKSPACE}/config.toml:/site/config.toml" \
-        -v "/var/www/dev.wikigdrive.com:/site/dist/hugo" \
-        --env CONFIG_TOML="/site/config.toml" --env BASE_URL="https://dev.wikigdrive.com" \
+        -v "${GITHUB_WORKSPACE}/hugo:/site" \
+        -v "${GITHUB_WORKSPACE}/website:/website" \
+        -v "/var/www/dev.wikigdrive.com:/dist/hugo" \
+        --env CONFIG_TOML="/site/config/_default/config.toml" --env BASE_URL="https://dev.wikigdrive.com" \
         wgd-action-runner:develop /steps/step_render_hugo
 
     - name: Start

.gitignore

@@ -6,3 +6,6 @@ node_modules
 dist
 content
 .hugo*
+hugo/resources
+hugo_stats.json
+

Dockerfile

@@ -13,7 +13,7 @@ RUN npm link --location=user
 EXPOSE 3000
 VOLUME /data
 
-RUN cd /usr/src/app/apps/ui && npm install && npm run build
+RUN cd /usr/src/app/apps/ui && cp ../../hugo/themes/wgd-bootstrap/layouts/_default/baseof.html index.html && npm install && npm run build
 
 WORKDIR "/usr/src/app"
 

README.md

@@ -1 +1 @@
-doc/_index.md
+website/docs/_index.md

apps/ui/assets/layout.css

@@ -43,7 +43,6 @@ body,
 .mainbar__content {
   flex: 1 1 auto;
   text-overflow: ellipsis;
-  white-space: nowrap;
   height: calc(100vh - var(--navbar-height));
   overflow: auto;
 }

apps/ui/assets/main.css

@@ -8,7 +8,6 @@ nav {
   justify-content: space-between;
   display: flex;
   align-items: center;
-  background-color: #2196F3;
   color: #FFF;
 }
 

apps/ui/src/components/NavBar.vue

@@ -11,7 +11,22 @@
         <router-link :to="{ name: 'home' }">WikiGDrive</router-link>
       </span>
     </span>
-    <slot></slot>
+    <slot>
+      <ul class="navbar-nav mr-auto align-items-center justify-content-start">
+        <li class="nav-item">
+          <a class="nav-link" :class="{'active': $route.path.startsWith('/docs')}" href="/docs">Documentation</a>
+        </li>
+        <li class="nav-item" v-if="isLogged">
+          <a class="nav-link" :class="{'active': $route.path.startsWith('/drive')}" href="/drive">Drives</a>
+        </li>
+      </ul>
+      <ul class="navbar-nav mr-auto align-items-center">
+        <li>
+          <button v-if="!isLogged" class="btn btn-secondary" @click="login">Sign in</button>
+          <button v-if="isLogged" class="btn btn-secondary" @click="logout">Logout User</button>
+        </li>
+      </ul>
+    </slot>
   </nav>
 </template>
 <script>

apps/ui/src/components/StaticContent.vue

@@ -25,7 +25,7 @@ export default {
   },
   computed: {
     isHtml() {
-      return (this.$route.path.endsWith('.html') || this.$route.path === '/');
+      return (this.$route.path.endsWith('.html') || this.$route.path === '/' || this.$route.path.startsWith('/docs'));
     }
   },
   methods: {

apps/ui/src/components/UtilsMixin.ts

@@ -271,7 +271,7 @@ export const UtilsMixin = {
       const driveId = this.driveId ? this.driveId : 'none';
       const urlSearchParams = new URLSearchParams();
       // urlSearchParams.set('redirectTo', '/drive/' + (req['driveId'] || ''));
-      urlSearchParams.set('redirectTo', window.location.pathname);
+      urlSearchParams.set('redirectTo', window.location.pathname && window.location.pathname.startsWith('/drive') ? window.location.pathname : '/drive');
       const authPath = '/auth/' + driveId + '?' + urlSearchParams.toString();
       this.openAuthRedirWindow(authPath, callback);
     },
@@ -284,7 +284,8 @@ export const UtilsMixin = {
         },
         return_error: true
       });
-      await this.fetch();
+      // await this.fetch();
+      this.$router.push('/');
     }
   }
 };

apps/ui/src/main.ts

@@ -204,7 +204,17 @@ const router = VueRouter.createRouter({
     {
       path: '/',
       name: 'home',
-      component: () => import('./pages/MainView.vue')
+      component: () => import('./pages/StaticView.vue')
+    },
+    {
+      path: '/docs',
+      name: 'docs',
+      component: () => import('./pages/StaticView.vue')
+    },
+    {
+      path: '/docs/:pathMatch(.*)*',
+      name: 'docs',
+      component: () => import('./pages/StaticView.vue')
     },
     {
       path: '/:pathMatch(.*)*',

apps/ui/src/pages/MainView.vue

@@ -2,6 +2,14 @@
   <BaseLayout>
     <template v-slot:navbar="{ sidebar, collapsed, collapse }">
       <NavBar :sidebar="sidebar" :collapsed="collapsed" @collapse="collapse">
+        <ul class="navbar-nav mr-auto align-items-center justify-content-start">
+          <li class="nav-item">
+            <a class="nav-link" :class="{'active': $route.path.startsWith('/docs')}" href="/docs">Documentation</a>
+          </li>
+          <li class="nav-item" v-if="isLogged">
+            <a class="nav-link" :class="{'active': $route.path.startsWith('/drive')}" href="/drive">Drives</a>
+          </li>
+        </ul>
         <ul class="navbar-nav mr-auto align-items-center">
           <li>
             <button v-if="!isLogged" class="btn btn-secondary" @click="login">Sign in</button>

apps/ui/src/pages/StaticView.vue

@@ -0,0 +1,109 @@
+<template>
+  <BaseLayout>
+    <template v-slot:navbar="{ sidebar, collapsed, collapse }">
+      <NavBar :sidebar="sidebar" :collapsed="collapsed" @collapse="collapse">
+        <ul class="navbar-nav mr-auto align-items-center justify-content-start">
+          <li class="nav-item">
+            <a class="nav-link" :class="{'active': $route.path.startsWith('/docs')}" href="/docs">Documentation</a>
+          </li>
+          <li class="nav-item" v-if="isLogged">
+            <a class="nav-link" :class="{'active': $route.path.startsWith('/drive')}" href="/drive">Drives</a>
+          </li>
+        </ul>
+        <ul class="navbar-nav mr-auto align-items-center">
+          <li>
+            <button v-if="!isLogged" class="btn btn-secondary" @click="login">Sign in</button>
+            <button v-if="isLogged" class="btn btn-secondary" @click="logout">Logout User</button>
+          </li>
+        </ul>
+      </NavBar>
+    </template>
+
+    <template v-slot:default>
+      <div class="container">
+        <StaticContent />
+      </div>
+    </template>
+  </BaseLayout>
+</template>
+<script>
+import {markRaw} from 'vue';
+import {UtilsMixin} from '../components/UtilsMixin';
+import BaseLayout from '../layout/BaseLayout.vue';
+import ShareModal from '../components/ShareModal.vue';
+import StaticContent from '../components/StaticContent.vue';
+import NavBar from '../components/NavBar.vue';
+import {awaitValue} from '@swc/helpers';
+
+export default {
+  mixins: [ UtilsMixin ],
+  components: {
+    BaseLayout, StaticContent, NavBar
+  },
+  data() {
+    return {
+      url: '',
+      drivesShared: [],
+      drivesNotShared: [],
+      loading: false
+    };
+  },
+  async created() {
+    await this.fetch();
+  },
+  methods: {
+    async fetch() {
+      await this.$root.fetchUser();
+      if (!this.isLogged) {
+        this.drivesShared = [];
+        this.drivesNotShared = [];
+        return;
+      }
+
+      this.loading = true;
+      try {
+        const drives = await this.DriveClientService.getDrives();
+        this.drivesShared = drives.filter(d => !!d.exists);
+        this.drivesNotShared = drives.filter(d => !d.exists);
+      } finally {
+        this.loading = false;
+      }
+    },
+    selectDrive(driveId) {
+      this.$router.push('/drive/' + driveId);
+    },
+    goToGDrive(folderId) {
+      window.open('https://drive.google.com/drive/u/0/folders/' + folderId);
+    },
+    async submit() {
+      try {
+        const json = await this.authenticatedClient.fetchApi('/api/share_drive', {
+          method: 'POST',
+          headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({
+            url: this.url
+          })
+        });
+        if (json.driveId) {
+          await this.$router.push({ name: 'drive', params: { driveId: json.driveId } });
+        } else {
+          alert('Error sharing drive');
+        }
+      } catch (err) {
+        console.error(err);
+      }
+    },
+    share(driveId) {
+      this.$root.$addModal({
+        component: markRaw(ShareModal),
+        props: {
+          driveId
+        },
+      });
+    }
+  }
+};
+</script>

hugo/config/_default/config.toml

@@ -0,0 +1,14 @@
+title = "WikiGDrive"
+theme="wgd-bootstrap"
+contentDir="../website"
+publishDir="../dist/hugo"
+#uglyURLs="true"
+uglyURLs = false
+
+[build]
+writeStats = true
+
+[module]
+[[module.mounts]]
+    source = './themes/wgd-bootstrap/layouts/_default/_markup'
+    target = 'layouts/_default/_markup'

hugo/config/_default/params.toml

@@ -0,0 +1,32 @@
+#customCSS = null  # To use: uncomment and replace null with value
+#customJS = null  # To use: uncomment and replace null with value
+dateFormat = ":date_long"
+description = "Google Drive to MarkDown synchronization"
+keywords = "GDrive, CLI, MarkDown, Google Docs, Wiki"
+math = true
+titleCase = true
+viewer = true
+
+[actionsPanel]
+disabled = true
+
+[post]
+featuredImage = true
+numberifyHeadings = true
+numberifyHeadingsSeparator = "."
+
+[sidebar]
+archives = false
+authors = false
+fixed = true
+recentPosts = false
+taxonomiesToggle = false
+
+[siteVerification]
+#baidu = null  # To use: uncomment and replace null with value
+#baiduUnion = null  # To use: uncomment and replace null with value
+#bing = null  # To use: uncomment and replace null with value
+#google = null  # To use: uncomment and replace null with value
+#shenma = null  # To use: uncomment and replace null with value
+#so = null  # To use: uncomment and replace null with value
+#sogou = null  # To use: uncomment and replace null with value

hugo/go.mod

@@ -0,0 +1,3 @@
+module github.com/mieweb/wikiGDrive
+
+go 1.21.1

hugo/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {},
+  "devDependencies": {},
+  "name": "wikiGDrive",
+  "version": "0.1.0"
+}

hugo/themes/wgd-bootstrap/layouts/404.html

@@ -0,0 +1,3 @@
+{{- define "main" }}
+Not found
+{{- end -}}