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

CS5331 Submission #19

Open
wants to merge 100 commits into
base: master
Choose a base branch
from
Open

CS5331 Submission #19

wants to merge 100 commits into from

Commits on Feb 19, 2018

  1. Add names of team members to readme

    @weechen
    weechen committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    56b842b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from MXs-Org/update-readme 

    Add names of team members to readme
    @weechen
    weechen authored Feb 19, 2018
    Configuration menu
    Copy the full SHA
    66b3c49 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Update files to start DB container and link app to it

    @weechen
    weechen committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    d836518 View commit details
    Browse the repository at this point in the history

  2. Add sleep, wait for db to finish loading

    @weechen
    weechen committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    b27342a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Allow persistent storage for db

    @weechen
    weechen committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    473678a View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @weechen
    weechen authored Feb 27, 2018
    Configuration menu
    Copy the full SHA
    2bc94d1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from MXs-Org/start-docker-db 

    Create DB container and link app to it
    @weechen
    weechen authored Feb 27, 2018
    Configuration menu
    Copy the full SHA
    1054a53 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Update run.sh

    @mxchai
    mxchai committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    f5d47f4 View commit details
    Browse the repository at this point in the history

  2. Update comments, replace python packages

    @mxchai
    mxchai committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    85a0951 View commit details
    Browse the repository at this point in the history

  3. Update app, add database and models

    @mxchai
    mxchai committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    c58e437 View commit details
    Browse the repository at this point in the history

  4. add entry and token model and their relationships with user

    @garbanzos
    garbanzos committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    9eb639f View commit details
    Browse the repository at this point in the history

  5. added diary routes skeleton code

    @garbanzos
    garbanzos committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    9bd0e62 View commit details
    Browse the repository at this point in the history

  6. Update User model for password hashing

    @mxchai
    mxchai committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    97c6226 View commit details
    Browse the repository at this point in the history

  7. Add /users/register route

    @mxchai
    mxchai committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    d4f425b View commit details
    Browse the repository at this point in the history

  8. added base ui html that is the parent of all htmls

    @garbanzos
    garbanzos committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    883da1a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Merge branch 'origin/diary-api' into users

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    5d2de5f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from MXs-Org/base-ui 

    added base ui html that is the parent of all htmls
    @mxchai
    mxchai authored Mar 1, 2018
    Configuration menu
    Copy the full SHA
    512b973 View commit details
    Browse the repository at this point in the history

  3. Update User model

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    55d1c02 View commit details
    Browse the repository at this point in the history

  4. Add /users/authenticate

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    645e69e View commit details
    Browse the repository at this point in the history

  5. Fix error in User model

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    08d8393 View commit details
    Browse the repository at this point in the history

  6. Add /users/expire

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    a54fa47 View commit details
    Browse the repository at this point in the history

  7. Add /users

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    2f14c5d View commit details
    Browse the repository at this point in the history

  8. Fix minor route errors

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    2d3076d View commit details
    Browse the repository at this point in the history

  9. Update run.sh to remove MySQL-related commands

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    9b1f54d View commit details
    Browse the repository at this point in the history

  10. Update team members

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    630dbad View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from MXs-Org/users 

    Users
    @mxchai
    mxchai authored Mar 1, 2018
    Configuration menu
    Copy the full SHA
    eb7e89f View commit details
    Browse the repository at this point in the history

  12. Update ENDPOINT_LIST

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    9f9cbda View commit details
    Browse the repository at this point in the history

  13. Rewrite to handle application/json instead of form-data

    @mxchai
    mxchai committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    e58645c View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. Update Entry model to change 'publish_date', add method to dump JSON

    @mxchai
    mxchai committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    d732073 View commit details
    Browse the repository at this point in the history

  2. Add /diary and /diary/create

    @mxchai
    mxchai committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    267cc58 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5 from MXs-Org/diary 

    Add 2 Diary routes
    @mxchai
    mxchai authored Mar 2, 2018
    Configuration menu
    Copy the full SHA
    524e41d View commit details
    Browse the repository at this point in the history

  4. Clean and update README

    @mxchai
    mxchai committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    7a21116 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/MXs-Org/rest-api-development

    @mxchai
    mxchai committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    1360b67 View commit details
    Browse the repository at this point in the history

  6. Clean up

    @mxchai
    mxchai committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    48f7545 View commit details
    Browse the repository at this point in the history

  7. add delete and change_permissions api for diary

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    6ebe201 View commit details
    Browse the repository at this point in the history

  8. moved templates into some dir as app.py so that they can be rendered … 

    …by flask
    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    d38f19b View commit details
    Browse the repository at this point in the history

  9. added create post ui and base form ui

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    37ab7b0 View commit details
    Browse the repository at this point in the history

  10. added skeleton login and register form template

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    9340bb6 View commit details
    Browse the repository at this point in the history

  11. add static folder to hold css, js and img

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    c339bfc View commit details
    Browse the repository at this point in the history

  12. add login and register form ui

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    3c01552 View commit details
    Browse the repository at this point in the history

  13. attempt to link api to register ui

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    c4a2266 View commit details
    Browse the repository at this point in the history

  14. change register_form ajax contenttype to json and added toasts

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    b06ca42 View commit details
    Browse the repository at this point in the history

  15. change auth api to match specs and added login_form submit handler

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    626f8f7 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/shift_ui_port_80' into diary-api-ui

    @garbanzos
    garbanzos committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    6d84824 View commit details
    Browse the repository at this point in the history

  17. Move views to port 80

    @weechen
    weechen committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    83e43d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2018

  1. WIP

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    81d924f View commit details
    Browse the repository at this point in the history

  2. Update auth.js skeleton

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    6cecdd5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'port_80_extra' into diary-api-ui

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    68835c6 View commit details
    Browse the repository at this point in the history

  4. login now stores token in localstorage and minor refactoring

    @garbanzos
    garbanzos committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    e6e8320 View commit details
    Browse the repository at this point in the history

  5. added logout js and add links to the navbar

    @garbanzos
    garbanzos committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    48fdd6f View commit details
    Browse the repository at this point in the history

  6. Add route for token validation. Not part of testing API

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    addc03c View commit details
    Browse the repository at this point in the history

  7. Modify navbar to display different options according to auth status

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    41de448 View commit details
    Browse the repository at this point in the history

  8. /diary now shows all public shows of users

    @garbanzos
    garbanzos committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    edaa974 View commit details
    Browse the repository at this point in the history

  9. Remove extra if-else block and debug messages

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    30eb6ab View commit details
    Browse the repository at this point in the history

  10. Merge pull request #12 from MXs-Org/fix-navbar 

    Debug navbar
    @weechen
    weechen authored Mar 3, 2018
    Configuration menu
    Copy the full SHA
    e851b6e View commit details
    Browse the repository at this point in the history

  11. added my_entries view

    @garbanzos
    garbanzos committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    c507bde View commit details
    Browse the repository at this point in the history

  12. Merge branch 'diary-api-ui' of github.com:MXs-Org/rest-api-developmen… 

    …t into

diary-api-ui
    @garbanzos
    garbanzos committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    b8e677f View commit details
    Browse the repository at this point in the history

  13. Make all external JS local

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    b82c8a9 View commit details
    Browse the repository at this point in the history

  14. Fix login failure materialize toast

    @mxchai
    mxchai committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    438e44a View commit details
    Browse the repository at this point in the history

  15. Resolve merge conflicts, remove auth.js in views and add create_entry

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    a684bc9 View commit details
    Browse the repository at this point in the history

  16. Remove endpoints

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    9431025 View commit details
    Browse the repository at this point in the history

  17. Fix create entry bugs

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    4cc1962 View commit details
    Browse the repository at this point in the history

  18. Add missing fonts

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    cd3ec26 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #16 from MXs-Org/Add-fonts 

    Add missing fonts
    @weechen
    weechen authored Mar 3, 2018
    Configuration menu
    Copy the full SHA
    235861b View commit details
    Browse the repository at this point in the history

  20. Merge remote-tracking branch 'origin/diary-api-ui' into create-form

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    1ec45e8 View commit details
    Browse the repository at this point in the history

  21. Prepare js methods and views

    @weechen
    weechen committed Mar 3, 2018
    Configuration menu
    Copy the full SHA
    919de2e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2018

  1. Implement delete post

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    ef3cf70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from MXs-Org/delete-diary-ui 

    Delete diary ui
    @weechen
    weechen authored Mar 4, 2018
    Configuration menu
    Copy the full SHA
    cbe5648 View commit details
    Browse the repository at this point in the history

  3. Fix bug in delete and implement change in visibility

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    8f4da03 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from MXs-Org/diary-change-permission-ui 

    Fix bug in delete and implement change in visibility
    @weechen
    weechen authored Mar 4, 2018
    Configuration menu
    Copy the full SHA
    6af84e6 View commit details
    Browse the repository at this point in the history

  5. Save sqlite db into host system

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    ed34700 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #20 from MXs-Org/persist-database 

    Save sqlite db into host system
    @weechen
    weechen authored Mar 4, 2018
    Configuration menu
    Copy the full SHA
    813ac4e View commit details
    Browse the repository at this point in the history

  7. Fix login/logout and my posts link

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    c5f83e8 View commit details
    Browse the repository at this point in the history

  8. Move navbar out of auth.js

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    6b806aa View commit details
    Browse the repository at this point in the history

  9. add user check endpoint

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    30e60fc View commit details
    Browse the repository at this point in the history

  10. Move auth helpers out

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    f7666ca View commit details
    Browse the repository at this point in the history

  11. Clean up auth.js calls

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    f8a2677 View commit details
    Browse the repository at this point in the history

  12. Add in redirect.js

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    d6c3edd View commit details
    Browse the repository at this point in the history

  13. Fix login form bug

    @weechen
    weechen committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    1ee6e02 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #21 from MXs-Org/fix-navbar 

    Fix navbar links and add authentication to visit pages
    @weechen
    weechen authored Mar 4, 2018
    Configuration menu
    Copy the full SHA
    24c2dca View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. remove debugging api and delete and change permissions api now checks… 

    … if entry exists
    @garbanzos
    garbanzos committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    93d6895 View commit details
    Browse the repository at this point in the history

  2. removed all users from navbar

    @garbanzos
    garbanzos committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    c546282 View commit details
    Browse the repository at this point in the history

  3. Default message when no public entries

    @weechen
    weechen committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    800566c View commit details
    Browse the repository at this point in the history

  4. Add default message for my entries page

    @weechen
    weechen committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    4cab2ad View commit details
    Browse the repository at this point in the history

  5. Merge pull request #22 from MXs-Org/touch-up-ui 

    Add default messages
    @weechen
    weechen authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    b2a6f83 View commit details
    Browse the repository at this point in the history

  6. center login page

    @garbanzos
    garbanzos committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    3910c90 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'diary-api-ui' of github.com:MXs-Org/rest-api-developmen… 

    …t into diary-api-ui
    @garbanzos
    garbanzos committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    2bd7ac6 View commit details
    Browse the repository at this point in the history

  8. Reject empty title or entry posts and touch up ui

    @weechen
    weechen committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    a47c376 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #23 from MXs-Org/reject-empty-entries 

    Reject empty title or entry posts and touch up ui
    @weechen
    weechen authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    6d98d23 View commit details
    Browse the repository at this point in the history

  10. Auto stash before merge of "diary-api-ui" and "origin/diary-api-ui"

    @weechen
    weechen committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    f6a7e85 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #24 from MXs-Org/add-screenshot 

    Replace sample screenshot
    @weechen
    weechen authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    82b8837 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #6 from MXs-Org/diary-api-ui 

    Diary api and some ui stuff
    @garbanzos
    garbanzos authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    340c94b View commit details
    Browse the repository at this point in the history

  13. Standardize server responses when unsuccessful request is made

    @mxchai
    mxchai committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    c41c3b3 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'diary-api-ui' of https://github.com/MXs-Org/rest-api-de… 

    …velopment into diary-api-ui
    @mxchai
    mxchai committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    602b9e0 View commit details
    Browse the repository at this point in the history

  15. added screenshots

    @garbanzos
    garbanzos committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    a86260e View commit details
    Browse the repository at this point in the history

  16. Remove internal route from ENDPOINT_LIST

    @mxchai
    mxchai committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    24941a7 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #25 from MXs-Org/diary-api-ui 

    Standardize server responses when unsuccessful request is made
    @mxchai
    mxchai authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    8756854 View commit details
    Browse the repository at this point in the history

  18. Update README

    @mxchai
    mxchai committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    7cbbf12 View commit details
    Browse the repository at this point in the history

  19. Update README.md

    @mxchai
    mxchai authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    74bba62 View commit details
    Browse the repository at this point in the history

  20. Update README.md

    @mxchai
    mxchai authored Mar 5, 2018
    Configuration menu
    Copy the full SHA
    525be46 View commit details
    Browse the repository at this point in the history