From 27d6a79c97816f7d7489c6d3947cfb1468539dc2 Mon Sep 17 00:00:00 2001 From: umut0 Date: Wed, 12 Feb 2020 15:23:56 +0100 Subject: [PATCH 1/8] add workshop URLs for workshop instance, if branch is workshop --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1d6fdfb..8100481e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,11 @@ script: export OPENSENSEMAP_API_URL=$OPENSENSEMAP_API_URL_DEV; export OPENSENSEMAP_MAPTILES_URL=$OPENSENSEMAP_MAPTILES_URL_DEV; fi + - if [[ -z "$TRAVIS_TAG" && "$TRAVIS_BRANCH" === "workshop" ]]; then + echo "Lets use the workshop envs"; + export OPENSENSEMAP_API_URL=$WORKSHOP_API_URL; + export OPENSENSEMAP_MAPTILES_URL=$OPENSENSEMAP_MAPTILES_URL; + fi - npm run build - docker build -t $IMAGE_NAME:$TRAVIS_BRANCH-temp . From f5d8b116bf15d0f05612c5aa326e04fea3de1090 Mon Sep 17 00:00:00 2001 From: umut0 Date: Wed, 12 Feb 2020 15:31:21 +0100 Subject: [PATCH 2/8] == --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8100481e..ca83584e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ script: export OPENSENSEMAP_API_URL=$OPENSENSEMAP_API_URL_DEV; export OPENSENSEMAP_MAPTILES_URL=$OPENSENSEMAP_MAPTILES_URL_DEV; fi - - if [[ -z "$TRAVIS_TAG" && "$TRAVIS_BRANCH" === "workshop" ]]; then + - if [[ -z "$TRAVIS_TAG" && "$TRAVIS_BRANCH" == "workshop" ]]; then echo "Lets use the workshop envs"; export OPENSENSEMAP_API_URL=$WORKSHOP_API_URL; export OPENSENSEMAP_MAPTILES_URL=$OPENSENSEMAP_MAPTILES_URL; From 009cd1682d12cd931bd397c7039c7f3a9b31180a Mon Sep 17 00:00:00 2001 From: felixerdy Date: Wed, 12 Feb 2020 16:48:44 +0100 Subject: [PATCH 3/8] only edu registration --- app/scripts/controllers/register.js | 2 +- app/views/account.box.register.html | 562 +--------------------------- 2 files changed, 2 insertions(+), 562 deletions(-) diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js index d041679c..3e475bcb 100644 --- a/app/scripts/controllers/register.js +++ b/app/scripts/controllers/register.js @@ -108,7 +108,7 @@ mqtt: false, ttn: false, hackair: false, - edu: false + edu: true }; vm.markers = {}; diff --git a/app/views/account.box.register.html b/app/views/account.box.register.html index 56057f9f..2a3a3049 100644 --- a/app/views/account.box.register.html +++ b/app/views/account.box.register.html @@ -176,353 +176,7 @@

{{ 'STEP2_SUB2' | translate }}

{{ 'STEP2_SUB3' | translate }}

- -
- - senseBox:home - -
-
-

Microcontroller

-
-
-
- -
-

senseBox:home

-

{{'BASED_ARDUINO' | translate}}

-

-

- - -
-

-
-
-
-
-
- -
-

senseBox:home V2

-

{{'BASED_MCU' | translate}}

-

-

- - -
-

-
-
-
-
-
-
-
-

{{'CONNECTION_TYPE' | translate}}

-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-

{{'SENSORS' | translate}}

-
    -
  • -
    -
    -
    -
    -
    -
    - - -
    - - {{'SENSOR_TEMP_HUMI' | translate}} -
    -
    -
    -
    -
    -
    -
    - - -
    - - - {{'SENSOR_TEMP_PRESSURE' | translate}} -
    -
    -
    -
    -
    -
    -
    - - -
    - - {{'SENSOR_LIGHT_UV' | translate}} -
    -
    -
    -
    -
    -
    -
    - - -
    - - BME680 -
    -
    - -
    -
    -
    -
    -
    - - -
    - - {{'SENSOR_PM' | translate}} -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    - - {{'SOIL_MOISTURE' | translate}} -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    - - Lautstärke -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    • -
-
-
-
-
-

{{'EDIT_EXTENSIONS'|translate}}

-
    -
  • -
    -
    -
    -
    -
    -
    - - -
    - - {{'EXTENSIONS_FINE_PARTICULATE_MATTER'|translate}} -
    -
    -
    -
    -
    -
    • -
-
-
- -
senseBox:edu Bodentemperatur style="vertical-align: middle; height: 90px; width: 90px;" alt="">

{{'SOUND_LEVEL'|translate}}

+

(Sound Level Meter)

@@ -843,221 +498,6 @@

{{'SOUND_LEVEL'|translate}}

-
- - luftdaten.info - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- - hackAIR - -
- - -
-
-
- - {{'MANUAL_CONFIGURATION'|translate}} - -
- -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - -
{{'CONFIG_ICON'|translate}}{{'CONFIG_PHENOMENON'|translate}}{{'CONFIG_UNIT'|translate}}{{'CONFIG_TYPE'|translate}} 
- -
-
- - -
- - -
- 		-
- - - -
- 		-
- - - -
- 		-
- - - -
- 		- -
-
{{ - 'CUSTOMBOX_SENSORINCOMPLETE'|translate }}
-
- -
-
-
{{ 'REG_HARDWAREINCOMPLETE'|translate }}
 From 856a711e0134d598258aac316f667081d18eb7f8 Mon Sep 17 00:00:00 2001 From: felixerdy Date: Wed, 11 Mar 2020 17:18:04 +0100 Subject: [PATCH 4/8] workshop logo and info modal --- Gruntfile.js | 1 + app/components/workshop.directive.html | 18 ++++++++ app/components/workshop.directive.js | 57 ++++++++++++++++++++++++++ app/index.html | 4 +- app/styles/main.css | 13 +++++- 5 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 app/components/workshop.directive.html create mode 100644 app/components/workshop.directive.js diff --git a/Gruntfile.js b/Gruntfile.js index de6bca7a..fcd61fcb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -175,6 +175,7 @@ module.exports = function (grunt) { '<%= yeoman.app %>/components/calendar.directive.js', '<%= yeoman.app %>/components/badge.directive.js', '<%= yeoman.app %>/components/loader.directive.js', + '<%= yeoman.app %>/components/workshop.directive.js', '<%= yeoman.app %>/components/clipboard.directive.js' ], tasks: [ diff --git a/app/components/workshop.directive.html b/app/components/workshop.directive.html new file mode 100644 index 00000000..e47be06c --- /dev/null +++ b/app/components/workshop.directive.html @@ -0,0 +1,18 @@ +
+
+
+
+
openSenseMap Workshop
+
+
+

Willkommen auf openSenseMap workshop. Diese Instanz ist für Workshops ausgelegt und sollte nicht für permanente Messungen genutzt werden. Die Datenbank wird jeden Sonntag Abend zurückgesetzt. Wenn Du Deine Messwerte behalten möchtest dann nutze bitte https://opensensemap.org/

+ + +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/app/components/workshop.directive.js b/app/components/workshop.directive.js new file mode 100644 index 00000000..45666bc0 --- /dev/null +++ b/app/components/workshop.directive.js @@ -0,0 +1,57 @@ +(function () { + 'use strict'; + + angular + .module('openSenseMapApp') + .directive('osemWorkshop', osemWorkshop); + + osemWorkshop.$inject = []; + function osemWorkshop () { + // Usage: + // + // Creates: + // + var directive = { + templateUrl: 'components/workshop.directive.html', + link: link, + restrict: 'EA', + bindToController: true, + controller: WorkshopController, + controllerAs: 'workshop', + }; + + return directive; + + function link (scope, element, attrs) { } + } + + WorkshopController.$inject = ['$scope']; + + /* @ngInject */ + function WorkshopController ($scope) { + var vm = this; + + + vm.$onInit = onInit; + vm.$onDestroy = onDestroy; + vm.close = close; + vm.visible = true; + vm.activate = activate; + + function onInit () { + activate(); + } + + function activate () { + vm.visible = true; + } + + function onDestroy () { + + } + + function close () { + vm.visible = false; + } + } +})(); diff --git a/app/index.html b/app/index.html index 98253512..ace70c79 100644 --- a/app/index.html +++ b/app/index.html @@ -62,7 +62,7 @@
@@ -312,6 +312,7 @@
+
@@ -356,6 +357,7 @@ + diff --git a/app/styles/main.css b/app/styles/main.css index 1f05ed70..4ecd690e 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -823,6 +823,17 @@ li.menuitem.filteractive > a .fa-exclamation-triangle { display: inline; } +.oSeM-brand > span { + transform: rotate(15deg); + display: inline-block; + color: darkgreen; + position: relative; + left: 0px; + border: darkgreen solid; + padding: 3px; + border-radius: 2px; +} + .typeahead-search .custom-popup-wrapper { position: absolute; top: 100%; @@ -1029,7 +1040,7 @@ input:checked + .slider:before { border-bottom-right-radius: 4px; } -@media screen and (max-width: 420px) { +@media screen and (max-width: 503px) { .oSeM-brand { display: none; } From b87a1693bce35df3c515d8a829cbaf2f2bf46a09 Mon Sep 17 00:00:00 2001 From: felixerdy Date: Wed, 4 Mar 2020 11:51:11 +0100 Subject: [PATCH 5/8] fix z-index for cookie consent banner --- app/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/index.html b/app/index.html index ace70c79..9603a596 100644 --- a/app/index.html +++ b/app/index.html @@ -403,6 +403,11 @@ +