Merge pull request #241 from Budibase/further-tidy-up

Further tidy up

.github/workflows/release.yml

@@ -1,8 +1,8 @@
 name: Budibase Release
 
 on: 
- # Trigger the workflow on push,
- # but only for the release branch
+ # Trigger the workflow on push with tags,
+ # but only for the master branch
  push:
   branches:
     - master
@@ -25,10 +25,10 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn 
-      # - run: yarn lint 
+      - run: yarn lint 
       - run: yarn bootstrap 
       - run: yarn build 
-      # - run: yarn test
+      - run: yarn test
 
       - name: Prepare for app notarization (macOS)
         if: startsWith(matrix.os, 'macos')

packages/builder/src/budibase.css

@@ -62,14 +62,14 @@
     margin: 5px 20px 5px 0px;
     border-radius: 0 5px 5px 0;
     display: flex;
-    align-items: baseline;
+    align-items: center;
     font-weight: 500;
     font-size: 13px;
 }
 
 .budibase__nav-item.selected {
     color: var(--button-text);
-    background: #fafafa !important;
+    background: #f1f4fc;
 }
 
 .budibase__nav-item:hover {

packages/builder/src/components/userInterface/ComponentsHierarchy.svelte

@@ -48,7 +48,6 @@
 </script>
 
 <div class="root">
-
   {#each _screens as screen}
     <div
       class="budibase__nav-item component"

packages/builder/src/index.html

@@ -11,6 +11,7 @@
 	<link rel='icon' type='image/png' href='/_builder/favicon.png'>
 	<link rel='stylesheet' href='/_builder/global.css'>
 	<link rel='stylesheet' href='/_builder/codemirror.css'>
+	<link rel='stylesheet' href='/_builder/budibase.css'>
 	<link rel='stylesheet' href='/_builder/monokai.css'>
 	<link rel='stylesheet' href='/_builder/bundle.css'>
 	<link rel='stylesheet' href='/_builder/fonts.css'>

packages/builder/src/pages/_builder.svelte

@@ -0,0 +1,48 @@
+<script>
+  import { store } from "builderStore"
+  import AppList from "components/start/AppList.svelte"
+  import { onMount } from "svelte"
+  import IconButton from "components/common/IconButton.svelte"
+  import Spinner from "components/common/Spinner.svelte"
+
+  let promise = getApps()
+
+  async function getApps() {
+    const res = await fetch(`/api/applications`)
+    const json = await res.json()
+
+    if (res.ok) {
+      return json
+    } else {
+      throw new Error(json)
+    }
+  }
+</script>
+
+<main>
+  {#await promise}
+    <div class="spinner-container">
+      <Spinner />
+    </div>
+  {:then result}
+    <AppList apps={result} />
+  {:catch err}
+    <h1 style="color:red">{err}</h1>
+  {/await}
+</main>
+
+<style>
+  main {
+    height: 100%;
+    width: 100%;
+    font-family: "Roboto", Helvetica, Arial, sans-serif;
+  }
+
+  .spinner-container {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+</style>

packages/server/builder/assets/javascript-logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#F0DB4F" d="M1.408 1.408h125.184v125.185h-125.184z"/><path fill="#323330" d="M116.347 96.736c-.917-5.711-4.641-10.508-15.672-14.981-3.832-1.761-8.104-3.022-9.377-5.926-.452-1.69-.512-2.642-.226-3.665.821-3.32 4.784-4.355 7.925-3.403 2.023.678 3.938 2.237 5.093 4.724 5.402-3.498 5.391-3.475 9.163-5.879-1.381-2.141-2.118-3.129-3.022-4.045-3.249-3.629-7.676-5.498-14.756-5.355l-3.688.477c-3.534.893-6.902 2.748-8.877 5.235-5.926 6.724-4.236 18.492 2.975 23.335 7.104 5.332 17.54 6.545 18.873 11.531 1.297 6.104-4.486 8.08-10.234 7.378-4.236-.881-6.592-3.034-9.139-6.949-4.688 2.713-4.688 2.713-9.508 5.485 1.143 2.499 2.344 3.63 4.26 5.795 9.068 9.198 31.76 8.746 35.83-5.176.165-.478 1.261-3.666.38-8.581zm-46.885-37.793h-11.709l-.048 30.272c0 6.438.333 12.34-.714 14.149-1.713 3.558-6.152 3.117-8.175 2.427-2.059-1.012-3.106-2.451-4.319-4.485-.333-.584-.583-1.036-.667-1.071l-9.52 5.83c1.583 3.249 3.915 6.069 6.902 7.901 4.462 2.678 10.459 3.499 16.731 2.059 4.082-1.189 7.604-3.652 9.448-7.401 2.666-4.915 2.094-10.864 2.07-17.444.06-10.735.001-21.468.001-32.237z"/></svg>

packages/server/src/electron.js

@@ -13,7 +13,7 @@ if (isDev) {
   })
 }
 
-const APP_URL = "http://localhost:4001"
+const APP_URL = "http://localhost:4001/_builder"
 const APP_TITLE = "Budibase Builder"
 
 let win