Merge pull request #55 from holloway-ai/font-fixes

new ui v 2.0.2
holloway-ai · Jun 30, 2023 · 5c2fe65 · 5c2fe65
2 parents b2442c1 + fbae832
commit 5c2fe65
Show file tree

Hide file tree

Showing 56 changed files with 3,185 additions and 1,104 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,23 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+      {
+      "type": "msedge",
+      "request": "launch",
+      "name": "vuejs: edge",
+      "url": "http://127.0.0.1:3000",
+      "webRoot": "${workspaceFolder}",
+      "pathMapping": {
+        "/_karma_webpack_": "${workspaceFolder}"
+      },
+      "sourceMapPathOverrides": {
+        "webpack:///./~/*": "${webRoot}/node_modules/*",
+        "webpack:///./*": "${webRoot}/*",
+        "webpack:///*": "${webRoot}/*",
+        "webpack:///node_modules/*": "${webRoot}/node_modules/*",
+        "webpack:///client/*": "${webRoot}/client/*"
+      }
+      },
     {
       "type": "node",
       "request": "attach",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,21 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "run dev",
+      "type": "shell",
+      "command": "yarn dev"
+    },
+    {
+      "type": "npm",
+      "script": "dev",
+      "problemMatcher": [
+        "$tsc"
+      ],
+      "label": "npm: dev",
+      "detail": "node dev"
+    }
+  ]
+}
diff --git a/client/components/common/nav-header.vue b/client/components/common/nav-header.vue
diff --git a/client/components/editor.vue b/client/components/editor.vue
@@ -1,51 +1,51 @@
 <template lang="pug">
   v-app.editor(:dark='$vuetify.theme.dark')
-    nav-header(dense)
-      template(slot='mid')
-        v-text-field.editor-title-input(
-          dark
-          solo
-          flat
-          v-model='currentPageTitle'
-          hide-details
-          background-color='black'
-          dense
-          full-width
-        )
-      template(slot='actions')
-        v-btn.mr-3.animated.fadeIn(color='amber', outlined, small, v-if='isConflict', @click='openConflict')
-          .overline.amber--text.mr-3 Conflict
-          status-indicator(intermediary, pulse)
-        v-btn.animated.fadeInDown(
-          text
-          color='green'
-          @click.exact='save'
-          @click.ctrl.exact='saveAndClose'
-          :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }'
-          )
-          v-icon(color='green', :left='$vuetify.breakpoint.lgAndUp') mdi-check
-          span.grey--text(v-if='$vuetify.breakpoint.lgAndUp && mode !== `create` && !isDirty') {{ $t('editor:save.saved') }}
-          span.white--text(v-else-if='$vuetify.breakpoint.lgAndUp') {{ mode === 'create' ? $t('common:actions.create') : $t('common:actions.save') }}
-        v-btn.animated.fadeInDown.wait-p1s(
-          text
-          color='blue'
-          @click='openPropsModal'
-          :class='{ "is-icon": $vuetify.breakpoint.mdAndDown, "mx-0": !welcomeMode, "ml-0": welcomeMode }'
-          )
-          v-icon(color='blue', :left='$vuetify.breakpoint.lgAndUp') mdi-tag-text-outline
-          span.white--text(v-if='$vuetify.breakpoint.lgAndUp') {{ $t('common:actions.page') }}
-        v-btn.animated.fadeInDown.wait-p2s(
-          v-if='!welcomeMode'
-          text
-          color='red'
-          :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }'
-          @click='exit'
-          )
-          v-icon(color='red', :left='$vuetify.breakpoint.lgAndUp') mdi-close
-          span.white--text(v-if='$vuetify.breakpoint.lgAndUp') {{ $t('common:actions.close') }}
-        v-divider.ml-3(vertical)
-    v-main
-      component(:is='currentEditor', :save='save')
+    nav-header
+    search-results
+      <!-- template(slot='mid') -->
+      <!--   v-text-field.editor-title-input( -->
+      <!--     dark -->
+      <!--     solo -->
+      <!--     flat -->
+      <!--     v-model='currentPageTitle' -->
+      <!--     hide-details -->
+      <!--     dense -->
+      <!--     full-width -->
+      <!--   ) -->
+      <!-- template(slot='actions') -->
+      <!--   v-btn.mr-3.animated.fadeIn(color='amber', outlined, small, v-if='isConflict', @click='openConflict') -->
+      <!--     .overline.amber--text.mr-3 Conflict -->
+      <!--     status-indicator(intermediary, pulse) -->
+      <!--   v-btn.animated.fadeInDown( -->
+      <!--     text -->
+      <!--     color='green' -->
+      <!--     @click.exact='save' -->
+      <!--     @click.ctrl.exact='saveAndClose' -->
+      <!--     :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }' -->
+      <!--     ) -->
+      <!--     v-icon(color='green', :left='$vuetify.breakpoint.lgAndUp') mdi-check -->
+      <!--     span(v-if='$vuetify.breakpoint.lgAndUp && mode !== `create` && !isDirty') {{ $t('editor:save.saved') }} -->
+      <!--     span(v-else-if='$vuetify.breakpoint.lgAndUp') {{ mode === 'create' ? $t('common:actions.create') : $t('common:actions.save') }} -->
+      <!--   v-btn.animated.fadeInDown.wait-p1s( -->
+      <!--     text -->
+      <!--     color='blue' -->
+      <!--     @click='openPropsModal' -->
+      <!--     :class='{ "is-icon": $vuetify.breakpoint.mdAndDown, "mx-0": !welcomeMode, "ml-0": welcomeMode }' -->
+      <!--     ) -->
+      <!--     v-icon(color='blue', :left='$vuetify.breakpoint.lgAndUp') mdi-tag-text-outline -->
+      <!--     span(v-if='$vuetify.breakpoint.lgAndUp') {{ $t('common:actions.page') }} -->
+      <!--   v-btn.animated.fadeInDown.wait-p2s( -->
+      <!--     v-if='!welcomeMode' -->
+      <!--     text -->
+      <!--     color='red' -->
+      <!--     :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }' -->
+      <!--     @click='exit' -->
+      <!--     ) -->
+      <!--     v-icon(color='red', :left='$vuetify.breakpoint.lgAndUp') mdi-close -->
+      <!--     span(v-if='$vuetify.breakpoint.lgAndUp') {{ $t('common:actions.close') }} -->
+      <!--   v-divider.ml-3(vertical) -->
+    v-main(:style="{'padding-top': '100px'}")
+      component(:is='currentEditor', :save='save', :saveAndClose='saveAndClose', :exit='exit', :exitGo='exitGo')
       editor-modal-properties(v-model='dialogProps')
       editor-modal-editorselect(v-model='dialogEditorSelector')
       editor-modal-unsaved(v-model='dialogUnsaved', @discard='exitGo')
@@ -204,7 +204,8 @@ export default {
   },
   watch: {
     currentEditor(newValue, oldValue) {
-      if (newValue !== '' && this.mode === 'create') {
+      console.log('newValue: ', newValue)
+      if (newValue !== '' && newValue !== 'editorMarkdown' && this.mode === 'create') {
         _.delay(() => {
           this.dialogProps = true
         }, 500)
@@ -238,6 +239,7 @@ export default {
     }
   },
   mounted() {
+    console.log('this.currentEditor: ', this.currentEditor)
     this.$store.set('editor/mode', this.initMode || 'create')
 
     this.initContentParsed = this.initContent ? Base64.decode(this.initContent) : ''
@@ -584,7 +586,6 @@ export default {
 <style lang='scss'>
 
   .editor {
-    background-color: mc('grey', '900') !important;
     min-height: 100vh;
 
     .application--wrap {