Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User accounts #48

Merged
merged 135 commits into from Jan 17, 2017
Merged

User accounts #48

Changes from 1 commit
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
6220393
Added routes to db handlers.
duncannevin Jan 4, 2017
0d67601
Some work on db connection. Not working
duncannevin Jan 5, 2017
4cdf407
Added routes to db handlers.
duncannevin Jan 4, 2017
52a1d2c
Some work on db connection. Not working
duncannevin Jan 5, 2017
4b5c160
Db working very basically
duncannevin Jan 6, 2017
205cadc
Mergin to master
duncannevin Jan 6, 2017
cf67626
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
f18f697
Fixed function name
duncannevin Jan 10, 2017
2f3d60e
Starting work on PUT
duncannevin Jan 10, 2017
34bb27b
Put request works. Post new file works
duncannevin Jan 10, 2017
2d41314
db code cleaned up, db finished
duncannevin Jan 11, 2017
94bc4ce
duncan.md
duncannevin Jan 11, 2017
e3cebe9
Updated duncan.md
duncannevin Jan 11, 2017
6cfd3c0
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
203345f
Adjust for merge
duncannevin Jan 11, 2017
0a120cc
Removed urls.go in order to rebase w/ upstream
duncannevin Jan 11, 2017
2ed63ec
Fixed merge conflict
duncannevin Jan 11, 2017
3a40492
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
fb560d4
Fixed API url
duncannevin Jan 12, 2017
b062d24
Added a documents table to the database:
duncannevin Jan 12, 2017
9cc369a
Renamed people.go to people_db.go
duncannevin Jan 12, 2017
d2618d8
Prepped for rebase
duncannevin Jan 13, 2017
078e12e
Added routes to db handlers.
duncannevin Jan 4, 2017
0e339db
Some work on db connection. Not working
duncannevin Jan 5, 2017
610d429
Added routes to db handlers.
duncannevin Jan 4, 2017
bf06d73
Some work on db connection. Not working
duncannevin Jan 5, 2017
d76bb9a
Db working very basically
duncannevin Jan 6, 2017
458066e
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
8f60b30
Fixed function name
duncannevin Jan 10, 2017
ac18542
Starting work on PUT
duncannevin Jan 10, 2017
291f546
Put request works. Post new file works
duncannevin Jan 10, 2017
9401bf5
db code cleaned up, db finished
duncannevin Jan 11, 2017
f00c3aa
duncan.md
duncannevin Jan 11, 2017
828d234
Updated duncan.md
duncannevin Jan 11, 2017
10f6785
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
af2d018
Adjust for merge
duncannevin Jan 11, 2017
01bbf71
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
3102715
Fixed API url
duncannevin Jan 12, 2017
238ac7a
Added a documents table to the database:
duncannevin Jan 12, 2017
0dd1d4a
Renamed people.go to people_db.go
duncannevin Jan 12, 2017
b771ae1
Some work on db connection. Not working
duncannevin Jan 5, 2017
2df2d88
Added routes to db handlers.
duncannevin Jan 4, 2017
30e3d6f
Some work on db connection. Not working
duncannevin Jan 5, 2017
9fcc963
Db working very basically
duncannevin Jan 6, 2017
d6c0452
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
d5474e8
Fixed function name
duncannevin Jan 10, 2017
a5b4791
Starting work on PUT
duncannevin Jan 10, 2017
ce19329
Put request works. Post new file works
duncannevin Jan 10, 2017
726fde4
db code cleaned up, db finished
duncannevin Jan 11, 2017
9768af3
duncan.md
duncannevin Jan 11, 2017
ceabf4b
Updated duncan.md
duncannevin Jan 11, 2017
8a756f7
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
e79470c
Adjust for merge
duncannevin Jan 11, 2017
1cb43a8
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
20e7b3f
Fixed API url
duncannevin Jan 12, 2017
9d96b0a
Prepped for rebase
duncannevin Jan 13, 2017
5feb12c
removed editor file
duncannevin Jan 13, 2017
e9191b9
removing db.go
duncannevin Jan 13, 2017
48d0bf3
Fixing issues from rebase:
duncannevin Jan 13, 2017
da4ffaa
Correction to docs get by id
duncannevin Jan 13, 2017
651ec7b
Repaired merge conflicts
duncannevin Jan 13, 2017
8d02cb4
Fixed merge conflict
duncannevin Jan 13, 2017
235ab27
Front end auth forms done. Can add new user, login works, sets cookie…
duncannevin Jan 14, 2017
efb0b34
Auth workflow working
duncannevin Jan 15, 2017
4b97354
Authentication works. Just started working on saving docs
duncannevin Jan 15, 2017
16c6a86
Save and receive docs works
duncannevin Jan 16, 2017
ecededf
Update existing document works
duncannevin Jan 16, 2017
98d9b87
Cleaned up save document flow
duncannevin Jan 16, 2017
ff1b7b2
Fixed bug when switching users.
duncannevin Jan 16, 2017
e08c9c2
Added 'new' feature, works.
duncannevin Jan 16, 2017
2af5333
No real changes
duncannevin Jan 16, 2017
f1098bb
Some work on db connection. Not working
duncannevin Jan 5, 2017
f60ee61
Added routes to db handlers.
duncannevin Jan 4, 2017
eb15bf2
Some work on db connection. Not working
duncannevin Jan 5, 2017
e29acd4
Db working very basically
duncannevin Jan 6, 2017
5900dc8
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
4d9b569
Fixed function name
duncannevin Jan 10, 2017
f92862c
Starting work on PUT
duncannevin Jan 10, 2017
e90568c
Put request works. Post new file works
duncannevin Jan 10, 2017
487594e
db code cleaned up, db finished
duncannevin Jan 11, 2017
9cde31d
duncan.md
duncannevin Jan 11, 2017
c2140ff
Updated duncan.md
duncannevin Jan 11, 2017
653d69d
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
86e50b6
Adjust for merge
duncannevin Jan 11, 2017
6d035b1
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
558cdb8
Fixed API url
duncannevin Jan 12, 2017
e0bb69e
Added a documents table to the database:
duncannevin Jan 12, 2017
88b6ba7
Renamed people.go to people_db.go
duncannevin Jan 12, 2017
4c520dd
Prepped for rebase
duncannevin Jan 13, 2017
046071e
Added routes to db handlers.
duncannevin Jan 4, 2017
cd1b290
Some work on db connection. Not working
duncannevin Jan 5, 2017
219c3d2
Added routes to db handlers.
duncannevin Jan 4, 2017
a1b6220
Some work on db connection. Not working
duncannevin Jan 5, 2017
b3e15fe
Db working very basically
duncannevin Jan 6, 2017
934923f
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
0e6d661
Fixed function name
duncannevin Jan 10, 2017
d09e35e
Starting work on PUT
duncannevin Jan 10, 2017
6ea0671
Put request works. Post new file works
duncannevin Jan 10, 2017
283f52b
db code cleaned up, db finished
duncannevin Jan 11, 2017
31b4299
duncan.md
duncannevin Jan 11, 2017
210157a
Updated duncan.md
duncannevin Jan 11, 2017
65d2e60
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
6bf4f11
Adjust for merge
duncannevin Jan 11, 2017
1fa1ca0
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
8e6428e
Fixed API url
duncannevin Jan 12, 2017
1389114
Added a documents table to the database:
duncannevin Jan 12, 2017
5b292ef
Renamed people.go to people_db.go
duncannevin Jan 12, 2017
a176196
Added routes to db handlers.
duncannevin Jan 4, 2017
164c1e0
Some work on db connection. Not working
duncannevin Jan 5, 2017
f3853b2
Db working very basically
duncannevin Jan 6, 2017
51b9e40
Go post request works, except still need to figure out the array for …
duncannevin Jan 10, 2017
e2f2099
Fixed function name
duncannevin Jan 10, 2017
f4cb158
Starting work on PUT
duncannevin Jan 10, 2017
45983e5
Put request works. Post new file works
duncannevin Jan 10, 2017
7c5b6f4
db code cleaned up, db finished
duncannevin Jan 11, 2017
9648623
duncan.md
duncannevin Jan 11, 2017
bcd634c
Updated duncan.md
duncannevin Jan 11, 2017
afcca8f
Adjusted Vue comp to help with merge conflict w/upstream
duncannevin Jan 11, 2017
ac918e3
Adjust for merge
duncannevin Jan 11, 2017
9a658ce
Updated http calls on front end. Wasn't able to test them yet due to …
duncannevin Jan 11, 2017
6e4330d
Fixed API url
duncannevin Jan 12, 2017
d0e5ea4
removing db.go
duncannevin Jan 13, 2017
28ff215
Fixing issues from rebase:
duncannevin Jan 13, 2017
b681c9b
Correction to docs get by id
duncannevin Jan 13, 2017
5425ae0
Fixed merge conflict with origin master
duncannevin Jan 16, 2017
1ba2838
Merging new changes into user accounts
duncannevin Jan 16, 2017
779f306
Fixed bugs that happened during rebase
duncannevin Jan 16, 2017
e3d67b4
Moved quill data to editor service
duncannevin Jan 17, 2017
c561a1b
No real changes
duncannevin Jan 17, 2017
f6f96cf
Updated duncan.md
duncannevin Jan 17, 2017
8f0e35d
Fixed doc encrypt
duncannevin Jan 17, 2017
5744ffe
Fixed update doc encrypt
duncannevin Jan 17, 2017
924f9ac
Fixed encryption errors
duncannevin Jan 17, 2017
29fe2fc
Merge branch 'user_accounts' of https://github.com/duncannevin/tesis …
duncannevin Jan 17, 2017
5290f16
Added back video feed
duncannevin Jan 17, 2017
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
Prev Previous commit
Next Next commit
Starting work on PUT
  • Loading branch information
@duncannevin
duncannevin committed Jan 10, 2017
commit 2f3d60ea3bae17f0e9b9da787a6ed815321f2afc
3 changes: 1 addition & 2 deletions editor/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type(
Email string `json:"email" bson:"email"`
Password string `json:"password" bson:"password"`
Avatar string `json:"avatar" bson:"avatar"`
// Saved []Saved `json:"saved", bson:"saved"`
Saved []Saved `json:"saved", bson:"saved"`
}
)
/* ======>Database Handlers<====== */
Expand Down Expand Up @@ -73,7 +73,6 @@ func CreateUser(w http.ResponseWriter, r *http.Request) {

// GetUser gets a user resource
func GetUser(w http.ResponseWriter, r *http.Request) {
// finds by id :o
session, err := mgo.Dial("mongodb:https://localhost:27017")
if err != nil {

Expand Down