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

Sockets #26

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

Sockets #26

wants to merge 180 commits into from

Commits on Feb 26, 2020

  1. Added to user model, and simple validation

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    9fd9d9d View commit details
    Browse the repository at this point in the history

  2. Fixed validation and typo.

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    f75569c View commit details
    Browse the repository at this point in the history

  3. password check and installed flask-wtf

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    0b4d77b View commit details
    Browse the repository at this point in the history

  4. CSRF protection added

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    c576a40 View commit details
    Browse the repository at this point in the history

  5. Update views.py

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    d7f8e5c View commit details
    Browse the repository at this point in the history

  6. js file to handle keyup, password validation

    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    8d15ea1 View commit details
    Browse the repository at this point in the history

  7. sign in form, flash added. 

    Sign in form can check if user exists and also checks against the hashed pass. But no session saving yet.
    @shenyang44
    shenyang44 committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    dc411a4 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2020

  1. made html file for users/index

    @shenyang44
    shenyang44 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    7630f5c View commit details
    Browse the repository at this point in the history

  2. moved sign in handling to sessions folder. And implemented sessions

    @shenyang44
    shenyang44 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    ddff478 View commit details
    Browse the repository at this point in the history

  3. changed session to flask_login

    @shenyang44
    shenyang44 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    25d980f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from shenyang44/flask-login 

    changed session to flask_login
    @shenyang44
    shenyang44 authored Feb 27, 2020
    Configuration menu
    Copy the full SHA
    61b3438 View commit details
    Browse the repository at this point in the history

  5. added navbar to control signin/up and logout

    @shenyang44
    shenyang44 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    06733d9 View commit details
    Browse the repository at this point in the history

  6. 404 and 500 error pages up and running 

    Non working.  edit page for user info.
WIP
    @shenyang44
    shenyang44 committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    4e46604 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2020

  1. update form up and running. 

    Email, username and password can all be altered.
    @shenyang44
    shenyang44 committed Feb 28, 2020
    Configuration menu
    Copy the full SHA
    90f1ada View commit details
    Browse the repository at this point in the history

  2. profile picture upload

    @shenyang44
    shenyang44 committed Feb 28, 2020
    Configuration menu
    Copy the full SHA
    ecab14d View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2020

  1. WIP file checking 

    checking file name and type before allowing submission.
    @shenyang44
    shenyang44 committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    3f2820d View commit details
    Browse the repository at this point in the history

  2. Update views.py

    @shenyang44
    shenyang44 committed Feb 29, 2020
    Configuration menu
    Copy the full SHA
    88c70c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2020

  1. Read desc. 

    Using S3_location abbreviation, made profile page and allows user to upload images (not their profile image).
Also basic users index displaying all users and their profile images.
    @shenyang44
    shenyang44 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    62fcaf5 View commit details
    Browse the repository at this point in the history

  2. altered profile HTML 

    can show different profiles and will only allow changes if on own pwofile.
    @shenyang44
    shenyang44 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    19f12ec View commit details
    Browse the repository at this point in the history

  3. moved out gallery images into own blueprint

    @shenyang44
    shenyang44 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    62fd159 View commit details
    Browse the repository at this point in the history

  4. some useless shiz

    @shenyang44
    shenyang44 committed Mar 2, 2020
    Configuration menu
    Copy the full SHA
    dbb6c9d View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2020

  1. blueprints and model for donos

    @shenyang44
    shenyang44 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    fd553d6 View commit details
    Browse the repository at this point in the history

  2. adding donation form

    @shenyang44
    shenyang44 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    b7a8ed0 View commit details
    Browse the repository at this point in the history

  3. payment gateway working. 

    adding record to database still a WIP
    @shenyang44
    shenyang44 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    c827c4e View commit details
    Browse the repository at this point in the history

  4. working email notifier

    @shenyang44
    shenyang44 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    142d4a4 View commit details
    Browse the repository at this point in the history

  5. Added categories for flash messages. 

    But it don't work :')
PLEASE FIX
    @shenyang44
    shenyang44 committed Mar 3, 2020
    Configuration menu
    Copy the full SHA
    199d9c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. User index displays all posts if not signed in

    @shenyang44
    shenyang44 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    2e63a47 View commit details
    Browse the repository at this point in the history

  2. flash categories finally working. 

     bootstrap classes
    @shenyang44
    shenyang44 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    8d7fbff View commit details
    Browse the repository at this point in the history

  3. google login implemented

    @shenyang44
    shenyang44 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    798a36b View commit details
    Browse the repository at this point in the history

  4. added protection for donations 

    user needs to be logged in to donate, and users cannot donate to themselves.
    @shenyang44
    shenyang44 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    a41695f View commit details
    Browse the repository at this point in the history

  5. modals for viewing images upclose.

    @shenyang44
    shenyang44 committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    3afe670 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. created models for comments and follows

    @shenyang44
    shenyang44 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    71dc7c9 View commit details
    Browse the repository at this point in the history

  2. follows and shit

    @shenyang44
    shenyang44 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    8d12406 View commit details
    Browse the repository at this point in the history

  3. listing fans and idols.

    @shenyang44
    shenyang44 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    8e6196a View commit details
    Browse the repository at this point in the history

  4. added messages if peeps dont have followers or folliwiowfj

    @shenyang44
    shenyang44 committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    4687e40 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. added authorized but no other code

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    0ba1481 View commit details
    Browse the repository at this point in the history

  2. Update requirements.txt

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    0d93d6c View commit details
    Browse the repository at this point in the history

  3. removed pwdbev

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    5e172d6 View commit details
    Browse the repository at this point in the history

  4. yeah

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    b8560d3 View commit details
    Browse the repository at this point in the history

  5. remved pwdbev

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    fb4a47c View commit details
    Browse the repository at this point in the history

  6. removed procfile

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    19ae1d9 View commit details
    Browse the repository at this point in the history

  7. added back pwdbev and procfile

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    cd6ea7c View commit details
    Browse the repository at this point in the history

  8. asidj

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    d4b73e0 View commit details
    Browse the repository at this point in the history

  9. n

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    b80a44f View commit details
    Browse the repository at this point in the history

  10. Update config.py

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    5b119f1 View commit details
    Browse the repository at this point in the history

  11. asd

    @shenyang44
    shenyang44 committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    efd450f View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. simple api call

    @shenyang44
    shenyang44 committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    953613e View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. placed block content into a tag and gave padding

    @shenyang44
    shenyang44 committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    d484c2e View commit details
    Browse the repository at this point in the history

  2. slight improvements to profile page layout and ui

    @shenyang44
    shenyang44 committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    d81750f View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. styled index a bit more. fixed navbar to top of window

    @shenyang44
    shenyang44 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    2a03be2 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. removing modal onclick on index and new hover effect

    @shenyang44
    shenyang44 committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    c207eaa View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Captions, hovers, dollar sign. 

    added hover effects, changed dono to dollar sign. removing modal, and showing caption upon hover of img. some styling
    @shenyang44
    shenyang44 committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    a030570 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. donation available in prof pg 

    Also, fixed some flash category problems. AND peewee stuff. and to &
    @shenyang44
    shenyang44 committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    7019e5e View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. moved image upload to its own pg

    @shenyang44
    shenyang44 committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    659eecf View commit details
    Browse the repository at this point in the history

  2. to heroku

    @shenyang44
    shenyang44 committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    3bea9b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. new image form updated. along with small profile changes 

    Disabling button if caption exceeds 50 chars, changed image preview method to prevent showing sourceless image on load.
removed d0no buttn from prof.
    @shenyang44
    shenyang44 committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    5a223ac View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. filename check 

    prevents special characters besides _- and . being in filenames. and no spaces as well.
    @shenyang44
    shenyang44 committed May 1, 2020
    Configuration menu
    Copy the full SHA
    0a69761 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. function buttonUpdate. 

    function to assess whether button should be disabled or not. caption length and image filename both affect it.
    @shenyang44
    shenyang44 committed May 2, 2020
    Configuration menu
    Copy the full SHA
    2096a7b View commit details
    Browse the repository at this point in the history

  2. WIP search function

    @shenyang44
    shenyang44 committed May 2, 2020
    Configuration menu
    Copy the full SHA
    66f937f View commit details
    Browse the repository at this point in the history

Commits on May 3, 2020

  1. completed search function

    @shenyang44
    shenyang44 committed May 3, 2020
    Configuration menu
    Copy the full SHA
    519df2c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. search results into grid

    @shenyang44
    shenyang44 committed May 5, 2020
    Configuration menu
    Copy the full SHA
    ca215c7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2020

  1. monopoly board visuals, no logic

    @shenyang44
    shenyang44 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    3d0cac1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from shenyang44/monopoly-board 

    monopoly board visuals, no logic
    @shenyang44
    shenyang44 authored May 9, 2020
    Configuration menu
    Copy the full SHA
    9f92b13 View commit details
    Browse the repository at this point in the history

  3. made new model for monopoly users. and sign up page

    @shenyang44
    shenyang44 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    b87181e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from shenyang44/monopoly-board 

    made new model for monopoly users. and sign up page
    @shenyang44
    shenyang44 authored May 9, 2020
    Configuration menu
    Copy the full SHA
    34e24e4 View commit details
    Browse the repository at this point in the history

  5. moved properties into user model and passed positions into html

    @shenyang44
    shenyang44 committed May 9, 2020
    Configuration menu
    Copy the full SHA
    1dc7447 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4 from shenyang44/monopoly-board 

    moved properties into user model and passed positions into html
    @shenyang44
    shenyang44 authored May 9, 2020
    Configuration menu
    Copy the full SHA
    cede5df View commit details
    Browse the repository at this point in the history

Commits on May 10, 2020

  1. dice rolling with effect on player position. reset button WIP propert… 

    …y model
    @shenyang44
    shenyang44 committed May 10, 2020
    Configuration menu
    Copy the full SHA
    a794e60 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from shenyang44/monopoly-board 

    dice rolling with effect on player position.
    @shenyang44
    shenyang44 authored May 10, 2020
    Configuration menu
    Copy the full SHA
    4b16d13 View commit details
    Browse the repository at this point in the history

  3. form for new property name, auto jail if land on 30

    @shenyang44
    shenyang44 committed May 10, 2020
    Configuration menu
    Copy the full SHA
    a86d1f3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from shenyang44/monopoly-board 

    form for new property name, auto jail if land on 30
    @shenyang44
    shenyang44 authored May 10, 2020
    Configuration menu
    Copy the full SHA
    3d09c54 View commit details
    Browse the repository at this point in the history

  5. resets for houses and users jail counter and disabled some stuff if i… 

    …n jail. jail roll WIP
    @shenyang44
    shenyang44 committed May 10, 2020
    Configuration menu
    Copy the full SHA
    f318221 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #7 from shenyang44/monopoly-board 

    resets for houses and users jail counter
    @shenyang44
    shenyang44 authored May 10, 2020
    Configuration menu
    Copy the full SHA
    cc12032 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. double rolls when in jail will move the player. altering jail status … 

    …added but manual
    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    f901df5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from shenyang44/monopoly-board 

    double rolls when in jail will move the player.
    @shenyang44
    shenyang44 authored May 11, 2020
    Configuration menu
    Copy the full SHA
    59b3f9d View commit details
    Browse the repository at this point in the history

  3. 1500 on reset, 200 upon passing go. moved location display. banker no… 

    …t displayed. banker exempted from resets.
    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    3321eaf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from shenyang44/monopoly-board 

    1500 on reset, 200 upon passing go.
    @shenyang44
    shenyang44 authored May 11, 2020
    Configuration menu
    Copy the full SHA
    48822b1 View commit details
    Browse the repository at this point in the history

  5. form for payment

    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    aefadff View commit details
    Browse the repository at this point in the history

  6. Merge pull request #10 from shenyang44/monopoly-board 

    form for payment
    @shenyang44
    shenyang44 authored May 11, 2020
    Configuration menu
    Copy the full SHA
    6ad83eb View commit details
    Browse the repository at this point in the history

  7. small

    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    cc56586 View commit details
    Browse the repository at this point in the history

  8. for heroku

    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b0a6819 View commit details
    Browse the repository at this point in the history

  9. missed banker option

    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    5ffac39 View commit details
    Browse the repository at this point in the history

  10. changed click listener to class instead of option tag

    @shenyang44
    shenyang44 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    970d954 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. payment method up and running

    @shenyang44
    shenyang44 committed May 12, 2020
    Configuration menu
    Copy the full SHA
    48022bf View commit details
    Browse the repository at this point in the history

  2. fixed conflicts

    @shenyang44
    shenyang44 committed May 12, 2020
    Configuration menu
    Copy the full SHA
    5b302de View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. rolling doubles into jail and out of jail

    @shenyang44
    shenyang44 committed May 15, 2020
    Configuration menu
    Copy the full SHA
    4769dca View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from shenyang44/monopoly-board 

    rolling dubs into and out of jail
    @shenyang44
    shenyang44 authored May 15, 2020
    Configuration menu
    Copy the full SHA
    9c1f360 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. fixed regex, reformed jaill freeing and rolls 

    WIP tooltip for confirmbtn letting them know what the problem is
    @shenyang44
    shenyang44 committed May 16, 2020
    Configuration menu
    Copy the full SHA
    8bd3402 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from shenyang44/monopoly-board 

    fixed regex, reformed jail freeing and rolls
    @shenyang44
    shenyang44 authored May 16, 2020
    Configuration menu
    Copy the full SHA
    cdec436 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. changed tooltip to p.text() 

    also removed payer input as redudant due to current-user
    @shenyang44
    shenyang44 committed May 17, 2020
    Configuration menu
    Copy the full SHA
    aaaf4fe View commit details
    Browse the repository at this point in the history

  2. rolls, jail rolls, jail payment all working cohesively 

    jaill roll will cap at 3rd time, deduct money, and move player. activity creation made more succinct in roll function. dropdown moved to left of board
    @shenyang44
    shenyang44 committed May 17, 2020
    Configuration menu
    Copy the full SHA
    ee32054 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13 from shenyang44/monopoly-board 

    Monopoly board
    @shenyang44
    shenyang44 authored May 17, 2020
    Configuration menu
    Copy the full SHA
    6b1af39 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. removed unnecessary file, display if prop is owned 

    House price added, image charfield added. pdf files for title deeds added.  Moved some modals into separate files for future improvement
    @shenyang44
    shenyang44 committed May 21, 2020
    Configuration menu
    Copy the full SHA
    cf90b41 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from shenyang44/monopoly-board 

    removed unnecessary file, display if prop is owned
    @shenyang44
    shenyang44 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    aebc40a View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. hover function, added classes, deleted useless files

    @shenyang44
    shenyang44 committed May 24, 2020
    Configuration menu
    Copy the full SHA
    acdc0dc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from shenyang44/monopoly-board 

    hover function, added classes, deleted useless files
    @shenyang44
    shenyang44 authored May 24, 2020
    Configuration menu
    Copy the full SHA
    da9b2de View commit details
    Browse the repository at this point in the history

  3. removed commented out code in mon/views

    @shenyang44
    shenyang44 committed May 24, 2020
    Configuration menu
    Copy the full SHA
    28dcac2 View commit details
    Browse the repository at this point in the history

  4. fixed syntax error

    @shenyang44
    shenyang44 committed May 24, 2020
    Configuration menu
    Copy the full SHA
    1beee0a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #16 from shenyang44/monopoly-board 

    fixed syntax error
    @shenyang44
    shenyang44 authored May 24, 2020
    Configuration menu
    Copy the full SHA
    cc3c342 View commit details
    Browse the repository at this point in the history

  6. added missing ecntype, image url for props are now returned as f

    @shenyang44
    shenyang44 committed May 24, 2020
    Configuration menu
    Copy the full SHA
    7a901ab View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. Merge pull request #17 from shenyang44/monopoly-board 

    added missing ecntype,  image url for props are now returned as func
    @shenyang44
    shenyang44 authored May 25, 2020
    Configuration menu
    Copy the full SHA
    2d61004 View commit details
    Browse the repository at this point in the history

  2. gave id to all prop sections, image modal, trigerring. 

    some styling.
    @shenyang44
    shenyang44 committed May 25, 2020
    Configuration menu
    Copy the full SHA
    5466d48 View commit details
    Browse the repository at this point in the history

  3. id fix, and spelling correction piccadilly

    @shenyang44
    shenyang44 committed May 25, 2020
    Configuration menu
    Copy the full SHA
    9bb0b8c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from shenyang44/monopoly-board 

    Monopoly board
    @shenyang44
    shenyang44 authored May 25, 2020
    Configuration menu
    Copy the full SHA
    46172b0 View commit details
    Browse the repository at this point in the history

  5. uncommented img in html1

    @shenyang44
    shenyang44 committed May 25, 2020
    Configuration menu
    Copy the full SHA
    3dfbbd7 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. app and start changes for socketio

    @shenyang44
    shenyang44 committed May 26, 2020
    Configuration menu
    Copy the full SHA
    7769e61 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. messin with procfile

    @shenyang44
    shenyang44 committed May 27, 2020
    Configuration menu
    Copy the full SHA
    e3d000b View commit details
    Browse the repository at this point in the history

  2. reverted to app.run

    @shenyang44
    shenyang44 committed May 27, 2020
    Configuration menu
    Copy the full SHA
    b24f956 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #19 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored May 27, 2020
    Configuration menu
    Copy the full SHA
    1561f23 View commit details
    Browse the repository at this point in the history

  4. removed module:app from procfile

    @shenyang44
    shenyang44 committed May 27, 2020
    Configuration menu
    Copy the full SHA
    a3b40d2 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. emit to send 'message'

    @shenyang44
    shenyang44 committed May 28, 2020
    Configuration menu
    Copy the full SHA
    330595f View commit details
    Browse the repository at this point in the history

  2. changed send to give one argument

    @shenyang44
    shenyang44 committed May 28, 2020
    Configuration menu
    Copy the full SHA
    a881c85 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2020

  1. send func in js only gives one arg

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    9a02063 View commit details
    Browse the repository at this point in the history

  2. server sending back info to client socketio

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    00efbf9 View commit details
    Browse the repository at this point in the history

  3. spelling error

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    5ed3dfd View commit details
    Browse the repository at this point in the history

  4. removing return redirect from rolling func. 

    in order to test out socketio functionality.
    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    7c4bffe View commit details
    Browse the repository at this point in the history

  5. Update views.py

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    6e7f673 View commit details
    Browse the repository at this point in the history

  6. reverting last change. keeping return for roll f. 

    Not viable with current infra, splitting front to react. WIP apis.
    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    467749a View commit details
    Browse the repository at this point in the history

  7. changing pay form and activity update to use socket

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    50635ac View commit details
    Browse the repository at this point in the history

  8. Merge pull request #20 from shenyang44/sockets 

    changing pay form and activity update to use socket
    @shenyang44
    shenyang44 authored May 30, 2020
    Configuration menu
    Copy the full SHA
    d6b8333 View commit details
    Browse the repository at this point in the history

  9. removed reference of monop.pay

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    67056f1 View commit details
    Browse the repository at this point in the history

  10. console logging to check values, toggling modal upon clicking btn

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    44b658a View commit details
    Browse the repository at this point in the history

  11. js pay gives 1 arg, json to dict on py side

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    2dff6e6 View commit details
    Browse the repository at this point in the history

  12. hide modal from toggle

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    256eb05 View commit details
    Browse the repository at this point in the history

  13. moved socket listeners inside doc ready

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    598425d View commit details
    Browse the repository at this point in the history

  14. removed undef f

    @shenyang44
    shenyang44 committed May 30, 2020
    Configuration menu
    Copy the full SHA
    38fd3af View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. alert element added. And overwrote the close btn... 

    functionality.  WIP custom alerts based on sockets
    @shenyang44
    shenyang44 committed May 31, 2020
    Configuration menu
    Copy the full SHA
    cf019fd View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. auto alert timeout. f for show and hide alert

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7b451d9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from shenyang44/sockets 

    auto alert timeout. f for show and hide alert
    @shenyang44
    shenyang44 authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    44821b9 View commit details
    Browse the repository at this point in the history

  3. removing show from initial alert ele. 

    alert.show, + z index else -
    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    3c8a0bb View commit details
    Browse the repository at this point in the history

  4. removing timeout temporarily

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    ef671b5 View commit details
    Browse the repository at this point in the history

  5. removing brackets from f call in timeout

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    e5a955a View commit details
    Browse the repository at this point in the history

  6. 2 to 5

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    1b21979 View commit details
    Browse the repository at this point in the history

  7. activities log fully managed via sockets

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    b3e5d1c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #22 from shenyang44/sockets 

    activities log fully managed via sockets
    @shenyang44
    shenyang44 authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    6114714 View commit details
    Browse the repository at this point in the history

  9. parentheses to curly brackets for string literal

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    e354825 View commit details
    Browse the repository at this point in the history

  10. calls update all f on connection

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    e609e07 View commit details
    Browse the repository at this point in the history

  11. user positions handled by sockets

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    6b277b2 View commit details
    Browse the repository at this point in the history

  12. WIP get sock to work on local too

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    c2ad64c View commit details
    Browse the repository at this point in the history

  13. Merge pull request #23 from shenyang44/sockets 

    calls update funcs on connection
user positions handled by sockets
    @shenyang44
    shenyang44 authored Jun 1, 2020
    Configuration menu
    Copy the full SHA
    22612d0 View commit details
    Browse the repository at this point in the history

  14. removed message from on connect and trying new start shit

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    0666dea View commit details
    Browse the repository at this point in the history

  15. put socket.connected in if statement. 

    fixed loop problem.
    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    700fabe View commit details
    Browse the repository at this point in the history

  16. added hr

    @shenyang44
    shenyang44 committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    4f767b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. cleared containers upon update to prevent endless appends.

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    54af132 View commit details
    Browse the repository at this point in the history

  2. changing roll from form to sockets.

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    09dbd18 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #24 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored Jun 2, 2020
    Configuration menu
    Copy the full SHA
    14605f8 View commit details
    Browse the repository at this point in the history

  4. changed redirect in roll f 

    removed commented out form
    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    372d6a6 View commit details
    Browse the repository at this point in the history

  5. from innerhtml to html

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    5dfad78 View commit details
    Browse the repository at this point in the history

  6. temporary bypass, forgot password

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    508a938 View commit details
    Browse the repository at this point in the history

  7. removing sign in backdoor

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    f9e05e9 View commit details
    Browse the repository at this point in the history

  8. added order by for update pos

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    fe91241 View commit details
    Browse the repository at this point in the history

  9. Property modal. sending owned props thru sock

    @shenyang44
    shenyang44 committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    f393963 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. added foreach to append prop info into propRow

    @shenyang44
    shenyang44 committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    6c76474 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    1c3b43b View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. handling house buying added 

    prop saving/house count inc. not working.
owned prop display added via modal.
delegated events to listen to btns
    @shenyang44
    shenyang44 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    e8465e4 View commit details
    Browse the repository at this point in the history

  2. money update in modal via sockets. 

    prop list now ordered.
    @shenyang44
    shenyang44 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    1cef8d8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    2fd79e8 View commit details
    Browse the repository at this point in the history

  4. resizing img in prop modal

    @shenyang44
    shenyang44 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    85c8723 View commit details
    Browse the repository at this point in the history

  5. adding if statement for house price 0

    @shenyang44
    shenyang44 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ae60f7e View commit details
    Browse the repository at this point in the history

  6. fix syntax error

    @shenyang44
    shenyang44 committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    0e4f904 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. using not() to prepend house btn

    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    86d7301 View commit details
    Browse the repository at this point in the history

  2. fixed some errors

    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0d1d71c View commit details
    Browse the repository at this point in the history

  3. fixed syntax error

    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    f3b875a View commit details
    Browse the repository at this point in the history

  4. added static dropdown to transfer-btn

    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    fc99b2f View commit details
    Browse the repository at this point in the history

  5. added other alerts, appending users to transfer prop 

    update users and prop_edit functions working.
    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    66d41c4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #27 from shenyang44/sockets 

    added other alerts, appending users to transfer prop
    @shenyang44
    shenyang44 authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    770c1aa View commit details
    Browse the repository at this point in the history

  7. moved money update in modal to request upon modal open

    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0ec21fa View commit details
    Browse the repository at this point in the history

  8. confirm prompt for transferring properties. 

    changed interfering class selector  .dropdown-item
    @shenyang44
    shenyang44 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0f03d2d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #28 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    2161f31 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

  1. usernames clickable to view other owned props 

    user positions display handled with js now instead of py.
    @shenyang44
    shenyang44 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    c5667bc View commit details
    Browse the repository at this point in the history

  2. removed whitespaces

    @shenyang44
    shenyang44 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    0f3b58d View commit details
    Browse the repository at this point in the history

  3. added socket to handle jail pay

    @shenyang44
    shenyang44 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    81d7769 View commit details
    Browse the repository at this point in the history

  4. removed pay form elements, and jinja if statements 

    no longer necessary due to socket use.
    @shenyang44
    shenyang44 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    d011804 View commit details
    Browse the repository at this point in the history

  5. showing different roll btn with sock 

    added update jailed f , on connect
    @shenyang44
    shenyang44 committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    ca2db99 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #29 from shenyang44/sockets 

    Sockets
    @shenyang44
    shenyang44 authored Jun 6, 2020
    Configuration menu
    Copy the full SHA
    3c4ea9a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. removed a comment

    @shenyang44
    shenyang44 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    c474ad9 View commit details
    Browse the repository at this point in the history

  2. moved mon property into own blueprint 

    page to update prop.price.
removed some unused imports in mon views
    @shenyang44
    shenyang44 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    e6e2059 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #30 from shenyang44/sockets 

    moved mon property into own blueprint
    @shenyang44
    shenyang44 authored Jun 7, 2020
    Configuration menu
    Copy the full SHA
    7d55de1 View commit details
    Browse the repository at this point in the history

  4. new model cards and created page to upload pics

    @shenyang44
    shenyang44 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    bd8f156 View commit details
    Browse the repository at this point in the history

  5. upload and view facility for cards

    @shenyang44
    shenyang44 committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    a8e8778 View commit details
    Browse the repository at this point in the history