Skip to content

CS5331 Submission #30

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
Open
weeyou90 wants to merge 170 commits into
base: master
Choose a base branch
from
Open

CS5331 Submission #30

weeyou90 wants to merge 170 commits into from

Conversation

@weeyou90
Copy link

@weeyou90 weeyou90 commented Mar 5, 2018

4e9d93075fc46d257cfcb512b5a5d17272cf36a253528dfbaab6303f12ea30cd

weeyou90 and others added 30 commits February 14, 2018 23:19
@weeyou90
Update team members name by alphabetical order
48f632a
@weeyou90
Added test function on endpoint (/users/register/)
0b5ca78
@weeyou90
Added empty functions for users register, auth, expire, and profile page
e9ab425
@shannielee
Initial commit for short answer questions
4613093
@crazy161
Initial signup
53af746
@JasonSia
Added database schema sample code to execute
fa6a992
@shannielee
GET/Diary
f781196
@weeyou90
Created an example for posting JSON with flask at diary/create
ce6bc55
@weeyou90
Merge branch 'master' of ssh://github.com/CS5331-Group-10/rest-api-de…
4deec45 
…velopment
@weeyou90
added db functionality
0be695b 
added incomplete code for insert
(tbd: autoincrement for insert: do in code or do in schema?)

added empty codes for the rest of diary functions
@weeyou90
added some simple and incomplete test commands
2388491
@weeyou90
inserted functionality for create, delete, and modify diary entry. no…
946c685 
… support for user yet
@shannielee
basic UI, to be further improved
e894800
@shannielee
update test script
ba3f44e
@shannielee
Merge branch 'master' of https://github.com/CS5331-Group-10/rest-api-…
02ba206 
…development
@crazy161
Implement register and login function, futher need logout function, c…
b9617c3 
…omment make_repose for auto reload
@crazy161
Implement logout and retrieve infor, further need to add token functi…
e3d6330 
…on and remove email
@weeyou90
added some commments
312e0dd
@JasonSia
Added Bootstrap css and js
90658af
@JasonSia
Moved all folders
de35d80
@weeyou90
Merge branch 'master' of ssh://github.com/CS5331-Group-10/rest-api-de…
49ca6e4 
…velopment
@weeyou90
done view diary
83c4cbd
@JasonSia
Added bootstrap dependencies
084d2b3
@crazy161
add token function, but need to algin with UI
f28a28a
@weeyou90
wMerge branch 'origin/ethan_021'
8f38ce6
@crazy161
merge UI, first version
7a1cced
@JasonSia
Updated ui
863bd6e
@JasonSia
Merge branch 'ethan_0219' of https://github.com/CS5331-Group-10/rest-…
07a300a 
…api-development into ethan_0219
@shannielee
Get diary entry
e2c37bd
@crazy161
Merge with UI, remove email and add token, still need modify API repo…
e9665bd 
…nse and info page
weeyou90 and others added 30 commits March 3, 2018 03:13
@weeyou90
fixed register error
c946865
@crazy161
add flask.db
0d22b7f
@JasonSia
updatedNav in profile
79e078f
@shannielee
clean up codes
b4043fd
@crazy161
haha
d3912af
@shannielee
clean up codes
2575406
@crazy161
try to fix invalid inputs
570492f
@crazy161
fix create post, but login is still a problem
ea2631b
@weeyou90
Merge branch 'master' into temp
bb6f7fb
@weeyou90
Final??? Hopefully!
a8964b5
@weeyou90
literally bugless
4e7896d
@shannielee
Short Answer Questions
028bf22
@shannielee
More answers for short answer questions
dfe2484
@JasonSia
updated readme
3c3c058
@crazy161
add some screenshots, modify time format in app.py
a9b7491
@weeyou90
answered question 3
455ddd1
@weeyou90
Individual Contributions
f6a3146
@JasonSia
updated readme
9cd1a81
@JasonSia
updated readme
d5a41e8
@weeyou90
removed trash
d633613
@weeyou90
Merge branch 'master' of ssh://github.com/CS5331-Group-10/rest-api-de…
64d4f82 
…velopment
@weeyou90
stylo screenshots
983bd33
@weeyou90
fixed login bug
f3a86bf
@weeyou90
fixed user profile endpoint
f9bb715
@weeyou90
endpoints
4334a3b
@weeyou90
editted json to take in public:true/false
a710cd6
@weeyou90
adjust readme.md
8704cf3
@weeyou90
adjust readme.md
3900a9e
@weeyou90
fixed typos. emptied database
afc40ee
@crazy161
update port
f327f00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@weeyou90 @shannielee @crazy161 @JasonSia