Browse Source

Merge branch 'develop'

master
Carmine De Rosa 7 years ago
parent
commit
068468b266
  1. 1
      images/lock.svg
  2. 1
      images/unlock.svg
  3. 1
      js/scripts.js
  4. 1
      messages.php
  5. 18
      package-lock.json
  6. 1
      package.json
  7. 2
      sessions.php
  8. 1
      socket/index.js
  9. 5
      socket/package-lock.json
  10. 1
      socket/package.json
  11. 2
      socket/public/NoSleep.min.js
  12. 20
      socket/public/css/styles.css
  13. 3
      socket/public/device.html
  14. 52
      socket/public/device.js
  15. 52
      socket/public/images/lock.svg
  16. 52
      socket/public/images/unlock.svg
  17. 28
      socket/public/pushMessage.html
  18. 33
      socket/public/pushMessage.js
  19. 18
      socket/public/scss/main.scss
  20. 26
      socket/public/setMessage.js

1
images/lock.svg

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z"/></svg>

After

Width:  |  Height:  |  Size: 292 B

1
images/unlock.svg

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M400 256H152V152.9c0-39.6 31.7-72.5 71.3-72.9 40-.4 72.7 32.1 72.7 72v16c0 13.3 10.7 24 24 24h32c13.3 0 24-10.7 24-24v-16C376 68 307.5-.3 223.5 0 139.5.3 72 69.5 72 153.5V256H48c-26.5 0-48 21.5-48 48v160c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z"/></svg>

After

Width:  |  Height:  |  Size: 355 B

1
js/scripts.js

@ -28,7 +28,6 @@ $(document).ready(function(){
dateFormat: "Y-m-d H:i:ss",
});
});

1
messages.php

@ -29,6 +29,7 @@
<div class="col-1 font-12 text-center"><?= $r['progress'];?></div>
<div class="col-1 text-right">
<a href="/cb_message_edit.php?id=<?= $r['id'];?>" class="cbOpen text-black"><i class="fa fa-pencil-square ml-2"></i></a>
<a href="<?= $BASE_URL.":3001/pushMessage.html?mid=".$r['id'];?>" class="cbOpenSmall text-black"><i class="fa fa-comment ml-2"></i></a>
<a href="/cb_message_delete.php?id=<?= $r['id'];?>" class="cbOpenSmall text-black"><i class="fa fa-times-circle ml-2"></i></a>
</div>
</div>

18
package-lock.json

@ -4,19 +4,6 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@fortawesome/fontawesome": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome/-/fontawesome-1.1.5.tgz",
"integrity": "sha512-WAgbcVs7/YTxq7RK/dhyoJPzaIZpOQnStyO5s1sj0rZa0J1ScXYoGPmsP1ec6qM/BhDjRVB228xr2DiCPTHRCA==",
"requires": {
"@fortawesome/fontawesome-common-types": "0.1.3"
}
},
"@fortawesome/fontawesome-common-types": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.3.tgz",
"integrity": "sha512-jJXUoNkmHozqlcXzNiYytcmEe3eNxn7Vh8hmnIoRi0TmT3ChQ0osuSApuIObIomnIcvqlA24FCpnamKvfZ7F5g=="
},
"bootstrap": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz",
@ -45,6 +32,11 @@
"jquery": "3.3.1"
}
},
"nosleep.js": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.7.0.tgz",
"integrity": "sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok="
},
"popper.js": {
"version": "1.12.9",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz",

1
package.json

@ -9,6 +9,7 @@
"font-awesome": "^4.7.0",
"jquery": "^3.3.1",
"jquery-colorbox": "^1.6.4",
"nosleep.js": "^0.7.0",
"popper.js": "^1.12.9",
"tinymce": "^4.7.9"
},

2
sessions.php

@ -36,7 +36,7 @@
<?= $r['enabled'] ? "<i class=\"fa fa-play text-green\"></i>" : "<i class=\"fa fa-pause text-grey\"></i>";?>
</a>
<a href="/cb_session_edit.php?id=<?= $r['id'];?>" class="cbOpen text-black"><i class="fa fa-pencil-square ml-2"></i></a>
<a href="<?= $BASE_URL.":3001/setMessage.html?sid=".$r['id'];?>" class="cbOpen text-black"><i class="fa fa-comment ml-2"></i></a>
<a href="<?= $BASE_URL.":3001/setMessage.html?sid=".$r['link'];?>" class="cbOpen text-black"><i class="fa fa-comment ml-2"></i></a>
<a href="/cb_session_delete.php?id=<?= $r['id'];?>" class="cbOpenSmall text-black"><i class="fa fa-times-circle ml-2"></i></a>
</div>
</div>

1
socket/index.js

@ -8,6 +8,7 @@ app.use(express.static(__dirname + '/public'));
function onConnection(socket){
socket.on('message', (data) => socket.broadcast.emit('message', data));
socket.on('pushMessage', (data) => socket.broadcast.emit('pushMessage', data));
}
io.on('connection', onConnection);

5
socket/package-lock.json

@ -627,6 +627,11 @@
"is-stream": "1.1.0"
}
},
"nosleep.js": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.7.0.tgz",
"integrity": "sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok="
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

1
socket/package.json

@ -11,6 +11,7 @@
"font-awesome": "latest",
"jquery": "^3.3.1",
"ms": "github:zeit/ms",
"nosleep.js": "^0.7.0",
"pillarjs": "latest",
"send": "github:pillarjs/send",
"socket.io": "latest",

2
socket/public/NoSleep.min.js

File diff suppressed because one or more lines are too long

20
socket/public/css/styles.css

@ -4213,8 +4213,26 @@ a:hover {
transform: translateY(-50%);
-webkit-transform: translateY(-50%);
}
/* line 178, main.scss */
.header .lock-toggle {
border: none;
padding: 0;
margin: 0;
background: none;
height: 40px;
width: 40px;
position: absolute;
right: 20px;
top: 50%;
transform: translateY(-50%);
-webkit-transform: translateY(-50%);
}
/* line 191, main.scss */
.header .lock-toggle img {
width: 50%;
}
/* line 180, main.scss */
/* line 198, main.scss */
.iframeGET {
display: none;
}

3
socket/public/device.html

@ -11,6 +11,7 @@
<div class="header">
<img class="menu" src="/images/menu.png">
<img class="logo" src="/images/logo.png">
<button class="lock-toggle"><img src="/images/unlock.svg"></button>
</div>
<div class="content">
@ -22,6 +23,8 @@
<script src="https://code.jquery.com/jquery-latest.min.js"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/NoSleep.min.js"></script>
<script src="/device.js"></script>
</body>
</html>

52
socket/public/device.js

File diff suppressed because one or more lines are too long

52
socket/public/images/lock.svg

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 448 512"
version="1.1"
id="svg4"
sodipodi:docname="lock.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="717"
id="namedview6"
showgrid="false"
inkscape:zoom="0.4609375"
inkscape:cx="-84.067797"
inkscape:cy="338.44068"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1"
inkscape:current-layer="svg4" />
<path
d="M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z"
id="path2"
style="fill:#ffffff;fill-opacity:0.29583332" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

52
socket/public/images/unlock.svg

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 448 512"
version="1.1"
id="svg14"
sodipodi:docname="unlock.svg"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata20">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs18" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="717"
id="namedview16"
showgrid="false"
inkscape:zoom="0.4609375"
inkscape:cx="-84.067797"
inkscape:cy="338.44068"
inkscape:window-x="0"
inkscape:window-y="22"
inkscape:window-maximized="1"
inkscape:current-layer="svg14" />
<path
d="M400 256H152V152.9c0-39.6 31.7-72.5 71.3-72.9 40-.4 72.7 32.1 72.7 72v16c0 13.3 10.7 24 24 24h32c13.3 0 24-10.7 24-24v-16C376 68 307.5-.3 223.5 0 139.5.3 72 69.5 72 153.5V256H48c-26.5 0-48 21.5-48 48v160c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V304c0-26.5-21.5-48-48-48z"
id="path12"
style="opacity:0.5;fill:#ffffff;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

28
socket/public/pushMessage.html

@ -0,0 +1,28 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>COZe</title>
<link href="/css/styles.css" rel="stylesheet" type="text/css"/>
<link href="/css/stylesGlobal.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<div id="MainContent" class="container">
<form method="post" enctype="multipart/form-data" class="send_message_form">
<div class="row">
<div class="col-12 text-center p-4">
<span class="font-20">Do you want to send this message to the whole session?</span>
</div>
<div class="col-12 text-center p4 px-0">
<button type="submit" class="button big full confirm mx-0">Send message</button>
</div>
</div>
</form>
</div>
<script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="/pushMessage.js"></script>
</body>
</html>

33
socket/public/pushMessage.js

@ -0,0 +1,33 @@
$(document).ready(()=>{
var socket = io();
var baseUrl = 'http://' + window.location.hostname;
var urlString = window.location.href;
var mid = getParameterByName("mid", urlString);
var form = $('.send_message_form');
form.on('submit', function(e){
e.preventDefault();
var title = form.find('.title').val();
//var mid = form.find('.mid').val();
socket.emit('pushMessage', mid);
parent.postMessage("cbClose", baseUrl);
});
function getParameterByName(name, url) {
if (!url) url = window.location.href;
name = name.replace(/[\[\]]/g, "\\$&");
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, " "));
}
});

18
socket/public/scss/main.scss

@ -174,6 +174,24 @@ a{
transform: translateY(-50%);
-webkit-transform: translateY(-50%);
}
.lock-toggle{
border: none;
padding: 0;
margin: 0;
background: none;
height: 40px;
width: 40px;
position: absolute;
right: 20px;
top: 50%;
transform: translateY(-50%);
-webkit-transform: translateY(-50%);
img {
width: 50%;
}
}
}

26
socket/public/setMessage.js

@ -1,7 +1,9 @@
$(document).ready(()=>{
const socket = io();
const baseUrl = 'http://' + window.location.hostname;
var socket = io();
var baseUrl = 'http://' + window.location.hostname;
var urlString = window.location.href;
var sid = getParameterByName("sid", urlString);
tinymce.init({
selector: '.mce',
@ -21,19 +23,20 @@ $(document).ready(()=>{
]
});
const form = $('.send_message_form');
var form = $('.send_message_form');
form.on('submit', function(e){
e.preventDefault();
const title = form.find('.title').val();
const text = form.find('.text').val().split('%break%');
var title = form.find('.title').val();
var text = form.find('.text').val().split('%break%');
const fullMessage = {
var fullMessage = {
'title': title,
'short_text': text[0],
'long_text': text[1],
'image': '',
'sid': sid,
};
socket.emit('message', fullMessage);
@ -41,5 +44,16 @@ $(document).ready(()=>{
});
function getParameterByName(name, url) {
if (!url) url = window.location.href;
name = name.replace(/[\[\]]/g, "\\$&");
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
results = regex.exec(url);
if (!results) return null;
if (!results[2]) return '';
return decodeURIComponent(results[2].replace(/\+/g, " "));
}
});

Loading…
Cancel
Save