Merge branch 'feature/page-refactor' of github.com:Budibase/budibase into feature/page-refactor

6 years ago · 3af1b7bad7
6 changed files with 11 additions and 20 deletions
--- a/packages/builder/rollup.config.js
+++ b/packages/builder/rollup.config.js
@ -76,10 +76,6 @@ export default {
        { src: "src/index.html", dest: outputpath },
        { src: "src/favicon.png", dest: outputpath },
        { src: "assets", dest: outputpath },
-        {
-          src: "node_modules/@budibase/client/dist/budibase-client.esm.mjs",
-          dest: outputpath,
-        },
        {
          src: "node_modules/@budibase/bbui/dist/bbui.css",
          dest: outputpath,
--- a/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/userInterface/AppPreview/CurrentItemPreview.svelte
@ -69,13 +69,11 @@
 </script>

 <div class="component-container">
-  {#if $currentAsset}
-    <iframe
-      style="height: 100%; width: 100%"
-      title="componentPreview"
-      bind:this={iframe}
-      srcdoc={iframeTemplate} />
-  {/if}
+  <iframe
+    style="height: 100%; width: 100%"
+    title="componentPreview"
+    bind:this={iframe}
+    srcdoc={iframeTemplate} />
 </div>

 <style>
--- a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.html
+++ b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.html
@ -1,12 +1,11 @@
 <html>
  <head>
    <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Mono">
    <style>
      body, html {
        height: 100% !important;
-        font-family: Inter !important;
-        margin: 0px !important;
+        font-family: Inter, sans-serif !important;
+        margin: 0 !important;
      }
      *, *:before, *:after {
        box-sizing: border-box;
@ -35,8 +34,6 @@
        }
      }
      
-      let selectedComponentStyle
-
      // Ignore clicks
      ["click", "mousedown"].forEach(type => {
        document.addEventListener(type, function(e) {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -3,7 +3,7 @@
  "version": "0.3.8",
  "license": "MPL-2.0",
  "main": "dist/budibase-client.js",
-  "module": "dist/budibase-client.esm.mjs",
+  "module": "dist/budibase-client.js",
  "scripts": {
    "build": "rollup -c",
    "dev:builder": "rollup -cw"
--- a/packages/client/src/store/routes.js
+++ b/packages/client/src/store/routes.js
@ -34,7 +34,7 @@ const createRouteStore = () => {
  }
  const setActiveRoute = route => {
    store.update(state => {
-      state.activeRoute = route
+      state.activeRoute = state.routes.find(x => x.path === route)
      return state
    })
  }
--- a/packages/client/src/store/screens.js
+++ b/packages/client/src/store/screens.js
@ -24,9 +24,9 @@ const createScreenStore = () => {
        activeLayout = layouts[0]
        if (screens.length === 1) {
          activeScreen = screens[0]
-        } else {
+        } else if ($routeStore.activeRoute) {
          activeScreen = screens.find(
-            screen => screen.routing.route === $routeStore.activeRoute
+            screen => screen._id === $routeStore.activeRoute.screenId
          )
        }
        if (activeScreen) {