Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
276 commits
Select commit Hold shift + click to select a range
e0da8e0
Merge pull request #13 from NJSim/sundayCSS
brandonlaursen Nov 7, 2021
7f59d71
Added all tables, preliminary seeder data
parkerbo Nov 8, 2021
89ff8e4
Merge pull request #14 from NJSim/database_modeling
parkerbo Nov 8, 2021
357ea49
when session user logs in- they get shown their dashboard page both n…
NJSim Nov 8, 2021
760ffbb
login page styling complete (1st)
asabushaban Nov 8, 2021
36e442b
Merge pull request #15 from NJSim/aj_branch
asabushaban Nov 8, 2021
33de25b
signup page styled (1st)
asabushaban Nov 8, 2021
b59a128
Merge branch 'main' into aj_branch
asabushaban Nov 8, 2021
ae2c620
Merge pull request #16 from NJSim/aj_branch
asabushaban Nov 8, 2021
3bf2843
added missing div in the right spot
asabushaban Nov 8, 2021
88494f4
Merge pull request #17 from NJSim/aj_branch
asabushaban Nov 8, 2021
c3ddaa4
Merge pull request #18 from NJSim/nick_branch
NJSim Nov 8, 2021
a0b24f9
Added transaction functionality
parkerbo Nov 8, 2021
c39fdfa
Merge pull request #19 from NJSim/transaction-backend
parkerbo Nov 8, 2021
376202e
stock charts started
asabushaban Nov 8, 2021
1440fa9
stock charts started
asabushaban Nov 8, 2021
c4cfd20
nav bar base with start of lists
NJSim Nov 8, 2021
e428431
Merge pull request #20 from NJSim/lists
NJSim Nov 8, 2021
9d1b98f
styled buy stock
brandonlaursen Nov 8, 2021
74b7e74
Merge branch 'main' into stockBuy
brandonlaursen Nov 8, 2021
03d2e03
Merge pull request #21 from NJSim/stockBuy
brandonlaursen Nov 8, 2021
9f103e7
npm installed
brandonlaursen Nov 8, 2021
c21e820
Starting backend for portfolio
parkerbo Nov 8, 2021
9f4457f
Merge pull request #22 from NJSim/portfolio_backend
parkerbo Nov 8, 2021
b471127
minor
brandonlaursen Nov 8, 2021
6af6077
Merge pull request #23 from NJSim/monday3
brandonlaursen Nov 8, 2021
c07b2ab
added more to dashboard as well as models for watchlists and join table
NJSim Nov 8, 2021
034f25b
Merge pull request #24 from NJSim/more_dashboard
NJSim Nov 8, 2021
4b14f1e
deleted watchlist.py model
NJSim Nov 8, 2021
4c287b6
daily/monthly/weekly charts added with styled buttons
asabushaban Nov 9, 2021
feb9cd6
added portfolio store data
parkerbo Nov 9, 2021
2052263
Merge branch 'main' into portfolio_store
parkerbo Nov 9, 2021
9cac4d6
Merge pull request #26 from NJSim/portfolio_store
parkerbo Nov 9, 2021
42c5996
finishing up buy stock box
brandonlaursen Nov 9, 2021
9e6833c
Merge pull request #27 from NJSim/stockBox
brandonlaursen Nov 9, 2021
4b312c2
Added backend call to get all users' lists
NJSim Nov 9, 2021
28ad470
Merge pull request #28 from NJSim/dashboard_more
NJSim Nov 9, 2021
e9ed791
Merge branch 'main' into aj_branch
asabushaban Nov 9, 2021
df2a05b
Merge pull request #25 from NJSim/aj_branch
asabushaban Nov 9, 2021
68c5e4f
Added more info to portfolio store
parkerbo Nov 9, 2021
925ce5c
Commit
parkerbo Nov 9, 2021
3d73500
Merge pull request #29 from NJSim/portfolio_store
parkerbo Nov 9, 2021
e131fc9
minor fix
brandonlaursen Nov 9, 2021
fe8f4fe
Merge pull request #30 from NJSim/tuesday3
brandonlaursen Nov 9, 2021
e3dcb50
fixed console errors
NJSim Nov 9, 2021
7ee33ee
Merge pull request #31 from NJSim/fixed_errors
NJSim Nov 9, 2021
6af00af
debugged chart plotting issue fixed
asabushaban Nov 9, 2021
d5b5be8
added href to a tags nav
NJSim Nov 9, 2021
3b147c0
Merge pull request #32 from NJSim/fixed_errors
NJSim Nov 9, 2021
f85f4c7
minor list css
brandonlaursen Nov 9, 2021
22becff
Merge branch 'main' into tuesday4
brandonlaursen Nov 9, 2021
8d2cba2
Merge pull request #33 from NJSim/tuesday4
brandonlaursen Nov 9, 2021
136309e
fixed list store
NJSim Nov 9, 2021
48858d6
Merge branch 'main' into list_store
NJSim Nov 9, 2021
61628c0
Merge pull request #34 from NJSim/list_store
NJSim Nov 9, 2021
9125347
small change
NJSim Nov 9, 2021
dc0e3f0
refactor chart component
asabushaban Nov 9, 2021
75de953
Merge pull request #35 from NJSim/aj_branch
asabushaban Nov 9, 2021
f21d254
Error handling for transactions
parkerbo Nov 9, 2021
4cfa3bb
Merge branch 'main' into transaction_errors
parkerbo Nov 9, 2021
9753239
Merge pull request #36 from NJSim/transaction_errors
parkerbo Nov 9, 2021
8a411f7
Fized mistake
parkerbo Nov 9, 2021
0661a7c
Merge pull request #37 from NJSim/fiexed_parker_mistake_trolol
parkerbo Nov 9, 2021
13b6c8b
added demo login
brandonlaursen Nov 9, 2021
84557b7
Merge pull request #38 from NJSim/tuesday5
brandonlaursen Nov 9, 2021
6bd84df
Updated some styling for stock page
parkerbo Nov 9, 2021
cade2e3
Merge pull request #39 from NJSim/StockPageStyling
parkerbo Nov 9, 2021
2f98dbb
working on watchlist routes
brandonlaursen Nov 9, 2021
380abac
lists modal basic form
NJSim Nov 10, 2021
608ab28
Merge pull request #40 from NJSim/list_modal
NJSim Nov 10, 2021
d21d139
created routes and store for watchlists
brandonlaursen Nov 10, 2021
62f746c
Merge pull request #41 from NJSim/tuesday7
brandonlaursen Nov 10, 2021
ced27ee
portfolio assets listed and chart showing
asabushaban Nov 10, 2021
fb2eb39
portfolio assets listed and chart showing
asabushaban Nov 10, 2021
63f779b
removed additional stock div
asabushaban Nov 10, 2021
1c614eb
minor
brandonlaursen Nov 10, 2021
6091718
Merge pull request #42 from NJSim/wednesday
brandonlaursen Nov 10, 2021
17c0969
Styling for stock page
parkerbo Nov 10, 2021
0952601
portfolio list design beggining
asabushaban Nov 10, 2021
cbc901d
Merge pull request #44 from NJSim/aj_branch
asabushaban Nov 10, 2021
fd28e79
minor
brandonlaursen Nov 10, 2021
ab4309c
added commas to average purchase price
asabushaban Nov 10, 2021
ab95863
Merge pull request #46 from NJSim/aj_branch
asabushaban Nov 10, 2021
550f8ad
pls work
parkerbo Nov 10, 2021
7a965ef
nav bar styling
parkerbo Nov 10, 2021
9f78649
Merge pull request #48 from NJSim/parker_development
parkerbo Nov 10, 2021
dd1dd4e
updated percentages on portfolio table
asabushaban Nov 10, 2021
d6689b6
Merge pull request #50 from NJSim/aj_branch
asabushaban Nov 10, 2021
a1f69ef
pushing to pull
brandonlaursen Nov 10, 2021
b93f8fc
bug fix?
parkerbo Nov 10, 2021
db4d693
Merge pull request #51 from NJSim/wed
brandonlaursen Nov 10, 2021
cd8f837
Merge pull request #52 from NJSim/store_bug_fix
parkerbo Nov 10, 2021
bd6cba0
small change line 50 HomePage.js
NJSim Nov 10, 2021
de2eca7
Create main.yml
NJSim Nov 10, 2021
94bb5fd
Update main.yml
NJSim Nov 10, 2021
f90a458
removed old migration versions
asabushaban Nov 10, 2021
c56ea0c
Merge branch 'main' of https://github.com/NJSim/Robinhood2.0
asabushaban Nov 10, 2021
59cb488
implemented search store and store change
NJSim Nov 10, 2021
372f15b
Merge pull request #53 from NJSim/search_thunk
NJSim Nov 10, 2021
23ecb68
create watchlist works
brandonlaursen Nov 10, 2021
5dbb467
Merge pull request #54 from NJSim/test2
brandonlaursen Nov 10, 2021
8d6b3df
Updated store
parkerbo Nov 10, 2021
561812e
Merge pull request #55 from NJSim/watched_assets
parkerbo Nov 10, 2021
7921dcb
still working on routes
brandonlaursen Nov 10, 2021
1e53a95
Merge pull request #56 from NJSim/routes2
brandonlaursen Nov 10, 2021
6fcd861
Fixed some homepage loading issues
parkerbo Nov 11, 2021
89ca461
finished list crud
NJSim Nov 11, 2021
295ec4b
Merge branch 'main' into delete-account-parker
parkerbo Nov 11, 2021
0d422b9
Merge pull request #57 from NJSim/delete-account-parker
parkerbo Nov 11, 2021
becc1cf
Merge pull request #58 from NJSim/list_crud
NJSim Nov 11, 2021
b7438d6
Delete account functionality, transaction history
parkerbo Nov 11, 2021
29e9a4a
Merge pull request #59 from NJSim/wed-night-parker
parkerbo Nov 11, 2021
4af63f4
starting addTolist box on stock page
brandonlaursen Nov 11, 2021
68446d4
Merge branch 'main' into wed4
brandonlaursen Nov 11, 2021
1be9bb7
Merge pull request #60 from NJSim/wed4
brandonlaursen Nov 11, 2021
1c98e19
fixed logged out homepage
parkerbo Nov 11, 2021
f35642a
Merge pull request #61 from NJSim/fix_home_load
parkerbo Nov 11, 2021
be09036
fix watchlist delete
parkerbo Nov 11, 2021
3fd523a
Merge pull request #62 from NJSim/fix_delete
parkerbo Nov 11, 2021
ee23323
finished all basic search functionality
NJSim Nov 11, 2021
aa36a17
Merge pull request #63 from NJSim/finished_search
NJSim Nov 11, 2021
a45856a
deleted mock data
NJSim Nov 11, 2021
a2edba2
Merge pull request #64 from NJSim/finished_search
NJSim Nov 11, 2021
792e560
all stock scroll nav start
asabushaban Nov 11, 2021
1e02dfd
Updated styling watchlists
parkerbo Nov 11, 2021
45733d6
Merge pull request #66 from NJSim/watchlist_styling_homepage
parkerbo Nov 11, 2021
af82983
added minor delete fix
parkerbo Nov 11, 2021
d867f1c
Merge pull request #67 from NJSim/minor_fix
parkerbo Nov 11, 2021
12b4862
stock scroll bar finished
asabushaban Nov 11, 2021
0aa1625
Merge branch 'main' into aj_branch
asabushaban Nov 11, 2021
d49e1b8
Merge pull request #65 from NJSim/aj_branch
asabushaban Nov 11, 2021
b8b277a
fixed stock loading
parkerbo Nov 11, 2021
1ca4d96
Merge pull request #68 from NJSim/fix_stock_loading
parkerbo Nov 11, 2021
a4eca8a
style changes
parkerbo Nov 11, 2021
64976df
resize stock scroll boxes
asabushaban Nov 11, 2021
81cac59
Merge pull request #69 from NJSim/update_syting-park
parkerbo Nov 11, 2021
2e80315
adjusted chart height
asabushaban Nov 11, 2021
c945495
cant get add to list checking to work
brandonlaursen Nov 11, 2021
737ee99
Merge branch 'main' into thursday
brandonlaursen Nov 11, 2021
0690991
Merge pull request #70 from NJSim/thursday
brandonlaursen Nov 11, 2021
8af6a0e
fix
brandonlaursen Nov 11, 2021
303976f
addTolistBox done
brandonlaursen Nov 11, 2021
ec92231
Merge pull request #71 from NJSim/cssThurs
brandonlaursen Nov 11, 2021
094bf84
margin fixes on portfolio, stocks scroll, and hide scroll bar
asabushaban Nov 11, 2021
e771fe8
Merge pull request #72 from NJSim/aj_branch
asabushaban Nov 11, 2021
4e22005
ad
brandonlaursen Nov 12, 2021
80cf70b
debugged addToList functionality
asabushaban Nov 12, 2021
9721bd2
Merge pull request #73 from NJSim/aj_branch
asabushaban Nov 12, 2021
e554f39
made some changes to nav bar as well as search
NJSim Nov 12, 2021
7a1ca51
Merge pull request #74 from NJSim/search_changes
NJSim Nov 12, 2021
8b56297
fixing bugs
brandonlaursen Nov 12, 2021
e70d63e
Merge branch 'main' into b2
brandonlaursen Nov 12, 2021
d182167
Merge pull request #75 from NJSim/b2
brandonlaursen Nov 12, 2021
fc5d3f6
results color change
NJSim Nov 12, 2021
9b75b30
Merge pull request #76 from NJSim/search_color
NJSim Nov 12, 2021
0abe29e
minor changes
brandonlaursen Nov 12, 2021
e75d24a
Merge pull request #77 from NJSim/brandon
brandonlaursen Nov 12, 2021
9afa780
added alert when you add stock to watchlist
asabushaban Nov 12, 2021
13afa7d
More styling
parkerbo Nov 12, 2021
8cccb46
Merge branch 'main' into styles_parker_thurs
parkerbo Nov 12, 2021
2c1060e
Merge pull request #78 from NJSim/styles_parker_thurs
parkerbo Nov 12, 2021
320f122
updated error
parkerbo Nov 12, 2021
7e762f2
Updated front page not loading when logged out
parkerbo Nov 12, 2021
f799e84
fixed add new list bug
parkerbo Nov 12, 2021
3f38894
Added new logo
parkerbo Nov 12, 2021
4c6feea
Updated logo
parkerbo Nov 12, 2021
0cedc4c
Updated favicon
parkerbo Nov 12, 2021
4b86832
alert when adding asset
asabushaban Nov 12, 2021
b07b8bb
Merge pull request #79 from NJSim/aj_branch
asabushaban Nov 12, 2021
2c3e97f
merge complete with logo added and watchlist addition functionality
asabushaban Nov 12, 2021
eede267
Merge pull request #80 from NJSim/aj_branch
asabushaban Nov 12, 2021
2d67729
notification when asset added to watchlist
asabushaban Nov 12, 2021
6e02c29
Merge pull request #81 from NJSim/aj_branch
asabushaban Nov 12, 2021
ad57f6d
graph on portfolio page displays first stock in portfolio and splash …
asabushaban Nov 12, 2021
646e947
Merge pull request #82 from NJSim/aj_branch
asabushaban Nov 12, 2021
83175e4
background color change on hover for individual portfolio asset
asabushaban Nov 12, 2021
f40763f
Merge pull request #83 from NJSim/aj_branch
asabushaban Nov 12, 2021
735e5af
individual stock card changes color on hover
asabushaban Nov 12, 2021
5b90f46
Merge pull request #84 from NJSim/aj_branch
asabushaban Nov 12, 2021
e55b307
working on search, removed comments and console.log
brandonlaursen Nov 12, 2021
8930b0e
Merge pull request #85 from NJSim/friday1
brandonlaursen Nov 12, 2021
1989eb5
search results dissapear when leaving search
brandonlaursen Nov 12, 2021
62b10ba
search fix for now
brandonlaursen Nov 12, 2021
31e9b83
Merge pull request #86 from NJSim/friday2
brandonlaursen Nov 12, 2021
d4c8667
search clears after submitting
brandonlaursen Nov 12, 2021
da07c9a
Merge pull request #87 from NJSim/friday3
brandonlaursen Nov 12, 2021
091d323
some styling updates
parkerbo Nov 12, 2021
5127286
Merge branch 'main' into parker_fri_dev
parkerbo Nov 12, 2021
fd78d52
Merge pull request #88 from NJSim/parker_fri_dev
parkerbo Nov 12, 2021
28f75a8
fixed bug
parkerbo Nov 12, 2021
701ec21
another bug fix
parkerbo Nov 12, 2021
f9ed30e
added stock name when searching
NJSim Nov 12, 2021
5c4d56c
Merge branch 'main' into search_name
NJSim Nov 12, 2021
780695a
Merge pull request #89 from NJSim/search_name
NJSim Nov 12, 2021
ece6d39
demo user bug
asabushaban Nov 12, 2021
f77e8a4
Merge pull request #90 from NJSim/aj_branch
asabushaban Nov 12, 2021
89afc21
fixed loading issues I think
parkerbo Nov 12, 2021
391edaa
styled watchlist box
brandonlaursen Nov 13, 2021
2423d40
Merge pull request #91 from NJSim/brandon1
brandonlaursen Nov 13, 2021
21f6285
Delete portfolio if 0
parkerbo Nov 13, 2021
0eaa388
Merge pull request #92 from NJSim/parker_fri_branch
parkerbo Nov 13, 2021
7c7a8d9
logout button styled
asabushaban Nov 13, 2021
921d9b5
Merge pull request #93 from NJSim/aj_branch
asabushaban Nov 13, 2021
85ccdca
removed white backgrounds on buttons, added cursor pointers, fixed ho…
brandonlaursen Nov 13, 2021
3ae514e
Merge pull request #94 from NJSim/laursen
brandonlaursen Nov 13, 2021
d2e05ed
minor css changes
brandonlaursen Nov 13, 2021
cee724a
Merge pull request #95 from NJSim/newBranch
brandonlaursen Nov 13, 2021
1a6b2bf
fixed bug on portfolio page-when you clicked on an element in the por…
asabushaban Nov 13, 2021
50e8e66
Merge pull request #96 from NJSim/aj_branch
asabushaban Nov 13, 2021
fd604de
Fixed homepage loading error
parkerbo Nov 13, 2021
a96f09b
footer with logos/links and about me page started
asabushaban Nov 13, 2021
800cb92
About us title added
asabushaban Nov 13, 2021
c0b7f5c
Merge pull request #97 from NJSim/aj_branch
asabushaban Nov 13, 2021
d8268c5
aj about me edit
asabushaban Nov 13, 2021
dd3873c
Merge pull request #98 from NJSim/aj_branch
asabushaban Nov 13, 2021
5785ede
refactor code and fix portfolio bug
asabushaban Nov 13, 2021
c710ba7
Merge pull request #99 from NJSim/aj_branch
asabushaban Nov 13, 2021
a8ba18e
started about me section
brandonlaursen Nov 14, 2021
d383881
Merge pull request #100 from NJSim/sat2
brandonlaursen Nov 14, 2021
924d5d1
updated readme
NJSim Nov 14, 2021
efc12d1
Update README.md
NJSim Nov 14, 2021
a225ca3
Update README.md
NJSim Nov 14, 2021
bc2b89c
Update README.md
NJSim Nov 14, 2021
d6913b7
Update README.md
NJSim Nov 14, 2021
ee0040b
finish about me
brandonlaursen Nov 14, 2021
4ac15a3
Merge pull request #101 from NJSim/sunday
brandonlaursen Nov 14, 2021
87bd7e2
Made some loading changes, improved search bar, updated some modal ti…
parkerbo Nov 14, 2021
a83c766
Merge pull request #102 from NJSim/parker_sun_afternoon
parkerbo Nov 14, 2021
139b038
Signup first render works now
parkerbo Nov 14, 2021
b26a265
fixed scrolling arrows
parkerbo Nov 14, 2021
c378f8f
footer on all pages
asabushaban Nov 14, 2021
b78184d
added about sections for myself
NJSim Nov 14, 2021
c8f8011
Merge pull request #104 from NJSim/nick_about
NJSim Nov 14, 2021
c4bda86
added readme images
NJSim Nov 14, 2021
c493d9a
Update README.md
NJSim Nov 14, 2021
578e2ca
all readme images and gifs
NJSim Nov 15, 2021
2d8bf2a
Merge pull request #105 from NJSim/readme_images
NJSim Nov 15, 2021
2e4ec61
Update README.md
NJSim Nov 15, 2021
76be797
added picture for about us
NJSim Nov 15, 2021
0045d9d
Merge pull request #106 from NJSim/nick_profile_pic
NJSim Nov 15, 2021
6221376
Parker about me
parkerbo Nov 15, 2021
80f8a36
minor change
brandonlaursen Nov 15, 2021
f4f331a
Merge pull request #107 from NJSim/sunday4
brandonlaursen Nov 15, 2021
8632751
Added some styling, purchase confirmation, empty portfolio homepage u…
parkerbo Nov 15, 2021
6d7d432
Removed dead links
parkerbo Nov 15, 2021
5bae44c
Statistics
parkerbo Nov 15, 2021
305511d
Typo
parkerbo Nov 15, 2021
c2fed12
added meta data
brandonlaursen Dec 2, 2021
496dbcc
Merge pull request #108 from NJSim/done
brandonlaursen Dec 2, 2021
e87f63a
fix: react-app/package.json & react-app/package-lock.json to reduce v…
snyk-bot Oct 2, 2024
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
24 changes: 24 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Push Container to Heroku

on:
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Login to Heroku Container registry
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
run: heroku container:login
- name: Build and push
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
run: heroku container:push -a to-the--moon web
- name: Release
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
run: heroku container:release -a to-the--moon web
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /react-app
COPY react-app/. .

# You have to set this because it should be set during build time.
ENV REACT_APP_BASE_URL=<Your-REACT_APP_BASE_URL-here>
ENV REACT_APP_BASE_URL=https://to-the--moon.herokuapp.com/

# Build our React App
RUN npm install
Expand Down
39 changes: 38 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,47 @@ python-dateutil = "==2.8.1"
python-editor = "==1.0.4"
greenlet = "==1.1.0"
Mako = "==1.1.4"
pyex = "*"
pyEX = "==0.5.0"
appnope = "==0.1.2"
backcall = "==0.2.0"
certifi = "==2021.10.8"
charset-normalizer = "==2.0.7"
decorator = "==5.1.0"
deprecation = "==2.1.0"
frozendict = "==2.0.7"
idna = "==3.3"
ipython = "==7.29.0"
jedi = "==0.18.0"
matplotlib-inline = "==0.1.3"
numpy = "==1.21.4"
pandas = "==1.3.4"
parso = "==0.8.2"
pexpect = "==4.8.0"
pickleshare = "==0.7.5"
prompt-toolkit = "==3.0.22"
ptyprocess = "==0.7.0"
pyparsing = "==2.4.7"
pytz-deprecation-shim = "==0.1.0.post0"
pytz = "==2021.3"
requests = "==2.26.0"
sseclient = "==0.0.27"
temporal-cache = "==0.1.4"
traitlets = "==5.1.1"
tzdata = "==2021.5"
tzlocal = "==4.1"
urllib3 = "==1.26.7"
wcwidth = "==0.2.5"
websocket-client = "==1.2.1"
Pillow = "==8.4.0"
Pygments = "==2.10.0"
socketIO-client-nexus = "==0.7.6"
finnhub-python = "==2.4.5"

[dev-packages]
psycopg2-binary = "==2.8.6"
pytest = "*"
dockerfile = "*"
pipfile = "*"

[requires]
python_version = "3.9"
Loading