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.

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

Form #116

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

Form #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
0e788f4
version troubleshooting
TanTanMa Dec 4, 2021
72ca946
addded validations ofr Email and username requirements
TanTanMa Dec 4, 2021
1b187fb
added bcrypt for password security
TanTanMa Dec 4, 2021
8491e85
added has_secure_pw
TanTanMa Dec 4, 2021
91a1877
migrate users db
TanTanMa Dec 4, 2021
66280c2
Merge pull request #1 from ralphsulit/db/user
TanTanMa Dec 4, 2021
024bcfa
+ routes for home page and signup page
TanTanMa Dec 4, 2021
5c848a9
+controller for pages, added home
TanTanMa Dec 4, 2021
76a9692
+contrller for users, added new
TanTanMa Dec 4, 2021
c9db9ed
added pages and users folder, erb for home and new
TanTanMa Dec 4, 2021
6de3f77
Merge pull request #2 from ralphsulit/routes/signup
TanTanMa Dec 4, 2021
303b325
added create user
ralphsulit Dec 6, 2021
731d752
Merge pull request #3 from ralphsulit/stonks
TanTanMa Dec 6, 2021
23f2878
added flash notince on creation of new user
TanTanMa Dec 7, 2021
a62cc00
added render messages on layout form
TanTanMa Dec 7, 2021
6658bf5
added render of errors on log in
TanTanMa Dec 7, 2021
c7aad25
added render of errors on sign up form
TanTanMa Dec 7, 2021
282ffc7
added flash messages .erb for flash messages
TanTanMa Dec 7, 2021
b443025
added errors render erb
TanTanMa Dec 7, 2021
52f9907
Merge pull request #4 from ralphsulit/render/errors
TanTanMa Dec 7, 2021
1f0acc5
installed stock api
TanTanMa Dec 7, 2021
706f7ea
added API key for the stocks
TanTanMa Dec 7, 2021
649e658
test rendering of API
TanTanMa Dec 7, 2021
a5868b2
added routes for search
TanTanMa Dec 7, 2021
2b8c442
Merge pull request #5 from ralphsulit/StockAPI
TanTanMa Dec 7, 2021
8cd606f
installed stock quote gem
ralphsulit Dec 9, 2021
de67822
Merge pull request #6 from ralphsulit/stonks
TanTanMa Dec 9, 2021
884735e
generated devices views
TanTanMa Dec 9, 2021
61e083a
generated users model via Device
TanTanMa Dec 9, 2021
cdc582f
migrated and added the device to development.rb
TanTanMa Dec 9, 2021
3cc8e57
Merge pull request #7 from ralphsulit/device/users
TanTanMa Dec 9, 2021
b160dde
added searchbar params and API key in controller
TanTanMa Dec 9, 2021
92e914a
added searchbar params and API key in controller
TanTanMa Dec 9, 2021
603a922
added close button and divs for flash prompts
TanTanMa Dec 9, 2021
639ca24
Added the search bar and submit btn
TanTanMa Dec 9, 2021
1a59d78
added post route for submit btn
TanTanMa Dec 9, 2021
ae861ea
Merge pull request #8 from ralphsulit/home/searchbar
TanTanMa Dec 9, 2021
e23ceae
added triggers if user submit blank on search, if user entered random…
TanTanMa Dec 11, 2021
9c8fdd7
renders of errors if user entered blanks or randoms
TanTanMa Dec 11, 2021
e4bbcdf
Merge pull request #9 from ralphsulit/searchbar/errors
TanTanMa Dec 11, 2021
69faf26
added stock resources
TanTanMa Dec 11, 2021
d8b31cf
+ scss files for stocks
TanTanMa Dec 11, 2021
028be96
+ sotcks controller
TanTanMa Dec 11, 2021
c3b5479
+stocks helper
TanTanMa Dec 11, 2021
e077517
+ stock model file
TanTanMa Dec 11, 2021
a7f8b46
+ schema for users, with index
TanTanMa Dec 11, 2021
3034aa8
added base haml pages for stocks: might change to ERB muna
TanTanMa Dec 11, 2021
ef1bb73
changed INTERGER to INTEGER
TanTanMa Dec 11, 2021
757f703
migrated stocks database
TanTanMa Dec 11, 2021
c81587f
Merge pull request #10 from ralphsulit/db/stocks
TanTanMa Dec 11, 2021
0ae28a2
added encryption for the API key
TanTanMa Dec 12, 2021
1098cc3
added the encrypted key to code
TanTanMa Dec 12, 2021
71ee73f
Merge pull request #11 from ralphsulit/Stocks.Encryption
ralphsulit Dec 12, 2021
3e24cc6
added connection bet stocks db and user db
TanTanMa Dec 14, 2021
c2553d8
added conenction to users and stocks db, deleted scaffold css
TanTanMa Dec 14, 2021
0a68cd6
added links to db manipulation for users and stocks for testing
TanTanMa Dec 14, 2021
6f5ea75
user cannot access anything stocks db related without logging in, due…
TanTanMa Dec 14, 2021
9be563b
converted form from haml to erb
TanTanMa Dec 14, 2021
0db2691
converted edit haml to erb
TanTanMa Dec 14, 2021
e99a401
converted stocks index from haml to erb
TanTanMa Dec 14, 2021
dbee5fb
converted stocks new from haml to erb
TanTanMa Dec 14, 2021
d8ec83e
stock show from haml to erb
TanTanMa Dec 14, 2021
0043737
changed search_bar attr to ticker for consistency to stocks database
TanTanMa Dec 14, 2021
c375301
changed search_bar attr to ticker for consistency to stocks database
TanTanMa Dec 14, 2021
c91724a
added correct_user function to check if the stocks in existing in the…
TanTanMa Dec 14, 2021
4808789
Merge pull request #12 from ralphsulit/Users/Authent
ralphsulit Dec 14, 2021
82ce556
added sass stylesheets, variables, mixins, and resposive breakpoints
ralphsulit Dec 14, 2021
1578e44
added sass stylesheets, variables, mixins, and resposive breakpoints
ralphsulit Dec 14, 2021
fbf6e4c
added button styles and change primaryBtn color
ralphsulit Dec 14, 2021
7011830
Merge pull request #13 from ralphsulit/stonks
TanTanMa Dec 15, 2021
c576b2b
added fields to stocks
TanTanMa Dec 16, 2021
6a124a6
migrated new fields to stocks db
TanTanMa Dec 16, 2021
431c19c
removed co-relation between users and stocks
TanTanMa Dec 16, 2021
4a6832e
refactored pages controller for sotkcs rendering
TanTanMa Dec 16, 2021
f5fd792
placed API callers in stocks models
TanTanMa Dec 16, 2021
bc5ddc5
test redering of api calls
TanTanMa Dec 16, 2021
ba19a2e
added fields to stocks database
TanTanMa Dec 16, 2021
0df783c
refactored pages controller for stock rendering
TanTanMa Dec 16, 2021
d3189b2
added the api callers to stock model
TanTanMa Dec 16, 2021
4450fe2
render stock api calls testing
TanTanMa Dec 16, 2021
0c081e5
fixed merging issues
TanTanMa Dec 16, 2021
3d9178a
Merge pull request #15 from ralphsulit/db/Changes_in_Stocks_db
ralphsulit Dec 16, 2021
df711ae
added variables for rendering of stock logos
TanTanMa Dec 16, 2021
1a62e15
added new function to fetch logo from API
TanTanMa Dec 16, 2021
c9c3268
testing logo rendering in index page
TanTanMa Dec 16, 2021
304a0fb
added form style
ralphsulit Dec 16, 2021
287aca1
Merge branch 'master' into form
TanTanMa Dec 16, 2021
1a03b46
Merge pull request #16 from ralphsulit/form
TanTanMa Dec 16, 2021
d11150c
added api call for Logo and raw financial data, function for seeding …
TanTanMa Dec 16, 2021
876f28e
fixed method to controller invocations for data and logo
TanTanMa Dec 16, 2021
89926b1
removed unused codes, initialize stocks for index
TanTanMa Dec 16, 2021
d39c0fc
testing stock db rendering
TanTanMa Dec 16, 2021
68a854a
Merge branch 'master' of github.com:ralphsulit/stonks into feature/AP…
TanTanMa Dec 16, 2021
6d37b84
Merge pull request #17 from ralphsulit/feature/API_rendering
ralphsulit Dec 17, 2021
2435373
added background image
ralphsulit Dec 18, 2021
c3bba66
installed iex api, old api has too many error 500
TanTanMa Dec 18, 2021
a26559c
commented out the search bar function
TanTanMa Dec 18, 2021
23a2b3c
commented out show for stock controller, will update soon
TanTanMa Dec 18, 2021
8cb4990
added validations, and tested inital seed function
TanTanMa Dec 18, 2021
10970f4
tested database rendering after seeding
TanTanMa Dec 18, 2021
4af93b4
added new API keys
TanTanMa Dec 18, 2021
55ff98a
added text file for initial datas for stocks
TanTanMa Dec 18, 2021
1c4d039
added seeders for stocks database
TanTanMa Dec 18, 2021
b3fbac0
added the seeder function to seeds.rb for calling
TanTanMa Dec 18, 2021
7a9d1fb
Merge pull request #18 from ralphsulit/db/stockSeeding
ralphsulit Dec 18, 2021
c431d89
added content and styles for homepage
ralphsulit Dec 18, 2021
507b2ad
change background image
ralphsulit Dec 18, 2021
b29f1c7
Merge branch 'master' into form
TanTanMa Dec 18, 2021
e766c98
Merge pull request #19 from ralphsulit/form
TanTanMa Dec 18, 2021
fb155b9
devise generate admin
TanTanMa Dec 20, 2021
f9f61f0
+ admin controller: for user approval, approved users, approving users
TanTanMa Dec 20, 2021
358dbba
pages for users to confirm and confirmed users
TanTanMa Dec 20, 2021
e19b370
added confirmed and username fields for users
TanTanMa Dec 20, 2021
51ab136
migrated the databases changes for users and admin
TanTanMa Dec 20, 2021
7530f33
added routes for admin pages
TanTanMa Dec 20, 2021
872308d
Merge pull request #20 from ralphsulit/Generate/Admin
ralphsulit Dec 20, 2021
1d38ca4
added username in params and text_fields
TanTanMa Dec 21, 2021
db75187
removed add and edit links and pages for stocks database
TanTanMa Dec 21, 2021
566e4f2
limited the stock routes to only show and index
TanTanMa Dec 21, 2021
be3ab19
added currency+interest converter function and render it to stock ind…
TanTanMa Dec 21, 2021
d0fd96c
Merge pull request #21 from ralphsulit/Stock/Price_convertion
ralphsulit Dec 21, 2021
285989d
added style in registration (left and right row)
ralphsulit Dec 21, 2021
77b598c
removed Whenever due to heroku incomp, installed resque and resque sc…
TanTanMa Dec 22, 2021
81281a7
lessen list of stocks ticker for testing
TanTanMa Dec 22, 2021
37ce6c6
tested scoping and update function
TanTanMa Dec 22, 2021
7e27260
added the update func to seeder file
TanTanMa Dec 22, 2021
04c85ed
configurations for resque
TanTanMa Dec 22, 2021
442ae51
removed the update function at seeder file
TanTanMa Dec 22, 2021
49fda36
update stock prices function
TanTanMa Dec 22, 2021
37d759b
added another module for resque call, set update prices every 10s
TanTanMa Dec 22, 2021
364df4d
Merge pull request #22 from ralphsulit/Scheduler/updateStockPrice
ralphsulit Dec 22, 2021
2574411
added navbar component with styles
ralphsulit Dec 27, 2021
5f48f26
change homepage ui
ralphsulit Dec 31, 2021
df16cc4
Merge branch 'master' into homepage
TanTanMa Dec 31, 2021
dc2acfd
Merge pull request #24 from ralphsulit/homepage
TanTanMa Dec 31, 2021
6d58565
added homepage background images
ralphsulit Jan 4, 2022
2d3bbc2
change homepage content
ralphsulit Jan 4, 2022
5570ee8
change homepage style and content, and responsive breakpoitns
ralphsulit Jan 4, 2022
93c90e6
fixed homepage navbar mobile and desktop view
ralphsulit Jan 4, 2022
43bdac0
move the background image to #homepage
ralphsulit Jan 5, 2022
e83bf94
added login page mobile view styling
ralphsulit Jan 6, 2022
908e6e6
generate Holdings, Trade Logs, and Wallets database
TanTanMa Jan 7, 2022
d9c6353
migrated the holding, trade logs and wallet databases
TanTanMa Jan 7, 2022
71602c5
added stocks, holdings and current user gate for index page
TanTanMa Jan 7, 2022
c8f68f4
+ user's current holdings and wallet balance
TanTanMa Jan 7, 2022
e669017
interconnected Users, holding, trade logs, and wallet databases
TanTanMa Jan 7, 2022
49cec72
+ new.html.erb on buy/sell a stock, user wallet specific, adds to hol…
TanTanMa Jan 7, 2022
e68b95b
added routes under Users
TanTanMa Jan 7, 2022
0afc3c2
changed Add_stock link to Trade Logs link
TanTanMa Jan 7, 2022
b0c42fa
added styling in small devices(600px)
ralphsulit Jan 7, 2022
eb68de4
added validations for holding and stock models, connected trade_log t…
TanTanMa Jan 8, 2022
cb4a78e
render user's email and wallet, profit/loss data on their holds
TanTanMa Jan 8, 2022
da3fe6a
rounded the profit and loss hashes to 4
TanTanMa Jan 8, 2022
29dcd71
added Units column to holding db; added transaction_type column and d…
TanTanMa Jan 8, 2022
4de4182
added holdings and trade_logs link to navbar, adjused the routes
TanTanMa Jan 8, 2022
e8ff1f1
+ forms and logic for buying and selling stocks, render user's wallet…
TanTanMa Jan 8, 2022
d2fc130
complie all trade logs of users via hashes
TanTanMa Jan 8, 2022
4e408ff
rounded units to 4 numbers
TanTanMa Jan 8, 2022
8f0f3a6
moved frequently used codes to application helper for ease access
TanTanMa Jan 8, 2022
9dd2182
Merge pull request #25 from ralphsulit/Feature/BuySellStocks
ralphsulit Jan 9, 2022
397761f
change login page style in medium size
ralphsulit Jan 10, 2022
0d3ce8f
change responsive breakpoints, login mobile design
ralphsulit Jan 10, 2022
62ccc15
change footer height and size, label width
ralphsulit Jan 10, 2022
70da674
added meta tag, and change navbar and footer design to mobile first …
ralphsulit Jan 11, 2022
462f5fa
added comment in breakpoints
ralphsulit Jan 11, 2022
3065c71
change image size, paragraph size, button in homepage (small devices)
ralphsulit Jan 11, 2022
38b2030
change homepage image, heading, and paragraph styles (small devices)
ralphsulit Jan 11, 2022
02a6066
change image size in medium deivce
ralphsulit Jan 11, 2022
62b1d96
change logo sizing in medium to large screen size
ralphsulit Jan 11, 2022
522a14a
change navlinks size in medium and large screen size
ralphsulit Jan 11, 2022
0db0281
change homepage style in large screen devices
ralphsulit Jan 11, 2022
0ac0fa5
homepage styling mobile first approach
ralphsulit Jan 11, 2022
f9f6d61
forms style change
ralphsulit Jan 11, 2022
647e3a0
remove main.scss in homepage
ralphsulit Jan 11, 2022
3571bd1
added styling for login page smaller devices
ralphsulit Jan 11, 2022
da99d7a
added class 'link', and change link styles
ralphsulit Jan 11, 2022
68eba0c
change form to mobile approach design
ralphsulit Jan 12, 2022
5cb04c0
Merge pull request #26 from ralphsulit/form
TanTanMa Jan 12, 2022
f4b9e67
change login style 280px below
ralphsulit Jan 12, 2022
2f3729f
change login style in medium devices
ralphsulit Jan 12, 2022
ed110cb
added username and email for trade log database
TanTanMa Jan 12, 2022
97d53a2
removed redis dependency on run
TanTanMa Jan 12, 2022
bc3d3ed
authenticated routes for admin and users
TanTanMa Jan 12, 2022
0a18dd7
conditional links for users and admins
TanTanMa Jan 12, 2022
bbc29ae
added login style in medium to large screen sizes
ralphsulit Jan 12, 2022
44bf693
added username field on registration, added admin account on database…
TanTanMa Jan 12, 2022
0a68640
added log book for all trade logs and individual logs of users in sho…
TanTanMa Jan 12, 2022
f03859f
changes user-settings to client list, added links for admin navigations
TanTanMa Jan 12, 2022
0b4c574
added conditional links for admin pages navigation
TanTanMa Jan 12, 2022
77c0a07
allow admin to add and edit user's information and wallet
TanTanMa Jan 12, 2022
111f16f
seed emails, and create 1 admin email
TanTanMa Jan 12, 2022
fcf1274
Merge pull request #27 from ralphsulit/form
TanTanMa Jan 12, 2022
bc537dd
solved merging conflicts for _form reque _navbar
TanTanMa Jan 12, 2022
0c0e117
Merge branch 'master' into Feature/AdminAccess
TanTanMa Jan 12, 2022
283721c
Merge pull request #28 from ralphsulit/Feature/AdminAccess
TanTanMa Jan 12, 2022
d28d4af
Delete master.yml
TanTanMa Jan 12, 2022
86cf11b
reigister form mobile to large screen size
ralphsulit Jan 13, 2022
09f880b
Merge branch 'master' into form
TanTanMa Jan 13, 2022
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
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 2.7.2
ruby 2.7.4
yarn 1.22.4
nodejs 12.18.3
10 changes: 8 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.2'
ruby '2.7.4'

gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
gem 'pg'
gem 'sqlite3', '~> 1.4'
# gem 'pg'
gem 'puma', '~> 4.1'
gem 'sass-rails', '>= 6'
gem 'webpacker', '~> 4.0'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.7'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'bcrypt', '~> 3.1.7'
gem 'stock_quote', '~> 3.0'
gem 'iex-ruby-client'
gem 'resque', '~> 2.2'
gem 'resque-scheduler', '~> 4.5'

gem 'devise'
gem 'hamlit-rails'
Expand Down
Loading