add empty database folder, or first bringup fails

check for isShift to paste in place

.gitignore

@@ -5,4 +5,5 @@ public/stylesheets/*.css
 database.sqlite
 *.swp
 *~
-
+storage/
+.DS_Store

.gitlab-ci.yml

@@ -0,0 +1,44 @@
+variables:
+  CONTAINER_IMAGE: git.universe.io:4567/$CI_PROJECT_PATH
+  DOCKER_HOST: tcp://docker:2376
+stages:
+  - build
+  - deploy_dev
+  - deploy
+build:
+  stage: build
+  image: docker:stable
+  services:
+    - docker:19.03.12-dind
+  variables:
+    DOCKER_TLS_CERTDIR: "/certs"
+  script:
+    - docker image build -t $CONTAINER_IMAGE:$CI_BUILD_REF -t $CONTAINER_IMAGE:latest .
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN git.universe.io:4567
+    - docker image push $CONTAINER_IMAGE:latest
+    - docker image push $CONTAINER_IMAGE:$CI_BUILD_REF
+  only:
+    - mnt
+    - custom/freiwerkb
+deploy_dev:
+  stage: deploy
+  image: alpine
+  script:
+    - apk add --update curl
+    - curl -XPOST $WWW_WEBHOOK
+  only:
+    - mnt
+    - custom/freiwerkb
+deploy:
+  when: manual
+  stage: deploy
+  image: alpine
+  script:
+    - apk add --update curl
+    - |
+      curl -XPOST -K - <<URL 
+        $WWW_WEBHOOKS 
+      URL
+  only:
+    - master
+    - custom/freiwerkb

.tool-versions

@@ -0,0 +1 @@
+nodejs 10.23.1

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "type": "node",
+        "request": "launch",
+        "name": "Launch debug",
+        "runtimeExecutable": "${workspaceFolder}/node_modules/nodemon/bin/nodemon.js",
+        "skipFiles": ["<node_internals>/**"],
+        "program": "${workspaceFolder}/spacedeck.js",
+        "cwd": "${workspaceFolder}",
+        "env": {
+          "NODE_APP_INSTANCE" :"dev"
+        }
+      },
+      {
+        "type": "node",
+        "request": "launch",
+        "name": "Launch ldap",
+        "runtimeExecutable": "${workspaceFolder}/node_modules/nodemon/bin/nodemon.js",
+        "skipFiles": ["<node_internals>/**"],
+        "program": "${workspaceFolder}/spacedeck.js",
+        "cwd": "${workspaceFolder}",
+        "env": {
+          "NODE_APP_INSTANCE" :"ldap"
+        }
+      }
+    ]
+  }

CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## [X.X.X] - 2021-03-23
+
+### Changes
+
+- Replaced phantomjs with puppeteer #169
+- Create Hungarian language pack #174

Dockerfile

@@ -21,6 +21,20 @@ RUN cd audiowaveform/build/ && cmake -D ENABLE_TESTS=0 -D BUILD_STATIC=1 ..
 RUN cd audiowaveform/build/ && make
 RUN cd audiowaveform/build/ && make install
 
+# install chromium
+RUN apk add --no-cache \
+    chromium \
+    nss \
+    freetype \
+    freetype-dev \
+    harfbuzz \
+    ca-certificates \
+    ttf-freefont
+
+# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
+    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
+
 # install other requirements
 
 RUN apk add graphicsmagick ffmpeg ffmpeg-dev ghostscript

Gulpfile.js

@@ -1,13 +1,15 @@
-const gulp = require('gulp')
-const sass = require('gulp-sass')
-const concat = require('gulp-concat')
+const gulp = require('gulp');
+const sass = require('gulp-sass');
+const concat = require('gulp-concat');
+const cleanCSS = require('gulp-clean-css');
 
 gulp.task('styles', function(done) {
   gulp.src('styles/**/*.scss')
     .pipe(sass({
         errLogToConsole: true
     }))
+    .pipe(cleanCSS())
     .pipe(gulp.dest('./public/stylesheets/'))
     .pipe(concat('style.css'))
   done()
-})
+});

README.md

@@ -12,7 +12,7 @@ We appreciate filed issues, pull requests and general discussion.
 
 # Features
 
-- Create virtual whiteboards called *Spaces* with virtually unlimited size
+- Create virtual whiteboards called _Spaces_ with virtually unlimited size
 - Drag & drop images, videos and audio from your computer or the web
 - Write and format text with full control over fonts, colors and style
 - Draw, annotate and highlight with included graphical shapes
@@ -37,7 +37,7 @@ Spacedeck requires:
 
 To run Spacedeck, you only need Node.JS 10.x.
 
-To install all node dependencies, run (do this once):
+To install all node dependencies, run (do this once) after cloning the repository:
 
     npm install
 
@@ -45,6 +45,52 @@ To install all node dependencies, run (do this once):
 
 See [config/default.json](config/default.json). Set `storage_local_path` for a local sqlite database or `storage_region`, `storage_bucket`, `storage_cdn` and `storage_endpoint` for AWS S3. `mail_provider` may be one of `console` or `smtp`. Also, omit a trailing `/` for the `endpoint`.
 
+## Disable DB logs
+
+```json
+...
+"db_logs_disabled": true
+...
+```
+
+## Configure color swatches
+
+Add a custom array of swatches to your config/default.json.
+
+**You should include the swatch transparent (rgba(0,0,0,0)) so users can remove the color applied.**
+
+## Configure default colors
+
+You can define text, stroke and fill color in your config/default.json.
+
+**You also should include the default colors in your custom swatches palette.**
+
+```json
+...
+"spacedeck": {
+  "default_text_color": "#E11F26",
+  "default_stroke_color": "#9E0F13",
+  "default_fill_color": "#64BCCA",
+  "swatches": [
+    {"id":8, "hex":"#000000"},
+    {"id":30, "hex":"rgba(0,0,0,0)"},
+    {"id":31, "hex": "#E11F26"},
+    {"id":32, "hex": "#9E0F13"},
+    {"id":33, "hex": "#64BCCA"},
+    {"id":34, "hex": "#40808A"},
+    {"id":35, "hex": "#036492"},
+    {"id":36, "hex": "#005179"},
+    {"id":37, "hex": "#84427E"},
+    {"id":38, "hex": "#6C3468"},
+    {"id":39, "hex": "#F79B84"},
+    {"id":40, "hex": "#B57362"},
+    {"id":41, "hex": "#E7D45A"},
+    {"id":42, "hex": "#ACA044"}
+  ]
+}
+...
+```
+
 # Run (web server)
 
     node spacedeck.js
@@ -61,18 +107,34 @@ For advanced media conversion:
 
 # Data Storage
 
-By default, media files are uploaded to the ```storage``` folder.
-The database is stored in ```database.sqlite``` by default.
+By default, media files are uploaded to the `storage` folder.
+The database is stored in `database.sqlite` by default.
+
+# Other databases (Not officially supported)
+
+## Postgres
+
+Add the [pg](https://www.npmjs.com/package/pg) module and change the config/default.json to
+
+```
+"storage_dialect": "postgres",
+```
+
+Adapt the other values as needed
+
+```
+"storage_host": "localhost",
+"storage_database": "spacedeck",
+"storage_username": "username",
+"storage_password": "password",
+```
 
 # Run with Docker
 
 - configure `config/default.json`
-- configure `volumes` section inside `docker-compose.yml`
-  - point to `database.sqlite` on the host system
-  - `touch database.sqlite` if it not exists
-  - point to `storage/` on the host system
-  - `mkdir storage/` if it not exists
-- start the container with `sudo docker-compose up -f docker-compose.yml -d --build`
+- adapt your `docker-compose.yml` if needed.
+- start the container with `docker-compose up`
+  (use `-d` for background process and `--build` for rebuilding the image)
 
 # Hacking
 
@@ -89,7 +151,7 @@ Spacedeck Open source code is released under the GNU Affero General Public Licen
     Spacedeck Open - Web-based Collaborative Whiteboard For Rich Media
     Copyright (C) 2011-2018 Lukas F. Hartmann, Martin Güther
     Icons and original CSS design copyright by Thomas Helbig
-    
+
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
     published by the Free Software Foundation, either version 3 of the

config/default.json

@@ -7,8 +7,15 @@
   "endpoint": "http://localhost:9666",
   "invite_code": "top-sekrit",
 
+  "storage_dialect": "sqlite",
+
+  "storage_host": "localhost",
+  "storage_database": "spacedeck",
+  "storage_username": "username",
+  "storage_password": "password",
+
   "storage_local_path": "./storage",
-  "storage_local_db": "./database.sqlite",
+  "storage_local_db": "./database/database.sqlite",
   "storage_region": "eu-central-1",
   "storage_endpoint": "http://localhost:4572",
   "storage_bucket": "my_spacedeck_bucket",
@@ -18,7 +25,7 @@
   "redis_mock": true,
   "redis_host": "localhost",
 
-  "phantom_api_secret": "very_secret_phantom_password",
+  "export_api_secret": "very_secret_export_password",
 
   "mail_provider": "smtp",
   "mail_smtp_host": "your.smtp.host",
@@ -26,5 +33,6 @@
   "mail_smtp_secure": true,
   "mail_smtp_require_tls": true,
   "mail_smtp_user": "your.smtp.user",
-  "mail_smtp_pass": "your.secret.smtp.password"
+  "mail_smtp_pass": "your.secret.smtp.password",
+  "spacedeck": {}
 }

docker-compose.yml

@@ -1,5 +1,4 @@
 version: "2.0"
-
 services:
   spacedeck:
     build: .
@@ -7,6 +6,5 @@ services:
     ports:
       - "9666:9666"
     volumes:
-      - /absolute/path/to/storage:/app/storage
-      - /absolute/path/to/database.sqlite:/app/database.sqlite
-
+      - ./storage:/app/storage
+      - ./database:/app/database

docs/nginx_setup.md

@@ -12,7 +12,7 @@ server {
         listen 80;
         listen [::]:80;
 
-        servername spacedeck.domain.de
+        server_name spacedeck.domain.de
 
         return 301 https://$server_name$request_uri;
 }

helpers/artifact_converter.js

@@ -50,6 +50,8 @@ const convertableAudioTypes = [
   "audio/x-hx-aac-adts",
   "audio/aac"];
 
+// ffmpeg progress
+var duration = 0, time = 0, progress = 0;
 
 function getDuration(localFilePath, callback){
   exec.execFile("ffprobe", ["-show_format", "-of", "json", localFilePath], function(error, stdout, stderr) {
@@ -58,6 +60,40 @@ function getDuration(localFilePath, callback){
   });
 }
 
+function getConversionProgress(content){
+  // get duration of source
+  var matches = (content) ? content.match(/Duration: (.*?), start:/) : [];
+  if( matches && matches.length>0 ){
+    var rawDuration = matches[1];
+    // convert rawDuration from 00:00:00.00 to seconds.
+    var ar = rawDuration.split(":").reverse();
+    duration = parseFloat(ar[0]);
+    if (ar[1]) duration += parseInt(ar[1]) * 60;
+    if (ar[2]) duration += parseInt(ar[2]) * 60 * 60;
+  } 
+  // get the time 
+  matches = content.match(/time=(.*?) bitrate/g);
+  if( matches && matches.length>0 ){
+    var rawTime = matches.pop();
+    // needed if there is more than one match
+    if (Array.isArray(rawTime)){ 
+        rawTime = rawTime.pop().replace('time=','').replace(' bitrate',''); 
+    } else {
+        rawTime = rawTime.replace('time=','').replace(' bitrate','');
+    }
+
+    // convert rawTime from 00:00:00.00 to seconds.
+    ar = rawTime.split(":").reverse();
+    time = parseFloat(ar[0]);
+    if (ar[1]) time += parseInt(ar[1]) * 60;
+    if (ar[2]) time += parseInt(ar[2]) * 60 * 60;
+
+    //calculate the progress
+    progress = Math.round((time/duration) * 100);
+  }
+  return progress;
+}
+
 function createWaveform(fileName, localFilePath, callback){
   var filePathImage = localFilePath + "-" + (new Date().getTime()) + ".png";
 
@@ -135,7 +171,7 @@ function convertVideo(fileName, filePath, codec, callback, progressCallback) {
   ff.stderr.on('data', function (data) {
     console.log('[ffmpeg-video] stderr: ' + data);
     if (progressCallback) {
-      progressCallback(data);
+      progressCallback(getConversionProgress(""+data)+"%");
     }
   });
 

helpers/exporter.js

@@ -0,0 +1,58 @@
+'use strict';
+
+const db = require('../models/db');
+const config = require('config');
+const puppeteer = require('puppeteer');
+const os = require('os');
+
+module.exports = {
+  // type = "pdf" or "png"
+  takeScreenshot: function(space,type,on_success,on_error) {
+    var spaceId = space._id;
+    var space_url = config.get("endpoint")+"/api/spaces/"+spaceId+"/html";
+
+    var export_path = os.tmpdir()+"/"+spaceId+"."+type;
+
+    var timeout = 5000;
+    if (type=="pdf") timeout = 30000;
+
+    space_url += "?api_token="+config.get("export_api_secret");
+
+    console.log("[space-screenshot] url: "+space_url);
+    console.log("[space-screenshot] export_path: "+export_path);
+
+    (async () => {
+      let browser;
+      let page;
+      try {
+        browser = await puppeteer.launch(
+          {
+            headless: true,
+            args: ['--disable-dev-shm-usage', '--no-sandbox']
+          }
+        );
+        page = await browser.newPage();
+
+        page.setDefaultTimeout(timeout);
+        await page.setJavaScriptEnabled(false);
+        await page.goto(space_url, {waitUntil: 'networkidle2'});
+        await page.emulateMediaType('screen');
+
+        if (type=="pdf") {
+          let margin = 2;
+          await page.pdf({path: export_path, printBackground: true, width: space.width+margin+'px', height: space.height+margin+'px' });
+        }else{
+          await page.screenshot({path: export_path, printBackground: true});
+        }
+
+        await browser.close();
+        on_success(export_path);
+      } catch (error) {
+        console.error(error);
+        console.error("[space-screenshot] puppeteer abnormal exit for url "+space_url);
+        on_error();
+      }
+    
+    })();
+  }
+};

helpers/phantom.js

@@ -1,70 +0,0 @@
-'use strict';
-
-const db = require('../models/db');
-const config = require('config');
-const phantom = require('node-phantom-simple');
-const os = require('os');
-
-module.exports = {
-  // type = "pdf" or "png"
-  takeScreenshot: function(space,type,on_success,on_error) {
-    var spaceId = space._id;
-    var space_url = config.get("endpoint")+"/api/spaces/"+spaceId+"/html";
-
-    var export_path = os.tmpdir()+"/"+spaceId+"."+type;
-
-    var timeout = 5000;
-    if (type=="pdf") timeout = 30000;
-
-    space_url += "?api_token="+config.get("phantom_api_secret");
-
-    console.log("[space-screenshot] url: "+space_url);
-    console.log("[space-screenshot] export_path: "+export_path);
-
-    var on_success_called = false;
-
-    var on_exit = function(exit_code) {
-      if (exit_code>0) {
-        console.error("phantom abnormal exit for url "+space_url);
-        if (!on_success_called && on_error) {
-          on_error();
-        }
-      }
-    };
-
-    phantom.create({ path: require('phantomjs-prebuilt').path }, function (err, browser) {
-      if (err) {
-        console.error(err);
-      } else {
-        return browser.createPage(function (err, page) {
-          console.log("page created, opening ",space_url);
-
-          if (type=="pdf") {
-            var psz = {
-              width: space.width+"px",
-              height: space.height+"px"
-            };
-            page.set('paperSize', psz);
-          }
-
-          page.set('settings.resourceTimeout',timeout);
-          page.set('settings.javascriptEnabled',false);
-
-          return page.open(space_url, function (err,status) {
-            page.render(export_path, function() {
-              on_success_called = true;
-              if (on_success) {
-                on_success(export_path);
-              }
-              page.close();
-              browser.exit();
-            });
-          });
-        });        
-      }
-
-    }, {
-      onExit: on_exit
-    });
-  }
-};

locales/de.js

@@ -320,5 +320,6 @@
 	"follow_present": "Folgen",
 	"mute_present": "Entfolgen",
 	"follow_present_help": "Wenn jemand den Space präsentiert, folgen die anderen Mitglieder automatisch der Präsentation. Mit diesem Knopf lässt sich das an- oder ausschalten.",
-	"media": "Media"
-}
+	"media": "Media",
+	"tool_edit_text": "Text bearbeiten"
+}

locales/en.js

@@ -322,6 +322,7 @@
 	"follow_present": "Follow",
 	"mute_present": "Unfollow",
 	"follow_present_help": "If someone else is presenting this Space, the other members automatically follow the presentation. Switch following on or off with this button.",
-	"export": "export",
-	"media": "Media"
-}
+	"export": "Export",
+	"media": "Media",
+	"tool_edit_text": "Edit Text"
+}

locales/hu.js

@@ -0,0 +1,328 @@
+{
+	"ok": "Rendben",
+	"cancel": "Mégse",
+	"close": "Bezárás",
+	"open": "Megnyitás",
+	"folder": "Mappa",
+	"save": "Mentés",
+	"saved": "Mentve",
+	"created": "létrehozva",
+	"duplicate": "Másolás",
+	"delete": "Törlés",
+	"remove": "Eltávolítás",
+	"set": "készlet",
+	"reset": "alaphelyzet",
+	"thanks": "Köszönöm",
+	"share": "Megosztás",
+	"signup": "Feliratkozás",
+	"login": "Bejelentkezés",
+	"logout": "Kijelentkezés",
+	"email": "E-mail-cím",
+	"password": "Jelszó",
+	"width": "Szélesség",
+	"height": "Magasság",
+	"nick": "Név",
+	"role": "Szerepkör",
+	"members": "Tagok",
+	"actions": "Műveletek",
+	"or": "vagy",
+	"you": "Ön",
+	"via": "ezen keresztül:",
+	"by": "szerző:",
+	"zero": "Nulla",
+	"page": "Oldal:",
+	"new": "Új",
+	"copy": "Másolás",
+	"home": "Kezdőoldal",
+	"owner": "Tulajdonos",
+	"space": "Hely",
+	"second": "másodperc",
+	"not_found": "Nem található.",
+	"untitled_space": "Névtelen hely",
+	"untitled_folder": "Névtelen mappa",
+	"untitled": "névtelen",
+	"sure": "Biztos vagy benne?",
+	"specify": "Kérjük, részletezze",
+	"confirm": "Erősítse meg a műveletet",
+	"error_unknown_email": "Ez az e-mail/jelszó kombináció ismeretlen.",
+	"error_password_confirmation": "A megadott jelszavak nem egyeznek.",
+	"error_domain_blocked": "Tartománya letiltva.",
+	"error_user_email_already_used": "Ez az e-mail cím már használatban van.",
+	"support": "Spacedeck támogatás",
+	"offline": "Kapcsolat nélküli üzemmód. Kattintson további információkért.",
+	"error": "Sajnálom, de valami rosszul ment. Kérjük, lépjen kapcsolatba a support@spacedeck.com-al",
+	"welcome": "Üdvözöljük",
+	"claim": "A digitális rajztáblája.",
+	"trynow": "Próbálja most.",
+	"about": "Rólunk",
+	"terms": "Feltételek",
+	"contact": "Kapcsolat",
+	"privacy": "Adatvédelem",
+	"business_adress": "Üzleti cím",
+	"post_adress": "Posta cím",
+	"phone": "Telefon",
+	"ceo": "Ügyvezető igazgató",
+	"name": "Név",
+	"confirm_subject": "Spacedeck e-mail megerősítés",
+	"confirm_body": "Köszönjük, hogy feliratkozott a Spacedeck-re.\nKérjük, hogy kattintson az alábbi linkre az e-mail cím megerősítéséhez.\n",
+	"confirm_action": "Erősítse meg most",
+	"team_invite_membership_subject": "Csapat meghívó %-s számára",
+	"team_invite_membership_body": "Meghívták a(z) %s oldalra a Spacedeck-en. Kattintson a következő hivatkozásra a meghívás elfogadásához.",
+	"team_invite_user_body": "Meghívták a(z)%s oldalra a Spacedeck-en.\nAz ideiglenes jelszó \"%s\".\n Kérjük, kattintson a következő hivatkozásra a meghívás elfogadásához.",
+	"team_invite_admin_body": "%s meghívást kapott a csapatodba: %s. Az ideiglenes jelszó \"%s\".",
+	"team_invite_membership_acction": "Elfogad",
+	"team_new_member_subject": "A(z) %s új csapattagja feliratkozott",
+	"team_new_member_body": "%s most csatlakozott a(z) %s csoporthoz a Spacedeck-en.",
+	"space_invite_membership_subject": "%s meghívott %s helyre",
+	"space_invite_membership_body": "%s meghívta, hogy csatlakozzon a(z) %s helyre a Spacedecken. Kattintson a következő linkre a meghívás elfogadásához.",
+	"space_invite_membership_action": "Elfogad",
+	"folder_invite_membership_subject": "Hely",
+	"folder_invite_membership_body": "Meghívták a Spacedeck csoportjába. Kérjük, hogy kattintson a következő linkre a meghívás elfogadásához.",
+	"folder_invite_membership_acction": "Elfogad",
+	"login_google": "Bejelentkezés a Google-al",
+	"save_changes": "Változtatások mentése",
+	"upgrade": "Frissítés",
+	"upgrade_now": "Frissítés most",
+	"create_space": "Hely létrehozása",
+	"create_folder": "Mappa létrehozása",
+	"email_unconfirmed": "E-mail nincs megerősítve",
+	"confirmation_sent": "E-mail elküldve",
+	"folder_filter": "Szűrő",
+	"sort_by": "Rendezés",
+	"last_modified": "Utoljára módosítva",
+	"last_opened": "Utoljára nyitva",
+	"title": "Cím",
+	"edit_team": "Csapat szerkesztése",
+	"edit_account": "Fiók szerkesztése",
+	"log_out": "Kijelentkezés",
+	"no_spaces_yet": "Isten hozta! Itt létrehozhat helyeket és mappákat a bal felső sarokban található gombokkal.",
+	"new_folder_title": "Új cím a mappához",
+	"folder_settings": "Mappa beállításai",
+	"upload_cover_image": "Borító kép feltöltése",
+	"spacedeck_pro_ad_folders": "A Spacedeck Pro segítségével korlátlan mennyiségű helyet foglalhat el a mappákban és kezelheti az egyes mappák hozzáférési vezérléseit. Szeretne többet megtudni a Pro funkcióiról?",
+	"spacedeck_pro_ad_versions": "A Spacedeck Pro segítségével korlátlan verziókat menthet az egyes helyekről, hogy nyomon kövesse az előrehaladást vagy biztonságban tartsa a pillanatképeket. Szeretne többet megtudni a Pro funkcióiról?",
+	"spacedeck_pro_ad_pdf": "A Spacedeck Pro segítségével a helyeket éles PDF-fájlokként exportálhatja archiváláshoz, postázáshoz vagy nyomtatáshoz. Szeretne többet megtudni a Pro funkcióiról?",
+	"spacedeck_pro_ad_zip": "A Spacedeck Pro segítségével exportálhatja a hely tartalmát ZIP-csomagként. Szeretne többet megtudni a Pro funkcióiról?",
+	"spacedeck_pro_ad_colors": "A Spacedeck Pro segítségével professzionális színválasztóval keverheti össze saját színeit.",
+	"profile_caption": "Profil",
+	"upload_avatar": "Avatar feltöltése",
+	"uploading_avatar": "Avatar feltöltése…",
+	"avatar_dimensions": "Ajánlott méretek: 200 × 200 képpont.",
+	"profile_name": "Név",
+	"profile_email": "E-mail cím",
+	"send_again": "Küldje újra",
+	"confirmation_sent_long": "E-mail megerősítő hivatkozáds elküldve.Kérjük, ellenőrizze a beérkező leveleket.",
+	"confirmation_sent_another": "Egy másik megerősítő link elküldve.",
+	"confirmation_sent_dialog_text": "E-mailt küldtünk Önnek, amelyben elmagyaráztuk, hogyan erősítse meg e-mail címét.",
+	"payment_caption": "Fizetés",
+	"language_caption": "Nyelv",
+	"notifications_caption": "Értesítések",
+	"notifications_option_chat": "E-mailben értesítsen az új megjegyzésekről",
+	"notifications_option_spaces": "Küldjön napi összefoglalót arról, hogy mi történt a helyeim és mappáim között",
+	"password_caption": "Jelszó",
+	"current_password": "Jelenlegi jelszó",
+	"new_password": "Új jelszó",
+	"verify_password": "Jelszó megerősítése",
+	"change_password": "Jelszó módosítása",
+	"reset_password": "Jelszó visszaállítása",
+	"terminate_caption": "Fiók törlése",
+	"terminate_warning": "Ha törli a fiókját, akkor az összes hely, mappa és üzenet, beleértve az Ön összes tartalmát és a helyeiben létrehozott más embereket megsemmisül.",
+	"terminate_warning2": "Ezt nem lehet visszavonni.",
+	"terminate_reason": "Üzenet",
+	"terminate_reason_caption": "Segítsen nekünk a fejlesztésben, ha megosztja a lemondás okait.",
+	"terminate_terminate": "Leállít",
+	"space_blank1": "Üdvözöljük egy friss, új helyen!",
+	"space_blank2": "Húzza ide a fájlokat, hivatkozások beillesztése",
+	"space_blank3": "vagy használja az alábbi eszközöket",
+	"space_blank4": "hogy ezt a helyet tartalommal töltse meg.",
+	"draft": "Piszkozat",
+	"publish": "Közzététel",
+	"published": "Közzétett",
+	"save_version": "Verzió mentése",
+	"version_saved": "Verzió mentve",
+	"post": "Üzenet küldése",
+	"chat_invite_cta1": "Az együttműködés szórakoztató!",
+	"chat_invite_cta2": "Miért ne",
+	"chat_invite_cta3": "hívjon meg néhány embert",
+	"chat_invite_cta4": "Önnel dolgozni?",
+	"chat_message_placeholder": "Írja meg az üzenetét…",
+	"view": "Nézet",
+	"edit": "Szerkesztés",
+	"present": "Jelen van",
+	"chat": "Csevegés",
+	"meta": "Meta",
+	"tool_search": "Keresés",
+	"tool_upload": "Feltöltés",
+	"tool_text": "Szöveg",
+	"tool_shape": "Forma",
+	"tool_zones": "Zónák",
+	"tool_canvas": "Vászon",
+	"search_media": "Keresés a médiában…",
+	"type_here": "Írja ide",
+	"text_formats": "Formátumok",
+	"format_p": "Bekezdés",
+	"format_bullets": "Listajeles lista",
+	"format_numbers": "Számozott lista",
+	"format_h1": "1. címsor",
+	"format_h2": "2. címsor",
+	"format_h3": "3. címsor",
+	"font_size": "Betűméret",
+	"line_height": "Sormagasság",
+	"tool_align": "Igazítás",
+	"tool_styles": "Stílusok",
+	"tool_bullets": "Felsorolás",
+	"tool_numbers": "Számok",
+	"tool_font": "Betűtípus",
+	"color_fill": "Kitöltés",
+	"color_stroke": "Vonás",
+	"color_text": "Szöveg",
+	"tool_type": "Típus",
+	"tool_box": "Doboz",
+	"tool_link": "Hivatkozás",
+	"tool_layout": "Elrendezés",
+	"tool_options": "Lehetőségek",
+	"tool_stroke": "Vonás ",
+	"tool_delete": "Törlés",
+	"tool_lock": "Lezár",
+	"tool_copy": "Másol",
+	"stack": "Halom",
+	"tool_circle": "Kör",
+	"tool_hexagon": "Hatszög",
+	"tool_square": "Négyzet",
+	"tool_diamond": "Gyémánt",
+	"tool_bubble": "Buborék",
+	"tool_cloud": "Felhő",
+	"tool_burst": "Sorozatfelvétel",
+	"tool_star": "Csillag",
+	"tool_heart": "Szív",
+	"tool_scribble": "Irkál",
+	"tool_line": "Vonal",
+	"tool_arrow": "Nyíl",
+	"search_media_placeholder": "Keresés az internetes médiában…",
+	"add_zone": "Új zóna",
+	"palette": "Paletta",
+	"picker": "Választó",
+	"background_image_caption": "Kép",
+	"background_color_caption": "Szín",
+	"upload_background_caption": "Kattintson egy háttérkép feltöltéséhez",
+	"upload_background": "Háttér feltöltése",
+	"access_caption": "Hozzáférés",
+	"versions_caption": "Verziók",
+	"info_caption": "Információ",
+	"mode_private": "Magán: Csak a tagok tekinthetik meg és szerkeszthetik",
+	"mode_public": "Nyilvános: A hivatkozás birtokában bárki megtekintheti",
+	"invite_collaborators": "Hívjon meg együttműködőket",
+	"revoke_access": "Hozzáférés visszavonása",
+	"invite": "Meghívók küldése",
+	"invitee_email_address": "Az új tag e-mail címe",
+	"optional_message": "Választható üzenet",
+	"role_viewer": "Néző",
+	"role_editor": "Szerkesztő",
+	"role_admin": "Adminisztrátor",
+	"new_space_title": "Új cím a helynek",
+	"team": "Csoport",
+	"search": "Keresés",
+	"search_no_results": "keresés_nincsenek_eredmények",
+	"search_clear": "keresés_törlés",
+	"rename": "Átnevezés",
+	"mobile": "mobil",
+	"image": "kép",
+	"tool_filter": "szűrő",
+	"canel": "mégse",
+	"invite_membership_action": "meghívni_tagságot",
+	"viewer": "néző",
+	"editor": "szerkesztő",
+	"admin": "adminisztrátor ",
+	"logging_in": "bejelentkezés",
+	"password_confirmation": "Jelszó megerősítése",
+	"confirm_again": "E-mailt küldtünk Önnek, amelyben elmagyaráztuk, hogyan erősítse meg e-mail címét.",
+	"confirmed": "Fiókját sikeresen megerősítettük. Köszönjük.",
+	"signing_up": "Feliratkozás",
+	"password_check_inbox": "Kérjük, ellenőrizze a beérkező leveleket",
+	"new_space": "Új hely",
+	"tool_more": "Több",
+	"what_is_your_name": "Üdvözöljük a %s oldalon! Kérjük, hogy válasszon egy felhasználónevet.",
+	"lang": "hu",
+	"landing_title": "Rajztáblája az interneten.",
+	"landing_claim": "A Spacedeck segítségével könnyedén kombinálhat mindenféle típusú médiát a virtuális rajztáblákon: szöveges jegyzeteket, fotókat, internetes linkeket, sőt videókat és hangfelvételeket.",
+	"landing_example": "Az emberek a Spacedeck segítségével szervezik ötleteiket, csoportokban, hogy egy pillantással teljes projekteket láthassanak vagy iskolákban és egyetemeken gazdagabb, összekapcsolt tanulási tapasztalatokkal.",
+	"spaces": "Saját helyek",
+	"access_editor_link": "Azonnali hivatkozás szerkesztése",
+	"access_editor_link_desc": "Adja meg ezt a hivatkozást mindenkinek, akinek képesnek kell lennie a hely azonnali szerkesztésére, nincs szükség fiókra:",
+	"access_editor_link_desc_slug": "Ez a hivatkozás tartalmazza a hely nevét is.",
+	"access_anonymous_edit_blocking": "Névtelen szerkesztők csak a saját tételeiket változtathatják meg",
+	"access_current_members": "Current Members",
+	"access_new_members": "Új tagok meghívása",
+	"access_no_members": "A Hely tagjai itt jelennek meg.",
+	"comments": "hozzászólások",
+	"landing_customers": "Ezrek bíznak benne.",
+	"landing_features_title": "Gyerekjáték használni.",
+	"landing_features_text": "Az új Spacedeck 5 korszerű, gyönyörű felhasználói felülettel rendelkezik, amely minden eddiginél könnyebbé és szórakoztatóbbá teszi munkáját - miközben még erőteljesebb funkciókat kínál:",
+	"landing_features_1": "<b>Fogd és vidd</b> képeket, videókat és hangokat a számítógépről vagy az internetről",
+	"landing_features_2": "<b>Szöveg írása és formázása</b> de a betűtípusok, a színek és a stílus teljes ellenőrzésével",
+	"landing_features_3": "<b>Rajzoljon, kommentáljon és jelöljön ki</b> a mellékelt grafikus alakzatokkal",
+	"landing_features_4": "</b>Kapcsolja tábláját <b>nagyító prezentációvá</b>",
+	"landing_features_5": "<b>Együttműködés és csevegés</b> valós időben csoport társaival, diákjaival vagy barátaival. ",
+	"landing_features_6": "<b>Helyek megosztása</b> az interneten vagy e-mailben",
+	"landing_features_7": "<b>Exportálja munkáját</b> nyomtatható PDF vagy ZIP formátumban",
+	"landing_pricing": "Hihetetlenül megfizethető.",
+	"landing_pricing_lite": "Ingyenes/személyes használat",
+	"landing_pricing_lite_text": "Az alap, átfogó verzió a képek gyűjtésére és a jegyzetek vezetésére.",
+	"landing_pricing_pro_features_list": "<ul><li>Korlátlan helyek</li><li>Mappa struktúrák</li><li>PDF és ZIP exportálás</li><li>Nincs vízjel</li><li>Egyéni hátterek</li><li>Tevékenység előzmények</li><li>20 GB tárhely</li><ul>",
+	"landing_pricing_pro": "€4,90/Felhasználó/hónap. <br><small>or 49,90/Felhasználó /év</small>",
+	"landing_pricing_pro_text": "Turbófeltöltve minden elvárt erővel.",
+	"landing_pricing_pro_features": "Turbófeltöltve minden elvárt erővel.",
+	"welcome_subject": "Üdvözöljük a Spacedeck-en",
+	"welcome_body": "Üdvözlet!\nKöszönjük, hogy feliratkozott a Spacedeck webhelyre.<br>Reméljük, hogy élvezni fogja a Helyek szolgáltatásban való munkát.<br>Ne feledje, hogy fiókjában korlátlan számú munkatárs található. Nyugodtan ossza meg helyeit barátaival és kollégáival a világ minden tájáról.",
+	"invite_emails": "E-mail címek (vesszővel elválasztva)",
+	"history_recently_updated": "Mostanában frissítve",
+	"history_recently_empty": "Még nem történt semmi.",
+	"parent_folder": "szülő_mappa",
+	"created_by": "Készítette",
+	"last_updated": "Utolsó frissítés",
+	"feedback_sent": "Köszönjük a visszajelzését!",
+	"role_member": "Tag",
+	"team_invite_membership_action": "Meghívás elfogadása",
+	"space_message_subject": "Új üzenet a következő helyen % s",
+	"space_message_body": "%s ezt írta %s-ban: \n",
+	"pro_ad_history_headline": "A Spacedeck Pro verzióra való frissítéskor itt láthatja az összes (megosztott) hely legújabb frissítésének előzményeit.",
+	"password_reset_subject": "Spacedeck jelszavának visszaállítása",
+	"password_reset_body": "Ön kérte a Spacedeck jelszavának visszaállítását.\n Kérjük, hogy kattintson a következő hivatkozásra az új jelszó beállításához.",
+	"password_reset_action": "Visszaállítás most",
+	"was_offline": "A Spacedeck-hez való kapcsolat megszakadt. Ha nem mentett munkája van, kérjük, tartsa nyitva ezt a böngészőfület a kapcsolat helyreállításáig, majd érintse meg újra a nem mentett objektumokat.",
+	"subscription_failed_user_subject": "Probléma a Spacedeck fizetésével",
+	"subscription_failed_user_body": "Sajnos nem tudtuk feldolgozni a fizetési módját. A fiók beállításokban könnyedén létrehozhat egy új fizetési módot, beleértve a PayPalt is.",
+	"subscription_failed_team_subject": "Probléma a Spacedeck fizetésével",
+	"subscription_failed_team_body": "Sajnos nem tudtuk feldolgozni a fizetési módját a Team-fiókjához. Kérjük, javítsa ki fizetési módját a lehető leghamarabb.",
+	"team_name": "Csoport név",
+	"subdomain": "altartomány",
+	"team_adresses": "E-mail címek",
+	"add": "Hozzáadás",
+	"invited": "meghívott",
+	"duplicate_destination": "Melyik mappába kívánja másolni ezt a helyet?",
+	"duplicate_confirm": "A(z)% s másolat% s-ra?",
+	"duplicate_success": "% s másolva lett% s-ra.",
+	"goto_space": "Lépjen a(z)% s helyre",
+	"goto_folder": "Lépjen a(z)% s mappába",
+	"stay_here": "Maradjon itt",
+	"sharing": "Megosztás",
+	"list": "Lista exportálása",
+	"link": "Hivatkozás",
+	"download_space": "Hely letöltése ",
+	"download_as_pdf": "Hely letöltése PDF formátumban",
+	"type": "Típus",
+	"download": "Letöltés",
+	"Previous Zone": "Előző zóna",
+	"Next Zone": "Következő zóna",
+	"promote": "Népszerűsít",
+	"demote": "Lefokoz",
+	"more": "Több",
+	"lock": "Lezár",
+	"unlock": "Felold",
+	"follow_present": "Követ",
+	"mute_present": "Követés megszüntetése",
+	"follow_present_help": "Ha valaki más mutatja be ezt a helyet, a többi tag automatikusan követi az előadást. Ezzel a gombbal kapcsolhatja be vagy ki a követést.",
+	"export": "Exportál",
+	"media": "Média",
+	"tool_edit_text": "Szöveg szerkesztése"
+}

locales/oc.js

@@ -173,7 +173,7 @@
     "tool_bullets": "Bullets",
     "tool_numbers": "Nombres",
     "color_fill": "Fill",
-    "tool_font": "Font",
+    "tool_font": "Poliça",
     "color_stroke": "Traçat",
     "color_text": "Tèxte",
     "tool_type": "Tipe",
@@ -244,7 +244,7 @@
     "what_is_your_name": "La benvenguda a %s ! Mercés de causir un escais-nom.",
     "lang": "en",
     "landing_title": "Vòstre tablèu blanc sul Web.",
-    "landing_claim": "Spacedeck vos permet de facilament combinar quin que siá tipe de mèdias sus un tablèu virtual : tèxte, nòtas, ligams web, amai vidèos e enregistraments àudio. ",
+    "landing_claim": "Spacedeck vos permet de facilament combinar quin tipe que siá de mèdias sus un tablèu virtual : tèxte, nòtas, ligams web, amai vidèos e enregistraments àudio. ",
     "landing_example": "Lo monde utiliza Spacedeck per organizar  lors idèas, en equipa per veire totes los projèctes en una ulhada, a l’escòla e a l’universitat pels mai rics, experiéncia d’aprendissatge connectat.",
     "spaces": "Mos espacis",
     "access_editor_link": "Ligam de modificacion dirècta",
@@ -253,7 +253,7 @@
     "access_anonymous_edit_blocking": "Los convidats pòdon pas modificar los elements qu’an creats.",
     "access_current_members": "Membres actuals",
     "access_new_members": "Convidar de novèls membres",
-    "access_no_members": "Los membres d’aqueste Espacii apreissaràn aquí.",
+    "access_no_members": "Los membres d’aqueste Espaci apareisseràn aquí.",
     "comments": "comentaris",
     "landing_customers": "La fisança de milièr de personas.",
     "landing_features_title": "Un jòc d'enfants d’utilizar.",
@@ -309,7 +309,7 @@
     "list": "lista",
     "link": "Ligam",
     "download_space": "Telecargar espaci",
-    "download_space_as_pdf": "Telecargar espaci PDF",
+    "download_space_as_pdf": "Telecargar espaci coma PDF",
     "type": "Tipe",
     "download": "Telecargar",
     "Previous Zone": "Zòna precedenta",
@@ -321,7 +321,7 @@
     "unlock": "Desverrolhar",
     "follow_present": "Seguir",
     "mute_present": "Quitar de seguir",
-    "follow_present_help": "follow_present_help",
+    "follow_present_help": "Se qualqu’un mai presenta aqueste espaci, los demai membres seguiràn automaticament la presentacion. Basculatz l’abonament a la presentacion amb aqueste boton.",
     "export": "exportar",
-    "media": "Media"
+    "media": "Mèdia"
 }

middlewares/session.js

@@ -1,22 +1,22 @@
-'use strict';
+"use strict";
 
-const db = require('../models/db');
-var config = require('config');
+const db = require("../models/db");
+var config = require("config");
 
 module.exports = (req, res, next) => {
-
   // authentication via API token
   const api_token = req.headers["x-spacedeck-api-token"];
 
-  if (api_token && api_token.length>7) {
-    db.User.findOne({where: {api_token: api_token}}).then(user => {
-      req.user = user;
-      next();
-    }).error(err => {
-      res.status(403).json({
-        "error": "invalid_api-token"
-      });
-      next();
+  if (api_token && api_token.length > 7) {
+    db.User.findOne({ where: { api_token: api_token } }).then((user) => {
+      if (user) {
+        req.user = user;
+        next();
+      } else {
+        res.status(403).json({
+          error: "invalid_api-token",
+        });
+      }
     });
 
     return;
@@ -26,28 +26,29 @@ module.exports = (req, res, next) => {
   const token = req.cookies["sdsession"];
 
   if (token && token != "null" && token != null) {
-    db.Session.findOne({where: {token: token}})
-      .then(session => {
+    db.Session.findOne({ where: { token: token } })
+      .then((session) => {
         if (!session) {
           // session not found
           next();
-        }
-        else db.User.findOne({where: {_id: session.user_id}})
-          .then(user => {
+        } else
+          db.User.findOne({ where: { _id: session.user_id } }).then((user) => {
             if (!user) {
-              var domain = (process.env.NODE_ENV == "production") ? new URL(config.get('endpoint')).hostname : req.headers.hostname;
-              res.clearCookie('sdsession', { domain: domain });
+              var domain =
+                process.env.NODE_ENV == "production"
+                  ? new URL(config.get("endpoint")).hostname
+                  : req.headers.hostname;
+              res.clearCookie("sdsession", { domain: domain });
 
               if (req.accepts("text/html")) {
                 res.send("Please clear your cookies and try again.");
-              } else if (req.accepts('application/json')) {
+              } else if (req.accepts("application/json")) {
                 res.status(403).json({
-                  "error": "token_not_found"
+                  error: "token_not_found",
                 });
               } else {
                 res.send("Please clear your cookies and try again.");
               }
-
             } else {
               req["token"] = token;
               req["user"] = user;
@@ -55,11 +56,11 @@ module.exports = (req, res, next) => {
             }
           });
       })
-      .error(err => {
-        console.error("Session resolve error",err);
+      .error((err) => {
+        console.error("Session resolve error", err);
         next();
       });
   } else {
     next();
   }
-}
+};

middlewares/space_helpers.js

@@ -86,7 +86,7 @@ module.exports = (req, res, next) => {
         // space is private
         
         // special permission for screenshot/pdf export from backend
-        if (req.query['api_token'] && req.query['api_token'] == config.get('phantom_api_secret')) {
+        if (req.query['api_token'] && req.query['api_token'] == config.get('export_api_secret')) {
           finalizeReq(space, "viewer");
           return;
         }

models/db.js

@@ -6,24 +6,28 @@ function sequel_log(a,b,c) {
 }
 
 const Sequelize = require('sequelize');
-const sequelize = new Sequelize('database', 'username', 'password', {
-  host: 'localhost',
-  dialect: 'sqlite',
-
-  pool: {
-    max: 5,
-    min: 0,
-    acquire: 30000,
-    idle: 10000
-  },
-
-  // SQLite only
-  storage: config.get('storage_local_db'),
-  logging: sequel_log,
-
-  // http://docs.sequelizejs.com/manual/tutorial/querying.html#operators
-  operatorsAliases: false
-});
+const sequelize = new Sequelize(
+  config.get('storage_database'),
+  config.get('storage_username'),
+  config.get('storage_password'),
+  {
+    host: config.get('storage_host'),
+    dialect: config.get('storage_dialect'),
+    pool: {
+      max: 5,
+      min: 0,
+      acquire: 30000,
+      idle: 10000
+    },
+    logging: config.has('db_logs_disabled') ? false : sequel_log,
+    // http://docs.sequelizejs.com/manual/tutorial/querying.html#operators
+    operatorsAliases: false,
+    // SQLite only
+    storage: config.get('storage_local_db')
+  }
+);
+// https://github.com/sequelize/sequelize/issues/8019#issuecomment-384316346
+Sequelize.postgres.DECIMAL.parse = function (value) { return parseFloat(value); };
 
 var User;
 var Session;

package.json

@@ -3,7 +3,9 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "start": "node spacedeck.js"
+    "start": "node spacedeck.js",
+    "dev": "nodemon spacedeck.js",
+    "styles": "gulp styles"
   },
   "engines": {
     "node": ">=10.0.0"
@@ -13,6 +15,7 @@
     "async": "2.3.0",
     "bcryptjs": "2.4.3",
     "body-parser": "^1.19.0",
+    "chargebee": "2.6.5",
     "cheerio": "0.22.0",
     "config": "1.25.1",
     "cookie-parser": "~1.4.3",
@@ -22,33 +25,35 @@
     "file-type": "^7.6.0",
     "glob": "7.1.1",
     "gm": "^1.23.1",
-    "gulp": "^4.0.2",
-    "gulp-concat": "^2.6.1",
-    "gulp-sass": "^4.0.2",
     "helmet": "^3.5.0",
     "i18n-2": "0.6.3",
     "log-timestamp": "latest",
-    "mock-aws-s3": "^2.6.0",
+    "mock-aws-s3": "^4.0.2",
     "moment": "^2.19.3",
     "morgan": "^1.9.1",
-    "node-phantom-simple": "2.2.4",
-    "node-server-screenshot": "^0.2.1",
-    "nodemailer": "^4.6.7",
-    "phantomjs-prebuilt": "^2.1.16",
+    "nodemailer": "^6.6.0",
+    "puppeteer": "8.0.0",
     "read-chunk": "^2.1.0",
     "request": "^2.88.0",
-    "sanitize-html": "^1.11.1",
+    "sanitize-html": "^2.3.3",
     "sequelize": "^4.37.6",
     "serve-favicon": "~2.4.2",
     "serve-static": "^1.13.1",
     "slug": "^1.1.0",
-    "sqlite3": "^4.0.0",
+    "sqlite3": "^4.2.0",
     "umzug": "^2.1.0",
-    "underscore": "1.8.3",
+    "underscore": "^1.13.1",
     "uuid": "^3.2.1",
     "validator": "7.0.0",
     "ws": "3.3.1"
   },
+  "devDependencies": {
+    "gulp": "^4.0.2",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-sass": "^4.0.2",
+    "nodemon": "^2.0.6"
+  },
   "main": "app.js",
   "description": "",
   "directories": {},

public/javascripts/spacedeck_sections.js

@@ -8,6 +8,8 @@ var SpacedeckSections = {
   data: {
     MAX_COLUMNS: 20,
 
+    isShift: false,
+
     redo_stack: [],
     undo_stack: [],
 
@@ -62,15 +64,15 @@ var SpacedeckSections = {
 
     active_style: {
       border_radius: 0,
-      stroke: 0,
+      stroke: 2,
       font_family: "Inter",
       font_size: 36,
       line_height: 1.5,
       letter_spacing: 0,
 
-      stroke_color: "#000000",
-      fill_color: "#00000000",
-      text_color: "#000000",
+      stroke_color: ENV.options.default_stroke_color ? ENV.options.default_stroke_color : "#000000",
+      fill_color: ENV.options.default_fill_color ? ENV.options.default_fill_color : "#000000",
+      text_color: ENV.options.default_text_color ? ENV.options.default_text_color : "#000000",
       background_color: "#ffffff",
 
       padding: 0,
@@ -109,7 +111,7 @@ var SpacedeckSections = {
     color_picker_hue: 127,
     color_picker_opacity: 255,
 
-    swatches: [
+    swatches: ENV.options.swatches ? ENV.options.swatches : [
       {id:1, hex:"#ff00ff"},
       {id:2, hex:"#ffff00"},
       {id:3, hex:"#00ffff"},
@@ -133,18 +135,7 @@ var SpacedeckSections = {
       {id:26, hex:"#d55c4b"},
       {id:27, hex:"#6f4021"},
       {id:29, hex:"#95a5a6"},
-      {id:30, hex:"rgba(0,0,0,0)"},
-    ],
-
-    swatches_text: [
-      {id:1, hex:"#9b59b6"},
-      {id:2, hex:"#3498db"},
-      {id:3, hex:"#2ecc71"},
-      {id:4, hex:"#f1c40f"},
-      {id:5, hex:"#e67e22"},
-      {id:6, hex:"#d55c4b"},
-      {id:8, hex:"#ffffff"},
-      {id:10, hex:"#252525"},
+      {id:30, hex:"rgba(0,0,0,0)"}
     ],
 
     fonts: [
@@ -217,7 +208,9 @@ var SpacedeckSections = {
       Mousetrap.bind('shift+left', function(evt)      { this.if_editable(function() {this.nudge_selected_artifacts(-10,0,evt);}) }.bind(this));
       Mousetrap.bind('shift+right', function(evt)     { this.if_editable(function() {this.nudge_selected_artifacts(10,0,evt);}) }.bind(this));
       Mousetrap.bind('space', function(evt)           { this.activate_pan_tool(evt); }.bind(this));
-
+      Mousetrap.bind(['shift'], function(evt)         { this.isShift = true; }.bind(this), 'keydown');
+      Mousetrap.bind(['shift'], function(evt)         { this.isShift = false; }.bind(this), 'keyup');
+      Mousetrap.bind('shift+up', function(evt)        { this.if_editable(function() {this.nudge_selected_artifacts(0,-10,evt);}) }.bind(this));
       $(document).bind("beforecopy", this.handle_onbeforecopy.bind(this));
       $(window).bind("beforeunload", this.handle_onunload.bind(this));
       $(window).bind("resize", this.handle_window_resize.bind(this));
@@ -1019,8 +1012,7 @@ var SpacedeckSections = {
       };
     },
 
-    update_selection_metrics: function(arts) {
-
+    update_selection_metrics: function(arts, temporary) {
       if (this.active_tool == "scribble") {
         this.selection_metrics.count = 1;
         return;
@@ -1053,8 +1045,6 @@ var SpacedeckSections = {
         // FIXME make sure that menus fit in window
         this.toolbar_props_x = pp.x+"px";
         this.toolbar_props_y = pp.y+"px";
-
-        //this.hide_toolbar_artifacts();
       }
 
       this.selection_metrics.x1 = sr.x1;
@@ -1069,24 +1059,26 @@ var SpacedeckSections = {
 
       if (!arts) arts = this.selected_artifacts();
 
-      this.first_selected_artifact = arts[0];
-      this.selection_metrics.count=arts.length;
-      this.selection_metrics.scribble_selection = false;
-      if (arts.length == 1 && arts[0].mime == "x-spacedeck/vector") {
-        if (arts[0].shape == "scribble") {
-          this.selection_metrics.scribble_selection = true;
+      if (!temporary) {
+        this.first_selected_artifact = arts[0];
+        this.selection_metrics.count=arts.length;
+        this.selection_metrics.scribble_selection = false;
+        if (arts.length == 1 && arts[0].mime == "x-spacedeck/vector") {
+          if (arts[0].shape == "scribble") {
+            this.selection_metrics.scribble_selection = true;
+          }
+          this.selection_metrics.vector_points = arts[0].control_points;
+          this.selection_metrics.vector_selection = true;
+        } else {
+          this.selection_metrics.vector_points = [{},{}];
+          this.selection_metrics.vector_selection = false;
+        }
+        this.selection_metrics.has_link=false;
+        this.insert_link_url="";
+        if (arts.length == 1 && arts[0].meta && arts[0].meta.link_uri && arts[0].meta.link_uri.length>0) {
+          this.selection_metrics.has_link=true;
+          this.insert_link_url = arts[0].meta.link_uri;
         }
-        this.selection_metrics.vector_points = arts[0].control_points;
-        this.selection_metrics.vector_selection = true;
-      } else {
-        this.selection_metrics.vector_points = [{},{}];
-        this.selection_metrics.vector_selection = false;
-      }
-      this.selection_metrics.has_link=false;
-      this.insert_link_url="";
-      if (arts.length == 1 && arts[0].meta && arts[0].meta.link_uri && arts[0].meta.link_uri.length>0) {
-        this.selection_metrics.has_link=true;
-        this.insert_link_url = arts[0].meta.link_uri;
       }
     },
 
@@ -1368,7 +1360,7 @@ var SpacedeckSections = {
     },
 
     reset_stroke: function() {
-      this.active_style.stroke = 0;
+      this.active_style.stroke = 2;
       this.active_style.border_radius = 0;
       this.active_style.stroke_style = "solid";
     },
@@ -1436,13 +1428,13 @@ var SpacedeckSections = {
       this.color_picker_rgb = rgb_to_hex(rgba.r,rgba.g,rgba.b);
     },
 
-    update_selected_artifacts: function(change_func, override_locked) {
+    update_selected_artifacts: function(change_func, override_locked, temporary) {
       var artifacts = this.selected_artifacts(!override_locked);
 
       if (!artifacts.length) return;
 
       this.update_artifacts(artifacts, change_func);
-      this.update_selection_metrics();
+      this.update_selection_metrics(null, temporary||false);
     },
 
     nudge_selected_artifacts: function(dx, dy, event) {
@@ -1726,7 +1718,7 @@ var SpacedeckSections = {
         h: h,
         stroke_color: this.active_style.stroke_color,
         text_color: this.active_style.text_color,
-        stroke: 0,
+        stroke: this.active_style.stroke,
         fill_color: this.active_style.fill_color,
         shape: shape_type,
         valign: "middle",
@@ -1923,10 +1915,7 @@ var SpacedeckSections = {
       }.bind(this));
     },
 
-    delayed_edit_artifact: function(evt) {
-      evt.stopPropagation();
-      evt.preventDefault();
-
+    delayed_edit_artifact: function() {
       var a = this.selected_artifacts()[0];
 
       var el = $("#ios-focuser-"+a._id);
@@ -2087,8 +2076,6 @@ var SpacedeckSections = {
           if (a.description!=dom.innerHTML) {
             a.description = dom.innerHTML;
 
-            console.log("new DOM:",dom.innerHTML);
-
             this.update_board_artifact_viewmodel(a);
             this.queue_artifact_for_save(a);
 
@@ -2309,17 +2296,19 @@ var SpacedeckSections = {
           for (var i=0; i<parsed.length; i++) {
             if (parsed[i].mime) {
               var z = this.highest_z()+1;
-              if (parsed.length==1) {
-                var w = parsed[i].w;
-                var h = parsed[i].h;
-                var point = this.find_place_for_item(w,h);
-                parsed[i].x = point.x;
-                parsed[i].y = point.y;
-                parsed[i].z = point.z;
-              } else {
-                parsed[i].x = parsed[i].x+50;
-                parsed[i].y = parsed[i].y+50;
-                parsed[i].y = parsed[i].z+z;
+              if(!this.isShift) {
+                if (parsed.length==1) {
+                  var w = parsed[i].w;
+                  var h = parsed[i].h;
+                  var point = this.find_place_for_item(w,h);
+                  parsed[i].x = point.x;
+                  parsed[i].y = point.y;
+                  parsed[i].z = point.z;
+                } else {
+                  parsed[i].x = parsed[i].x+100;
+                  parsed[i].y = parsed[i].y+100;
+                  parsed[i].y = parsed[i].z+z;
+                }
               }
               this.clone_artifact(parsed[i], 0,0, function(a) {
                 this.multi_select([a]);

public/javascripts/spacedeck_spaces.js

@@ -99,7 +99,7 @@ var SpacedeckSpaces = {
       }.bind(this), {value: dft || "Guest "+parseInt(10000*Math.random()), ok: __("ok"), cancel: __("cancel")});
     },
     
-    load_space: function(space_id, on_success, on_error, space_auth) {
+    load_space: function(space_id, on_success, on_error) {
       this.folder_spaces_filter="";
       this.folder_spaces_search="";
 
@@ -308,7 +308,8 @@ var SpacedeckSpaces = {
         userReady();
       }
 
-      if (!this.user && space_auth) {
+      if (!this.user.nickname && space_auth) {
+        this.guest_nickname = get_query_param("nickname") || this.guest_nickname;
         if (this.guest_nickname) {
           userReady();
         } else {

public/javascripts/spacedeck_users.js

@@ -130,9 +130,27 @@ SpacedeckUsers = {
         $event.stopPropagation();
       }
 
-      create_user(name, email, password, password_confirmation, invite_code, function(session) {
+      create_user(name, email, password, password_confirmation, invite_code, function(res) {
         this.creating_user = false;
-        this.login_submit(email, password, null, on_success);
+
+        if (res.chargebee_checkout) {
+          var chargebeeInstance = Chargebee.init({
+            site: "spacedeck-test",
+            enableRedirectMode: true,
+            enableFriendbuyTracking: false
+          });
+          
+          chargebeeInstance.openCheckout({
+            hostedPage: function() {
+              return new Promise(function(resolve, reject) {
+                resolve(res.chargebee_checkout);
+              })
+            }
+          });
+        } else {
+          // user created, login
+          this.login_submit(email, password, null, on_success);
+        }
       }.bind(this), function(req) {
         this.creating_user = false;
         try {

public/javascripts/spacedeck_whiteboard.js

@@ -6,7 +6,7 @@
 
 function setup_whiteboard_directives() {
   var mode_touch = false;
-  
+
   if ('ontouchstart' in window) {
     mode_touch = true;
     var edown = "touchstart";
@@ -38,7 +38,7 @@ function setup_whiteboard_directives() {
       $(el).bind("mousedown", this.handle_mouse_down_space.bind(this));
       $(el).bind("mousemove", this.handle_mouse_move.bind(this));
       $(el).bind("mouseup", this.handle_mouse_up_space.bind(this));
-      
+
       $(el).bind("wheel", this.handle_wheel_space.bind(this));
 
       $(document.body).bind("mouseleave", this.handle_mouse_leave.bind(this));
@@ -99,7 +99,7 @@ function setup_whiteboard_directives() {
         this.handle_mouse_down_space(evt);
         return;
       }
-      
+
       if ($scope.active_tool == "note") {
         this.handle_mouse_down_space(evt, true);
         return;
@@ -154,7 +154,7 @@ function setup_whiteboard_directives() {
 
       var a = $scope.find_artifact_by_id(evt.currentTarget.id.replace("artifact-",""));
       if (!a) return;
-      
+
       if (a.payload_uri) {
         $scope.download_selected_artifacts();
       }
@@ -200,10 +200,10 @@ function setup_whiteboard_directives() {
       var $scope = this.vm.$root;
 
       if (!evt.ctrlKey && !evt.shiftKey) return;
-      
+
       evt.preventDefault();
       evt.stopPropagation();
-      
+
       var amount = 1;
       var dy = evt.originalEvent.deltaY;
       if (dy>0) {
@@ -222,7 +222,7 @@ function setup_whiteboard_directives() {
       if (!force && evt.which != 2) {
         if (evt.target != evt.currentTarget && !_.include(["wrapper"],evt.target.className)) return;
       }
-      
+
       var $scope = this.vm.$root;
 
       $scope.opened_dialog="none";
@@ -234,7 +234,7 @@ function setup_whiteboard_directives() {
       if ((mode_touch && $scope.active_tool=="pointer") || evt.which == 2 || evt.buttons == 4) {
         $scope.active_tool = "pan";
       }
-      
+
       if ($scope.active_tool=="note") {
         this.deselect();
         this.mouse_state = "transform";
@@ -285,6 +285,7 @@ function setup_whiteboard_directives() {
         $scope.start_adding_placeholder(evt);
         return;
       } else if ($scope.active_tool=="pan") {
+        this.deselect();
         this.start_pan(evt);
         return;
       }
@@ -305,7 +306,7 @@ function setup_whiteboard_directives() {
         this.old_panx = el.scrollLeft;
         this.old_pany = el.scrollTop;
       }
-      
+
       var cursor = this.cursor_point_to_space(evt);
       $scope.mouse_ox = cursor.x;
       $scope.mouse_oy = cursor.y;
@@ -314,7 +315,7 @@ function setup_whiteboard_directives() {
 
     deselect: function() {
       var $scope = this.vm.$root;
-      
+
       $scope.deselect();
     },
 
@@ -342,7 +343,7 @@ function setup_whiteboard_directives() {
 
     rects_intersecting: function(r1,r2) {
       if (!r1 || !r2) return false;
-      
+
       if ( (r1.x+r1.w < r2.x)
         || (r1.x > r2.x+r2.w)
         || (r1.y+r1.h < r2.y)
@@ -352,7 +353,7 @@ function setup_whiteboard_directives() {
 
     artifacts_in_rect: function(rect) {
       if (!rect) return [];
-      
+
       var $scope = this.vm.$root;
 
       return _.filter($scope.active_space_artifacts, function(a) {
@@ -688,7 +689,7 @@ function setup_whiteboard_directives() {
       var $scope = this.vm.$root;
 
       evt.preventDefault();
-      
+
       if (this.mouse_state == "lasso") {
         var lasso_rect = this.abs_rect(this.lasso);
 
@@ -696,7 +697,7 @@ function setup_whiteboard_directives() {
           var arts = this.artifacts_in_rect(lasso_rect);
           this.multi_select(arts);
         } else {
-          
+
           if (this._no_artifact_toolbar_this_round) {
             this._no_artifact_toolbar_this_round = false;
           } else {
@@ -708,7 +709,7 @@ function setup_whiteboard_directives() {
       }
       else if (_.include(["transform","move","vector_transform","scribble"],this.mouse_state)) {
         var ars = $scope.selected_artifacts();
-        
+
         for (var i=0; i<ars.length; i++) {
 
           if (_.include(["text","placeholder"],$scope.artifact_major_type(ars[i]))) {
@@ -723,6 +724,9 @@ function setup_whiteboard_directives() {
 
           //save_artifact(ars[i], null, $scope.display_saving_error);
         }
+
+        // update vector handles
+        $scope.update_selection_metrics();
       }
 
       if (this.mouse_state == "text_editor") {
@@ -794,7 +798,7 @@ function setup_whiteboard_directives() {
 
         $scope.websocket_send(cursor_msg);
       }
-      
+
       // side effects ftw!
       $scope.snap_ruler_x = -1000;
       $scope.snap_ruler_y = -1000;
@@ -818,7 +822,7 @@ function setup_whiteboard_directives() {
 
       if (this.mouse_state == "move") {
         $scope.hide_toolbar_props();
-        
+
         var snap_dx = 0;
         var snap_dy = 0;
 
@@ -878,7 +882,7 @@ function setup_whiteboard_directives() {
         }
 
         $scope.hide_toolbar_props();
-        
+
         var ew = (edges.x2-edges.x1);
         var eh = (edges.y2-edges.y1);
 
@@ -924,7 +928,7 @@ function setup_whiteboard_directives() {
 
       } else if (this.mouse_state == "vector_transform") {
         $scope.hide_toolbar_props();
-        
+
         var _this = this;
         $scope.update_selected_artifacts(function(a) {
           var old_a = $scope.find_artifact_before_transaction(a);
@@ -941,18 +945,14 @@ function setup_whiteboard_directives() {
 
           // special case for arrow's 3rd point
           if (a.shape == "arrow" && $scope.selected_control_point_idx!=2) {
-            /*control_points[2].dx += dx/2;
-            control_points[2].dy += dy/2; */
-
             control_points[2].dx = (control_points[0].dx+control_points[1].dx)/2;
             control_points[2].dy = (control_points[0].dy+control_points[1].dy)/2;
           }
 
           return _this.normalize_control_points(control_points, old_a);
-        });
+        }, false, true); // override_locked: false, temporary: true
 
       } else if (this.mouse_state == "scribble") {
-
         $scope.update_selected_artifacts(function(a) {
           var old_a = a;
 

public/javascripts/vector-render.js

@@ -23,6 +23,9 @@ function vec2_angle(v) {
 function render_vector_drawing(a, padding) {
   var shape = a.shape || "";
   var path = [];
+  if(typeof a.control_points == 'string'){
+    a.control_points = JSON.parse(a.control_points);
+  }
   var p = a.control_points[0];
 
   if (!p) return "";

routes/api/space_exports.js

@@ -5,7 +5,7 @@ const db = require('../../models/db');
 var mailer = require('../../helpers/mailer');
 var uploader = require('../../helpers/uploader');
 var space_render = require('../../helpers/space-render');
-var phantom = require('../../helpers/phantom');
+var exporter = require('../../helpers/exporter');
 
 var async = require('async');
 var moment = require('moment');
@@ -51,7 +51,7 @@ router.get('/png', function(req, res, next) {
   if (!req.space.thumbnail_updated_at || req.space.thumbnail_updated_at < req.space.updated_at || !req.space.thumbnail_url) {
     db.Space.update({ thumbnail_updated_at: triggered }, {where : {"_id": req.space._id }});
     
-    phantom.takeScreenshot(req.space, "png", function(local_path) {
+    exporter.takeScreenshot(req.space, "png", function(local_path) {
       var localResizedFilePath = local_path + ".thumb.jpg";
       gm(local_path).resize(640, 480).quality(70.0).autoOrient().write(localResizedFilePath, function(err) {
         
@@ -109,7 +109,7 @@ function make_export_filename(space, extension) {
 router.get('/pdf', function(req, res, next) {
   var s3_filename = make_export_filename(req.space, "pdf");
 
-  phantom.takeScreenshot(req.space, "pdf", function(local_path) {
+  exporter.takeScreenshot(req.space, "pdf", function(local_path) {
     uploader.uploadFile(s3_filename, "application/pdf", local_path, function(err, url) {
       res.status(201).json({
         url: url

routes/api/space_messages.js

@@ -9,7 +9,7 @@ var redis = require('../../helpers/redis');
 var mailer = require('../../helpers/mailer');
 var uploader = require('../../helpers/uploader');
 var space_render = require('../../helpers/space-render');
-var phantom = require('../../helpers/phantom');
+var exporter = require('../../helpers/exporter');
 
 var async = require('async');
 var fs = require('fs');

routes/api/spaces.js

@@ -10,7 +10,7 @@ var redis = require('../../helpers/redis');
 var mailer = require('../../helpers/mailer');
 var uploader = require('../../helpers/uploader');
 var space_render = require('../../helpers/space-render');
-var phantom = require('../../helpers/phantom');
+var exporter = require('../../helpers/exporter');
 var payloadConverter = require('../../helpers/artifact_converter');
 
 var slug = require('slug');

routes/api/users.js

@@ -23,6 +23,8 @@ var express = require('express');
 var router = express.Router();
 var glob = require('glob');
 
+var chargebee = require('chargebee');
+
 router.get('/current', function(req, res, next) {
   if (req.user) {
     var u = _.clone(req.user.dataValues);
@@ -39,6 +41,88 @@ router.get('/current', function(req, res, next) {
   }
 });
 
+function createChargebeeCheckout(req, res, plan_id, email, name, company) {
+  var nameParts = name.split(" ");
+  var firstName = nameParts.shift();
+  var lastName = nameParts.join(" ");
+
+  chargebee.hosted_page.checkout_new({
+    subscription: {
+      plan_id: plan_id
+    },
+    customer: {
+      first_name: firstName,
+      last_name: lastName,
+      email: email,
+      company: company,
+    }
+  }).request(function(error,result) {
+    if (error) {
+      console.log(error);
+      res.status(400).json({"error":error+""});
+    } else {
+      res.status(200).json({"chargebee_checkout":result.hosted_page});
+    }
+  });
+};
+
+function createUser(req, res, email, nickname, password) {
+  bcrypt.genSalt(10, function(err, salt) {
+    bcrypt.hash(password, salt, function(err, hash) {
+      crypto.randomBytes(16, function(ex, buf) {
+        var token = buf.toString('hex');
+
+        var u = {
+          _id: uuidv4(),
+          email: email,
+          account_type: "email",
+          nickname: nickname,
+          password_hash: hash,
+          prefs_language: req.i18n.locale,
+          confirmation_token: token
+        };
+
+        db.User.create(u)
+          .error(err => {
+            res.sendStatus(400);
+          })
+          .then(u => {
+            var homeFolder = {
+              _id: uuidv4(),
+              name: req.i18n.__("home"),
+              space_type: "folder",
+              creator_id: u._id
+            };
+            db.Space.create(homeFolder)
+              .error(err => {
+                res.sendStatus(400);
+              })
+              .then(homeFolder => {
+                u.home_folder_id = homeFolder._id;
+                u.save()
+                  .then(() => {
+                    // home folder created,
+                    // auto accept pending invites
+                    db.Membership.update({
+                      "state": "active"
+                    }, {
+                      where: {
+                        "email_invited": u.email,
+                        "state": "pending"
+                      }
+                    });
+                    res.status(201).json({});          
+                  })
+                  .error(err => {
+                    res.status(400).json(err);
+                  });
+              })
+          });
+      });
+    });
+  });
+};
+  
 // create user
 router.post('/', function(req, res) {
   if (!req.body["email"] || !req.body["password"]) {
@@ -51,6 +135,7 @@ router.post('/', function(req, res) {
   var password = req.body["password"];
   var password_confirmation = req.body["password_confirmation"];
   var invite_code = req.body["invite_code"];
+  var company = req.body["company"] || "";
 
   if (password_confirmation != password) {
     res.status(400).json({"error":"password_confirmation"});
@@ -67,67 +152,17 @@ router.post('/', function(req, res) {
     return;
   }
   
-  var createUser = function() {
-    bcrypt.genSalt(10, function(err, salt) {
-      bcrypt.hash(password, salt, function(err, hash) {
-        crypto.randomBytes(16, function(ex, buf) {
-          var token = buf.toString('hex');
-
-          var u = {
-            _id: uuidv4(),
-            email: email,
-            account_type: "email",
-            nickname: nickname,
-            password_hash: hash,
-            prefs_language: req.i18n.locale,
-            confirmation_token: token
-          };
-
-          db.User.create(u)
-            .error(err => {
-              res.sendStatus(400);
-            })
-            .then(u => {
-              var homeFolder = {
-                _id: uuidv4(),
-                name: req.i18n.__("home"),
-                space_type: "folder",
-                creator_id: u._id
-              };
-              db.Space.create(homeFolder)
-                .error(err => {
-                  res.sendStatus(400);
-                })
-                .then(homeFolder => {
-                  u.home_folder_id = homeFolder._id;
-                  u.save()
-                    .then(() => {
-                      // home folder created,
-                      // auto accept pending invites
-                      db.Membership.update({
-                        "state": "active"
-                      }, {
-                        where: {
-                          "email_invited": u.email,
-                          "state": "pending"
-                        }
-                      });
-                      res.status(201).json({});          
-                    })
-                    .error(err => {
-                      res.status(400).json(err);
-                    });
-                })
-            });
-        });
-      });
-    });
-  };
-  
   db.User.findAll({where: {email: email}})
     .then(users => {
       if (users.length == 0) {
-        createUser();
+        if (config.get('chargebee_integration')) {
+          // sign up via paid plan trial
+          createChargebeeCheckout(req, res, config.get('chargebee_default_plan_id'), email, nickname, company);
+          // TODO: createUser after chargebee checkout
+        }
+        else {
+          createUser(req, res, email, nickname, password);
+        }
       } else {
         res.status(400).json({"error":"user_email_already_used"});
       }

routes/api/webgrabber.js

@@ -1,10 +1,10 @@
 "use strict";
 
+const puppeteer = require('puppeteer');
+
 var config = require('config');
 require('../../models/db');
-
 var fs = require('fs');
-var phantom = require('node-phantom-simple');
 var md5 = require('md5');
 
 var express = require('express');
@@ -19,40 +19,39 @@ function website_to_png(url,on_success,on_error) {
   console.log("[webgrabber] url: "+url);
   console.log("[webgrabber] export_path: "+export_path);
 
-  var on_success_called = false;
-
-  var on_exit = function(exit_code) {
-    if (exit_code>0) {
-      console.log("[phantom-webgrabber] abnormal exit for url "+url);
-      if (!on_success_called && on_error) {
-        on_error();
-      }
-    }
-  };
-  
   fs.stat(export_path, function(err, stat) {
     if (!err) {
       // file exists
       console.log("[webgrabber] serving cached snapshot of url: "+url);
       on_success(export_path);
     } else {
-      phantom.create({ path: require('phantomjs-prebuilt').path }, function (err, browser) {
-        return browser.createPage(function (err, page) {
-          page.set('settings.resourceTimeout',timeout);
-          page.set('settings.javascriptEnabled',false);
-          
-          return page.open(url, function(err, status) {
-            console.log("[webgrabber] status: "+status);
-            page.render(export_path, function() {
-              on_success_called = true;
-              on_success(export_path);
-              browser.exit();
-            });
-          });
-        });
-      }, {
-        onExit: on_exit
-      });
+      (async () => {
+        let browser;
+        let page;
+        try {
+          browser = await puppeteer.launch(
+            {
+              headless: true,
+              args: ['--disable-dev-shm-usage', '--no-sandbox']
+            }
+          );
+          page = await browser.newPage();
+  
+          page.setDefaultTimeout(timeout);
+          await page.setJavaScriptEnabled(false);
+          await page.goto(url, {waitUntil: 'networkidle2'});
+          await page.emulateMedia('screen');
+          await page.screenshot({path: export_path, printBackground: true});
+  
+          await browser.close();
+          on_success(export_path);
+        } catch (error) {
+          console.error(error);
+          console.log("[webgrabber] puppeteer abnormal exit for url "+url);
+          on_error();
+        }
+      
+      })();
     }
   });
 }

routes/root.js

@@ -78,6 +78,22 @@ router.get('/oc', (req, res) => {
   res.redirect("/t/oc");
 });
 
+router.get('/es/*', (req, res) => {
+  res.redirect("/t/es");
+});
+
+router.get('/es', (req, res) => {
+  res.redirect("/t/es");
+});
+
+router.get('/hu/*', (req, res) => {
+  res.redirect("/t/hu");
+});
+
+router.get('/hu', (req, res) => {
+  res.redirect("/t/hu");
+});
+
 router.get('/en/*', (req, res) => {
   res.redirect("/t/en");
 });
@@ -87,7 +103,7 @@ router.get('/en', (req, res) => {
 });
 
 router.get('/account', (req, res) => {
-  res.render('spacedeck');
+  res.render('spacedeck', { config:config });
 });
 
 router.get('/login', (req, res) => {

spacedeck.js

@@ -23,6 +23,8 @@ const express = require('express');
 const app = express();
 const serveStatic = require('serve-static');
 
+const chargebee = require('chargebee');
+
 const isProduction = app.get('env') === 'production';
 
 // workaround for libssl_conf.so error triggered by phantomjs
@@ -33,7 +35,7 @@ console.log("Booting Spacedeck Open… (environment: " + app.get('env') + ")");
 app.use(logger(isProduction ? 'combined' : 'dev'));
 
 i18n.expressBind(app, {
-  locales: ["en", "de", "fr", "oc", "es"],
+  locales: ["de", "en", "es", "fr", "hu", "oc"],
   defaultLocale: "en",
   cookieName: "spacedeck_locale",
   devMode: (app.get('env') == 'development')
@@ -110,6 +112,14 @@ if (app.get('env') == 'development') {
 
 module.exports = app;
 
+// ChargeBee Integration (Optional)
+if (config.get('chargebee_integration')) {
+  chargebee.configure({
+    site: config.get('chargebee_site'),
+    api_key: config.get('chargebee_api_key')
+  });
+}
+
 // CONNECT TO DATABASE
 db.init();
 

styles/artifact.scss

@@ -11,10 +11,12 @@
     max-height: 100%;
   }
 
-  &.hide-text .text { opacity: 0 }
+  &.hide-text .text {
+    opacity: 0;
+  }
 
   &.locked.selected {
-    box-shadow: 0px 0px 0px 3px rgba(0,0,0,0.5) !important;
+    box-shadow: 0px 0px 0px 3px rgba(0, 0, 0, 0.5) !important;
   }
 
   .placeholder {
@@ -26,7 +28,9 @@
     }
   }
 
-  &.artifact-text.text-blank [contentEditable=true]:not(.text-editing) p:first-child::after {
+  &.artifact-text.text-blank
+    [contentEditable="true"]:not(.text-editing)
+    p:first-child::after {
     content: "Double click to edit";
     opacity: 0.25;
   }
@@ -79,7 +83,6 @@
     // padding-right: 20px; margin-right: -20px;
 
     //> * {pointer-events: auto; }
-
   }
 
   &:not(.artifact-text) {
@@ -142,7 +145,9 @@
         li {
           margin-top: 0;
           margin-bottom: 0.5em;
-          &:last-child {margin-bottom: 0em !important; }
+          &:last-child {
+            margin-bottom: 0em !important;
+          }
         }
 
         h1 {
@@ -179,10 +184,14 @@
         p {
           margin-top: 0;
           margin-bottom: 0.5em; // compatibility to old system
-          &:last-child {margin-bottom: 0em !important; }
+          &:last-child {
+            margin-bottom: 0em !important;
+          }
         }
 
-        a {pointer-events: none; }
+        a {
+          pointer-events: none;
+        }
 
         ol {
           padding: 0;
@@ -247,7 +256,7 @@
   }
 
   .oembed,
-  div[class*='oembed-'] {
+  div[class*="oembed-"] {
     height: 100%;
     .play {
       position: absolute;
@@ -290,7 +299,9 @@
       }
     }
 
-    .title {font-size: 20px; }
+    .title {
+      font-size: 20px;
+    }
     .image {
       height: auto;
       top: 0;
@@ -319,10 +330,11 @@
     }
   }
 
-  .video   {
+  .video {
     width: 100%;
     height: 100%;
     background-size: cover;
+    background-color: black;
 
     &.playing {
       video {
@@ -347,6 +359,7 @@
       width: 100%;
       height: 100%;
       position: absolute;
+      left: 0;
     }
 
     .tl-controls {
@@ -359,10 +372,8 @@
 
       .btn {
         margin-top: 20px;
-
       }
     }
-
   }
 
   // FIXME: fix later
@@ -381,8 +392,8 @@
     height: 100%;
     .timeline {
       position: absolute;
-      left:0;
-      top:0;
+      left: 0;
+      top: 0;
       width: 100%;
       bottom: 54px;
       background-size: 100% 100%;
@@ -391,7 +402,7 @@
       overflow: hidden;
 
       .tl-current-time {
-        height:100%;
+        height: 100%;
         background: white;
         opacity: 0.5;
         border-right: 1px solid #888;
@@ -427,12 +438,11 @@
 
       .btn {
         margin-top: 20px;
-
       }
     }
 
     .tl-title {
-      margin-left:10px;
+      margin-left: 10px;
       max-width: 55%;
       overflow: hidden;
       display: inline-block;
@@ -454,19 +464,41 @@
     height: 100%;
   }
 
-  &.bold          { font-weight: bold;}
-  &.italic        { font-style: italic;}
-  &.underline     { text-decoration: underline;}
-  &.strike        { text-decoration: line-through;}
+  &.bold {
+    font-weight: bold;
+  }
+  &.italic {
+    font-style: italic;
+  }
+  &.underline {
+    text-decoration: underline;
+  }
+  &.strike {
+    text-decoration: line-through;
+  }
 
-  &.align-top     .text-cell {vertical-align: top;}
-  &.align-middle  .text-cell {vertical-align: middle;}
-  &.align-bottom  .text-cell {vertical-align: bottom;}
+  &.align-top .text-cell {
+    vertical-align: top;
+  }
+  &.align-middle .text-cell {
+    vertical-align: middle;
+  }
+  &.align-bottom .text-cell {
+    vertical-align: bottom;
+  }
 
-  &.align-left    { text-align: left; }
-  &.align-center  { text-align: center; }
-  &.align-right   { text-align: right; }
-  &.align-justify { text-align: justify; }
+  &.align-left {
+    text-align: left;
+  }
+  &.align-center {
+    text-align: center;
+  }
+  &.align-right {
+    text-align: right;
+  }
+  &.align-justify {
+    text-align: justify;
+  }
 
   audio {
     width: 100%;
@@ -481,10 +513,14 @@
   font-size: 36px;
 
   &.artifact-zone {
-    background-color: rgba(0,0,0,0.05);
+    background-color: rgba(0, 0, 0, 0.05);
     border-radius: 10px;
-    &:after {display: none; }
-    .shape {display: none; }
+    &:after {
+      display: none;
+    }
+    .shape {
+      display: none;
+    }
     .zone {
       height: 100%;
     }
@@ -496,32 +532,31 @@ body.present-mode {
     .artifact-zone {
       display: none;
     }
-    .artifact  {
+    .artifact {
       cursor: default !important;
-      .text a { pointer-events: auto !important; }
+      .text a {
+        pointer-events: auto !important;
+      }
     }
   }
 }
 
 body:not(.present-mode) {
-
   #space {
-
     .Medium {
       cursor: text;
     }
 
     .artifact {
-
       &.selected.text-editing,
       &.text-editing {
         cursor: text;
 
         &:before {
-          border: 1px solid rgba(255,255,255,0.25);
+          border: 1px solid rgba(255, 255, 255, 0.25);
         }
         &:after {
-          border: 1px dotted rgba(40,140,215,0.5);
+          border: 1px dotted rgba(40, 140, 215, 0.5);
           background-color: transparent !important;
         }
       }
@@ -535,24 +570,27 @@ body:not(.present-mode) {
         }
 
         &:not(.artifact-vector):after {
-          border: 1px solid rgba(40,140,215,1);
+          border: 1px solid rgba(40, 140, 215, 1);
           // overlay color removed for now (messes with colors)
           //background-color: rgba(40,140,215,0.35);
         }
       }
-
     }
   }
 }
 
-.mouse-scribble, .tool-scribble, .tool-line, .tool-arrow {
+.mouse-scribble,
+.tool-scribble,
+.tool-line,
+.tool-arrow {
   cursor: crosshair !important;
 
   .artifact {
     pointer-events: none !important;
   }
 
-  .artifact:after, .artifact:before {
+  .artifact:after,
+  .artifact:before {
     display: none !important;
   }
 }
@@ -566,21 +604,27 @@ body:not(.present-mode) {
 }
 
 .artifact.state-idle {
-  .progress, .progress-text {
+  .progress,
+  .progress-text {
     display: none;
   }
 }
 
-.artifact.state-processing, .artifact.state-uploading {
+.artifact.state-processing,
+.artifact.state-uploading {
   .progress {
     height: 100%;
-    padding: 10px;
-
-    background-color: $blue;
+    padding: 4px;
     opacity: 0.9;
-    text-align: center;
     font-size: 14px;
   }
+  .progress-container {
+    background: $white;
+    width: 100%;
+    height: 100%;
+    padding-left: 10px;
+    padding-top: 10px;
+  }
   .progress-text {
     text-align: center;
     padding: 8px;
@@ -593,43 +637,48 @@ body:not(.present-mode) {
     color: #888;
     font-size: 10px;
   }
-  video, audio, .tl-controls, .timeline {
+  video,
+  audio,
+  .tl-controls,
+  .timeline {
     display: none;
   }
 
-
   background-color: white;
 }
 
 .state-processing .spinner {
   opacity: 1;
-  background-image: url('/images/hourglass.gif');
+  background-image: url("/images/hourglass.gif");
 }
 
 .state-uploading .spinner {
   opacity: 0.8;
-  background-image: url('/images/hourglass.gif');
+  background-image: url("/images/hourglass.gif");
 }
 
 .state-idle .spinner {
   display: none;
 }
 
-
 .artifact.image {
   background-color: transparent;
-  &.state-loading { background-color: rgba(40,140,215,0.05);}
-  &.state-processing { background-color: rgba(107,195,111,0.05);}
+  &.state-loading {
+    background-color: rgba(40, 140, 215, 0.05);
+  }
+  &.state-processing {
+    background-color: rgba(107, 195, 111, 0.05);
+  }
 }
 
 .spinner {
-  height:44px;
-  width:44px;
-  position:absolute;
+  height: 44px;
+  width: 44px;
+  position: absolute;
   top: 50%;
   left: 50%;
   margin: -22px;
-  border-radius:100%;
+  border-radius: 100%;
   background-size: cover;
   background-repeat: no-repeat;
 }

styles/folder.scss

@@ -3,12 +3,17 @@
 @import "unicode";
 
 @-webkit-keyframes appear {
-  0% { opacity: 0;}
-  30% { opacity: 0;}
-  100%   { opacity: 1; }
+  0% {
+    opacity: 0;
+  }
+  30% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 
-
 .avatar {
   background-color: $blue;
   font-family: $main-font;
@@ -26,7 +31,9 @@
 #user-root {
   margin-left: 5px !important;
   padding: 0px !important;
-  .btn {margin-right: 10px; }
+  .btn {
+    margin-right: 10px;
+  }
 }
 
 #sidebar.folder-sidebar {
@@ -70,7 +77,9 @@
   li {
     display: inline-block;
     line-height: 44px;
-    &.active span {color: $light; }
+    &.active span {
+      color: $light;
+    }
     span {
       color: $medium;
       display: inline-block;
@@ -82,8 +91,6 @@
   }
 }
 
-
-
 #folder {
   position: absolute;
   height: 100%;
@@ -137,7 +144,7 @@
     z-index: initial;
   }
 
-  .folder  .icon {
+  .folder .icon {
     color: $yellow;
     opacity: 1;
   }
@@ -150,7 +157,7 @@
       width: 100%;
     }
     > .icon {
-      margin-left: -15px
+      margin-left: -15px;
     }
   }
 
@@ -176,30 +183,30 @@
     // margin-top: -18px;
     margin-right: -60px;
     // margin-bottom: -18px;
-    @include transition( all 0.125s ease-in-out);
+    @include transition(all 0.125s ease-in-out);
     .icon {
       left: 0px;
       top: 0px;
       line-height: 60px;
       font-size: 13px;
       position: absolute;
-      @include scale(0,0);
-      @include transition( all 0.125s ease-in-out);
+      @include scale(0, 0);
+      @include transition(all 0.125s ease-in-out);
       @include opacity(0.25);
     }
 
     &:hover {
       margin-right: -12px;
       .icon {
-        @include scale(1,1);
+        @include scale(1, 1);
       }
     }
   }
 }
 
 #folder-header {
-  background-color: rgba(41,41,41,0.95);
-  background-color: rgba(245,245,245,0.95);
+  background-color: rgba(41, 41, 41, 0.95);
+  background-color: rgba(245, 245, 245, 0.95);
 }
 
 #folder-wrapper {
@@ -212,15 +219,22 @@
   margin: auto;
 }
 
-
 #folder-grid .item {
   float: left;
   width: 100%;
 
-  @media screen and (min-width: 640px)  {width: 50%; }
-  @media screen and (min-width: 800px)  {width: 33.333333%; }
-  @media screen and (min-width: 1000px) {width: 25%; }
-  @media screen and (min-width: 1200px) {width: 20%; }
+  @media screen and (min-width: 640px) {
+    width: 50%;
+  }
+  @media screen and (min-width: 800px) {
+    width: 33.333333%;
+  }
+  @media screen and (min-width: 1000px) {
+    width: 25%;
+  }
+  @media screen and (min-width: 1200px) {
+    width: 20%;
+  }
 }
 
 .compact-hidden {
@@ -256,8 +270,8 @@
   .item {
     display: inline-block;
     text-align: left;
-    padding-right: $folder-gutter*2;
-    padding-bottom: $folder-gutter*2;
+    padding-right: $folder-gutter * 2;
+    padding-bottom: $folder-gutter * 2;
     margin-bottom: $folder-gutter;
 
     position: relative;
@@ -265,36 +279,38 @@
 
     cursor: pointer;
 
-   .folder-drop {display:none; }
+    .folder-drop {
+      display: none;
+    }
 
     &.appear > a,
     &.creating > a {
       opacity: 0;
       -webkit-animation: appear 0.25s ease-out 0.05s;
-         -moz-animation: appear 0.25s ease-out 0.05s;
-          -ms-animation: appear 0.25s ease-out 0.05s;
-           -o-animation: appear 0.25s ease-out 0.05s;
-              animation: appear 0.25s ease-out 0.05s;
+      -moz-animation: appear 0.25s ease-out 0.05s;
+      -ms-animation: appear 0.25s ease-out 0.05s;
+      -o-animation: appear 0.25s ease-out 0.05s;
+      animation: appear 0.25s ease-out 0.05s;
 
       -webkit-animation-fill-mode: forwards;
-         -moz-animation-fill-mode: forwards;
-          -ms-animation-fill-mode: forwards;
-           -o-animation-fill-mode: forwards;
-              animation-fill-mode: forwards;
+      -moz-animation-fill-mode: forwards;
+      -ms-animation-fill-mode: forwards;
+      -o-animation-fill-mode: forwards;
+      animation-fill-mode: forwards;
     }
 
     &.deleting > a {
       -webkit-animation: disappear 0.25s ease-out 0.05s;
-         -moz-animation: disappear 0.25s ease-out 0.05s;
-          -ms-animation: disappear 0.25s ease-out 0.05s;
-           -o-animation: disappear 0.25s ease-out 0.05s;
-              animation: disappear 0.25s ease-out 0.05s;
+      -moz-animation: disappear 0.25s ease-out 0.05s;
+      -ms-animation: disappear 0.25s ease-out 0.05s;
+      -o-animation: disappear 0.25s ease-out 0.05s;
+      animation: disappear 0.25s ease-out 0.05s;
 
       -webkit-animation-fill-mode: forwards;
-         -moz-animation-fill-mode: forwards;
-          -ms-animation-fill-mode: forwards;
-           -o-animation-fill-mode: forwards;
-              animation-fill-mode: forwards;
+      -moz-animation-fill-mode: forwards;
+      -ms-animation-fill-mode: forwards;
+      -o-animation-fill-mode: forwards;
+      animation-fill-mode: forwards;
     }
 
     &.tag-important > a {
@@ -308,7 +324,7 @@
 
     &.dropping {
       .folder-drop {
-        display:block;
+        display: block;
       }
     }
 
@@ -349,7 +365,13 @@
           background-color: $darker;
           position: absolute;
           bottom: 2px;
-          -webkit-mask-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0,0,0,0)), to(rgba(0,0,0,0.1)));
+          -webkit-mask-image: -webkit-gradient(
+            linear,
+            left top,
+            left bottom,
+            from(rgba(0, 0, 0, 0)),
+            to(rgba(0, 0, 0, 0.1))
+          );
           background-color: black;
           pointer-events: none;
         }
@@ -360,7 +382,7 @@
       .fav-toggle {
         margin-right: -12px;
         .icon {
-          @include scale(1,1);
+          @include scale(1, 1);
           @include opacity(1);
         }
       }
@@ -384,7 +406,7 @@
 
     > a {
       /* aspect ratio without spacer image */
-      &:before{
+      &:before {
         content: "";
         display: block;
         padding-top: 100%; /* initial ratio of 1:1*/
@@ -392,9 +414,11 @@
       }
 
       background-color: white;
-      border-radius: $radius*2;
+      border-radius: $radius * 2;
 
-      &:active { opacity: 0.95 !important; }
+      &:active {
+        opacity: 0.95 !important;
+      }
 
       box-shadow: 0 0 30px 1px rgba(0, 0, 0, 0.15);
       border: 1px solid black;
@@ -406,7 +430,7 @@
       font-weight: 400;
       display: block;
       text-decoration: none;
-      border-radius: $radius*2;
+      border-radius: $radius * 2;
       position: relative;
 
       .item-thumbnail {
@@ -420,8 +444,9 @@
         overflow: hidden;
 
         background-color: transparent;
-        border-top-left-radius: $radius*2;
-        border-top-right-radius: $radius*2;
+        background-size: cover;
+        border-top-left-radius: $radius * 2;
+        border-top-right-radius: $radius * 2;
 
         border-bottom-left-radius: 10px;
         border-bottom-right-radius: 10px;
@@ -431,7 +456,7 @@
 
       .item-title {
         display: block;
-        border-top: 1px solid rgba(0,0,0,0.05);
+        border-top: 1px solid rgba(0, 0, 0, 0.05);
         background-color: white;
         font-size: 18px;
         width: 100%;
@@ -439,15 +464,15 @@
         left: 0px;
         bottom: 0px;
         position: absolute;
-        border-bottom-left-radius: $radius*2;
-        border-bottom-right-radius: $radius*2;
+        border-bottom-left-radius: $radius * 2;
+        border-bottom-right-radius: $radius * 2;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         color: $dark;
         text-align: left;
       }
-      
+
       .thumbnail-loading {
         position: absolute;
         z-index: 0;
@@ -464,11 +489,11 @@
     }
 
     .item-meta {
-      border-top: 2px solid rgba(0,0,0,0.025);
-      border-radius: 2*$radius;
+      border-top: 2px solid rgba(0, 0, 0, 0.025);
+      border-radius: 2 * $radius;
       border-top-left-radius: 0;
       border-top-right-radius: 0;
-      
+
       @include clearfix;
       color: $medium;
       position: absolute;
@@ -493,8 +518,8 @@
         left: 0px;
         bottom: 0px;
         position: relative;
-        border-bottom-left-radius: $radius*2;
-        border-bottom-right-radius: $radius*2;
+        border-bottom-left-radius: $radius * 2;
+        border-bottom-right-radius: $radius * 2;
         //white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -509,7 +534,7 @@
       position: absolute;
       bottom: 0;
       left: 0;
-      right: $folder-gutter*2;
+      right: $folder-gutter * 2;
       color: $medium;
       font-size: 11px;
       font-family: $main-font;

views/layouts/outer-footer.ejs

@@ -2,9 +2,8 @@
     <div class="footer">
       <p>
         <div class="col-xs-6">
-          &copy; 2020 <a href="https://mntre.com">MNT Research GmbH</a>, Fehlerstr. 8, 12161 Berlin, Germany<br>
-          &copy; 2011–2020 Spacedeck GmbH (in liquidation)<br>
-          Source Code: <a href="https://github.com/mntmn/spacedeck-open">https://github.com/mntmn/spacedeck-open</a>
+          Spacedeck is Free and Open Source Software. The developers are not affiliated with this website.<br>
+          &copy; 2011–2020 <a href="https://github.com/mntmn/spacedeck-open">Spacedeck Open Developers</a><br>
           <br>
           Font: <a href="https://rsms.me/inter/">Inter by rsms</a>
         </div>

views/layouts/outer-header.ejs

@@ -3,7 +3,12 @@
   <head>
     <meta charset="utf-8">
     <title>Spacedeck Open</title>
-    <meta name="description" content="">
+    <meta name="title" content="Spacedeck Open">
+    <meta name="description" content="Whenever you need to lay out pictures, text notes, video and audio clips on a blank canvas, Spacedeck can help you."/>
+    <meta name="keywords" content="spacedeck, collaboration, teams, collages, moodboards, teaching, shared whiteboards, design thinking"/>
+    <meta name="author" content="MNT Research GmbH"/>
+    <meta name="copyright" content="MNT Research GmbH"/>
+    <meta name="robots" content="index,follow"/>
     <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
@@ -24,6 +29,5 @@
           <a class="btn btn-md btn-dark btn-round" href="/spaces"><%=__("spaces")%></a>
           <a class="btn btn-md btn-dark btn-round" href="/logout"><%=__("logout")%></a>
         <% } %>
-
       </div>
     </header>

views/partials/account.html

@@ -110,7 +110,10 @@
         </label>
         <label class="radio" v-bind:class="{checked: user.prefs_language=='es'}" v-on:click="save_user_language('es')">
           <input type="radio" id="user-preferences_language" name="language" value="es"><span>Español</span>
-        </label>        
+        </label>
+        <label class="radio" v-bind:class="{checked: user.prefs_language=='hu'}" v-on:click="save_user_language('hu')">
+          <input type="radio" id="user-preferences_language" name="language" value="hu"><span>Magyar</span>
+        </label>
       </div>
     </div>
 

views/partials/space.html

@@ -85,13 +85,13 @@
          v-bind:class="{text-editing:(editing_artifact_id==a._id && (a.view.major_type=='text' || a.view.major_type=='shape'))}"
          id="artifact-{{a._id}}">
 
-
       <div v-if="a.view && a.view.major_type" style="height:100%; width:100%" v-bind:title="(a.editor_name || (a.user && a.user.nickname) || '')">
-          <span v-if="a.locked && is_selected(a)" class="link-wrapper">
-            <span class="btn btn-sm btn-icon btn-round btn-primary">
-              <span class="icon icon-lock-closed"></span>
-            </span>
+        <span v-if="a.locked && is_selected(a)" class="link-wrapper">
+          <span class="btn btn-sm btn-icon btn-round btn-primary">
+            <span class="icon icon-lock-closed"></span>
           </span>
+        </span>
+
         <!-- text -->
         <div v-if="a.view.major_type == 'text'" class="text" v-bind:style="a.view.inner_style">
           <div class="text-table">
@@ -156,8 +156,13 @@
             <source v-for="rep in a.view.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" />
             <source v-if="a.view.payload_uri && a.view.mime" v-bind:src="a.view.payload_uri" v-bind:type="a.view.mime" />
           </video>
-          <div class="spinner"></div>
-          <div class="progress" v-bind:style="{width: a.view.progress+'%'}">{{a.description}}</div>
+          <div class="progress" v-bind:style="{width: a.description}">
+            <div class="progress-container">
+              <h3>
+                {{a.description}}
+              </h3>
+            </div>
+          </div>
         </div>
 
         <!-- audio -->

views/partials/tool/image.html

@@ -4,7 +4,7 @@
   <div class="dialog-section">
     <label class="btn btn-xxl btn-transparent btn-icon">
       <span class="icon icon-picture-upload"></span>
-      <input type="file" accept="*/*" multiple v-on:change="handle_image_file_upload($event)" id="image_file_upload">
+      <input type="file" multiple v-on:change="handle_image_file_upload($event)" id="image_file_upload">
     </label>
     <p>Click to Upload<br/> or drag file(s) anywhere.</p>
   </div>

views/partials/tool/toolbar-elements.html

@@ -1,18 +1,18 @@
 <div class="toolbar toolbar-elements" v-bind:class="{in:toolbar_artifacts_in,out:!toolbar_artifacts_in}" v-show="!is_active_space_role('viewer') && active_space_loaded">
-  
+
   <div class="btn-group light vertical">
-    
+
     <a class="btn btn-icon btn-transparent"
        title="<%=__("home")%>" href="/spaces"
        v-if="(!active_space.parent_space_id && !guest_nickname && !embedded)">
       <span class="icon icon-folder"></span>
     </a>
-      
+
     <a class="btn btn-icon btn-dark"
        title="Parent Folder"
        href="/folders/{{active_space.parent_space_id}}"
        v-if="(active_space.parent_space_id && !guest_nickname && !embedded)">
-      
+
       <span class="icon icon-sd6 icon-svg"></span>
     </a>
 
@@ -35,15 +35,16 @@
       <span class="icon icon-tool-scribble"></span>
       <span class="icon-label"><%=__("tool_scribble")%></span>
     </button>
-    
+
     <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_drawing_arrow()" v-bind:class="{active:active_tool=='arrow'}" title="<%=__("tool_arrow")%>">
       <span class="icon icon-tool-arrow"></span>
       <span class="icon-label"><%=__("tool_arrow")%></span>
     </button>
-    
+
     <div class="dropdown bottom light center">
       <div class="btn-collapse in">
-        <button class="btn btn-transparent btn-icon-labeled" v-on:click="handle_insert_image_url()" v-on:touchstart="handle_insert_image_url()" title="<%=__("media")%>">
+        <input type="file" multiple v-on:change="handle_image_file_upload($event)" id="image_file_upload" class="btn btn-transparent btn-icon-labeled" style="position: absolute; z-index: 1; opacity: 0;">
+        <button class="btn btn-transparent btn-icon-labeled" title="<%=__("media")%>">
           <span class="icon icon-upload"></span>
           <span class="icon-label" ><%=__("media")%></span>
         </button>
@@ -59,19 +60,6 @@
       </div>
     </div>
 
-    <div class="dropdown top left light">
-      <div class="btn-collapse">
-        <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='image'}" v-on:click="open_dialog('image')" title="<%=__("image")%>">
-          <span class="icon icon-picture"></span>
-          <span class="icon-label"><%=__("image")%></span>
-        </button>
-      </div>
-
-      <div class="dialog">
-        <%- include("./image.html") %>
-      </div>
-    </div>
-
     <div class="dropdown top left light" v-bind:class="{open:opened_dialog=='zones'}">
       <div class="btn-collapse in">
         <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='zones'}" v-on:click="open_dialog('zones')" title="<%=__("tool_zones")%>">
@@ -84,7 +72,7 @@
         <%- include("./zones.html") %>
       </div>
     </div>
-    
+
     <button class="btn btn-divider" v-show="logged_in"></button>
 
     <div class="dropdown top left center" v-show="logged_in" v-bind:class="{open:opened_dialog=='background'}">
@@ -107,8 +95,8 @@
       <span class="icon icon-share"></span>
       <span class="icon-label"><%= __('share') %></span>
     </button>
-    
-    <!--        
+
+    <!--
             <li v-on:click="edit_space_title()" v-if="logged_in">
               <span>
                 <span class="icon icon-sm icon-tag"></span>

views/partials/tool/toolbar-object.html

@@ -40,7 +40,7 @@
 
     <button class="btn btn-divider"></button>
     -->
-    
+
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='text-styles'}">
       <div class="btn-collapse in">
         <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-styles')" v-bind:class="{open : opened_dialog=='text-styles'}" title="<%=__("tool_styles")%>">
@@ -53,7 +53,7 @@
         <%- include("./text-styles.html") %>
       </div>
     </div>
-    
+
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='type-align'}">
       <div class="btn-collapse" v-bind:class="{in:selection_metrics.contains_text}">
         <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('type-align')" v-bind:class="{open : opened_dialog=='type-align'}" title="<%=__("tool_align")%>">
@@ -80,9 +80,9 @@
         <%- include("./layout.html") %>
       </div>
     </div>
-    
+
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='text-settings'}">
-      
+
       <div class="btn-collapse in">
         <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('text-settings')" v-bind:class="{open : opened_dialog=='text-settings'}" title="<%=__("tool_font")%>">
           <span class="icon icon-text-typeface"></span>
@@ -97,6 +97,17 @@
 
     <button class="btn btn-divider"></button>
 
+    <div class="dropdown bottom light center">
+      <div class="btn-collapse" v-bind:class="{in:selection_metrics.contains_text}">
+        <button
+          class="btn btn-icon-labeled btn-transparent"
+          v-on:click="delayed_edit_artifact()">
+          <span class="icon icon-pencil"></span>
+          <span class="icon-label"><%=__("tool_edit_text")%></span>
+        </button>
+      </div>
+    </div>
+
     <div class="dropdown top light right" v-bind:class="{open:opened_dialog=='object-options'}">
       <button class="btn btn-transparent btn-icon-labeled" v-on:click="open_dialog('object-options')" v-bind:class="{open : opened_dialog=='object-options'}">
         <span class="icon icon-cogwheel"></span>
@@ -107,6 +118,6 @@
         <%- include("./object-options.html") %>
       </div>
     </div>
-    
+
   </div>
 </div>

views/spacedeck.ejs

@@ -17,7 +17,8 @@
         webHost: location.host,
         webEndpoint: location.origin,
         apiEndpoint: location.origin,
-        websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:")
+        websocketsEndpoint: location.origin.replace("https:","wss:").replace("http:","ws:"),
+        options: <%- config && config.spacedeck ? JSON.stringify(config.spacedeck) : "{}" %>
       };
     </script>
 
@@ -56,6 +57,9 @@
     <script src="/javascripts/spacedeck_directives.js"></script>
     <script src="/javascripts/spacedeck_vue.js"></script>
 
+    <!-- TODO: only include based on config -->
+    <script src="https://js.chargebee.com/v2/chargebee.js"></script>
+    
     <script>if (window.module) module = window.module;</script>
   </head>
 
@@ -73,15 +77,17 @@
 
   <script type="text/javascript">
     window.locales = {};
-    window.locales.en = {};
     window.locales.de = {};
-    window.locales.fr = {};
-    window.locales.oc = {};
+    window.locales.en = {};
     window.locales.es = {};
-    window.locales.en.translation = <%- include("./../locales/en.js") %>;
+    window.locales.fr = {};
+    window.locales.hu = {};
+    window.locales.oc = {};
     window.locales.de.translation = <%- include("./../locales/de.js") %>;
-    window.locales.fr.translation = <%- include("./../locales/fr.js") %>;
-    window.locales.oc.translation = <%- include("./../locales/oc.js") %>;
+    window.locales.en.translation = <%- include("./../locales/en.js") %>;
     window.locales.es.translation = <%- include("./../locales/es.js") %>;
+    window.locales.fr.translation = <%- include("./../locales/fr.js") %>;
+    window.locales.hu.translation = <%- include("./../locales/hu.js") %>;
+    window.locales.oc.translation = <%- include("./../locales/oc.js") %>;
   </script>
 </html>