dbm 1.1.22 → 1.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm",
-  "version": "1.1.22",
+  "version": "1.1.23",
   "main": "index.js",
   "type": "module",
   "scripts": {},

package/react/blocks/content/AnchorPosition.js

@@ -0,0 +1,12 @@
+import React from "react";
+import Dbm from "../../../index.js";
+
+export default class AnchorPosition extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    _renderMainElement() {
+      return React.createElement("div", {"id": this.context.blockData.linkName});
+    }
+}

package/react/blocks/content/index.js

@@ -1,2 +1,3 @@
 export {default as Card} from "./Card.js";
-export {default as ContentBlock} from "./ContentBlock.js";
+export {default as ContentBlock} from "./ContentBlock.js";
+export {default as AnchorPosition} from "./AnchorPosition.js";

package/react/blocks/index.js

@@ -215,6 +215,15 @@ export let registerAllBlocks = function() {
         registerBlock("content/contentBlock", "Content block", createElement(Dbm.react.blocks.content.ContentBlock, {}), editor, {}, {});
     }
 
+    {
+        let editor = createElement(Dbm.react.admin.editor.EditorBlockName, {},
+            createElement(Dbm.react.form.LabelledArea, {label: "Link name"},
+                createElement(Dbm.react.admin.editor.fields.TextField, {name: "linkName"})
+            )
+        );
+        registerBlock("content/anchorPosition", "Anchor position", createElement(Dbm.react.blocks.content.AnchorPosition, {}), editor, {}, {});
+    }
+
     {
         let editor = createElement(Dbm.react.admin.editor.EditorBlockName, {},
             createElement(Dbm.react.form.LabelledArea, {label: "Initial sections"}, 

package/react/cookies/CookieOverlayMessage.js

@@ -0,0 +1,188 @@
+import React from "react";
+import Dbm from "../../index.js";
+import Cookies from "js-cookie";
+
+export default class CookieOverlayMessage extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        let openProperty = this.getDynamicProp("open", false);
+        this.item.requireProperty("envelope", 0);
+
+        let stateToEnvelope = Dbm.flow.updatefunctions.logic.switchValue(openProperty).setDefaultValue(100).addCase(true, 0);
+        let inDomCase = Dbm.flow.updatefunctions.logic.switchValue(this.item.properties.envelope).setDefaultValue(true).addCase(100, false);
+
+        this.item.requireProperty("inDom", false).connectInput(inDomCase.output.properties.value);
+
+        let animation = new Dbm.flow.animateValue(stateToEnvelope.output.properties.value);
+        
+        this.item.properties.envelope.connectInput(animation.properties.output);
+
+        let transform = new Dbm.flow.updatefunctions.dom.TransformStyle();
+        transform.translateY(animation.properties.output, "%");
+
+        let style = new Dbm.flow.updatefunctions.dom.StyleObject();
+        style.addProperty("transform", transform.output.properties.value);
+        this.item.requireProperty("style", null).connectInput(style.output.properties.style);
+
+        let shouldShow = Cookies.get("cookie/hideCookieBar") !== "1";
+
+        this.getDynamicProp("open").getMostUpstreamProperty().setValue(shouldShow);
+
+        this.item.setValue("widthElement", null);
+
+        let elementSize = new Dbm.flow.updatefunctions.dom.ElementSize();
+        this.item.setValue("elementSize", elementSize);
+
+        elementSize.input.properties.element.connectInput(this.item.properties.widthElement);
+        elementSize.start();
+
+        let layoutSwitch = new Dbm.flow.updatefunctions.logic.RangeSwitch();
+        layoutSwitch.input.properties.value.connectInput(elementSize.output.properties.width);
+
+        layoutSwitch.input.defaultValue = React.createElement("div", {},
+                React.createElement("div", {className: "cookie-bar cookie-bar-padding all-pointer-events"},
+                
+                React.createElement("div", {},
+                    React.createElement("div", {"className": "cookie-bar-title"},
+                        "Your privacy is important to us"
+                    ),
+                    React.createElement("div", {"className": "cookie-bar-description"},
+                        "We use cookies to make our site work properly and to improve your experience. You can choose to accept all cookies, allow only those that are necessary, or manage your preferences in the settings."
+                    )
+                ),
+                React.createElement("div", {"className": "spacing small"}),
+                React.createElement("div", {"className": "standard-button standard-button-padding big text-align-center",  onClick: () => this._acceptAll()}, "Allow all"),
+                React.createElement("div", {"className": "spacing small"}),
+                React.createElement("div", {"className": "secondary-button standard-button-padding text-align-center", onClick: () => this._rejectAll()}, "Only necessary"),
+                React.createElement("div", {"className": "spacing small"}),
+                React.createElement("div", {"className": "cookie-overlay-message-divider"}),
+                React.createElement("div", {"className": "spacing small"}),
+                React.createElement("div", {"className": "text-align-center"},
+                    "Take full control over how we use cookies:"
+                ),
+                React.createElement("div", {"className": "spacing small"}),
+                React.createElement("a", {"href": "/cookie-settings/", className:"custom-styled-link"},
+                    React.createElement("div", {"className": "secondary-button standard-button-padding text-align-center"}, "Settings")
+                )
+            
+            )
+        );
+
+        let desktopLayout = React.createElement("div", {className: "centered-site"},
+            React.createElement("div", {className: "cookie-overlay-message-box cookie-overlay-message-box-padding all-pointer-events"},
+                React.createElement("div", {"className": "flex-row small-item-spacing"}, 
+                    React.createElement("div", {"className": "flex-row-item half"},
+                        React.createElement("div", {"className": "cookie-bar-title"},
+                            "Your privacy is important to us"
+                        ),
+                        React.createElement("div", {"className": "cookie-bar-description"},
+                            "We use cookies to make our site work properly and to improve your experience. You can choose to accept all cookies, allow only those that are necessary, or manage your preferences in the settings."
+                        )
+                    ),
+                    React.createElement("div", {"className": "flex-row-item quarter"}),
+                    React.createElement("div", {"className": "flex-row-item quarter"}, 
+                        React.createElement("div", {"className": "standard-button standard-button-padding big full-width text-align-center",  onClick: () => this._acceptAll()}, "Allow all"),
+                        React.createElement("div", {"className": "spacing medium"}),
+                        React.createElement("div", {"className": "secondary-button standard-button-padding full-width text-align-center", onClick: () => this._rejectAll()}, "Only necessary")
+                        
+                    )
+                ),
+                React.createElement("div", {"className": "spacing standard"}),
+                React.createElement("div", {"className": "cookie-overlay-message-divider"}),
+                React.createElement("div", {"className": "spacing standard"}),
+                React.createElement("div", {"className": "flex-row small-item-spacing justify-between"},
+                    React.createElement("div", {"className": "flex-row-item"},
+                        "Take full control over how we use cookies:"
+                    ),
+                    React.createElement("div", {"className": "flex-row-item"},
+                        React.createElement("a", {"href": "/cookie-settings/", className:"custom-styled-link"},
+                            React.createElement("div", {"className": "cookie-settings-link"}, "Settings >")
+                        )
+                    ),
+                )
+            ),
+            React.createElement("div", {"className": "spacing double"}),
+            React.createElement("div", {"className": "spacing double"}),
+        );
+
+        layoutSwitch.addValueForRange(desktopLayout, 700);
+
+        this.item.setValue("element", null);
+        this.item.properties.element.connectInput(layoutSwitch.output.properties.value);
+    }
+
+    _getDomain() {
+
+        let parts = document.location.hostname.split('.');
+
+        let length = parts.length;
+        if (length === 1) {
+            return parts[0];
+        }
+        else if(parts[length-2] === "co" && parts[length-1] === "uk") {
+            return '.' + parts.slice(-3).join('.');
+        }
+        
+        return '.' + parts.slice(-2).join('.');
+    }
+
+    _acceptAll() {
+        console.log("_acceptAll");
+
+        let options = {"expires": 365, "domain": this._getDomain()};
+
+        Cookies.set("cookie/allowPreferences", "1", options);
+        Cookies.set("cookie/allowStatistics", "1", options);
+        Cookies.set("cookie/allowMarketing", "1", options);
+        Cookies.set("cookie/hideCookieBar", "1", options);
+
+        let consentTime = (new Date()).toISOString();
+
+        Cookies.set("cookie/consentTime", consentTime, options);
+
+        Dbm.getInstance().repository.getItem("trackingController").allowStatistics = true;
+        Dbm.getInstance().repository.getItem("trackingController").allowMarketing = true;
+
+        Dbm.getInstance().repository.getItem("userSettings").setValue("hideCookieBar", true);
+
+        this.getDynamicProp("open").getMostUpstreamProperty().setValue(false);
+    }
+
+    _rejectAll() {
+
+        let options = {"expires": 365, "domain": this._getDomain()};
+
+        Cookies.set("cookie/allowPreferences", "0", options);
+        Cookies.set("cookie/allowStatistics", "0", options);
+        Cookies.set("cookie/allowMarketing", "0", options);
+        Cookies.set("cookie/hideCookieBar", "1", options);
+
+        let consentTime = (new Date()).toISOString();
+
+        Cookies.set("cookie/consentTime", consentTime, options);
+
+        Dbm.getInstance().repository.getItem("trackingController").allowStatistics = false;
+        Dbm.getInstance().repository.getItem("trackingController").allowMarketing = false;
+
+        Dbm.getInstance().repository.getItem("userSettings").setValue("hideCookieBar", true);
+
+        this.getDynamicProp("open").getMostUpstreamProperty().setValue(false);
+    }
+
+    _renderMainElement() {
+
+        return this._createMainElement("div", {className: "cookie-bar-position no-pointer-events cookie-overlay-message-layer", ref: this.createRef("widthElement")},
+            React.createElement(Dbm.react.area.HasData, {"check": this.item.properties.inDom},
+                React.createElement("div", {className: "overflow-hidden"},	
+                    React.createElement(Dbm.react.BaseObject, {style: this.item.properties.style},
+                        React.createElement("div", {},
+                            React.createElement(Dbm.react.area.InsertElement, {element: this.item.properties.element})
+                        )
+                    )
+                )
+            )
+        );
+    }
+}
+

package/react/cookies/index.js

@@ -1,2 +1,3 @@
 export {default as CookieSettings} from "./CookieSettings.js";
-export {default as CookieBar} from "./CookieBar.js";
+export {default as CookieBar} from "./CookieBar.js";
+export {default as CookieOverlayMessage} from "./CookieOverlayMessage.js";

package/site/SiteNavigation.js

@@ -127,6 +127,11 @@ export default class SiteNavigation extends Dbm.core.BaseObject {
 					if(hardNavigation) {
 						shouldSkip = true;
 					}
+
+					let target = currentNode.getAttribute("target");
+					if(target === "_blank") {
+						shouldSkip = true;
+					}
 					break;
 				}
 			}