Merge pull request #270 from levys19/extension-HotFix

Extension hot fix

README.md

@@ -50,11 +50,11 @@ Now, the web app can be launched in your local web browser on localhost:3000
 # MVP: 
 1) Users will first create a user account with the web application or log into their exisiting account:
   These are the fields they are required to fill out(when they first create an account):
-    * Name 
-    * Email
-    * Major/year 
-    * City 
-    * What are you looking for? Internship/full-time
+    * Firstname
+    * Lastname
+    * Username
+    * Password
+    * Upload Resume
 2) Then, user uploads their resume to the web app 
 3) After the user uploads their resume, he/she can upvote, downvote or comment on other users' resumes.  
 

cracking_the_resume/app.js

@@ -21,12 +21,12 @@ var settings = require('./routes/settings');
 var multer  = require('multer')
 
 var redirect = require('./routes/redirect');
-var individual = require('./routes/individual'); 
-//METHOD OVERRIDE 
+var individual = require('./routes/individual');
+//METHOD OVERRIDE
 var methodOverride = require("method-override");
 //Database set up: MONGOOSE
 var mongoose = require('mongoose');
-mongoose.connect("mongodb://levyshi:CSE442@ds119772.mlab.com:19772/cracking_the_resume");
+mongoose.connect("mongodb://levyshi:CSE442@ds147069.mlab.com:47069/cracking_the_test");
 
 //Seeds file
 seedDB = require("./seeds");
@@ -51,7 +51,7 @@ app.use(express.static("../Resumes"));
 app.use(express.static("public"));
 app.use(express.static("Resumes"))
 
-//METHOD OVERRIDE 
+//METHOD OVERRIDE
 app.use(methodOverride("_method"));
 
 //add session middleware to save session in the database

cracking_the_resume/package.json

@@ -25,6 +25,7 @@
     "socket.io": "^2.0.4",
     "aws-sdk": "*",
     "pdf-image": "*",
-    "zoomove": "^1.2.1"
+    "zoomove": "^1.2.1",
+    "mmmagic": "*"
   }
 }

cracking_the_resume/public/Javascript/account.js

@@ -2,29 +2,39 @@ $(function () {
 
   //1 for liked, 0 for disliked
 if($(".qty1").attr("id") == 1){
-        $(".dislike").prop('disabled', true);
-        $(".like").prop('disabled', true);
+        // $(".like").prop('disabled', true);
+        // $(".dislike").prop('disabled', false);
+        //
+        // $(".upvote")  .prop('disabled', true);
+        // $(".downvote").prop('disabled', false);
+        //
+        // $(".qty1").prop('disabled', true);
+        // $(".qty2").prop('disabled', false);
 
-        $(".upvote").prop('disabled', true);
-        $(".downvote").prop('disabled', true);
+        $(".likeButtons").hide();
+        $(".displayLikes").css({ 'display' : ''});
 
-        $(".qty1").prop('disabled', true);
-        $(".qty2").prop('disabled', true);
-        $(".like").css("background-color", "blue");
-      }
 
-if($(".qty2").attr("id") == 1){
-        $(".like").prop('disabled', true);
-        $(".dislike").prop('disabled', true);
+        // $(".like").css("background-color", "blue");
+      }
 
-        $(".downvote").prop('disabled', true);
-        $(".upvote").prop('disabled', true);
 
-        $(".qty2").prop('disabled', true);
-        $(".qty1").prop('disabled', true);
-        $(".dislike").css("background-color", "blue");
+if($(".qty2").attr("id") == 1){
+        // $(".like").prop('disabled', false);
+        // $(".dislike").prop('disabled', true);
+        //
+        // $(".upvote").prop('disabled', false);
+        // $(".downvote").prop('disabled', true);
+        //
+        // $(".qty1").prop('disabled', false);
+        // $(".qty2").prop('disabled', true);
+        // $(".dislike").css("background-color", "blue");
+
+        $(".likeButtons").hide();
+        $(".displayLikes").css({ 'display' : ''});
       }
 
+
   //disables submit if comment is empty or contains all spaces only
   $("#postIt").prop('disabled', true);
 

cracking_the_resume/public/stylesheets/acc.css

@@ -13,13 +13,13 @@ h1{
     height: 700px;
     overflow: hidden;
     border: 50px solid rgba(197, 173, 183, 0.363);
-    
+
   }
   .tileind{
     position: relative;
     float: both;
     width: 555px;
-    height: 700px;    
+    height: 700px;
     overflow: hidden;
     border: 50px solid rgba(83, 71, 76, 0.363);
   }
@@ -132,32 +132,39 @@ button:hover {
     border-bottom: 1px dotted #ccc;
 }
 
-.main-btn{ 
-    background:#917c86; 
-    border-color:#917c86; 
+.main-btn{
+    background:#917c86;
+    border-color:#917c86;
     color:#fff;
     margin: 8px;
 }
-.main-btn:hover{ 
+.main-btn:hover{
     background:#917c86;
     color:rgb(189, 184, 184);
 }
 
 #commentsWrapper{
-  /*overflow: hidden;*/
-  /*collab-xinyuche*/
-  overflow-wrap: break-word;
+  overflow: hidden;
+  /* overflow-wrap: break-word; */
 }
+
+.break-word{
+  overflow-wrap:break-word;
+  width: 70%;
+  /* background: lime; */
+}
+
 .comments-list{
-  overflow: auto;
-  /* overflow-y: auto;
+  /* overflow: auto; */
+  /* overflow-y: auto;*/
   overflow-x: hidden; */
   height:600px;
   width: 800px;
+  /* overflow-wrap:break-word; */
 }
 #navcol.navbar-inverse{
     /* background-color:rgba(146, 135, 142, 0.815); */
-    background-color:transparent; 
+    background-color:transparent;
     border-color: transparent;
   }
 #navcol a{
@@ -171,4 +178,16 @@ button:hover {
     background-color: transparent;
     margin-top: 10px;
   }
-
+
+  #Message{
+    min-width: 100%;
+    min-height: 50%;
+  }
+  .likeButtons,.displayLikes{
+    font-family: "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans";
+    color: grey;
+  }
+  .like-button, .dislike-button, .like, .dislike{
+    margin-left: 10px !important;
+    /* margin-right: 10px !important; */
+  }

cracking_the_resume/public/stylesheets/error.css

@@ -0,0 +1,58 @@
+html{
+}
+body{
+    margin: 0;
+    padding: 0;
+    background: #e7ecf0;
+    font-family: Arial, Helvetica, sans-serif;
+}
+*{
+    margin: 0;
+    padding: 0;
+}
+p{
+    font-size: 12px;
+    color: #373737;
+    font-family: Arial, Helvetica, sans-serif;
+    line-height: 18px;
+}
+p a{
+    color: #218bdc;
+    font-size: 12px;
+    text-decoration: none;
+}
+a{
+    outline: none;
+}
+.f-left{
+    float:left;
+}
+.f-right{
+    float:right;
+}
+.clear{
+    clear: both;
+    overflow: hidden;
+}
+#block_error{
+    width: 845px;
+    height: 384px;
+    border: 1px solid #cccccc;
+    margin: 72px auto 0;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    background: #fff url(http://www.ebpaidrev.com/systemerror/block.gif) no-repeat 0 51px;
+}
+#block_error div{
+    padding: 100px 40px 0 186px;
+}
+#block_error div h2{
+    color: #218bdc;
+    font-size: 24px;
+    display: block;
+    padding: 0 0 14px 0;
+    border-bottom: 1px solid #cccccc;
+    margin-bottom: 12px;
+    font-weight: normal;
+}

cracking_the_resume/public/stylesheets/viewing.css

@@ -23,13 +23,13 @@ body{
 
 .gallery img {
   width: 100%;
-  height: auto;
+  height: 400px;
   padding-bottom: 10px;
-  border-radius: 4px; 
+  border-radius: 4px;
 }
 a:hover, a:active {
   background-color: rgb(2, 1, 1);
-} 
+}
 
 a.button{
   background-color: #c9b8b6;
@@ -62,5 +62,7 @@ a.button{
   background-color: transparent;
   margin-top: 10px;
 }
-
-
+.otherResume{
+  width: 350px;
+  height: 400px;
+}