UiO-Gaming/infoscreen3
1
0 Fork 0
mirror of https://github.com/UiO-Gaming/infoscreen3.git synced 2026-11-05 13:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

update npm deps, fix for socket.io connection, new try on 1920x1080 resolution, seems to work.

Browse Source
This commit is contained in:
Reaby committed 2020-05-13 21:18:13 +03:00
1 parent 61cd2cce9b
commit 843f6320b1
18 files changed
+185 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app.js
+26 -12
View File
@@ -9,13 +9,17 @@ const EventEmitter = require('events');
let cookieParser = require('cookie-parser')(config.sessionKey);
class Dispatcher extends EventEmitter {}
class Dispatcher extends EventEmitter { }
const eventDispatcher = new Dispatcher();
let app = express();
let server = require('http').Server(app);
let io = require('socket.io')(server);
let io = require('socket.io')(server, {
cookieHttpOnly: true,
cookieSecure: false,
cookie: false
});
let i18next = require("i18next");
let FilesystemBackend = require("i18next-node-fs-backend");
let i18nextMiddleware = require("i18next-express-middleware");
@@ -38,8 +42,8 @@ passport.deserializeUser(function (id, cb) {
});
passport.use("local", new LocalStrategy({
passReqToCallback: true
},
passReqToCallback: true
},
function (req, username, password, cb) {
User.findByUsername(username, function (err, user) {
if (err) {
@@ -59,6 +63,7 @@ if (config.mediaServer) {
const NodeMediaServer = require('node-media-server');
const nodeServerConfig = {
logtype: 2,
rtmp: {
port: 1935,
chunk_size: 60000,
@@ -68,7 +73,12 @@ if (config.mediaServer) {
},
http: {
port: (parseInt(config.serverListenPort) + 1),
allow_origin: '*'
allow_origin: '*',
auth: {
api: true,
api_user: config.admins[0].username,
api_pass: config.admins[0].password
}
}
};
@@ -108,7 +118,7 @@ i18next
// optional expire and domain for set cookie
// cookieExpirationDate: new Date(),
// cookieDomain: 'myDomain',
// cookieSecure: true // if need secure cookie
cookieSecure: false // if need secure cookie
}
});
@@ -140,8 +150,12 @@ app.use(expressSession({
key: 'express.sid',
secret: config.sessionKey,
store: sessionStore,
resave: false,
saveUninitialized: true
resave: true,
saveUninitialized: true,
cookie: {
sameSite: true,
secure: false
}
}));
app.use(passport.initialize({}));
@@ -150,7 +164,7 @@ app.use(passport.session({}));
// default socket.io config
var passportSocketIo = require('passport.socketio');
/* var passportSocketIo = require('passport.socketio');
io.use(passportSocketIo.authorize({
key: 'express.sid', // the name of the cookie where express/connect stores its session_id
secret: config.sessionKey, // the session_secret to parse the cookie
@@ -161,7 +175,7 @@ io.use(passportSocketIo.authorize({
}));
function onAuthorizeFail(data, message, error, accept) {
if (message) {
if (message) {
console.log("Websocket error: " + message);
if (message === "No session found") {
message += ", logout and try login again.";
@@ -170,11 +184,11 @@ function onAuthorizeFail(data, message, error, accept) {
}
if (error) {
console.log("Websocket error: " + message);
console.log("Websocket error: " + message);
return accept(new Error(message));
}
}
*/
let pluginManager = new PluginManager(app, io, eventDispatcher);
let websocket = require("./modules/websocket")(pluginManager, io, eventDispatcher);
data/bundles/default/render/03191688-bb93-4376-a3ab-53ed790b2155.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 288 KiB

data/bundles/default/render/6a298b8c-9246-411f-b364-2d73c7e292d0.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 111 KiB

After

Width:  |  Height:  |  Size: 109 KiB

data/bundles/default/render/f0411f05-a312-44a7-82fd-778328ba390e.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 KiB

After

Width:  |  Height:  |  Size: 317 KiB

data/bundles/default/slides/03191688-bb93-4376-a3ab-53ed790b2155
+1 -1
View File
@@ -1 +1 @@
{"version":"3.6.1","objects":[{"type":"i-text","version":"3.6.1","left":505.15,"top":73,"width":268.71,"height":63.28,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Features","fontSize":56,"fontWeight":900,"fontFamily":"Arial","id":"header","styles":{}},{"type":"i-text","version":"3.6.1","left":227,"top":194.61,"width":825.13,"height":413.67,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Easy-to-use editor for slides supports\nadding text and images to slides.\n\n\n\nFinnish and English language support, \nautomatically set from browser language.\n\nSupports web content as slides with scaling\nis useful for timetables, tournament brackets...","fontSize":32,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}},{"type":"image","version":"3.6.1","left":200,"top":291.07,"width":1310,"height":141,"scaleX":0.68,"scaleY":0.68,"crossOrigin":"","src":"/images/default/toolbar.png","filters":[]}]}
{"version":"3.6.1","objects":[{"type":"i-text","version":"3.6.1","left":805.95,"top":75,"width":307.1,"height":72.32,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Features","fontSize":64,"fontWeight":900,"fontFamily":"Arial","id":"header","styles":{}},{"type":"i-text","version":"3.6.1","left":340.65,"top":202,"width":1237.69,"height":620.51,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Easy-to-use editor for slides supports\nadding text and images to slides.\n\n\n\nFinnish and English language support, \nautomatically set from browser language.\n\nSupports web content as slides with scaling\nis useful for timetables, tournament brackets...","fontSize":48,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}},{"type":"image","version":"3.6.1","left":380.39,"top":346,"width":1310,"height":141,"scaleX":0.88,"scaleY":0.88,"crossOrigin":"","src":"/images/default/toolbar.png","filters":[]}]}
data/bundles/default/slides/6a298b8c-9246-411f-b364-2d73c7e292d0
+1 -1
View File
@@ -1 +1 @@
{"version":"2.7.0","objects":[{"type":"i-text","version":"2.7.0","left":362.25,"top":128,"width":554.5,"height":63.28,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false},"text":"Language support","fontSize":56,"fontWeight":900,"fontFamily":"Arial","id":"header","styles":{}},{"type":"i-text","version":"2.7.0","left":189.79,"top":280,"width":878.06,"height":78.11,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false},"text":"Finnish and english support by default\nCan be extended by translating to new languages","fontSize":32,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}}]}
{"version":"3.6.1","objects":[{"type":"i-text","version":"3.6.1","left":642.64,"top":128,"width":633.73,"height":72.32,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Language support","fontSize":64,"fontWeight":900,"fontFamily":"Arial","id":"header","styles":{}},{"type":"i-text","version":"3.6.1","left":410.71,"top":350,"width":1097.59,"height":97.63,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Finnish and english support by default\nCan be extended by translating to new languages","fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}}]}
data/bundles/default/slides/f0411f05-a312-44a7-82fd-778328ba390e
+1 -1
View File
@@ -1 +1 @@
{"version":"2.7.0","objects":[{"type":"i-text","version":"2.7.0","left":426.4,"top":62,"width":388.97,"height":63.28,"fill":"rgb(251, 251, 251)","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false},"text":"InfoScreen 3","fontSize":56,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"header","styles":{"0":{"11":{"fill":"rgb(25, 152, 55)"}}}},{"type":"i-text","version":"2.7.0","left":579.49,"top":113,"width":235.7,"height":36.16,"fill":"rgb(250, 250, 250)","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false},"text":"for lanparties","fontSize":32,"fontWeight":900,"fontFamily":"Arial","id":"normal","styles":{}},{"type":"i-text","version":"2.7.0","left":59,"top":200,"width":1141.39,"height":329.78,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false},"text":"Can display easily slides from browser\nyou just need network connection, laptop with a browser\n\nOutput resolution does not matter, all contents are automatically\n scaled from full hd or half-hd as source material\n\nSupports multiple client-displays, by default you have 3 screens:\nbigscreen, sidescreen and kiosk","fontSize":32,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}}]}
{"version":"3.6.1","objects":[{"type":"i-text","version":"3.6.1","left":709.45,"top":112,"width":500.1,"height":81.36,"fill":"rgb(251, 251, 251)","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"InfoScreen 3","fontSize":72,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"header","styles":{"0":{"11":{"fill":"rgb(22, 167, 56)"}}}},{"type":"i-text","version":"3.6.1","left":960,"top":180,"width":294.63,"height":45.2,"fill":"rgb(250, 250, 250)","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"for lanparties","fontWeight":900,"fontFamily":"Arial","id":"normal","styles":{}},{"type":"i-text","version":"3.6.1","left":174.79,"top":300,"width":1569.41,"height":453.45,"fill":"#fff","stroke":"","shadow":{"color":"rgba(0,0,0,0.6)","blur":5,"offsetX":2,"offsetY":2,"affectStroke":false,"nonScaling":false},"text":"Can display easily slides from browser\nyou just need network connection, laptop with a browser\n\nOutput resolution does not matter, all contents are automatically\n scaled from full hd or half-hd as source material\n\nSupports multiple client-displays, by default you have 3 screens:\nbigscreen, sidescreen and kiosk","fontSize":44,"fontWeight":900,"fontFamily":"Arial","textAlign":"center","id":"normal","styles":{}}]}
package-lock.json
Generated
+108 -71
View File
@@ -1,6 +1,6 @@
{
"name": "infoscreen3",
"version": "1.1.0",
"version": "1.2.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -50,6 +50,7 @@
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
"integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
"optional": true,
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -141,6 +142,7 @@
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"optional": true,
"requires": {
"safer-buffer": "~2.1.0"
}
@@ -148,7 +150,8 @@
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"optional": true
},
"async-limiter": {
"version": "1.0.0",
@@ -158,17 +161,20 @@
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"optional": true
},
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
"optional": true
},
"aws4": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
"optional": true
},
"backo2": {
"version": "1.0.2",
@@ -214,6 +220,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"optional": true,
"requires": {
"tweetnacl": "^0.14.3"
}
@@ -316,7 +323,8 @@
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"optional": true
},
"chalk": {
"version": "2.4.2",
@@ -360,6 +368,7 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"optional": true,
"requires": {
"delayed-stream": "~1.0.0"
}
@@ -476,6 +485,7 @@
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"optional": true,
"requires": {
"assert-plus": "^1.0.0"
}
@@ -501,7 +511,8 @@
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"optional": true
},
"delegates": {
"version": "1.0.0",
@@ -536,6 +547,7 @@
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"optional": true,
"requires": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
@@ -748,9 +760,9 @@
}
},
"express-session": {
"version": "1.17.0",
"resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.0.tgz",
"integrity": "sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg==",
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz",
"integrity": "sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==",
"requires": {
"cookie": "0.4.0",
"cookie-signature": "1.0.6",
@@ -787,22 +799,26 @@
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
"optional": true
},
"extsprintf": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
"optional": true
},
"fast-deep-equal": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
"optional": true
},
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
"optional": true
},
"finalhandler": {
"version": "1.1.2",
@@ -833,12 +849,14 @@
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"optional": true
},
"form-data": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"optional": true,
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
@@ -892,6 +910,7 @@
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"optional": true,
"requires": {
"assert-plus": "^1.0.0"
}
@@ -910,20 +929,22 @@
}
},
"graceful-fs": {
"version": "4.1.15",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
"integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
"optional": true
},
"har-schema": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
"optional": true
},
"har-validator": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
"optional": true,
"requires": {
"ajv": "^6.5.5",
"har-schema": "^2.0.0"
@@ -982,6 +1003,7 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"optional": true,
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@@ -1080,7 +1102,8 @@
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"optional": true
},
"isarray": {
"version": "0.0.1",
@@ -1090,7 +1113,8 @@
"isstream": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"optional": true
},
"js-yaml": {
"version": "3.13.1",
@@ -1104,22 +1128,26 @@
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"optional": true
},
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
"optional": true
},
"json-schema-traverse": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
"optional": true
},
"json-stringify-safe": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"optional": true
},
"json5": {
"version": "2.0.0",
@@ -1133,6 +1161,7 @@
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
"optional": true,
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
@@ -1197,20 +1226,22 @@
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
},
"mime": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
"integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
"optional": true
},
"mime-db": {
"version": "1.36.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
"integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
"optional": true
},
"mime-types": {
"version": "2.1.20",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"optional": true,
"requires": {
"mime-db": "~1.36.0"
}
@@ -1246,18 +1277,11 @@
}
},
"mkdirp": {
"version": "0.5.1",
"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
"requires": {
"minimist": "0.0.8"
},
"dependencies": {
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
}
"minimist": "^1.2.5"
}
},
"morgan": {
@@ -1278,14 +1302,14 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"nan": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
"version": "2.14.1",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
"integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
},
"needle": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.3.2.tgz",
"integrity": "sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==",
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz",
"integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==",
"requires": {
"debug": "^3.2.6",
"iconv-lite": "^0.4.4",
@@ -1318,9 +1342,9 @@
"integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="
},
"node-media-server": {
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/node-media-server/-/node-media-server-2.1.6.tgz",
"integrity": "sha512-hnmQI7nJmtO4iO41RrcZ1mZhkqSmo96lkYLPpMtWaWZ0zKsGd4SXTzV9ukStOW6/52v4XHvqxYRqQKxf9+O2vg==",
"version": "2.1.8",
"resolved": "https://registry.npmjs.org/node-media-server/-/node-media-server-2.1.8.tgz",
"integrity": "sha512-fWABN8opPf9pcIRPOGFnL7ET0l+Tu+Xk/FQqeSIcUopjHfHsQ+/JONotqlnMBdIQmbeOeAJligjdk1i9nTkZwA==",
"requires": {
"basic-auth-connect": "^1.0.0",
"chalk": "^2.4.2",
@@ -1373,9 +1397,9 @@
}
},
"nopt": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
@@ -1423,7 +1447,8 @@
"oauth-sign": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
"optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -1544,7 +1569,8 @@
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"optional": true
},
"process-nextick-args": {
"version": "2.0.1",
@@ -1578,17 +1604,20 @@
"psl": {
"version": "1.1.31",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
"integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
"integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
"optional": true
},
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
"optional": true
},
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
"optional": true
},
"random-bytes": {
"version": "1.0.0",
@@ -1601,9 +1630,9 @@
"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
},
"rate-limiter-flexible": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.1.3.tgz",
"integrity": "sha512-xpUP6qDd4QTgg61D/OBekrpQralUJnfSfYweS/Msmz1d3qpg+XThOvLjgpY+7NgoakMk9mBlNdJlSmP/sXBS5Q=="
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.1.4.tgz",
"integrity": "sha512-wtbWcqZbCqyAO1k63moagJlCZuPCEqbJJ6il1y2JVoiUyxlE36+cM7ETta9K6tTom9O5pNK+CxwHMgyyyJ31Gg=="
},
"raw-body": {
"version": "2.4.0",
@@ -1671,6 +1700,7 @@
"version": "2.88.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
"optional": true,
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
@@ -1803,9 +1833,9 @@
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
},
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
},
"socket.io": {
"version": "2.3.0",
@@ -1948,19 +1978,19 @@
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"sqlite3": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz",
"integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz",
"integrity": "sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg==",
"requires": {
"nan": "^2.12.1",
"node-pre-gyp": "^0.11.0",
"request": "^2.87.0"
"node-pre-gyp": "^0.11.0"
}
},
"sshpk": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
"optional": true,
"requires": {
"asn1": "~0.2.3",
"assert-plus": "^1.0.0",
@@ -2047,6 +2077,7 @@
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
"optional": true,
"requires": {
"psl": "^1.1.24",
"punycode": "^1.4.1"
@@ -2055,7 +2086,8 @@
"punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"optional": true
}
}
},
@@ -2063,6 +2095,7 @@
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"optional": true,
"requires": {
"safe-buffer": "^5.0.1"
}
@@ -2070,7 +2103,8 @@
"tweetnacl": {
"version": "0.14.5",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
"optional": true
},
"twig": {
"version": "0.10.3",
@@ -2123,6 +2157,7 @@
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"optional": true,
"requires": {
"punycode": "^2.1.0"
}
@@ -2148,7 +2183,8 @@
"uuid": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
"optional": true
},
"vary": {
"version": "1.1.2",
@@ -2159,6 +2195,7 @@
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"optional": true,
"requires": {
"assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
package.json
+5 -5
View File
@@ -16,22 +16,22 @@
"cors": "^2.8.5",
"debug": "~2.6.9",
"express": "^4.17.1",
"express-session": "^1.17.0",
"express-session": "^1.17.1",
"http-errors": "~1.6.2",
"i18next": "^15.1.3",
"i18next-express-middleware": "^1.9.1",
"i18next-node-fs-backend": "^2.1.3",
"less-middleware": "^3.1.0",
"morgan": "~1.9.1",
"minimist": ">=1.2.2",
"node-media-server": "^2.1.6",
"morgan": "~1.9.1",
"node-media-server": "^2.1.8",
"node.extend": ">=2.0.1",
"passport": "^0.4.1",
"passport-local": "^1.0.0",
"passport.socketio": "^3.7.0",
"rate-limiter-flexible": "^2.1.3",
"rate-limiter-flexible": "^2.1.4",
"socket.io": "^2.3.0",
"sqlite3": "^4.1.1",
"sqlite3": "^4.2.0",
"twig": "~0.10.3",
"utf-8-validate": "^5.0.2"
}
public/js/display.js
+10 -7
View File
@@ -416,6 +416,8 @@ function reloadImage(data) {
var found = false;
for (var i in window.f.images) {
if (window.f.images[i].id === data.uuid) {
image.id = imageId;
window.f.images[i] = image;
window.f.imageData[i] = imageData;
found = true;
}
@@ -463,7 +465,7 @@ function checkImages(allSlides) {
getDataUri("/render/" + serverOptions.currentBundle + "/" + allIds[i] + ".png", allIds[i], function (imageId, imageData, image) {
image.id = imageId;
window.f.images.push(image);
window.f.imageData.push(imageData);
// window.f.imageData.push(imageData);
});
return true;
}
@@ -519,12 +521,13 @@ function clearIFrame(id) {
function getDataUri(url, imageId, callback) {
var image = new Image();
image.onload = function () {
var canvas = document.createElement('canvas');
canvas.width = this.naturalWidth; // or 'width' if you want a special/scaled size
canvas.height = this.naturalHeight; // or 'height' if you want a special/scaled size
canvas.getContext('2d').drawImage(this, 0, 0);
callback(imageId, canvas.toDataURL('image/png'), {src: url});
canvas = null;
// let canvas = document.createElement('canvas');
// canvas.width = 1920; // or 'width' if you want a special/scaled size
// canvas.height = 1080; // or 'height' if you want a special/scaled size
// canvas.getContext('2d').drawImage(this, 0, 0);
//callback(imageId, canvas.toDataURL('image/png'), this);
callback(imageId, null, this);
// canvas = null;
};
image.src = url;
}
public/js/edit.js
+11 -9
View File
@@ -1,7 +1,7 @@
var canvas;
var bundleData;
var grid = 1280 / 32;
var grid = 1920 / 32;
var _clipboard = null;
var slideName = "untitled";
@@ -194,7 +194,7 @@ function undo() {
if (bundleData.styleHeader.fontSize !== fontSize) {
object.setOptions({fontSize: fontSize});
}
if (bundleData.styleHeader.fill !== "") {
if (bundleData.styleHeader.stroke !== "") {
object.setShadow({color: "rgba(0,0,0,0.6)", blur: 5, offsetX: 2, offsetY: 2});
}
} else {
@@ -202,7 +202,7 @@ function undo() {
if (bundleData.styleText.fontSize !== fontSize) {
object.setOptions({fontSize: fontSize});
}
if (bundleData.styleText.fill !== "") {
if (bundleData.styleText.stroke !== "") {
object.setShadow({color: "rgba(0,0,0,0.6)", blur: 5, offsetX: 2, offsetY: 2});
}
}
@@ -419,20 +419,22 @@ function parseUrl(url) {
}
function drawGrid() {
var w = 1280 / 32 / 8;
var w = 1920 / 32 / 8;
// Grid display part
for (var i = 1; i <= (1280 / grid); i++) {
canvas.add(new fabric.Line([i * grid, 0, i * grid, 1280], {
for (var i = 1; i <= (1920 / grid); i++) {
canvas.add(new fabric.Line([i * grid, 0, i * grid, 1920], {
stroke: '#ccc',
strokeDashArray: [w, w],
strokeWidth: 2,
opacity: 0.5,
selectable: false,
zIndex: -1
}));
canvas.add(new fabric.Line([0, i * grid, 1280, i * grid], {
canvas.add(new fabric.Line([0, i * grid, 1920, i * grid], {
stroke: '#ccc',
strokeDashArray: [w, w],
strokeWidth: 2,
opacity: 0.5,
selectable: false,
zIndex: -1
@@ -785,8 +787,8 @@ function saveAsFullScreenImage(name = "untitled", imageData) {
objects: [{
type: "image",
version: "2.6.0",
width: 1280,
height: 720,
width: 1920,
height: 1080,
crossOrigin: "",
src: dataurl,
filters: []
public/js/flux.js
+8 -7
View File
@@ -72,7 +72,7 @@ window.flux = {
this.options.transitions = newTrans;
this.images = [];
this["imageData"] = [];
this.imageData = [];
this.imageLoadedCount = 0;
this.currentImageIndex = 0;
this.nextImageIndex = 1;
@@ -386,9 +386,10 @@ window.flux = {
},
setupImages: function () {
var img1 = this.getImageData(this.currentImageIndex);
var img1 = this.getImage(this.currentImageIndex);
css1 = {
'background-image': 'url("' + img1.replace(/(\r\n|\n|\r)/gm, "") + '")',
// 'background-image': 'url("' + img1.replace(/(\r\n|\n|\r)/gm, "") + '")',
'background-image': 'url("' + img1.src + '")',
'z-index': 101,
'cursor': 'auto',
'background-repeat': 'no-repeat',
@@ -396,9 +397,9 @@ window.flux = {
};
this.image1.css(css1).children().remove();
var img2 = this.getImageData(this.nextImageIndex);
var img2 = this.getImage(this.nextImageIndex);
this.image2.css({
'background-image': 'url("' + img2.replace(/(\r\n|\n|\r)/gm, "") + '")',
'background-image': 'url("' + img2.src + '")',
'z-index': 100,
'background-repeat': 'no-repeat',
'background-size': this.options.width + "px " + this.options.height + "px",
@@ -725,7 +726,7 @@ window.flux = {
rowRemainder = imgHeight - (this.options.rows * rowHeight),
rowAddPerLoop = Math.floor(rowRemainder / this.options.rows),
delayBetweenBars = 150,
delayBetweenBars = 300,
height = this.slider.options.height;
totalLeft = 0,
totalTop = 0,
@@ -802,7 +803,7 @@ window.flux = {
return new flux.transition_grid(fluxslider, $.extend({
columns: 10,
rows: 1,
delayBetweenBars: 40,
delayBetweenBars: 80,
renderTile: function (elem, colIndex, rowIndex, colWidth, rowHeight, leftOffset, topOffset) {
$(elem).css({
'background-image': this.slider.image1.css('background-image'),
public/js/preview.js
+1 -1
View File
@@ -138,7 +138,7 @@ function fixCanvas() {
width = con.innerWidth(),
height = Math.floor(width * aspect);
canvas.setWidth(1280).setHeight(720);
canvas.setWidth(1920).setHeight(1080);
$("#c").css("width", width + "px").css("height", height + "px");
canvas.calcOffset();
}
views/admin/dashboard.twig
+1 -1
View File
@@ -203,7 +203,7 @@
</template>
<script>
var socket = io.connect("{{ config.serverUrl }}:{{ config.serverListenPort }}/admin-{{ displayId }}");
var socket = io("{{ config.serverUrl }}:{{ config.serverListenPort }}/admin-{{ displayId }}");
var displayId = {{ displayId }};
</script>
<script src="/js/dashboard.js"></script>
views/admin/editSlide.twig
+10 -4
View File
@@ -21,6 +21,12 @@
text-rendering: geometricPrecision;
font-smooth: always;
}
#matchsize {
transform-origin: top left;
scale: 0.5;
}
</style>
{% endblock %}
@@ -189,7 +195,7 @@
<div style="margin:0; padding:0;">
<div id="matchsize">
<canvas id="edit" width="1280" height="720" style="position: fixed; z-index:10;"></canvas>
<canvas id="edit" width="1920" height="1080" style="position: fixed; z-index:10;"></canvas>
<div id="bg">
<img id="bgimg" class="fsimage" src="" />
</div>
@@ -234,7 +240,7 @@
</div>
</div>
<canvas id="tempCanvas" width="1280" height="720" style="display: none"></canvas>
<canvas id="tempCanvas" width="1920" height="1080" style="display: none"></canvas>
<script>
var socket = io.connect("{{ config.serverUrl }}:{{ config.serverListenPort }}/admin-" + displayId);
@@ -283,8 +289,8 @@
var src = e.target.result;
var tempCanvas = new fabric.StaticCanvas("tempCanvas", {
width: 1280,
height: 720
width: 1920,
height: 1080
});
tempCanvas.backgroundColor = null;
tempCanvas.backgroundImage = null;
views/display.twig
+1 -2
View File
@@ -14,7 +14,6 @@
{% block body %}
<div id="blackoutLayer" class="animated"></div>
{{ extra }}
<div id="time" class="noselect animated">00:00</div>
@@ -42,7 +41,7 @@
<video loop autoplay id="bgvid" class="fsimage" poster=""></video>
<script>
var socket = io.connect("{{ config.serverUrl }}:{{ config.serverListenPort }}/display-{{ displayId }}");
var socket = io("{{ config.serverUrl }}:{{ config.serverListenPort }}/display-{{ displayId }}");
var videoVolume = {{ videoVolume }};
var isPreview = {{ isPreview }};
</script>
views/layout/edit.twig
-1
View File
@@ -2,7 +2,6 @@
<html lang="">
<head>
<title>InfoScreen3 - Admin</title>
{% include "assets.twig" %}
<script src="/js/filereader.js"></script>
{% block header %}{% endblock %}
views/preview.twig
+1 -1
View File
@@ -11,7 +11,7 @@
{% block body %}
<canvas id="c" width="1280" height="720" style="position: fixed; z-index: 3;"></canvas>
<canvas id="c" width="1920" height="1080" style="position: fixed; z-index: 3;"></canvas>
<div id="bg" style="display: none;">
<img id="bgimg" class="fsimage" src="" />