Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
a0c4689
Added initialization instructions
GreenRaccoon23 Jan 5, 2016
4fa4832
Added db folder to .gitignore
GreenRaccoon23 Jan 5, 2016
38903f1
Fixed initialization instructions
GreenRaccoon23 Jan 5, 2016
9ecb9ae
Fixed initialization instructions
GreenRaccoon23 Jan 5, 2016
878b6e6
Merge pull request #11 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
10aedf3
Created public and assets folders; moved images to assets
kjhandy Jan 5, 2016
b33ae29
Merge branch 'master' into kayla
kjhandy Jan 5, 2016
4b8f2b4
Fixed initialization instructions again
GreenRaccoon23 Jan 5, 2016
52db831
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
GreenRaccoon23 Jan 5, 2016
e19e8a2
Merge pull request #12 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
a077687
Added fields for database
hankcouture Jan 5, 2016
f7ff542
updated SQL file
hankcouture Jan 5, 2016
a878ced
Showing a message on a failed signin
GreenRaccoon23 Jan 5, 2016
3ba2213
Merge branch 'master' into GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
33ba0e7
Merge pull request #14 from GreenRaccoon23/master
GreenRaccoon23 Jan 5, 2016
474bd9f
Added first name, last name, gender to sign up page
kjhandy Jan 5, 2016
1703e12
Merge branch 'GreenRaccoon23' of https://github.com/GreenRaccoon23/co…
GreenRaccoon23 Jan 5, 2016
12b65d5
Added BCrypt to package.json
hankcouture Jan 5, 2016
64609d2
Merge pull request #15 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
d6ebca6
Added Q to package.json
hankcouture Jan 5, 2016
ff3aa19
Merge pull request #16 from GreenRaccoon23/hank
hankcouture Jan 5, 2016
a0b69e8
Added Cheerio to Server Side
hankcouture Jan 5, 2016
03f8c33
Deleted angular local files
kjhandy Jan 5, 2016
7d2699f
Added users/ to signin, signup, and getCloset functions
kjhandy Jan 5, 2016
7d2966f
Started Reorganization of Server Side
hankcouture Jan 5, 2016
9ee1eac
Merge pull request #18 from GreenRaccoon23/hank
GreenRaccoon23 Jan 5, 2016
168e7b1
Merge pull request #17 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 5, 2016
f0b86cf
Changed signup
kjhandy Jan 5, 2016
f4029ca
Merge pull request #19 from GreenRaccoon23/kayla
hankcouture Jan 5, 2016
2fafee6
Added Windows instructions for postgres
GreenRaccoon23 Jan 5, 2016
62c1f3a
Created public and assets folders; moved images to assets
kjhandy Jan 5, 2016
8922f6a
Added first name, last name, gender to sign up page
kjhandy Jan 5, 2016
6312746
Deleted angular local files
kjhandy Jan 5, 2016
b3e043c
Added users/ to signin, signup, and getCloset functions
kjhandy Jan 5, 2016
b1ed21a
Changed signup
kjhandy Jan 5, 2016
aad6ae9
Merge branch 'kayla' of https://github.com/GreenRaccoon23/codequatro …
kjhandy Jan 5, 2016
2efb949
Merge pull request #20 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
3a15edb
Added Images Routing and Controller
hankcouture Jan 5, 2016
e280490
Merge branch 'kayla'
kjhandy Jan 5, 2016
fc387a6
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
hankcouture Jan 5, 2016
a69665b
completed server reconfig
hankcouture Jan 5, 2016
26d2278
Merge pull request #21 from GreenRaccoon23/hank
hankcouture Jan 5, 2016
6124076
Fixed Images Server Side Organization
hankcouture Jan 5, 2016
1bbe5b6
Updated support for Windows
GreenRaccoon23 Jan 5, 2016
77b1d25
Merge pull request #22 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 5, 2016
976183a
Server edits
hankcouture Jan 5, 2016
96ae11b
Merge pull request #23 from GreenRaccoon23/hank
hankcouture Jan 5, 2016
35a481b
Now can upvote, downvote, or flag from server side
hankcouture Jan 5, 2016
25936a6
added imagesUtil.js
AM-III Jan 5, 2016
1af3e3e
Merge pull request #24 from GreenRaccoon23/hank
GreenRaccoon23 Jan 5, 2016
3c9601c
API GET function for all images
hankcouture Jan 5, 2016
7ef84fd
Merge pull request #25 from GreenRaccoon23/hank
GreenRaccoon23 Jan 5, 2016
3aeb3c8
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
kjhandy Jan 5, 2016
a4986a3
move get imgdata to iagesUtil
AM-III Jan 6, 2016
d81b828
blah
AM-III Jan 6, 2016
f1eedc1
Merge pull request #26 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
969d9dd
Now pulling all user info for closet
hankcouture Jan 6, 2016
880e0e9
Merge pull request #27 from GreenRaccoon23/hank
GreenRaccoon23 Jan 6, 2016
82c99c0
Added image functions. Need to create object from response from getIm…
kjhandy Jan 6, 2016
8dbc346
Added vote data within pic object when getting images for closet
hankcouture Jan 6, 2016
30353c6
Cleaned up merge errors
hankcouture Jan 6, 2016
715e854
Storing profile data in closet controller
hankcouture Jan 6, 2016
8d867d3
Now sending gender when voting
hankcouture Jan 6, 2016
3a97539
Merge pull request #32 from GreenRaccoon23/hank
hankcouture Jan 6, 2016
f47e1e2
Now returning gender vote data when sending closet photos
hankcouture Jan 6, 2016
c0d67b9
Merge pull request #33 from GreenRaccoon23/hank
hankcouture Jan 6, 2016
47bc22d
Started to promisify functions in images controller to help readability
GreenRaccoon23 Jan 6, 2016
6a9fcff
adding url scapers to Util
AM-III Jan 6, 2016
1b6f1a8
more scraping utils
AM-III Jan 6, 2016
8c93d1c
Merge branch 'master' into GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
bd42952
Merge pull request #34 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
83bf278
Readded the commit that git removed
GreenRaccoon23 Jan 6, 2016
efc75c3
Merge pull request #35 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
0ecaa0c
Now storing credibility score in DB and updating DB whenever credibil…
hankcouture Jan 6, 2016
77dd5d6
required imagesUtil.js in imagesController.js
AM-III Jan 6, 2016
c2e1b8a
Added server function for user to edit profile data
hankcouture Jan 6, 2016
8ed608c
Delete old index.js file
hankcouture Jan 6, 2016
68a2ad3
Added server function for getting all user data
hankcouture Jan 6, 2016
f2a8b67
cleaned up server routing and added new emojis for voting
hankcouture Jan 6, 2016
a21cedc
Merge pull request #36 from GreenRaccoon23/hank
hankcouture Jan 6, 2016
e3ee172
Fixed connectString to work with both Windows and Unix
GreenRaccoon23 Jan 6, 2016
030d290
Merge pull request #37 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
0fbe60c
Added server function to get top users
hankcouture Jan 6, 2016
831f2f8
Merge pull request #38 from GreenRaccoon23/hank
GreenRaccoon23 Jan 6, 2016
d09a413
now sending back userID on signin and login
hankcouture Jan 6, 2016
e2b71b0
Merge pull request #41 from GreenRaccoon23/hank
GreenRaccoon23 Jan 6, 2016
006128b
Now sending back all images with vota data included
hankcouture Jan 6, 2016
0087867
Fixed signup userID bug and now sorting all images by most upvotes
hankcouture Jan 6, 2016
3530741
Merge pull request #42 from GreenRaccoon23/hank
GreenRaccoon23 Jan 6, 2016
549d387
Changed main.html to display response from getAllImages
kjhandy Jan 6, 2016
44e6aeb
working in imagecontroller adding getImageData
AM-III Jan 6, 2016
0d28cdc
Merge pull request #43 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
0bd23c4
finished getImageData submitting for testing
AM-III Jan 6, 2016
019d0b8
Merge pull request #44 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
18d4e6c
Delete logfile
kjhandy Jan 6, 2016
9d912a1
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
kjhandy Jan 6, 2016
0d19774
Merge branch 'master' into kayla
kjhandy Jan 6, 2016
0ffd512
Merge pull request #45 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
eff5a81
added comma MY COMMITgit add .git add .!
AM-III Jan 6, 2016
f274a71
Merge pull request #46 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
122f9a1
tiny schema edit
hankcouture Jan 6, 2016
db9b8fb
Fixed Util file for URL pull
hankcouture Jan 6, 2016
fb00d10
Added a GET request to get all images
kjhandy Jan 6, 2016
11af2b8
Merge pull request #47 from GreenRaccoon23/kayla
kjhandy Jan 6, 2016
9f649f2
Running the GET request for all images
kjhandy Jan 6, 2016
86db181
Merge pull request #48 from GreenRaccoon23/kayla
kjhandy Jan 6, 2016
207a1e0
Added modal to submit a link for parsing by the server
kjhandy Jan 6, 2016
f9b629f
Merge pull request #49 from GreenRaccoon23/kayla
kjhandy Jan 6, 2016
72d6127
Merge pull request #50 from GreenRaccoon23/hank
GreenRaccoon23 Jan 6, 2016
7c61bb3
Deleted background image from css
kjhandy Jan 6, 2016
b2a84a5
Merge branch 'master' into kayla
kjhandy Jan 6, 2016
1b092f6
Adding user id to local storage
GreenRaccoon23 Jan 6, 2016
08f6cf5
Merge pull request #52 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
91d0a1f
Merge pull request #51 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
3c85e5f
working on getImageData function
kjhandy Jan 6, 2016
77197f3
Merge pull request #53 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
650e9cf
removed valid url checker
AM-III Jan 6, 2016
d927855
Merge pull request #54 from GreenRaccoon23/stoney
AM-III Jan 6, 2016
c8edd9a
Displaying image data in second modal
kjhandy Jan 6, 2016
c94fc34
Changed userID to user_id
kjhandy Jan 6, 2016
d355a01
Merge pull request #55 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
8004339
Added Hank's modal css to index.css
kjhandy Jan 6, 2016
d48e93a
Merge pull request #56 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
11e80f4
Commented out imageUrl on line6 to get rid of error
kjhandy Jan 6, 2016
309474b
searching # of flags when voting image
hankcouture Jan 6, 2016
7f6dc1c
Merge pull request #57 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 6, 2016
b078a27
Showing username
GreenRaccoon23 Jan 6, 2016
e39e50e
Merge pull request #58 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
01514d4
Clicking username goes to the closet
GreenRaccoon23 Jan 6, 2016
fc6a64f
Merge pull request #59 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 6, 2016
c60bfa3
Added thumb up and thumb down icons for homepage images
GreenRaccoon23 Jan 7, 2016
6f28096
Merge pull request #60 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
b910c35
Added modal css and + icon calls the first modal
kjhandy Jan 7, 2016
4ae869e
Re-added missing css settings
GreenRaccoon23 Jan 7, 2016
7679aa5
Merge pull request #62 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
c0c449d
Merge pull request #63 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
ddb1c5f
now deleting images with 3 flags
hankcouture Jan 7, 2016
38adec9
nav edit
hankcouture Jan 7, 2016
182b13b
Merge pull request #64 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
cccd7b4
Merge branch 'master' into kayla
kjhandy Jan 7, 2016
d1a0e1a
Merge branch 'master' into kayla
kjhandy Jan 7, 2016
8d0c288
Added font awesome
kjhandy Jan 7, 2016
8e2dca3
Merge pull request #61 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 7, 2016
e2d8cdb
Fixed signup bug
hankcouture Jan 7, 2016
da046ce
Merge pull request #65 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
391c80b
Added x button svg images
GreenRaccoon23 Jan 7, 2016
50efc23
Merge pull request #66 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
e8ea826
Modal background covers entire screen
kjhandy Jan 7, 2016
0a527c6
Added server 'posturl' function
hankcouture Jan 7, 2016
699485d
attempted kaylas nav edits
hankcouture Jan 7, 2016
6cd3346
Merge pull request #69 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
7e3c73f
changed css colors
hankcouture Jan 7, 2016
c2ab9a1
Merge pull request #70 from GreenRaccoon23/hank
GreenRaccoon23 Jan 7, 2016
3491186
added posturl route
kjhandy Jan 7, 2016
6cafd8a
Working on postImage function
kjhandy Jan 7, 2016
965796a
Merge branch 'master' into kayla
kjhandy Jan 7, 2016
965f759
Merge pull request #71 from GreenRaccoon23/kayla
GreenRaccoon23 Jan 7, 2016
ee05c55
Styled new signin page
hankcouture Jan 7, 2016
458f7bd
Merge pull request #72 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
23defb5
Added home nav bar button and some styling on signup page
hankcouture Jan 7, 2016
166b4f1
fixed bug on storing userID
hankcouture Jan 7, 2016
59bc891
Merge pull request #73 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
98c4e03
Making changes to display images on users closet
kjhandy Jan 7, 2016
07740e2
Merge pull request #74 from GreenRaccoon23/kayla
hankcouture Jan 7, 2016
2a7d0db
fixed bugs when grabbing user info
hankcouture Jan 7, 2016
d490cba
Added topUsers page
GreenRaccoon23 Jan 7, 2016
d96a52e
Merge pull request #75 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
c998dc4
Added styling for topUsers page
GreenRaccoon23 Jan 7, 2016
b054015
Merge pull request #76 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
6c4af52
added table for followers in schema
AM-III Jan 7, 2016
355a164
Finished styling for signup page
hankcouture Jan 7, 2016
099984a
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
hankcouture Jan 7, 2016
814836f
Merge pull request #77 from GreenRaccoon23/stoney
AM-III Jan 7, 2016
bb35790
Merge branch 'master' of https://github.com/GreenRaccoon23/codequatro
hankcouture Jan 7, 2016
7d640a0
Now accessing user info from nav
hankcouture Jan 7, 2016
d553fa9
Merge pull request #78 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
ffb2978
Added routing to other user's profiles
GreenRaccoon23 Jan 7, 2016
2cb35e6
Merge pull request #79 from GreenRaccoon23/GreenRaccoon23
GreenRaccoon23 Jan 7, 2016
d4be429
Now displaying photos when voting
hankcouture Jan 7, 2016
8be9922
Merge pull request #80 from GreenRaccoon23/hank
hankcouture Jan 7, 2016
835058a
Now actually getting user info for nav
hankcouture Jan 7, 2016
4050a18
fixed nav bug
hankcouture Jan 7, 2016
b24a655
some styling on votes
hankcouture Jan 7, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ bower_components/
/client/src/config.json
/client/src/s3test.js
/client/uploads/*
client/uploads
.DS_Store
config.json
config.js
db/**
98 changes: 87 additions & 11 deletions client/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ angular.module('myApp', [

.config(function($stateProvider, $urlRouterProvider) {

$urlRouterProvider.otherwise('/');
$urlRouterProvider.otherwise('/closet');

$stateProvider

Expand All @@ -21,15 +21,13 @@ angular.module('myApp', [
.state('signin', {
url:'/signin',
views: {
"nav": {templateUrl: "views/nav.html"},
"main":{templateUrl: 'views/signin.html'}
}
})

.state('signup', {
url:'/signup',
views: {
"nav": {templateUrl: "views/nav.html"},
"main":{templateUrl: 'views/signup.html'}
}
})
Expand Down Expand Up @@ -58,6 +56,22 @@ angular.module('myApp', [
}
})

.state('profile', {
url: '/profile/:username',
views: {
"nav": {templateUrl: "views/nav.html"},
"main":{templateUrl: 'views/closet.html'}
}
})

.state('topUsers', {
url: '/topUsers',
views: {
"nav": {templateUrl: "views/nav.html"},
"main":{templateUrl: 'views/topUsers.html'}
}
})

.state('s3test', {
url: '/s3test',
views: {
Expand Down Expand Up @@ -101,13 +115,14 @@ angular.module('myApp', [
var register = {}; // local storage for users and current user

register.currentUser = $window.localStorage.getItem('username') || '' ;
register.currentUserID = $window.localStorage.getItem('userID') || '';
register.users = [];

/***************AUTHORIZATION***********************/
register.signup = function(user) {
return $http({
method: 'POST',
url: '/signup',
url: 'users/signup',
data: user
})
.then(function(resp){
Expand All @@ -118,7 +133,7 @@ angular.module('myApp', [
register.signin = function(user){
return $http({
method: 'POST',
url: '/signin',
url: 'users/signin',
data: user
})
.then(function(resp){
Expand All @@ -131,49 +146,108 @@ angular.module('myApp', [
register.randomImage = function(username){
return $http({
method: 'POST',
url: '/randomimage',
url: 'images/randomimage',
data: {username: username}
})
.then(function(resp){
return resp.data;
})
}

register.vote = function(hotOrNot, username, imageId){
register.vote = function(voteValue, username, imageId){
console.log('Factory Image ID', imageId);
return $http({
method: 'POST',
url: '/vote',
data: {hotOrNot: hotOrNot, username: username, imageId: imageId}
url: 'images/vote',
data: {voteValue: voteValue, username: username, imageId: imageId}
})
.then(function(resp){
return resp.data;
})
}
/*****************VOTING ON IMAGE*******************/

/*****************GET ALL IMAGES*******************/

register.getAllImages = function() {
return $http({
method: 'GET',
url: 'images/getAllImages'
})
.then(function(data) {
console.log(data)
return data;
})
};

register.getImageData = function(link) {
return $http({
method: 'POST',
url: 'images/getImageData',
data: link
}).then(function(res) {
console.log('success', res);
return res.data;
})
};

register.postImage = function(data) {
return $http({
method: 'POST',
url: 'images/postUrl',
data: data
}).then(function(res) {
return res.data;
})
}
/*************GET CLOSET IMAGES********************/
register.getCloset = function(user){
console.log('getCloset', user)
return $http({
method: 'POST',
url: '/closet',
url: 'users/closet',
data: {username: user}
})
.then(function(resp){
console.log(resp)
return resp.data;
})
};
/*************GET CLOSET IMAGES********************/
register.getBasicUserInfo = function(user){
console.log('getBasicUserInfo', user)
return $http({
method: 'POST',
url: 'users/getBasicUserInfo',
data: {username: user}
})
.then(function(resp){
console.log('basic info response: ', resp)
return resp.data;
})
};
/*************GET CLOSET IMAGES********************/
register.removeImage = function(imageId, imageName){
return $http({
method: 'POST',
url: '/removeimage',
url: 'images/removeimage',
data: {imageId: imageId, imageName: imageName}
})
.then(function(resp){
return resp.data;
})
};
/*************GET TOP USERS********************/
register.getTopUsers = function(user){
return $http({
method: 'GET',
url: 'users/topUsers',
data: user
})
.then(function(resp){
return resp.data;
})
};
/***************** AWS S3 ****************************/
register.s3 = function(params){
return $http({
Expand All @@ -194,3 +268,5 @@ angular.module('myApp', [

; // end of app.js



Binary file added client/assets/closet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/closet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/delete-icon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/fire.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/flag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/pablo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/thumb-down.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/thumb-up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/thumbs_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/assets/thumbs_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading