From e0c309850bd3929aad9e2a5a11a0c6031cb906cc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Oct 2020 17:06:58 +0100 Subject: [PATCH] Update default page templates --- .../appDirectoryTemplate/pages/main/page.json | 107 ++++++++++++------ .../d834fea2-1b3e-4320-ab34-f9009f5ecc59.json | 89 +++++++++++---- .../pages/unauthenticated/page.json | 40 +++++-- 3 files changed, 172 insertions(+), 64 deletions(-) diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json index 037c385f5c..436f5b32df 100644 --- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/page.json @@ -1,59 +1,97 @@ { + "componentLibraries": [ + "@budibase/standard-components" + ], "title": "{{ name }}", "favicon": "./_shared/favicon.png", "stylesheets": [], - "componentLibraries": ["@budibase/standard-components"], "props": { "_id": "private-master-root", "_component": "@budibase/standard-components/container", "_children": [ { - "_id": "49e0e519-9e5e-4127-885a-ee6a0a49e2c1", - "_component": "@budibase/standard-components/Navigation", + "_id": "c74f07266980c4b6eafc33e2a6caa783d", + "_component": "@budibase/standard-components/container", "_styles": { - "normal": {}, + "normal": { + "display": "flex", + "flex-direction": "row", + "justify-content": "flex-start", + "align-items": "flex-start", + "background": "#fff", + "width": "100%" + }, "hover": {}, "active": {}, "selected": {} }, "_code": "", - "logoUrl": "http://acmelogos.com/images/logo-8.svg", - "title": "", - "backgroundColor": "", - "color": "", - "borderWidth": "", - "borderColor": "", - "borderStyle": "", - "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", - "_instanceName": "Navigation", + "className": "", + "onLoad": [], + "type": "div", + "_instanceId": "inst_app_80b_f158d4057d2c4bedb0042d42fda8abaf", + "_instanceName": "Header", "_children": [ { - "_id": "48b35328-4c91-4343-a6a3-1a1fd77b3386", - "_component": "@budibase/standard-components/link", + "_id": "49e0e519-9e5e-4127-885a-ee6a0a49e2c1", + "_component": "@budibase/standard-components/Navigation", "_styles": { "normal": { - "font-family": "Inter", + "max-width": "1400px", + "margin-left": "auto", + "margin-right": "auto", + "padding": "20px", + "color": "#757575", "font-weight": "400", - "color": "#000000", - "text-decoration-line": "none", - "font-size": "16px" + "font-size": "16px", + "flex": "1 1 auto" }, "hover": {}, "active": {}, "selected": {} }, "_code": "", - "url": "/", - "openInNewTab": false, - "text": "Home", + "logoUrl": "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg", + "title": "", + "backgroundColor": "", "color": "", - "hoverColor": "", - "underline": false, - "fontSize": "", - "fontFamily": "initial", + "borderWidth": "", + "borderColor": "", + "borderStyle": "", "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", - "_instanceName": "Home Link", - "_children": [] + "_instanceName": "Navigation", + "_children": [ + { + "_id": "48b35328-4c91-4343-a6a3-1a1fd77b3386", + "_component": "@budibase/standard-components/link", + "_styles": { + "normal": { + "font-family": "Inter", + "font-weight": "400", + "color": "#000000", + "text-decoration-line": "none", + "font-size": "16px" + }, + "hover": { + "color": "#4285f4" + }, + "active": {}, + "selected": {} + }, + "_code": "", + "url": "/", + "openInNewTab": false, + "text": "Home", + "color": "", + "hoverColor": "", + "underline": false, + "fontSize": "", + "fontFamily": "initial", + "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", + "_instanceName": "Home Link", + "_children": [] + } + ] } ] }, @@ -66,7 +104,12 @@ "display": "flex", "flex-direction": "column", "justify-content": "flex-start", - "align-items": "stretch" + "align-items": "stretch", + "max-width": "100%", + "margin-left": "20px", + "margin-right": "20px", + "width": "1400px", + "padding": "20px" }, "hover": {}, "active": {}, @@ -83,11 +126,12 @@ "normal": { "display": "flex", "flex-direction": "column", - "align-items": "stretch", + "align-items": "center", "justify-content": "flex-start", "margin-right": "auto", "margin-left": "auto", - "min-height": "100%" + "min-height": "100%", + "background-image": "linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);" }, "selected": {} }, @@ -95,6 +139,5 @@ "className": "", "onLoad": [] }, - "_css": "", "uiFunctions": "" } diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json index 35c4656a3d..7c94af517e 100644 --- a/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/main/screens/d834fea2-1b3e-4320-ab34-f9009f5ecc59.json @@ -5,7 +5,13 @@ "_id": "d834fea2-1b3e-4320-ab34-f9009f5ecc59", "_component": "@budibase/standard-components/container", "_styles": { - "normal": {}, + "normal": { + "flex": "1 1 auto", + "display": "flex", + "flex-direction": "column", + "justify-content": "flex-start", + "align-items": "stretch" + }, "hover": {}, "active": {}, "selected": {} @@ -18,40 +24,75 @@ { "_id": "ef60083f-4a02-4df3-80f3-a0d3d16847e7", "_component": "@budibase/standard-components/heading", - "_styles": { - "normal": {}, - "hover": {}, - "active": {}, - "selected": {} - }, - "_code": "", - "className": "", - "text": "Home", - "type": "h1", - "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", - "_instanceName": "Heading", - "_children": [] - }, - { - "_id": "6c256e06-784c-4ac0-a644-ed2f9b91d459", - "_component": "@budibase/standard-components/image", "_styles": { "normal": { - "width": "100%" + "text-align": "left" }, "hover": {}, "active": {}, "selected": {} }, "_code": "", - "url": "https://source.unsplash.com/Vun-71Vy2hc", "className": "", - "description": "", - "height": "", - "width": "", + "text": "Welcome to your Budibase App 👋", + "type": "h2", "_instanceId": "inst_cf8ace4_69efc0d72e6f443db2d4c902c14d9394", - "_instanceName": "Image", + "_instanceName": "Heading", "_children": [] + }, + { + "_id": "cbbf41b27c2b44d1abba38bb694880c6a", + "_component": "@budibase/standard-components/container", + "_styles": { + "normal": { + "display": "flex", + "flex-direction": "column", + "justify-content": "center", + "align-items": "stretch", + "flex": "1 1 auto", + "border-width": "4px", + "border-style": "Dashed", + "margin-bottom": "32px" + }, + "hover": {}, + "active": {}, + "selected": {} + }, + "_code": "", + "className": "", + "onLoad": [], + "type": "div", + "_instanceId": "inst_app_2cc_ca3383f896034e9295345c05f7dfca0c", + "_instanceName": "Video Container", + "_children": [ + { + "_id": "c07d752cb3e544b418088fa9be84ba2e4", + "_component": "@budibase/standard-components/embed", + "_styles": { + "normal": { + "width": "100%", + "flex": "1 1 auto", + "opacity": "0", + "transition-property": "Opacity", + "transition-duration": "1s", + "transition-timing-function:": "ease-in" + }, + "hover": { + "transition-property": "Opacity", + "transition-duration": "1s", + "transition-timing-function:": "ease-out", + "opacity": "1" + }, + "active": {}, + "selected": {} + }, + "_code": "", + "embed": "", + "_instanceId": "inst_app_2cc_ca3383f896034e9295345c05f7dfca0c", + "_instanceName": "Rick Astley Video", + "_children": [] + } + ] } ], "_instanceName": "Home" diff --git a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json index 483b20cf44..d3e6e55ac9 100644 --- a/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json +++ b/packages/server/src/utilities/appDirectoryTemplate/pages/unauthenticated/page.json @@ -1,5 +1,7 @@ { - "componentLibraries": ["@budibase/standard-components"], + "componentLibraries": [ + "@budibase/standard-components" + ], "title": "{{ name }}", "favicon": "./_shared/favicon.png", "stylesheets": [], @@ -11,7 +13,19 @@ "_id": "686c252d-dbf2-4e28-9078-414ba4719759", "_component": "@budibase/standard-components/login", "_styles": { - "normal": {}, + "normal": { + "padding": "64px", + "background": "rgba(255, 255, 255, 0.4)", + "border-radius": "0.5rem", + "margin-top": "0px", + "margin": "0px", + "line-height": "1", + "box-shadow": "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)", + "font-size": "16px", + "font-family": "Inter", + "flex": "0 1 auto", + "transform": "0" + }, "hover": {}, "active": {}, "selected": {} @@ -25,20 +39,30 @@ "_instanceName": "Login", "inputClass": "", "_children": [], - "title": "Login to {{ name }}", - "buttonText": "Login", - "logo": "" + "title": "Log in to {{ name }}", + "buttonText": "Log In", + "logo": "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" } ], "type": "div", "_styles": { - "layout": {}, - "position": {} + "active": {}, + "hover": {}, + "normal": { + "display": "flex", + "flex-direction": "column", + "align-items": "center", + "justify-content": "center", + "margin-right": "auto", + "margin-left": "auto", + "min-height": "100%", + "background-image": "linear-gradient(135deg, rgba(252,215,212,1) 20%, rgba(207,218,255,1) 100%);" + }, + "selected": {} }, "_code": "", "className": "", "onLoad": [] }, - "_css": "", "uiFunctions": "" }