From cd9bc93bbd85f54cfc5f28aca9e054640767fd01 Mon Sep 17 00:00:00 2001 From: ontheloosewu <35973933+ontheloosewu@users.noreply.github.com> Date: Thu, 19 Apr 2018 20:54:50 -0400 Subject: [PATCH 01/15] Updated account.ejs --- cracking_the_resume/views/account.ejs | 93 +++++++++++++-------------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/cracking_the_resume/views/account.ejs b/cracking_the_resume/views/account.ejs index aa3dce3..8d93c32 100644 --- a/cracking_the_resume/views/account.ejs +++ b/cracking_the_resume/views/account.ejs @@ -99,58 +99,44 @@ fclose ($handle);}
-
-
- -
- -
- - -
- - -
- -
- -
-
-
- - -
-
-
- - -
-
- - + + From 60cd57b3e0d02fa04773eec684435a6d08a5f9dd Mon Sep 17 00:00:00 2001 From: Sravanika Doddi Date: Sun, 22 Apr 2018 12:55:11 -0400 Subject: [PATCH 02/15] Update README.md Updated Readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f234462..072decd 100644 --- a/README.md +++ b/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. From 69497fdfed8f12acd49ba58c63936b5fd7ea58a9 Mon Sep 17 00:00:00 2001 From: YongJi Date: Sun, 22 Apr 2018 13:28:36 -0400 Subject: [PATCH 03/15] removed certain sections in the sign up page --- cracking_the_resume/app.js | 6 +++--- cracking_the_resume/views/signUp.ejs | 31 ---------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/cracking_the_resume/app.js b/cracking_the_resume/app.js index 716b1c1..2f05a3e 100644 --- a/cracking_the_resume/app.js +++ b/cracking_the_resume/app.js @@ -21,8 +21,8 @@ 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'); @@ -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 diff --git a/cracking_the_resume/views/signUp.ejs b/cracking_the_resume/views/signUp.ejs index 7f55582..2c27dc8 100644 --- a/cracking_the_resume/views/signUp.ejs +++ b/cracking_the_resume/views/signUp.ejs @@ -28,12 +28,6 @@ -
- -
- -
-
@@ -46,31 +40,6 @@
-
- -
- -
-
-
- -
- -
-
From bc76fa0b98a5a5a73c3bdf3ff4aa81af41b2389b Mon Sep 17 00:00:00 2001 From: YongJi Date: Sun, 22 Apr 2018 15:24:01 -0400 Subject: [PATCH 04/15] votes functionality --- cracking_the_resume/app.js | 8 +- .../public/Javascript/account.js | 42 +++++---- cracking_the_resume/views/account.ejs | 14 +-- cracking_the_resume/views/individual.ejs | 85 +++++++++++-------- 4 files changed, 88 insertions(+), 61 deletions(-) diff --git a/cracking_the_resume/app.js b/cracking_the_resume/app.js index 716b1c1..242656b 100644 --- a/cracking_the_resume/app.js +++ b/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 diff --git a/cracking_the_resume/public/Javascript/account.js b/cracking_the_resume/public/Javascript/account.js index 1f1d059..d662b95 100644 --- a/cracking_the_resume/public/Javascript/account.js +++ b/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); diff --git a/cracking_the_resume/views/account.ejs b/cracking_the_resume/views/account.ejs index aa3dce3..6796c01 100644 --- a/cracking_the_resume/views/account.ejs +++ b/cracking_the_resume/views/account.ejs @@ -104,28 +104,28 @@ fclose ($handle);}
- +
diff --git a/cracking_the_resume/views/individual.ejs b/cracking_the_resume/views/individual.ejs index 23cc47e..5585330 100644 --- a/cracking_the_resume/views/individual.ejs +++ b/cracking_the_resume/views/individual.ejs @@ -64,38 +64,49 @@ -
-
+ + +
+
@@ -108,8 +119,32 @@
- +
+
+ +
+
+
+ +
+ + <%resumeRecord.comments.forEach(function(comment){ %> +
+
+

<%=comment.username%>

+

<%=comment.content%>

+
+
+ <%})%> +
+
+
+
+ +
@@ -117,28 +152,10 @@
-
-
-
- -
- - <%resumeRecord.comments.forEach(function(comment){ %> -
-
-

<%=comment.username%>

-

<%=comment.content%>

-
-
- <%})%> -
-
-
-
+ + - \ No newline at end of file + From a6685851175084065cf798e3ce5a7edd8d0a6be3 Mon Sep 17 00:00:00 2001 From: YongJi Date: Sun, 22 Apr 2018 15:28:01 -0400 Subject: [PATCH 05/15] changed app.js link --- cracking_the_resume/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cracking_the_resume/app.js b/cracking_the_resume/app.js index 242656b..2f05a3e 100644 --- a/cracking_the_resume/app.js +++ b/cracking_the_resume/app.js @@ -26,7 +26,7 @@ var individual = require('./routes/individual'); var methodOverride = require("method-override"); //Database set up: MONGOOSE var mongoose = require('mongoose'); -mongoose.connect("mongodb://levyshi:CSE442@ds147069.mlab.com:47069/cracking_the_test"); +mongoose.connect("mongodb://levyshi:CSE442@ds119772.mlab.com:19772/cracking_the_resume"); //Seeds file seedDB = require("./seeds"); From 3a819b943eed6213f930a68a6d6769e2984ca6e2 Mon Sep 17 00:00:00 2001 From: lieselva Date: Mon, 23 Apr 2018 14:43:43 -0400 Subject: [PATCH 06/15] fixed duplicates --- cracking_the_resume/app.js | 2 +- cracking_the_resume/views/account.ejs | 46 --------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/cracking_the_resume/app.js b/cracking_the_resume/app.js index 2f05a3e..d00c151 100644 --- a/cracking_the_resume/app.js +++ b/cracking_the_resume/app.js @@ -26,7 +26,7 @@ var individual = require('./routes/individual'); 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_resume"); //Seeds file seedDB = require("./seeds"); diff --git a/cracking_the_resume/views/account.ejs b/cracking_the_resume/views/account.ejs index e9fd5e5..8d93c32 100644 --- a/cracking_the_resume/views/account.ejs +++ b/cracking_the_resume/views/account.ejs @@ -99,52 +99,6 @@ fclose ($handle);}
-
-
- -
- -
- - -
- - -
- -
- -
-
-
- - -
-
-
- - -
-
- From b21b776505ac5c5a41360ee1ed9816157a31f5ac Mon Sep 17 00:00:00 2001 From: YongJi Date: Mon, 23 Apr 2018 14:48:31 -0400 Subject: [PATCH 07/15] fixed comment box size, moved changes in individual to accounts page as well, created an error page, fixed comments overflowing. --- .../public/stylesheets/acc.css | 37 +++-- .../public/stylesheets/error.css | 58 +++++++ cracking_the_resume/views/account.ejs | 152 ++++++++---------- cracking_the_resume/views/error.ejs | 24 +++ cracking_the_resume/views/individual.ejs | 6 +- 5 files changed, 176 insertions(+), 101 deletions(-) create mode 100644 cracking_the_resume/public/stylesheets/error.css create mode 100644 cracking_the_resume/views/error.ejs diff --git a/cracking_the_resume/public/stylesheets/acc.css b/cracking_the_resume/public/stylesheets/acc.css index 77dc908..710daa9 100644 --- a/cracking_the_resume/public/stylesheets/acc.css +++ b/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,8 @@ button:hover { background-color: transparent; margin-top: 10px; } - + + #Message{ + min-width: 100%; + min-height: 50%; + } diff --git a/cracking_the_resume/public/stylesheets/error.css b/cracking_the_resume/public/stylesheets/error.css new file mode 100644 index 0000000..ffd450e --- /dev/null +++ b/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; +} diff --git a/cracking_the_resume/views/account.ejs b/cracking_the_resume/views/account.ejs index 6796c01..ec19fb1 100644 --- a/cracking_the_resume/views/account.ejs +++ b/cracking_the_resume/views/account.ejs @@ -1,13 +1,4 @@ - @@ -17,7 +8,7 @@ fclose ($handle);} Cracking The Resume - + @@ -25,6 +16,7 @@ fclose ($handle);} + @@ -32,7 +24,7 @@ fclose ($handle);} - - - - - - +
- - +
- + +
+ + + + -
-
+ + +
+
-
+
@@ -141,8 +119,32 @@ fclose ($handle);}
- +
+
+ +
+
+
+ +
+ + <%resumeRecord.comments.forEach(function(comment){ %> +
+
+

<%=comment.username%>

+

<%=comment.content%>

+
+
+ <%})%> +
+
+
+
+ +
@@ -150,30 +152,10 @@ fclose ($handle);}
-
-
-
- -
- - <%resumeRecord.comments.forEach(function(comment){ %> -
-
-

<%=comment.username%>

-

<%=comment.content%>

-
-
- <%})%> -
-
-
-
+ +
-
- diff --git a/cracking_the_resume/views/error.ejs b/cracking_the_resume/views/error.ejs new file mode 100644 index 0000000..ec853f8 --- /dev/null +++ b/cracking_the_resume/views/error.ejs @@ -0,0 +1,24 @@ + + + + + + + + + +
+
+

Error 404.  Oops you've have encountered an error

+

+ It apperrs that Either something went wrong or the page doesn't exist anymore..
+ This website is temporarily unable to service your request as it has exceeded it’s resource limit. Please check back shortly. +

+

+ If you are the owner of the account and are regularly seeing this error, please read more about it in our knowledgebase. + If you have any questions, please contact our Technical Support department. +

+
+
+ + diff --git a/cracking_the_resume/views/individual.ejs b/cracking_the_resume/views/individual.ejs index 5585330..cf1889e 100644 --- a/cracking_the_resume/views/individual.ejs +++ b/cracking_the_resume/views/individual.ejs @@ -79,8 +79,8 @@
-
-
+
+
+

haha

+
@@ -147,9 +153,9 @@
- +
diff --git a/cracking_the_resume/views/individual.ejs b/cracking_the_resume/views/individual.ejs index cf1889e..9d70a51 100644 --- a/cracking_the_resume/views/individual.ejs +++ b/cracking_the_resume/views/individual.ejs @@ -76,34 +76,38 @@
diff --git a/cracking_the_resume/views/resumeViewing.ejs b/cracking_the_resume/views/resumeViewing.ejs index 5c74763..5da8114 100644 --- a/cracking_the_resume/views/resumeViewing.ejs +++ b/cracking_the_resume/views/resumeViewing.ejs @@ -54,7 +54,7 @@
<%resumeRecord.forEach(function(resume){ %> <% if (String(resume._id) !== String(user.Resume)) {%> -