support added for emojis, Grunt added to automate various build tasks

jessecordeiro · Jan 8, 2017 · 988aea9 · 988aea9
1 parent c8992f6
commit 988aea9
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,50 @@
+module.exports = function(grunt) {
+  grunt.initConfig({
+    copy: {
+      emoji: {
+        expand: true,
+        flatten: true,
+        src: 'node_modules/emojify.js/dist/images/basic/*',
+        dest: 'dist/images/emoji/',
+        filter: 'isFile'
+      },
+      css: {
+        expand: true,
+        flatten: true,
+        src: 'src/css/*',
+        dest: 'dist/css/',
+        filter: 'isFile'
+      },
+      images: {
+        expand: true,
+        flatten: true,
+        src: 'src/images/*',
+        dest: 'dist/images/',
+        filter: 'isFile'
+      },
+    },
+    concat: {
+      dist: {
+        src: ['src/js/main.js','src/js/modal.js'],
+        dest: 'dist/js/build.js',
+      }
+    },
+    uglify: {
+      dist: {
+        files: {
+          'dist/js/build.min.js': ['dist/js/build.js']
+        }
+      }
+    },
+    clean: {
+      dist: ['dist/'],
+      build: ['dist/js/build.js']
+    }
+});
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  grunt.registerTask('build', ['clean', 'copy', 'concat', 'uglify', 'clean:build']);
+};
diff --git a/package.json b/package.json
@@ -3,9 +3,17 @@
   "version": "1.0.0",
   "description": "Chatr is an application intended to provide teams with a simple and lightweight platform for messaging.",
   "dependencies": {
+    "emojify.js": "^1.1.0",
     "express": "^4.10.2",
     "identicon.js": "^2.0.0",
     "materialize-css": "^0.97.8",
     "socket.io": "^1.7.2"
+  },
+  "devDependencies": {
+    "grunt": "^1.0.1",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-uglify": "^2.0.0"
   }
 }
diff --git a/src/app.js b/src/app.js
@@ -3,10 +3,10 @@ var app = require('express')();
 var express = require('express');
 var http = require('http').Server(app);
 var io = require('socket.io')(http);
-var connectionManager = require('./connection-manager.js');
+var connectionManager = require('./js/connection-manager.js');
 
 // Allow folders in /public to be accessible client-side
-app.use(express.static(__dirname + '/public'));
+app.use(express.static(__dirname + '/../dist'));
 
 app.get('/', function(req, res){
   res.sendFile(__dirname + '/index.html');
@@ -31,7 +31,6 @@ io.on('connection', function(socket){
       }
     }else{
       socket.emit('login response', false, {"error": "Nickname already taken"});
-      console.log(connections.length);
     }
   });
 
@@ -46,7 +45,6 @@ io.on('connection', function(socket){
   });
 
   socket.on('disconnect', function(){
-    console.log('a user disconnected');
     var connection = connectionManager.getConnection(socket);
     if (connection){
       connectionManager.removeConnection(socket);
@@ -89,7 +87,6 @@ io.on('connection', function(socket){
   socket.on('typing', function(){
     var connection = connectionManager.getConnection(socket);
     connection['lastActive'] = (new Date()).toLocaleTimeString();
-    console.log(connection['lastActive']);
   });
 
   socket.on('view profile', function(nickname){

diff --git a/src/public/css/main.css → src/css/main.css b/src/public/css/main.css → src/css/main.css
diff --git a/src/public/images/favicon-192x192.png → src/images/favicon-192x192.png b/src/public/images/favicon-192x192.png → src/images/favicon-192x192.png
diff --git a/src/public/images/favicon-194x194.png → src/images/favicon-194x194.png b/src/public/images/favicon-194x194.png → src/images/favicon-194x194.png
diff --git a/src/public/images/favicon-32x32.png → src/images/favicon-32x32.png b/src/public/images/favicon-32x32.png → src/images/favicon-32x32.png
diff --git a/src/public/images/office.jpg → src/images/office.jpg b/src/public/images/office.jpg → src/images/office.jpg
diff --git a/src/index.html b/src/index.html
@@ -12,6 +12,7 @@
     <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!-- Compiled and minified CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/css/materialize.min.css">
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" />
   </head>
 
   <body>
@@ -68,7 +69,7 @@
     <script src="http://code.jquery.com/jquery-1.11.1.js"></script>
     <!-- Compiled and minified JavaScript -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.8/js/materialize.min.js"></script>
-    <script src="js/modal.js"></script>
-    <script src="js/main.js"></script>
+    <script src="js/build.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/js/emojify.min.js"></script>
   </body>
 </html>
diff --git a/src/connection-manager.js → src/js/connection-manager.js b/src/connection-manager.js → src/js/connection-manager.js
@@ -6,12 +6,9 @@ function addConnection(name, socket){
     _id: socket.id,
     lastActive: (new Date()).toLocaleTimeString()
   });
-  console.log(connections.length);
 };
 
 function removeConnection(socket){
-  // connections.splice(getConnection(socket), 1);
-  // console.log(connections.length);
   for (var i = 0; i < connections.length; i++){
     if (connections[i]._id == socket.id){
       connections.splice(i, 1);
@@ -41,7 +38,6 @@ function getConnections(){
 
 function setAvatar(socket, src){
   var connection = getConnection(socket);
-  // console.log(connections.length);
   connection['avatar'] = src;
 }
 

diff --git a/src/public/js/main.js → src/js/main.js b/src/public/js/main.js → src/js/main.js
@@ -29,6 +29,7 @@ function openSocket(nickname){
     var avatar = $('<img class="circle avatar-chat tooltipped" src="'+ connectionObject.avatar +'" data-position="right" data-delay="50" data-tooltip="' + (new Date()).toLocaleTimeString() + '">').tooltip();
     var userInfo = $('<b></b>').text(connectionObject.nickname);
     var messageContent = $('<span></span>').text(': ' + connectionObject.msg).prepend(userInfo);
+    emojify.run(messageContent[0])
     var message = $('<li class="valign-wrapper"></li>').append(avatar).append(messageContent);
     $('#messages').append(message);
   });

diff --git a/src/public/js/modal.js → src/js/modal.js b/src/public/js/modal.js → src/js/modal.js
@@ -8,5 +8,4 @@ $(document).ready(function(){
       closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
     });
     $('.tooltipped').tooltip({delay: 50});
-
 });