WebDev
/
VersaWhiteboard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(front): use uuid for random ids

This commit is contained in:
Florent Chehab 2020-05-12 20:01:57 +02:00
parent 0be0baf655
commit 25bcdee083
No known key found for this signature in database
GPG Key ID: 9A0CE018889EA246
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
package-lock.json generated
View File

@ -7683,6 +7683,12 @@
"psl": "^1.1.28", "psl": "^1.1.28",
"punycode": "^2.1.1" "punycode": "^2.1.1"
} }
},
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true
} }
} }
}, },
@ -11249,6 +11255,11 @@
"psl": "^1.1.24", "psl": "^1.1.24",
"punycode": "^1.4.1" "punycode": "^1.4.1"
} }
},
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
} }
} }
}, },
@ -12794,9 +12805,9 @@
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
}, },
"uuid": { "uuid": {
"version": "3.3.2", "version": "8.1.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
}, },
"uws": { "uws": {
"version": "0.14.5", "version": "0.14.5",
@ -13604,6 +13615,14 @@
"requires": { "requires": {
"ansi-colors": "^3.0.0", "ansi-colors": "^3.0.0",
"uuid": "^3.3.2" "uuid": "^3.3.2"
},
"dependencies": {
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true
}
} }
}, },
"webpack-merge": { "webpack-merge": {

3
package.json
View File

@ -33,12 +33,13 @@
"express": "4.*", "express": "4.*",
"formidable": "1.*", "formidable": "1.*",
"fs-extra": "7.*", "fs-extra": "7.*",
"jquery-ui-rotatable": "^1.1.0",
"html2canvas": "^1.0.0-rc.5", "html2canvas": "^1.0.0-rc.5",
"jquery-ui-rotatable": "^1.1.0",
"js-yaml": "3.13.1", "js-yaml": "3.13.1",
"jsdom": "^14.0.0", "jsdom": "^14.0.0",
"pdfjs-dist": "^2.3.200", "pdfjs-dist": "^2.3.200",
"socket.io": "2.*", "socket.io": "2.*",
"uuid": "^8.1.0",
"webdav": "^2.8.0" "webdav": "^2.8.0"
}, },
"devDependencies": { "devDependencies": {

7
src/js/main.js
View File

@ -10,16 +10,15 @@ import ReadOnlyService from "./services/ReadOnlyService";
import InfoService from "./services/InfoService"; import InfoService from "./services/InfoService";
import { getQueryVariable, getSubDir } from "./utils"; import { getQueryVariable, getSubDir } from "./utils";
import ConfigService from "./services/ConfigService"; import ConfigService from "./services/ConfigService";
import { v4 as uuidv4 } from "uuid";
let whiteboardId = getQueryVariable("whiteboardid"); let whiteboardId = getQueryVariable("whiteboardid");
const randomid = getQueryVariable("randomid"); const randomid = getQueryVariable("randomid");
if (randomid && !whiteboardId) { if (randomid && !whiteboardId) {
//set random whiteboard on empty whiteboardid //set random whiteboard on empty whiteboardid
whiteboardId = Array(2) whiteboardId = uuidv4();
.fill(null)
.map(() => Math.random().toString(36).substr(2))
.join("");
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
urlParams.delete("randomid");
urlParams.set("whiteboardid", whiteboardId); urlParams.set("whiteboardid", whiteboardId);
window.location.search = urlParams; window.location.search = urlParams;
} }