Fix import bugs and make window not resizable.

pixel-point · Jun 5, 2019 · 9e59270 · 9e59270
1 parent ffada30
commit 9e59270
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/cypress/snapshots/Clusters.spec.js/pagesClusters -- visual -- plain.snap.png b/cypress/snapshots/Clusters.spec.js/pagesClusters -- visual -- plain.snap.png
diff --git a/src/main/index.js b/src/main/index.js
@@ -30,10 +30,11 @@ function createWindow() {
    * Initial window options
    */
   mainWindow = new BrowserWindow({
-    height: 563,
+    height: 542,
     useContentSize: true,
-    width: 1000,
+    width: 800,
     titleBarStyle: 'hiddenInset',
+    resizable: process.env.NODE_ENV === 'development',
     webPreferences: {
       nodeIntegration: true
     }

diff --git a/src/main/menuTemplate.js b/src/main/menuTemplate.js
@@ -21,14 +21,14 @@ export default function buildMenuTemplate(app) {
       submenu: [
         { role: 'reload' },
         { role: 'forcereload' },
-        { role: 'toggledevtools' },
+        process.env.NODE_ENV === 'development' && { role: 'toggledevtools' },
         { type: 'separator' },
         { role: 'resetzoom' },
         { role: 'zoomin' },
         { role: 'zoomout' },
         { type: 'separator' },
         { role: 'togglefullscreen' }
-      ]
+      ].filter(Boolean)
     },
     {
       role: 'window',

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -36,6 +36,7 @@ body {
   color: #142d55; /* = $color-text */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  display: flex;
 }
 
 .body_target_web {

diff --git a/src/renderer/components/ClusterImport.vue b/src/renderer/components/ClusterImport.vue
@@ -61,9 +61,9 @@ export default {
             clusterId: cluster.id
           })
         }))
-
-        this.$router.push('/')
       }
+
+      this.$router.push('/')
     }
   }
 }

diff --git a/src/renderer/components/Clusters.vue b/src/renderer/components/Clusters.vue
@@ -4,7 +4,7 @@
       <Header>
         <SearchInput v-model="query" size="s" />
         <div class="space" />
-        <Dropdown theme="primary">
+        <Dropdown>
           <template v-slot:trigger="triggerSlotProps">
             <Button :outline="!triggerSlotProps.opened" theme="primary" @click="triggerSlotProps.toggle">
               Add a cluster
@@ -31,7 +31,19 @@
     </template>
 
     <template v-else>
-      <Button size="l" theme="primary" to="/clusters/new">Add a cluster</Button>
+      <Dropdown>
+        <template v-slot:trigger="triggerSlotProps">
+          <Button theme="primary" size="l" @click="triggerSlotProps.toggle">
+            Add a cluster
+            <IconArrowDropdown :to="triggerSlotProps.opened ? 'top' : 'bottom'" />
+          </Button>
+        </template>
+
+        <ul class="popup__actions">
+          <li><Action to="/clusters/new">FROM SCRATCH</Action></li>
+          <li><Action to="/clusters/import">FROM IMPORT</Action></li>
+        </ul>
+      </Dropdown>
     </template>
   </div>
 </template>

diff --git a/src/renderer/components/Layout.vue b/src/renderer/components/Layout.vue
@@ -31,8 +31,8 @@ main {
 }
 
 .app-container {
-  min-height: 100%;
   display: flex;
   flex-direction: column;
+  flex-grow: 1;
 }
 </style>
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,9 +61,9 @@ export default { @@
                 clusterId: cluster.id
               })
             }))
-            this.$router.push('/')
           }
+          this.$router.push('/')
         }
       }
     }
@@ Expand Down @@