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

Broker name #128

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

Broker name #128

wants to merge 118 commits into from

Conversation

jujubean22
Copy link

No description provided.

jujubean22 and others added 30 commits December 9, 2021 02:37
@jujubean22
updated dependencies
bcfdca3
@jujubean22
added stockqoute gem & initial homepage
372b293
@jujubean22
Merge pull request #1 from jujubean22/testing_branch
56eca9f 
added stock_qoute gem & initial homepage
@jujubean22
initial set-up for devise views, models and database
6370257
@jujubean22
Merge pull request #2 from jujubean22/testing_branch
2da1381 
initial set-up  for devise views, models and database
changed application.css to .scss
f26f6c2
@jujubean22
Merge pull request #3 from jujubean22/ui_usersignin
77587db 
changed application.css to .scss
logo applied on main index
8fb2ab7
static landing navbar added
aeefbed
v1 element testing on landing page, added test fonts and layout
d7249db
added landing page animation
b71206b
@jujubean22
uncomment devise migrations
d16cf57
@jujubean22
added validations and relationships on buyer, broker and admin
435c4aa
@jujubean22
fixed syntax error
fbb96ca
@jujubean22
conditional rendering in home
f3e1a4a
@jujubean22
Merge pull request #4 from jujubean22/Migration
72504a2 
Migration
@jujubean22
Merge pull request #5 from jujubean22/ui_usersignin
617073e 
UI usersignin
@jujubean22
Merge branch 'master' into home-rendering
0d70e0d
@jujubean22
Merge pull request #6 from jujubean22/home-rendering
8d560c1 
Home rendering
@jujubean22
landing page design by annora
21cd182
@jujubean22
Merge pull request #7 from jujubean22/home-rendering
325f2ed 
landing page design by annora
added onclick routing on landing page navbar links
76286a5
added skeleton elements for buyer signin and signup pages
5cce5d6
@jujubean22
uncomment devise in database
a608a28
@jujubean22
added stocks table in database
ffe0cdf
@jujubean22
added buyer stocks table in database
9b15d5a
@jujubean22
added transactions table in database
a0d1352
@jujubean22
added references to buyer and broker
f63c798
@jujubean22
Merge pull request #8 from jujubean22/Database
81decb3 
Database
@jujubean22
added an admin
cfe865c
jujubean22 and others added 30 commits January 11, 2022 20:22
@jujubean22
Merge pull request #22 from jujubean22/logo
3515127 
added logo, broker's id
added api for stock news
a3bbc7f
added error rendering for news api
5a39ae4
added status codes in api news
a41bd38
added api controller and routes
df6a033
@annoraischia
Merge pull request #23 from jujubean22/ui_usersignin
5bd6a01 
UI usersignin
@jujubean22
added portfolio to buyers stocks and cleaned code on broker stocks
007246d
@jujubean22
Merge branch 'master' into buyer_page
41e4c03
@jujubean22
Merge pull request #24 from jujubean22/buyer_page
5eb915c 
added portfolio to buyers stocks and cleaned code on broker stocks
added div broker index
a908c54
added buyer index welcome div
62695c7
added stock ticker to buyer index
1e17771
uncommented news api code
d5f3394
@annoraischia
Merge branch 'master' into ui_usersignin
e16340c
@annoraischia
Merge pull request #25 from jujubean22/ui_usersignin
087e666 
buyer index landing
@jujubean22
updated api token for wrapper
985c609
@jujubean22
added notices for failed signup
4bb57c9
@jujubean22
added portfolio for buyer in controllers
0ff13f5
@jujubean22
added api wrapper in home index controller
40692d0
@jujubean22
added relationship to buyer_stocks and function for buying stocks
539e0bd
@jujubean22
added relationship to broker_stocks and dependent when destroyed
b077b1a
@jujubean22
added buyer portfolio view and broker_stocks view
37413d9
@jujubean22
added $ on prices
d2daa15
@jujubean22
added controllers and models for buyer_stocks
4f2e892
@jujubean22
added views for buyer
21f41e4
@jujubean22
cleaned code in sessions controller
d72ed41
@jujubean22
:try api wrapper rendering in buyer's partial home and added routes f…
b2329ae 
…or broker and buyer portfolio
@jujubean22
Merge branch 'master' into buyer_page
71f34b6
@jujubean22
fixed syntax error and commented api_wrapper
0808211
@jujubean22
added broker name in devise views and updated the navbar
f81ebd6
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.
2 participants
@jujubean22 @annoraischia