Merge branch 'LumberjackOtters-mnt' into mnt

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10-alpine3.11
+FROM node:16-alpine3.11
 
 WORKDIR /app
 

helpers/importer.js

@@ -8,7 +8,8 @@ const path = require('path')
 const db = require('../models/db')
 const Sequelize = require('sequelize')
 const Op = Sequelize.Op
-const uuidv4 = require('uuid/v4')
+const { v4: uuidv4 } = require('uuid');
+
 
 require('../models/db')
 

locales/en.js

@@ -199,6 +199,7 @@
 	"tool_scribble": "Scribble",
 	"tool_line": "Line",
 	"tool_arrow": "Arrow",
+	"tool_pan": "Pan",
 	"search_media_placeholder": "Search web media…",
 	"add_zone": "New Zone",
 	"palette": "Palette",
@@ -329,4 +330,4 @@
 	"tool_space_help_part_one": "Use the toolbar to add content.",
 	"tool_space_help_part_two": "You can also drop images or sound and video files.",
 	"tool_delete_space": "Really delete \"%s\"?"
-}
+}

public/javascripts/spacedeck_sections.js

@@ -2562,6 +2562,17 @@ var SpacedeckSections = {
       this.opened_dialog = "none";
     },
 
+    start_pan: function(evt) {
+      this.deselect();
+      if (this.active_tool == "pan") {
+        this.active_tool = "pointer";
+      } else {
+        this.active_tool = "pan";
+      }
+      this.opened_dialog = "none";
+
+    },
+
     start_drawing_scribble: function(evt) {
       this.deselect();
       if (this.active_tool == "scribble") {

public/javascripts/spacedeck_whiteboard.js

@@ -733,7 +733,7 @@ function setup_whiteboard_directives() {
         return;
       }
 
-      if (_.include(["zoom", "scribble"], $scope.active_tool)) {
+      if (_.include(["zoom", "scribble", "pan"], $scope.active_tool)) {
         // tools that stay active after use
         this.mouse_state = "idle";
         $scope.mouse_state = this.mouse_state;

routes/api/memberships.js

@@ -14,7 +14,7 @@ var router = express.Router();
 const db = require('../../models/db');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 
 router.get('/:membership_id/accept', function(req, res, next) {
   if (req.user) {

routes/api/space_artifacts.js

@@ -6,7 +6,7 @@ const os = require('os');
 const db = require('../../models/db');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 
 var payloadConverter = require('../../helpers/artifact_converter');
 var redis = require('../../helpers/redis');

routes/api/space_memberships.js

@@ -3,7 +3,7 @@ var config = require('config');
 const db = require('../../models/db');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 
 var redis = require('../../helpers/redis');
 var mailer = require('../../helpers/mailer');

routes/api/space_messages.js

@@ -3,7 +3,7 @@ var config = require('config');
 const db = require('../../models/db');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 
 var redis = require('../../helpers/redis');
 var mailer = require('../../helpers/mailer');

routes/root.js

@@ -12,7 +12,7 @@ const _ = require('underscore');
 const db = require('../models/db');
 const Sequelize = require('sequelize');
 const Op = Sequelize.Op;
-const uuidv4 = require('uuid/v4');
+const { v4: uuidv4 } = require('uuid');
 
 router.get('/', (req, res) => {
   res.render('index', { config:config, user:req.user });

views/partials/tool/toolbar-elements.html

@@ -18,6 +18,11 @@
 
     <button class="btn btn-divider"></button>
 
+    <button class="btn btn-icon-labeled btn-transparent" v-on:click="start_pan()" v-bind:class="{active:active_tool=='pan'}" title="<%=__("tool_pan")%>">
+      <span class="icon icon-move"></span>
+      <span class="icon-label"><%=__("tool_pan")%></span>
+    </button>
+
     <div class="dropdown top left light" v-bind:class="{open:opened_dialog=='shapes'}">
       <div class="btn-collapse in" title="<%=__("tool_shape")%>">
         <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='shapes'}" v-on:click="open_dialog('shapes')">