From 77830bec4ffe0a46f0b8a7baa75250ead522a33f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 4 May 2021 18:14:13 +0100
Subject: [PATCH] lint and tidy

---
 packages/auth/src/db/utils.js                 |  4 +-
 .../builder/src/builderStore/store/admin.js   | 40 +------------------
 .../builder/src/pages/builder/_layout.svelte  |  6 ++-
 .../src/pages/builder/oauth/index.svelte      | 21 +++++++---
 .../pages/builder/oauth/logos/Google.svelte   | 15 ++++---
 5 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index 18b44dadf5..4bc0427976 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -153,7 +153,9 @@ const determineScopedConfig = async function (db, { type, user, group }) {
   }
 
   // Find the config with the most granular scope based on context
-  const scopedConfig = response.rows.sort((a, b) => determineScore(a) - determineScore(b))[0]
+  const scopedConfig = response.rows.sort(
+    (a, b) => determineScore(a) - determineScore(b)
+  )[0]
 
   return scopedConfig.doc
 }
diff --git a/packages/builder/src/builderStore/store/admin.js b/packages/builder/src/builderStore/store/admin.js
index 69fe81c91a..dcf7fef485 100644
--- a/packages/builder/src/builderStore/store/admin.js
+++ b/packages/builder/src/builderStore/store/admin.js
@@ -1,47 +1,11 @@
 import { writable } from "svelte/store"
-import api, { get } from "../api"
 
 const INITIAL_ADMIN_STATE = {
-  oauth: []
+  oauth: [],
 }
 
 export const getAdminStore = () => {
   const store = writable({ ...INITIAL_ADMIN_STATE })
-  store.actions = {
-    fetch: async () => {
-      const responses = await Promise.all([
-        api.get("/api/hosting/"),
-        api.get("/api/hosting/urls"),
-      ])
-      const [info, urls] = await Promise.all(responses.map(resp => resp.json()))
-      store.update(state => {
-        state.hostingInfo = info
-        state.appUrl = urls.app
-        return state
-      })
-      return info
-    },
-    save: async hostingInfo => {
-      const response = await api.post("/api/hosting", hostingInfo)
-      const revision = (await response.json()).rev
-      store.update(state => {
-        state.hostingInfo = {
-          ...hostingInfo,
-          _rev: revision,
-        }
-        return state
-      })
-    },
-    fetchDeployedApps: async () => {
-      let deployments = await (await get("/api/hosting/apps")).json()
-      store.update(state => {
-        state.deployedApps = deployments
-        state.deployedAppNames = Object.values(deployments).map(app => app.name)
-        state.deployedAppUrls = Object.values(deployments).map(app => app.url)
-        return state
-      })
-      return deployments
-    },
-  }
+  store.actions = {}
   return store
 }
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index d762a7beac..de657a63ac 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -33,13 +33,15 @@
               <Item
                 external
                 href="https://github.com/Budibase/budibase/discussions"
-                icon="PeopleGroup">
+                icon="PeopleGroup"
+              >
                 Community
               </Item>
               <Item
                 external
                 href="https://github.com/Budibase/budibase/issues/new/choose"
-                icon="Bug">
+                icon="Bug"
+              >
                 Raise an issue
               </Item>
             </Navigation>
diff --git a/packages/builder/src/pages/builder/oauth/index.svelte b/packages/builder/src/pages/builder/oauth/index.svelte
index bdc5420496..1abed023f3 100644
--- a/packages/builder/src/pages/builder/oauth/index.svelte
+++ b/packages/builder/src/pages/builder/oauth/index.svelte
@@ -6,7 +6,9 @@
     Button,
     Heading,
     Divider,
+    Label,
     notifications,
+    Layout,
     Input,
     ModalContent,
     Toggle,
@@ -71,21 +73,30 @@
   </Body>
   <Divider />
   {#if google}
-    <div class="form">
+    <Layout gap="S">
       <Heading size="S">
         <GoogleLogo />
         Google
       </Heading>
       {#each ConfigFields.Google as field}
-        <Input bind:value={google.config[field]} label={field} />
+        <div class="form-row">
+          <Label>{field}</Label>
+          <Input bind:value={google.config[field]} />
+        </div>
       {/each}
-      <Button primary on:click={() => save(google)}>Save</Button>
-    </div>
+    </Layout>
+    <Button primary on:click={() => save(google)}>Save</Button>
   {/if}
 </section>
 
 <style>
   section {
-    margin: 40px 80px;
+    margin: 60px 320px;
+  }
+
+  .form-row {
+    display: grid;
+    grid-template-columns: 20% 1fr;
+    grid-gap: var(--spacing-l);
   }
 </style>
diff --git a/packages/builder/src/pages/builder/oauth/logos/Google.svelte b/packages/builder/src/pages/builder/oauth/logos/Google.svelte
index faf45c9849..03f62a6065 100644
--- a/packages/builder/src/pages/builder/oauth/logos/Google.svelte
+++ b/packages/builder/src/pages/builder/oauth/logos/Google.svelte
@@ -3,32 +3,37 @@
   height="14"
   viewBox="0 0 268 268"
   fill="none"
-  xmlns="http://www.w3.org/2000/svg">
+  xmlns="http://www.w3.org/2000/svg"
+>
   <g clip-path="url(#clip0)">
     <path
       d="M58.8037 109.043C64.0284 93.2355 74.1116 79.4822 87.615 69.7447C101.118
       60.0073 117.352 54.783 134 54.8172C152.872 54.8172 169.934 61.5172 183.334
       72.4828L222.328 33.5C198.566 12.7858 168.114 0 134 0C81.1817 0 35.711
       30.1277 13.8467 74.2583L58.8037 109.043Z"
-      fill="#EA4335" />
+      fill="#EA4335"
+    />
     <path
       d="M179.113 201.145C166.942 208.995 151.487 213.183 134 213.183C117.418
       213.217 101.246 208.034 87.7727 198.369C74.2993 188.703 64.2077 175.044
       58.9265 159.326L13.8132 193.574C24.8821 215.978 42.012 234.828 63.2572
       247.984C84.5024 261.14 109.011 268.075 134 268C166.752 268 198.041 256.353
       221.48 234.5L179.125 201.145H179.113Z"
-      fill="#34A853" />
+      fill="#34A853"
+    />
     <path
       d="M221.48 234.5C245.991 211.631 261.903 177.595 261.903 134C261.903
       126.072 260.686 117.552 258.866 109.634H134V161.414H205.869C202.329
       178.823 192.804 192.301 179.125 201.145L221.48 234.5Z"
-      fill="#4A90E2" />
+      fill="#4A90E2"
+    />
     <path
       d="M58.9265 159.326C56.1947 151.162 54.8068 142.609 54.8172 134C54.8172
       125.268 56.213 116.882 58.8037 109.043L13.8467 74.2584C4.64957 92.825
       -0.0915078 113.28 1.86708e-05 134C1.86708e-05 155.44 4.96919 175.652
       13.8132 193.574L58.9265 159.326Z"
-      fill="#FBBC05" />
+      fill="#FBBC05"
+    />
   </g>
   <defs>
     <clipPath id="clip0">