Added setup type var
This commit is contained in:
parent
92060d0b89
commit
820fc656cc
|
@ -63,6 +63,7 @@ ENV TZ=Asia/Tel_Aviv \
|
||||||
_APP_STATSD_PORT=8125 \
|
_APP_STATSD_PORT=8125 \
|
||||||
_APP_SMTP_HOST=smtp \
|
_APP_SMTP_HOST=smtp \
|
||||||
_APP_SMTP_PORT=25 \
|
_APP_SMTP_PORT=25 \
|
||||||
|
_APP_SETUP=self-hosted \
|
||||||
_APP_VERSION=$VERSION
|
_APP_VERSION=$VERSION
|
||||||
#ENV _APP_SMTP_SECURE ''
|
#ENV _APP_SMTP_SECURE ''
|
||||||
#ENV _APP_SMTP_USERNAME ''
|
#ENV _APP_SMTP_USERNAME ''
|
||||||
|
|
|
@ -23,8 +23,7 @@ $layout
|
||||||
->setParam('protocol', $request->getServer('REQUEST_SCHEME', 'https'))
|
->setParam('protocol', $request->getServer('REQUEST_SCHEME', 'https'))
|
||||||
->setParam('domain', $domain)
|
->setParam('domain', $domain)
|
||||||
->setParam('home', $request->getServer('_APP_HOME'))
|
->setParam('home', $request->getServer('_APP_HOME'))
|
||||||
->setParam('api', $request->getServer('_APP_APPWRITE_HOST_CLIENT'))
|
->setParam('setup', $request->getServer('_APP_SETUP'))
|
||||||
->setParam('project', $request->getServer('_APP_APPWRITE_ID'))
|
|
||||||
->setParam('class', 'unknown')
|
->setParam('class', 'unknown')
|
||||||
->setParam('icon', '/images/favicon.png')
|
->setParam('icon', '/images/favicon.png')
|
||||||
->setParam('roles', $roles)
|
->setParam('roles', $roles)
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
<div class="list pull-start project-only">
|
<div class="list pull-start project-only">
|
||||||
<label>
|
<label>
|
||||||
<select
|
<select
|
||||||
data-analytics-event="change"
|
data-xanalytics-event="change"
|
||||||
data-analytics-category="console/header"
|
data-xanalytics-category="console/header"
|
||||||
data-analytics-label="Project Switch"
|
data-xanalytics-label="Project Switch"
|
||||||
data-switch
|
data-switch
|
||||||
data-ls-bind="{{router.params.project}}"
|
data-ls-bind="{{router.params.project}}"
|
||||||
data-unsync="1"
|
data-unsync="1"
|
||||||
|
|
|
@ -4,8 +4,6 @@ use Utopia\Locale\Locale;
|
||||||
|
|
||||||
$protocol = $this->getParam('protocol', '');
|
$protocol = $this->getParam('protocol', '');
|
||||||
$domain = $this->getParam('domain', '');
|
$domain = $this->getParam('domain', '');
|
||||||
$api = $this->getParam('api', '');
|
|
||||||
$project = $this->getParam('project', 'console');
|
|
||||||
$platforms = $this->getParam('platforms', []);
|
$platforms = $this->getParam('platforms', []);
|
||||||
$version = $this->getParam('version', '0.0.0');
|
$version = $this->getParam('version', '0.0.0');
|
||||||
$isDev = $this->getParam('isDev', false);
|
$isDev = $this->getParam('isDev', false);
|
||||||
|
@ -35,7 +33,7 @@ if(!empty($platforms)) {
|
||||||
<link rel="icon" type="image/png" href="<?php echo $this->escape($this->getParam('icon', '')); ?>?v=1" />
|
<link rel="icon" type="image/png" href="<?php echo $this->escape($this->getParam('icon', '')); ?>?v=1" />
|
||||||
<link href="https://fonts.googleapis.com/css?family=Poppins:100,300,400,500,600" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css?family=Poppins:100,300,400,500,600" rel="stylesheet">
|
||||||
<link rel="apple-touch-icon" href="/images/apple.png">
|
<link rel="apple-touch-icon" href="/images/apple.png">
|
||||||
<link rel="preconnect" href="<?php echo $api; ?>" />
|
<!-- <link rel="preconnect" href="" /> -->
|
||||||
<?php if (!empty($canonical)): ?>
|
<?php if (!empty($canonical)): ?>
|
||||||
<link rel="canonical" href="<?php echo $canonical; ?>" />
|
<link rel="canonical" href="<?php echo $canonical; ?>" />
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
@ -67,8 +65,9 @@ if(!empty($platforms)) {
|
||||||
PROTOCOL: '<?php echo $protocol; ?>',
|
PROTOCOL: '<?php echo $protocol; ?>',
|
||||||
DOMAIN: '<?php echo $domain; ?>',
|
DOMAIN: '<?php echo $domain; ?>',
|
||||||
HOME: '<?php echo $this->escape($this->getParam('home')); ?>',
|
HOME: '<?php echo $this->escape($this->getParam('home')); ?>',
|
||||||
API: '<?php echo $api; ?>/v1',
|
SETUP: '<?php echo $this->escape($this->getParam('setup')); ?>',
|
||||||
PROJECT: '<?php echo $project; ?>',
|
API: '/v1',
|
||||||
|
PROJECT: 'console',
|
||||||
PLATFORMS: <?php echo json_encode($platforms); ?>,
|
PLATFORMS: <?php echo json_encode($platforms); ?>,
|
||||||
LOCALE: '<?php echo $this->escape(Locale::getText('settings.locale')); ?>',
|
LOCALE: '<?php echo $this->escape(Locale::getText('settings.locale')); ?>',
|
||||||
PREFIX: '<?php echo $this->escape($this->getParam('prefix')); ?>',
|
PREFIX: '<?php echo $this->escape($this->getParam('prefix')); ?>',
|
||||||
|
|
4
public/dist/scripts/app-all.js
vendored
4
public/dist/scripts/app-all.js
vendored
|
@ -2610,8 +2610,8 @@ element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",
|
||||||
switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
|
switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
|
||||||
if(debug)
|
if(debug)
|
||||||
console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
|
console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
|
||||||
ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router){if(!ga){console.error("Google Analytics ga object is not available");}
|
ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
|
||||||
var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
|
var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
|
||||||
if(target){target=document.getElementById(target);}
|
if(target){target=document.getElementById(target);}
|
||||||
button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
|
button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
|
||||||
clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
|
clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
|
||||||
|
|
4
public/dist/scripts/app.js
vendored
4
public/dist/scripts/app.js
vendored
|
@ -336,8 +336,8 @@ element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",
|
||||||
switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
|
switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
|
||||||
if(debug)
|
if(debug)
|
||||||
console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
|
console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
|
||||||
ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router){if(!ga){console.error("Google Analytics ga object is not available");}
|
ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
|
||||||
var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
|
var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
|
||||||
if(target){target=document.getElementById(target);}
|
if(target){target=document.getElementById(target);}
|
||||||
button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
|
button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
|
||||||
clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
|
clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
window.ls.container.get("view").add({
|
window.ls.container.get("view").add({
|
||||||
selector: "data-analytics-pageview",
|
selector: "data-analytics-pageview",
|
||||||
controller: function(window, router) {
|
controller: function(window, router, env) {
|
||||||
if (!ga) {
|
if (!ga) {
|
||||||
console.error("Google Analytics ga object is not available");
|
console.error("Google Analytics ga object is not available");
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,8 @@
|
||||||
ga("set", "page", window.location.pathname);
|
ga("set", "page", window.location.pathname);
|
||||||
|
|
||||||
ga("set", "dimension1", project);
|
ga("set", "dimension1", project);
|
||||||
//ga('set', 'dimension2', '');
|
ga('set', 'dimension2', env.VERSION);
|
||||||
|
ga('set', 'dimension3', env.SETUP);
|
||||||
|
|
||||||
ga("send", "pageview");
|
ga("send", "pageview");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue