feat: move to node v16 and adding a pan tool

pull/262/head
PurpleBabar 2023-09-20 18:27:34 +02:00
parent d5cd829834
commit cf8902f3c5
15 changed files with 13814 additions and 1019 deletions

View File

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

View File

@ -199,6 +199,7 @@
"tool_scribble": "Scribble", "tool_scribble": "Scribble",
"tool_line": "Line", "tool_line": "Line",
"tool_arrow": "Arrow", "tool_arrow": "Arrow",
"tool_pan": "Pan",
"search_media_placeholder": "Search web media…", "search_media_placeholder": "Search web media…",
"add_zone": "New Zone", "add_zone": "New Zone",
"palette": "Palette", "palette": "Palette",

9856
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,47 +11,47 @@
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
"dependencies": { "dependencies": {
"archiver": "1.3.0", "archiver": "5.3.1",
"async": "2.3.0", "async": "3.2.4",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"cheerio": "0.22.0", "cheerio": "1.0.0-rc.12",
"config": "1.25.1", "config": "3.3.9",
"cookie-parser": "~1.4.3", "cookie-parser": "~1.4.3",
"ejs": "3.1.5", "ejs": "3.1.9",
"execSync": "latest", "execSync": "latest",
"express": "^4.16.4", "express": "^4.16.4",
"file-type": "^7.6.0", "file-type": "^16.5.0",
"glob": "7.1.1", "glob": "10.3.3",
"gm": "^1.23.1", "gm": "^1.23.1",
"helmet": "^3.5.0", "helmet": "^7.0.0",
"i18n-2": "0.6.3", "i18n-2": "0.7.3",
"log-timestamp": "latest", "log-timestamp": "latest",
"mock-aws-s3": "^4.0.2", "mock-aws-s3": "^4.0.2",
"moment": "^2.19.3", "moment": "^2.19.3",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"nodemailer": "^6.6.0", "nodemailer": "^6.6.0",
"puppeteer": "8.0.0", "puppeteer": "^18",
"read-chunk": "^2.1.0", "read-chunk": "^3",
"request": "^2.88.0", "request": "^2.88.0",
"sanitize-html": "^2.3.3", "sanitize-html": "^2.3.3",
"sequelize": "^4.37.6", "sequelize": "^4",
"serve-favicon": "~2.4.2", "serve-favicon": "~2.5.0",
"serve-static": "^1.13.1", "serve-static": "^1.13.1",
"slug": "^1.1.0", "slug": "^8.2.2",
"sqlite3": "^4.2.0", "sqlite3": "5.*",
"umzug": "^2.1.0", "umzug": "^2",
"underscore": "^1.13.1", "underscore": "^1.13.1",
"uuid": "^3.2.1", "uuid": "^9.0.0",
"validator": "7.0.0", "validator": "13.9.0",
"ws": "5.2.3" "ws": "8.13.0"
}, },
"devDependencies": { "devDependencies": {
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0", "gulp-clean-css": "^4.3.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-sass": "^4.0.2", "gulp-sass": "^5",
"nodemon": "^2.0.6" "nodemon": "^3.0.1"
}, },
"main": "app.js", "main": "app.js",
"description": "", "description": "",

View File

@ -2562,6 +2562,17 @@ var SpacedeckSections = {
this.opened_dialog = "none"; 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) { start_drawing_scribble: function(evt) {
this.deselect(); this.deselect();
if (this.active_tool == "scribble") { if (this.active_tool == "scribble") {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,7 +2,8 @@
var config = require('config'); var config = require('config');
const db = require('../../models/db'); const db = require('../../models/db');
const uuidv4 = require('uuid/v4'); const { v4: uuidv4 } = require('uuid');
const os = require('os'); const os = require('os');
var mailer = require('../../helpers/mailer'); var mailer = require('../../helpers/mailer');

View File

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

View File

@ -18,6 +18,11 @@
<button class="btn btn-divider"></button> <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="dropdown top left light" v-bind:class="{open:opened_dialog=='shapes'}">
<div class="btn-collapse in" title="<%=__("tool_shape")%>"> <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')"> <button class="btn btn-transparent btn-icon-labeled" v-bind:class="{open:opened_dialog=='shapes'}" v-on:click="open_dialog('shapes')">

4890
yarn.lock 100644

File diff suppressed because it is too large Load Diff