Develop

.editorconfig

@@ -4,7 +4,7 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 
-[*.{ts,js,mjs,css,scss,html}]
+[*.{ts,js,mjs,css,scss,html,vue}]
 charset = utf-8
 indent_style = space
 indent_size = 2

.github/workflows/DevelopServerDeploy.yml

@@ -41,6 +41,18 @@ jobs:
         node-version: 18
         cache: npm
 
+    - name: Build hugo docs
+      run: |
+        docker run \
+        -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: Copy index for vite
+      run: mkdir -p ${GITHUB_WORKSPACE}/dist/hugo && cp -rf /var/www/dev.wikigdrive.com/* ${GITHUB_WORKSPACE}/dist/hugo
+
     - uses: whoan/docker-build-with-cache-action@v5
       with:
         image_name: "wikigdrive-develop"
@@ -55,16 +67,6 @@ jobs:
       run: docker stop wikigdrive-develop ; docker rm wikigdrive-develop
       continue-on-error: true
 
-    - 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" \
-        wgd-action-runner:develop /steps/step_render_hugo
-
     - name: Start
       run: |
         docker run -d --name wikigdrive-develop \
@@ -73,12 +75,13 @@ jobs:
           -v /home/githubactions/wikigdrive/service_account.json:/service_account.json \
           -v /home/githubactions/wikigdrive/env.develop:/usr/src/app/.env \
           -v /var/run/docker.sock:/var/run/docker.sock \
+          -v "/var/www/dev.wikigdrive.com:/usr/src/app/dist/hugo" \
           -e "GIT_SHA=${GITHUB_SHA}" \
           -e "ZIPKIN_URL=https://dev.wikigdrive.com/zipkin" \
           -e "ZIPKIN_SERVICE=wikigdrive-develop" \
           --link=zipkin:zipkin \
           --publish 127.0.0.1:4000:3000 \
-          "wikigdrive-develop:${GITHUB_SHA}" wikigdrive-ts \
+          "wikigdrive-develop:${GITHUB_SHA}" wikigdrive \
           --service_account /service_account.json \
           --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com \
           --workdir /data \

.github/workflows/ProdServerDeploy.yml

@@ -42,6 +42,18 @@ jobs:
         node-version: 18
         cache: npm
 
+    - name: Build hugo docs
+      run: |
+        docker run \
+        -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://wikigdrive.com" \
+        wgd-action-runner:prod /steps/step_render_hugo
+
+    - name: Copy index for vite
+      run: mkdir -p ${GITHUB_WORKSPACE}/dist/hugo && cp -rf /var/www/wikigdrive.com/* ${GITHUB_WORKSPACE}/dist/hugo
+
     - uses: whoan/docker-build-with-cache-action@v5
       with:
         image_name: "wikigdrive-prod"
@@ -56,27 +68,18 @@ jobs:
       run: docker stop wikigdrive-prod ; docker rm wikigdrive-prod
       continue-on-error: true
 
-    - 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/wikigdrive.com:/site/dist/hugo" \
-        --env CONFIG_TOML="/site/config.toml" --env BASE_URL="https://wikigdrive.com" \
-        wgd-action-runner:prod /steps/step_render_hugo
-
     - name: Start
       run: |
         docker run -d --name wikigdrive-prod \
           -v wikiGDriveProd:/data \
           -v /home/githubactions/wikigdrive/service_account.json:/service_account.json \
           -v /home/githubactions/wikigdrive/env.prod:/usr/src/app/.env \
           -v /var/run/docker.sock:/var/run/docker.sock \
+          -v "/var/www/wikigdrive.com:/usr/src/app/dist/hugo" \
           -e "GIT_SHA=${GITHUB_SHA}" \
           --publish 127.0.0.1:3000:3000 \
           --restart unless-stopped \
-          "wikigdrive-prod:${GITHUB_SHA}" wikigdrive-ts \
+          "wikigdrive-prod:${GITHUB_SHA}" wikigdrive \
           --service_account /service_account.json \
           --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com \
           --workdir /data \

.github/workflows/pull-request.yml

@@ -40,6 +40,18 @@ jobs:
         node-version: 18
         cache: npm
 
+    - name: Build hugo docs
+      run: |
+        docker run \
+        -v "${GITHUB_WORKSPACE}/hugo:/site" \
+        -v "${GITHUB_WORKSPACE}/website:/website" \
+        -v "/var/www/test.wikigdrive.com:/dist/hugo" \
+        --env CONFIG_TOML="/site/config/_default/config.toml" --env BASE_URL="https://test.wikigdrive.com" \
+        wgd-action-runner:develop /steps/step_render_hugo
+
+    - name: Copy index for vite
+      run: mkdir -p dist/hugo && cp -rf /var/www/test.wikigdrive.com/* dist/hugo
+
     - name: Build
       run: docker build -t wikigdrive-test --build-arg "GIT_SHA=${GITHUB_SHA}" .
 
@@ -52,4 +64,4 @@ jobs:
       continue-on-error: true
 
     - name: Start
-      run: docker run -t -v wikiGDriveExample:/data -v /home/githubactions/wikigdrive/service_account.json:/service_account.json wikigdrive-test wikigdrive-ts --service_account /service_account.json --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com --workdir /data pull 0AIkOKXbzWCtSUk9PVA
+      run: docker run -t -v wikiGDriveExample:/data -v /home/githubactions/wikigdrive/service_account.json:/service_account.json -v "/var/www/dev.wikigdrive.com:/usr/src/app/dist/hugo" wikigdrive-test wikigdrive --service_account /service_account.json --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com --workdir /data pull 0AIkOKXbzWCtSUk9PVA

.gitignore

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

Dockerfile

@@ -13,8 +13,10 @@ RUN npm link --location=user
 EXPOSE 3000
 VOLUME /data
 
+RUN cp /usr/src/app/hugo/themes/wgd-bootstrap/layouts/_default/baseof.html /usr/src/app/apps/ui/index.html
+RUN if [[ -d /usr/src/app/dist/hugo/ui ]]; then cp /usr/src/app/dist/hugo/ui/index.html /usr/src/app/apps/ui/index.html ; fi
 RUN cd /usr/src/app/apps/ui && npm install && npm run build
 
 WORKDIR "/usr/src/app"
 
-CMD [ "sh", "-c", "wikigdrive-ts --workdir /data server 3000" ]
+CMD [ "sh", "-c", "wikigdrive --workdir /data server 3000" ]

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;
 }
@@ -97,3 +96,9 @@ body,
   }
 
 }
+
+@media (min-width: 768px) {
+  .position-fixed-md {
+    position: fixed;
+  }
+}

apps/ui/assets/main.css

@@ -8,7 +8,6 @@ nav {
   justify-content: space-between;
   display: flex;
   align-items: center;
-  background-color: #2196F3;
   color: #FFF;
 }
 
@@ -167,6 +166,9 @@ a[disabled] {
 .border-left-0 {
   border-left: none;
 }
+.border-left-0-not-first:not(:first-of-type) {
+  border-left: none;
+}
 
 .mh-auto {
   min-height: auto !important;
@@ -192,3 +194,8 @@ a[disabled] {
 .pl-1 {
   padding-left: 10px !important;
 }
+
+.docs__content pre {
+  border-left: 3px solid var(--bs-gray-500);
+  padding: 2em 0 2em 3em;
+}

apps/ui/package.json

@@ -23,6 +23,6 @@
     "@vitejs/plugin-vue": "4.0.0",
     "eslint-plugin-vue": "8.7.1",
     "typescript": "4.9.4",
-    "vite": "4.0.1"
+    "vite": "4.4.9"
   }
 }

apps/ui/src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <ErrorView v-if="errorMessage" :errorMessage="errorMessage">
   </ErrorView>
-  <router-view v-else class="view main-content"></router-view>
+  <router-view v-else class="router-view"></router-view>
   <ModalsContainer></ModalsContainer>
   <ToastsContainer></ToastsContainer>
 </template>

apps/ui/src/components/ChangesViewer.vue

@@ -36,7 +36,7 @@
         </div>
         <div class="card-footer" v-if="active_jobs.length === 0">
           <div class="btn-group">
-            <a class="btn btn-outline-primary me-2" v-if="selectedFile.id" @click.prevent="$emit('sync', { $event, file: selectedFile })">Sync Single</a>
+            <a class="btn btn-outline-primary me-2" v-if="selectedFile.id && selectedFile.id !== 'TO_FILL'" @click.prevent="$emit('sync', { $event, file: selectedFile })">Sync Single</a>
             <a class="btn btn-outline-danger me-2" v-if="drive.name" @click.prevent="syncAll">Sync All</a>
             <a class="btn btn-outline-secondary me-2" v-if="!isGDocsPreview && drive.name && selectedFile.id" @click.prevent="$emit('transform', $event, selectedFile)">Transform Single Markdown</a>
             <a class="btn btn-outline-secondary me-2" v-if="!isGDocsPreview && drive.name" @click.prevent="transformAll">Transform All Markdown</a>
@@ -105,7 +105,7 @@
               <td>
                 {{ job.finishedStr }}
                 ({{ job.durationStr }})
-                <button class="btn float-end" @click="showLogs(job)">Logs</button>
+                <a class="btn float-end" :href="'#drive_logs:job-' + job.id" @click.prevent="showLogs(job)">Logs</a>
               </td>
             </tr>
             </tbody>
@@ -177,11 +177,7 @@ export default {
       }
     },
     showLogs(job) {
-      this.$emit('showLogs', {
-        from: job.started,
-        until: job.finished
-      });
-      this.setActiveTab('drive_logs');
+      this.$router.push(`/drive/${this.driveId}#drive_logs:job-${job.id}`);
     }
   }
 };

apps/ui/src/components/DriveTools.vue

@@ -37,15 +37,20 @@
         </a>
       </li>
 
-      <li class="list-group-item" v-if="treeEmpty && !isGDocsPreview">
+      <li class="list-group-item" v-if="selectedFolder.contentDir && treeEmpty && !isGDocsPreview">
         Markdown tree empty
         <a class="btn btn-outline-secondary me-2" @click.prevent="syncAll">Sync All</a>
       </li>
-      <li class="list-group-item" v-else-if="treeVersion && treeVersion !== GIT_SHA">
+      <li class="list-group-item" v-else-if="selectedFolder.contentDir && treeVersion && treeVersion !== GIT_SHA">
         Markdowns were generated with version: <em>{{treeVersion}}</em>.<br/>
         WikiGDrive is now running: <em>{{GIT_SHA}}</em>.<br/>
         <a class="btn btn-outline-secondary me-2" @click.prevent="transformAll">Update your entire tree now?</a>
       </li>
+
+      <li class="list-group-item" v-if="selectedFolder.contentDir">
+        Synchronize to Google Drive
+        <a class="btn btn-outline-secondary me-2" @click.prevent="uploadGdrive">Upload missing markdowns to Google Drive</a>
+      </li>
     </ul>
   </div>
 </template>
@@ -59,6 +64,10 @@ export default {
   mixins: [UtilsMixin, UiMixin],
   components: {ToolButton},
   props: {
+    driveEmpty: {
+      type: Boolean,
+      default: false
+    },
     treeEmpty: {
       type: Boolean,
       default: false

apps/ui/src/components/FilesTreeLeaf.vue

@@ -125,7 +125,7 @@ export default {
       }
     },
     openExternal(file) {
-      if (file.id === 'UNKNOWN') {
+      if (file.id === 'UNKNOWN' || file.id === 'TO_FILL') {
         return;
       }
       if (this.isFolder(file)) {

apps/ui/src/components/GitCommit.vue

@@ -9,10 +9,12 @@
 
     <template v-slot:sidebar="{ collapse }">
       <GitSideBar
+          ref="git_sidebar"
           :selectedPath="selectedPath"
           :gitChanges="gitChanges"
           :checked="checked"
           @toggle="toggle"
+          @toggleAll="toggleAll"
           @setCurrentDiff="setCurrentDiff"
           @collapse="collapse"
       />
@@ -21,7 +23,6 @@
     <form>
       <div class="container d-flex flex-column order-0 w-vh-toolbar w-100">
         <GitToolBar :active-tab="activeTab" :selected-file="selectedFile" />
-
         <div v-if="file_deleted" class="flex-grow-1">
           <div class="alert-warning p-3 mb-3">
             File deleted
@@ -88,7 +89,8 @@ export default {
     contentDir: {
       type: String
     },
-    selectedFile: Object
+    selectedFile: Object,
+    selectedFolder: Object
   },
   data() {
     return {
@@ -103,7 +105,8 @@ export default {
   },
   computed: {
     file_deleted() {
-      return !this.selectedFile.id && !['/toc.md'].includes(this.selectedFile.path);
+      return false;
+      // return !this.selectedFile.id && !this.selectedFolder?.path && !['/toc.md'].includes(this.selectedFile.path);
     },
     git_remote_url() {
       return this.user_config.remote_url || '';
@@ -178,6 +181,13 @@ export default {
 
       const responseConfig = await this.authenticatedClient.fetchApi(`/api/config/${this.driveId}`);
       this.user_config = await responseConfig.json();
+
+      this.$nextTick(() => {
+        const el = this.$el.querySelector('[data-path="' + this.selectedPath + '"]');
+        if (el) {
+          el.scrollIntoView();
+        }
+      });
     },
     open(url) {
       window.open(url, '_blank');
@@ -270,6 +280,15 @@ export default {
         }
       });
     },
+    toggleAll() {
+      if (Object.keys(this.checked).length === this.gitChanges.length) {
+        this.checked = {};
+      } else {
+        for (const change of this.gitChanges) {
+          this.checked[change.path] = true;
+        }
+      }
+    },
     toggle(path) {
       if (this.checked[path]) {
         delete this.checked[path];