dslak
/
coze_training
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add pushMessage

develop
Carmine De Rosa 7 years ago
parent
4bb3ef16d0
commit
b887794b7a
7 changed files with 111 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      messages.php
  2. 2
      sessions.php
  3. 1
      socket/index.js
  4. 34
      socket/public/device.js
  5. 28
      socket/public/pushMessage.html
  6. 33
      socket/public/pushMessage.js
  7. 26
      socket/public/setMessage.js

1
messages.php
View File

@ -29,6 +29,7 @@
<div class="col-1 font-12 text-center"><?= $r['progress'];?></div> <div class="col-1 font-12 text-center"><?= $r['progress'];?></div>
<div class="col-1 text-right"> <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="/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> <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>
</div> </div>

2
sessions.php
View File

@ -36,7 +36,7 @@
<?= $r['enabled'] ? "<i class=\"fa fa-play text-green\"></i>" : "<i class=\"fa fa-pause text-grey\"></i>";?> <?= $r['enabled'] ? "<i class=\"fa fa-play text-green\"></i>" : "<i class=\"fa fa-pause text-grey\"></i>";?>
</a> </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="/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> <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>
</div> </div>

1
socket/index.js
View File

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

34
socket/public/device.js
View File

File diff suppressed because one or more lines are too long

28
socket/public/pushMessage.html
View File

@ -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
View File

@ -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, " "));
}
});

26
socket/public/setMessage.js
View File

@ -1,7 +1,9 @@
$(document).ready(()=>{ $(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({ tinymce.init({
selector: '.mce', selector: '.mce',
@ -21,19 +23,20 @@ $(document).ready(()=>{
] ]
}); });
const form = $('.send_message_form');
var form = $('.send_message_form');
form.on('submit', function(e){ form.on('submit', function(e){
e.preventDefault(); 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, 'title': title,
'short_text': text[0], 'short_text': text[0],
'long_text': text[1], 'long_text': text[1],
'image': '', 'image': '',
'sid': sid,
}; };
socket.emit('message', fullMessage); 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, " "));
}
}); });

Write Preview
Loading…
Cancel
Save