Permalink
Browse files
Harden camper news and don't expose user object. Upvoting still needs…
… to be looked at.
1 parent
2c53a17
commit 08bf658897bad23baab1784f0f97b20eb6d6b0f0
terakilobyte
committed
terakilobyte
committed
Showing
with
58 additions
and 63 deletions.
- +2 −2 .bowerrc
- +24 −9 controllers/story.js
- +21 −35 public/js/main.js
- +1 −0 views/partials/universal-head.jade
- +3 −10 views/stories/comments.jade
- +6 −5 views/stories/index.jade
- +1 −2 views/stories/show.jade
4
.bowerrc
| @@ -1,3 +1,3 @@ | |||
| { | { | ||
| - "directory" : "public/js/lib" | + "directory" : "public/bower_components" | ||
| -} | +} | ||
33
controllers/story.js
56
public/js/main.js
| @@ -234,7 +234,7 @@ $(document).ready(function() { | |||
| $('#upvote').unbind('click'); | $('#upvote').unbind('click'); | ||
| var alreadyUpvoted = false; | var alreadyUpvoted = false; | ||
| for (var i = 0; i < upVotes.length; i++) { | for (var i = 0; i < upVotes.length; i++) { | ||
| - if (upVotes[i].upVotedBy === user._id) { | + if (upVotes[i].upVotedBy === B3BA669EC5C1DD70FB478221E067A7E1B686929C569F5E73561B69C8F42129B) { | ||
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
|
|||
| alreadyUpvoted = true; | alreadyUpvoted = true; | ||
| break; | break; | ||
| } | } | ||
| @@ -243,8 +243,7 @@ $(document).ready(function() { | |||
| $.post('/stories/upvote', | $.post('/stories/upvote', | ||
| { | { | ||
| data: { | data: { | ||
| - id: _id, | + id: _id | ||
| - upVoter: user | |||
| } | } | ||
| }) | }) | ||
| .fail(function (xhr, textStatus, errorThrown) { | .fail(function (xhr, textStatus, errorThrown) { | ||
| @@ -264,10 +263,7 @@ $(document).ready(function() { | |||
| var link = $('#story-url').val(); | var link = $('#story-url').val(); | ||
| var headline = $('#story-title').val(); | var headline = $('#story-title').val(); | ||
| var description = $('#description-box').val(); | var description = $('#description-box').val(); | ||
| - var userDataForUpvote = { | + | ||
| - upVotedBy: user._id, | |||
| - upVotedByUsername: user.profile.username | |||
| - }; | |||
| $('#story-submit').unbind('click'); | $('#story-submit').unbind('click'); | ||
| $.post('/stories/', | $.post('/stories/', | ||
| { | { | ||
| @@ -277,15 +273,7 @@ $(document).ready(function() { | |||
| timePosted: Date.now(), | timePosted: Date.now(), | ||
| description: description, | description: description, | ||
| storyMetaDescription: storyMetaDescription, | storyMetaDescription: storyMetaDescription, | ||
| - originalStoryAuthorEmail: user.email, | |||
| rank: 1, | rank: 1, | ||
| - upVotes: [userDataForUpvote], | |||
| - author: { | |||
| - picture: user.profile.picture, | |||
| - email: user.email, | |||
| - userId: user._id, | |||
| - username: user.profile.username | |||
| - }, | |||
| comments: [], | comments: [], | ||
| image: storyImage | image: storyImage | ||
| } | } | ||
| @@ -311,14 +299,7 @@ $(document).ready(function() { | |||
| data: { | data: { | ||
| associatedPost: storyId, | associatedPost: storyId, | ||
| originalStoryLink: originalStoryLink, | originalStoryLink: originalStoryLink, | ||
| - originalStoryAuthorEmail: originalStoryAuthorEmail, | + body: data | ||
| - body: data, | |||
| - author: { | |||
| - picture: user.profile.picture, | |||
| - userId: user._id, | |||
| - username: user.profile.username, | |||
| - email: user.email | |||
| - } | |||
| } | } | ||
| }) | }) | ||
| .fail(function (xhr, textStatus, errorThrown) { | .fail(function (xhr, textStatus, errorThrown) { | ||
| @@ -332,7 +313,8 @@ $(document).ready(function() { | |||
| $('#comment-button').on('click', commentSubmitButtonHandler); | $('#comment-button').on('click', commentSubmitButtonHandler); | ||
| }); | }); | ||
| -var profileValidation = angular.module('profileValidation',['ui.bootstrap']); | +var profileValidation = angular.module('profileValidation', | ||
| + ['ui.bootstrap', 'ngLodash']); | |||
| profileValidation.controller('profileValidationController', ['$scope', '$http', | profileValidation.controller('profileValidationController', ['$scope', '$http', | ||
| function($scope, $http) { | function($scope, $http) { | ||
| $http.get('/account/api').success(function(data) { | $http.get('/account/api').success(function(data) { | ||
| @@ -389,7 +371,7 @@ profileValidation.controller('submitStoryController', ['$scope', | |||
| } | } | ||
| ]); | ]); | ||
| -profileValidation.directive('uniqueUsername',['$http',function($http) { | +profileValidation.directive('uniqueUsername', ['$http', function($http) { | ||
| return { | return { | ||
| restrict: 'A', | restrict: 'A', | ||
| require: 'ngModel', | require: 'ngModel', | ||
| @@ -398,7 +380,7 @@ profileValidation.directive('uniqueUsername',['$http',function($http) { | |||
| ngModel.$setValidity('unique', true); | ngModel.$setValidity('unique', true); | ||
| if (element.val()) { | if (element.val()) { | ||
| $http.get("/api/checkUniqueUsername/" + element.val()).success(function (data) { | $http.get("/api/checkUniqueUsername/" + element.val()).success(function (data) { | ||
| - if (element.val() == scope.storedUsername) { | + if (element.val() === scope.storedUsername) { | ||
| ngModel.$setValidity('unique', true); | ngModel.$setValidity('unique', true); | ||
| } else if (data) { | } else if (data) { | ||
| ngModel.$setValidity('unique', false); | ngModel.$setValidity('unique', false); | ||
| @@ -407,10 +389,11 @@ profileValidation.directive('uniqueUsername',['$http',function($http) { | |||
| } | } | ||
| }); | }); | ||
| } | } | ||
| - } | + }; | ||
| }]); | }]); | ||
| -profileValidation.directive('existingUsername', ['$http', function($http) { | +profileValidation.directive('existingUsername', | ||
| + ['$http', 'lodash', function($http, lodash) { | |||
| return { | return { | ||
| restrict: 'A', | restrict: 'A', | ||
| require: 'ngModel', | require: 'ngModel', | ||
| @@ -423,15 +406,18 @@ profileValidation.directive('existingUsername', ['$http', function($http) { | |||
| ngModel.$setPristine(); | ngModel.$setPristine(); | ||
| } | } | ||
| if (element.val()) { | if (element.val()) { | ||
| - $http | + var debo = lodash.debounce(function() { | ||
| - .get("/api/checkExistingUsername/" + element.val()) | + $http | ||
| - .success(function (data) { | + .get('/api/checkExistingUsername/' + element.val()) | ||
| - ngModel.$setValidity('exists', data); | + .success(function (data) { | ||
| - }); | + ngModel.$setValidity('exists', data); | ||
| + }); | |||
| + }, 2000); | |||
| + debo(); | |||
| } | } | ||
| }); | }); | ||
| } | } | ||
| - } | + }; | ||
| }]); | }]); | ||
| profileValidation.directive('uniqueEmail', ['$http', function($http) { | profileValidation.directive('uniqueEmail', ['$http', function($http) { | ||
| @@ -443,7 +429,7 @@ profileValidation.directive('uniqueEmail', ['$http', function($http) { | |||
| ngModel.$setValidity('unique', true); | ngModel.$setValidity('unique', true); | ||
| if (element.val()) { | if (element.val()) { | ||
| $http.get("/api/checkUniqueEmail/" + encodeURIComponent(element.val())).success(function (data) { | $http.get("/api/checkUniqueEmail/" + encodeURIComponent(element.val())).success(function (data) { | ||
| - if (element.val() == scope.storedEmail) { | + if (element.val() === scope.storedEmail) { | ||
| ngModel.$setValidity('unique', true); | ngModel.$setValidity('unique', true); | ||
| } else if (data) { | } else if (data) { | ||
| ngModel.$setValidity('unique', false); | ngModel.$setValidity('unique', false); | ||
1
views/partials/universal-head.jade
13
views/stories/comments.jade
11
views/stories/index.jade
3
views/stories/show.jade
@terakilobyte Not sure if this should be hardcoded, but if it should, it needs to be surrounded by double-quotes :-)
Wow, my bad; didn't see this:
var B3BA669EC5C1DD70FB478221E067A7E1B686929C569F5E73561B69C8F42129B = !{JSON.stringify(user._id)}var userID = "..."?I tried evaluating B3BA669EC5C1DD70FB478221E067A7E1B686929C569F5E73561B69C8F42129B in the console and got an error, so I thought this was supposed to be a string, but... nope