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

App UI #88

Open
wants to merge 132 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
86ec582
added and created Rspec for model testing
curtydudes Sep 13, 2021
ec31e8c
Merge pull request #1 from curtydudes/model_RSPEC
curtydudes Sep 13, 2021
1ab258c
Revert "added and created Rspec for model testing"
curtydudes Sep 13, 2021
aa608b3
Merge pull request #2 from curtydudes/revert-1-model_RSPEC
Stephdajon Sep 13, 2021
75b3b96
added another rspec model test file
curtydudes Sep 13, 2021
9f485e9
updated rubocop correctables
curtydudes Sep 13, 2021
122b91b
added devise gem and functionalities for both user and admin. I also …
curtydudes Sep 14, 2021
8ff0b05
rubocop configures and addressed the offenses
curtydudes Sep 14, 2021
99469c9
adjusted the rspec configuration
curtydudes Sep 14, 2021
a637025
rubocop -A on the rspec
curtydudes Sep 14, 2021
34632d2
configurations for credentials
curtydudes Sep 14, 2021
1f80fed
Added home page
Stephdajon Sep 14, 2021
c19764f
added changes in gitignore for masterkey
curtydudes Sep 14, 2021
59515e4
made pass rspec
curtydudes Sep 14, 2021
91a2e57
corrected correctables
Stephdajon Sep 15, 2021
ad7ba25
cleaned up the rspec file, add more columns in the db, deleted the du…
curtydudes Sep 15, 2021
3faf932
removed credentials
Stephdajon Sep 15, 2021
5d51f66
run rubocop
Stephdajon Sep 15, 2021
a408ef5
brought back the deleted codes in rails_helper
curtydudes Sep 16, 2021
3a2ece2
deleted routes because of deleted landing page in route for Steph's PR
curtydudes Sep 16, 2021
dce05af
Merge pull request #4 from curtydudes/devise_gem
curtydudes Sep 16, 2021
678ed4b
Merge branch 'master' into home-page
curtydudes Sep 16, 2021
295cfb3
Merge pull request #5 from curtydudes/home-page
curtydudes Sep 16, 2021
654ac2c
add credentials
curtydudes Sep 16, 2021
350833a
Merge branch 'master' into api_key
curtydudes Sep 16, 2021
4697a2b
Merge pull request #6 from curtydudes/api_key
Stephdajon Sep 16, 2021
7e46bfe
Merge
Stephdajon Sep 17, 2021
fb4a9e7
deleted credential causing conflicts
Stephdajon Sep 17, 2021
232efb5
cosmetic changes
curtydudes Sep 17, 2021
b2b2833
Merge branch 'master' into devise_gem_views_on_user_and_admin
curtydudes Sep 17, 2021
747993f
Merge pull request #7 from curtydudes/devise_gem_views_on_user_and_admin
curtydudes Sep 17, 2021
9e78d97
Merge branch 'master' of github.com:curtydudes/rails-base-project
Stephdajon Sep 17, 2021
c167a50
added new credentials file
Stephdajon Sep 17, 2021
e509004
resolve conflicts and merge
Stephdajon Sep 17, 2021
ead840b
added removed codes from merging
Stephdajon Sep 17, 2021
ef65011
added UI
Stephdajon Sep 17, 2021
4df62b8
HOME-PAGE: added UI and fix crendentials merging error
Stephdajon Sep 17, 2021
d673385
home-page: Added NavBar, UI, and partial file for landing page
Stephdajon Sep 17, 2021
7809dda
home-page: Added NavBar, UI, and partial file for landing page
Stephdajon Sep 17, 2021
8459eee
Home-page: Navbar, and UI
Stephdajon Sep 18, 2021
3480049
Merge pull request #8 from curtydudes/home-page
curtydudes Sep 18, 2021
adc3a31
make it better
curtydudes Sep 18, 2021
1e0bc83
make it better 2
curtydudes Sep 18, 2021
cd86785
make it better index in home controller
curtydudes Sep 18, 2021
5c51696
make it better index in home controller
curtydudes Sep 18, 2021
3bd9f8f
for api changes
curtydudes Sep 18, 2021
adf5767
created a route for when user logs in, it goes to their own profile
curtydudes Sep 20, 2021
a9d5e47
accidentally deleted database.yml.sample, restoring it back
curtydudes Sep 20, 2021
88c2645
added parameters in application controller for the added validation i…
curtydudes Sep 20, 2021
16a1dd2
revised the requested changes in controller, models and views
curtydudes Sep 20, 2021
d72cb47
added lines in the portfolio index
curtydudes Sep 20, 2021
378eeab
rubocop for home_controller
curtydudes Sep 20, 2021
051953c
Merge pull request #9 from curtydudes/devise_gem_views_on_user_and_admin
curtydudes Sep 20, 2021
604da13
improved on user portfolio interface
curtydudes Sep 20, 2021
52a2f4c
fixed the spacing in index
curtydudes Sep 20, 2021
350177b
Merge pull request #10 from curtydudes/devise_gem_views_on_user_and_a…
Stephdajon Sep 20, 2021
baec067
adding columns to user to set up mailer
curtydudes Sep 21, 2021
d4b8b10
Merge pull request #11 from curtydudes/devise_gem_views_on_user_and_a…
Stephdajon Sep 21, 2021
0345cb1
Wallet: created model,controller and UI for wallet
warda-nur Sep 22, 2021
7ba948d
Wallet: created model, controller, UI for wallet and fixed rubocop error
warda-nur Sep 22, 2021
5b7bea1
fixed rebase conflict and rubocop error
warda-nur Sep 22, 2021
e6a5f84
commented the pending message
warda-nur Sep 22, 2021
266a932
commented admin spec contents
warda-nur Sep 22, 2021
57b53ba
Merge pull request #12 from curtydudes/wallet
Stephdajon Sep 22, 2021
01d88a2
Admin & Mailer: created controllers, views, mailers, models, routes
curtydudes Sep 22, 2021
50708a6
rubocop mailers, controllers, models, views and routes
curtydudes Sep 22, 2021
b29221c
added needed changes for model user and approved mailer
curtydudes Sep 22, 2021
9b73226
Admin: views on adding user
curtydudes Sep 22, 2021
b2bd25c
registration controller: added autofocus, new file in user index, cor…
curtydudes Sep 22, 2021
4124bcc
deleted bootstrap in stylsheets, renamed mailer, changes text type in…
curtydudes Sep 22, 2021
046f57b
rubocop fix in registration controller
curtydudes Sep 22, 2021
07ad3e6
added extra lines to views admins, views layouts and added dummy emai…
curtydudes Sep 23, 2021
08d9cfa
reverted back to placeholder in envrionment and production and rename…
curtydudes Sep 23, 2021
303a6d2
deleted spaces so github will recognize it as newline for views admin…
curtydudes Sep 23, 2021
d4e3c50
added the necessary credentials on the placeholder for gmailer
curtydudes Sep 23, 2021
cdd3e41
Merge pull request #13 from curtydudes/admin_login
curtydudes Sep 23, 2021
a04aab5
App UI: updated login, sign up and homepage html.erb file
warda-nur Sep 23, 2021
21bbc99
App UI: created scss files for login, sign up, navbar and homepage
warda-nur Sep 23, 2021
3cec610
deleted wallets.rb file for rspec error
warda-nur Sep 23, 2021
59640c2
fixed extra white space at the buttom
warda-nur Sep 23, 2021
127d343
Merge pull request #15 from curtydudes/App-UI
curtydudes Sep 23, 2021
90db9f7
make it better
curtydudes Sep 23, 2021
120b7d7
commiting admin view and controller
curtydudes Sep 23, 2021
0cf8802
resolved conflicts on credentials and schema since my local is not up…
Stephdajon Sep 23, 2021
0f439ee
merging the commented out fields for a cleaner UI
curtydudes Sep 23, 2021
07be645
API: added stock model and iex
Stephdajon Sep 22, 2021
f213bf8
API: added font awesome rails for stock market UI
Stephdajon Sep 23, 2021
239e1f1
commiting deployment admin functions and UI
curtydudes Sep 23, 2021
e9d0783
Fixes and pushes to satisfy the deployment to Heroku
curtydudes Sep 23, 2021
f127a1e
Fixed commits to be able to push in previews and registrations
curtydudes Sep 23, 2021
c8bb643
fixing the routes to fix the database
curtydudes Sep 23, 2021
226f039
Merge pull request #16 from curtydudes/admin_login
curtydudes Sep 23, 2021
b4c15ad
hotfix on credentials to deploy properly
curtydudes Sep 23, 2021
602e969
Merge pull request #17 from curtydudes/hotfix/credentials
analyn-cajocson Sep 23, 2021
b75b4e3
hotfix on production.rb
curtydudes Sep 23, 2021
56b5b21
commenting out smtp settings
curtydudes Sep 23, 2021
a37f1ec
added yarn.lock
curtydudes Sep 23, 2021
3295063
add bootstrap install
curtydudes Sep 23, 2021
90b79aa
resolved conflict on credentials.yml.enc
Stephdajon Sep 23, 2021
4a3922d
API: removed imported bootstrap at application scss, put sample title…
Stephdajon Sep 23, 2021
aa986d8
API: run rubocop test
Stephdajon Sep 23, 2021
8937e36
API: define search on controller to fetch from api using the search b…
Stephdajon Sep 23, 2021
e97a292
API: removed partial file js since it's not yet working, removed aler…
Stephdajon Sep 23, 2021
ef7f363
API: fixed rubocop error
Stephdajon Sep 23, 2021
f8b9608
API: added new lines on stock scss and partial file search
Stephdajon Sep 23, 2021
d415ef2
add package json and add bootstrap
curtydudes Sep 23, 2021
9255adf
resolved conflicts accepted current changes
Stephdajon Sep 23, 2021
fcdc23d
resolved conflicts on credentials file
Stephdajon Sep 23, 2021
0f5c05c
Hotfix Mailer: Deleted duplicate and redundant data and files to orga…
curtydudes Sep 24, 2021
d428352
Fixed newlines for mailer files
curtydudes Sep 24, 2021
05449c5
deleted the rspec mailers temporarily
curtydudes Sep 24, 2021
5782eed
Merge pull request #18 from curtydudes/hotfix/admin_mailer
curtydudes Sep 24, 2021
8f37e38
commented out gmailer
curtydudes Sep 24, 2021
cc296f4
Merge branch 'master' into api
curtydudes Sep 24, 2021
a988f86
Merge pull request #14 from curtydudes/api
curtydudes Sep 24, 2021
552cdb5
Admin Views and Controller: added Create, View and Edit user
curtydudes Sep 24, 2021
e3cca25
Merge pull request #19 from curtydudes/admin_edit_view_users
Stephdajon Sep 24, 2021
5b30e5e
App-UI: updated login, sign up and portfolio UI
warda-nur Sep 24, 2021
075db4d
App-UI: created search.scss file for the stock search bar
warda-nur Sep 24, 2021
d26cd14
Merge pull request #20 from curtydudes/App-UI
Stephdajon Sep 24, 2021
e0b679f
Feature in Mailer: Mailed welcome mail and approval mail
curtydudes Sep 24, 2021
821ea4a
fixed rubocop errors in controllers and models
curtydudes Sep 24, 2021
d22021a
Add newlines to the user_portfolio and credentials file
curtydudes Sep 24, 2021
57cabbf
Commented out the rspec test temporarily since it gives the error of …
curtydudes Sep 24, 2021
87d2ca7
restored rspec and removed credentials
curtydudes Sep 24, 2021
9020d96
Merge pull request #21 from curtydudes/admin_mailer
curtydudes Sep 24, 2021
cb9735b
Commented out if statement calling if users are empty as this is in c…
curtydudes Sep 24, 2021
4a033f7
Merge pull request #22 from curtydudes/hotfix/admin_homepage
curtydudes Sep 24, 2021
c983483
commented out the end in the if function
curtydudes Sep 24, 2021
4f2102d
App-UI: updates app's login, signup, home page, portfolio, and admin'…
warda-nur Sep 25, 2021
37c659b
Wallet: On goinh transaction history
warda-nur Sep 25, 2021
b50eca4
Wallet: fixed rubocop Time.now error
warda-nur Sep 25, 2021
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
yarn-debug.log*
.yarn-integrity

config/database.yml
config/database.yml
9 changes: 7 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.7'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'iex-ruby-client'
gem 'devise'
gem 'hamlit-rails'
gem "font-awesome-rails"

group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
Expand All @@ -25,10 +26,11 @@ group :development do
gem 'listen', '~> 3.2'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'rspec-rails', '~> 5.0.0'
end

group :test do
gem 'rspec-rails'
gem 'rspec-rails', '~> 5.0.0'
gem 'database_rewinder'
gem 'factory_bot_rails'
gem 'shoulda-matchers'
Expand All @@ -37,3 +39,6 @@ group :test do
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false
end

gem 'bootstrap', '~> 4.4.1'
gem 'jquery-rails'
Loading