Merge branch 'master' into master

dan-divy · Apr 30, 2019 · cc9d4fd · cc9d4fd
2 parents 27e3eb9 + 8f9c227
commit cc9d4fd
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,10 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
+# Release builds
 release/
+release-builds/
+
 # Runtime data
 pids
 *.pid
@@ -61,5 +64,6 @@ typings/
 # next.js build output
 .next
 
-#testing images
 .vscode/sftp.json
+# local uploads
+public/feeds/
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 [![spruce-banner](./public/images/logo/banner.png)](http://mygurukulonline.in)
 
 Spruce is a tiny but powerful open-source social networking platform made with Node.js and MongoDB
-
-_Deployed on an Amazon EC2 instance [here](http://mygurukulonline.in)_
+[![Gitter](https://badges.gitter.im/spruce-social/community.svg)](https://gitter.im/spruce-social/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+_Deployed on an Amazon EC2 instance [here](http://spruce.divy.work)_
 
 Get the live MongoDB stats out [here](https://cloud.mongodb.com/freemonitoring/cluster/SQXXT6OAMR757LIEYJRN3WDUCIRAEYYV).
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,8 @@
     "morgan": "~1.9.0",
     "mv": "2.1.1",
     "newsapi": "^2.4.0",
+    "passport": "^0.4.0",
+    "passport-google-oauth": "^2.0.0",
     "request": "2.88.0",
     "time-ago": "0.2.1"
   },

diff --git a/routes/settings.js b/routes/settings.js
@@ -3,6 +3,7 @@ var router = express.Router();
 var path = require('path');
 var guid = require('guid');
 var mv = require('mv');
+const mime = require('mime-types')
 var db = require('../utils/handlers/user');
 var formParser = require('../utils/form-parser.js');
 const fs = require('file-system');
@@ -58,9 +59,12 @@ router.post('/upload', formParser,function(req, res, next) {
 		    var final_location = `/feeds/${req.session.user}_${random_id}${req.files.filetoupload.name}`;
 
 		    console.log(`${oldpath} - OldPath\n ${newpath} - Newpath\n ${final_location} - DiskLocation\n`)
-		    // Finally upload the file to disk and save the feed to users profile
+		    // Finally upload the file to disk and save the feed to users profile.
+        var type = mime.lookup(req.files.filetoupload.name).split("/")[1]
+
 			mv(oldpath, newpath, function (err) {
-				console.log('moving files')
+				console.log('moving files');
+
 			db.findOne({username:req.session.user}, (err, u) => {
 				console.log(u)
 				u.posts.push({
@@ -71,7 +75,7 @@ router.post('/upload', formParser,function(req, res, next) {
 					category:req.body.type,
 					comments:[],
 					likes:[],
-					type:'image',
+					type:type,
 					createdAt:new Date(),
 					lastEditedAt:new Date()
 				})

diff --git a/views/main.ejs b/views/main.ejs
@@ -32,7 +32,14 @@
 <br>
 <br>
     <div class="gram-card-image">
-      <center><img author="<%= people[i].posts[z].author %>" src="<%= people[i].posts[z].static_url %>" id="<%= people[i].posts[z]._id %>" class="post img-responsive"></center>
+      <center>
+          <% if(people[i].posts[z].type == "image") { %>
+        <img author="<%= people[i].posts[z].author %>" src="<%= people[i].posts[z].static_url %>" id="<%= people[i].posts[z]._id %>" class="post img-responsive">
+        <% } %>
+        <% if(people[i].posts[z].type == "mp4") { %>
+      <video author="<%= people[i].posts[z].author %>" src="<%= people[i].posts[z].static_url %>" id="<%= people[i].posts[z]._id %>" class="post img-responsive" controls></video>
+      <% } %>
+      </center>
     </div>
 
     <div class="gram-card-content">

diff --git a/views/upload/file-upload.ejs b/views/upload/file-upload.ejs
@@ -94,6 +94,7 @@
                 var reader = new FileReader();
 
                 reader.onload = function (e) {
+                  console.log(e)
                     $('#blah')
                         .attr('src', e.target.result);
                     /* $('#postBtn')