Code

App UI#88

Code

Open

warda-nur wants to merge 132 commits intoavionschool:masteravionschool/rails-base-project:masterfrom curtydudes:App-UIcurtydudes/rails-trio-stock-app:App-UICopy head branch name to clipboard

+13,431-125

Commits

Commits on Sep 13, 2021

• added and created Rspec for model testing

  curtydudes

  committed
  86ec582

• Merge pull request #1 from curtydudes/model_RSPEC

  Show description for ec31e8c
  curtydudes

  authored
  ec31e8c

• Revert "added and created Rspec for model testing"

  curtydudes

  authored
  1ab258c

• Merge pull request #2 from curtydudes/revert-1-model_RSPEC

  Show description for aa608b3
  Stephdajon

  authored
  aa608b3

• added another rspec model test file

  curtydudes

  committed
  75b3b96

• updated rubocop correctables

  curtydudes

  committed
  9f485e9

Commits on Sep 14, 2021

• added devise gem and functionalities for both user and admin. I also added a tempoarary landing page

  curtydudes

  committed
  122b91b

• rubocop configures and addressed the offenses

  curtydudes

  committed
  8ff0b05

• adjusted the rspec configuration

  curtydudes

  committed
  99469c9

• rubocop -A on the rspec

  curtydudes

  committed
  a637025

• configurations for credentials

  curtydudes

  committed
  34632d2

• Added home page

  Stephdajon

  committed
  1f80fed

• added changes in gitignore for masterkey

  curtydudes

  committed
  c19764f

• made pass rspec

  curtydudes

  committed
  59515e4

Commits on Sep 15, 2021

• corrected correctables

  Stephdajon

  committed
  91a2e57

• cleaned up the rspec file, add more columns in the db, deleted the duplicate file and the landing page to give way to the other related push

  curtydudes

  committed
  ad7ba25

• removed credentials

  Stephdajon

  committed
  3faf932

• run rubocop

  Stephdajon

  committed
  5d51f66

Commits on Sep 16, 2021

• brought back the deleted codes in rails_helper

  curtydudes

  committed
  a408ef5

• deleted routes because of deleted landing page in route for Steph's PR

  curtydudes

  committed
  3a2ece2

• Merge pull request #4 from curtydudes/devise_gem

  Show description for dce05af
  curtydudes

  authored
  dce05af

• Merge branch 'master' into home-page

  curtydudes

  authored
  678ed4b

• Merge pull request #5 from curtydudes/home-page

  Show description for 295cfb3
  curtydudes

  authored
  295cfb3

• add credentials

  curtydudes

  committed
  654ac2c

• Merge branch 'master' into api_key

  curtydudes

  authored
  350833a

• Merge pull request #6 from curtydudes/api_key

  Show description for 4697a2b
  Stephdajon

  authored
  4697a2b

Commits on Sep 17, 2021

• Merge

  Stephdajon

  committed
  7e46bfe

• deleted credential causing conflicts

  Stephdajon

  committed
  fb4a9e7

• cosmetic changes

  curtydudes

  committed
  232efb5

• Merge branch 'master' into devise_gem_views_on_user_and_admin

  curtydudes

  authored
  b2b2833

• Merge pull request #7 from curtydudes/devise_gem_views_on_user_and_admin

  Show description for 747993f
  curtydudes

  authored
  747993f

• Merge branch 'master' of github.com:curtydudes/rails-base-project

  Stephdajon

  committed
  9e78d97

• added new credentials file

  Stephdajon

  committed
  c167a50

• resolve conflicts and merge

  Stephdajon

  committed
  e509004

• added removed codes from merging

  Stephdajon

  committed
  ead840b

• added UI

  Stephdajon

  committed
  ef65011

• HOME-PAGE: added UI and fix crendentials merging error

  Stephdajon

  committed
  4df62b8

• home-page: Added NavBar, UI, and partial file for landing page

  Stephdajon

  committed
  d673385

• home-page: Added NavBar, UI, and partial file for landing page

  Stephdajon

  committed
  7809dda

Commits on Sep 18, 2021

• Home-page: Navbar, and UI

  Stephdajon

  committed
  8459eee

• Merge pull request #8 from curtydudes/home-page

  Show description for 3480049
  curtydudes

  authored
  3480049

• make it better

  curtydudes

  committed
  adc3a31

• make it better 2

  curtydudes

  committed
  1e0bc83

• make it better index in home controller

  curtydudes

  committed
  cd86785

• make it better index in home controller

  curtydudes

  committed
  5c51696

• for api changes

  curtydudes

  committed
  3bd9f8f

Commits on Sep 20, 2021

• created a route for when user logs in, it goes to their own profile

  curtydudes

  committed
  adf5767

• accidentally deleted database.yml.sample, restoring it back

  curtydudes

  committed
  a9d5e47

• added parameters in application controller for the added validation in user model

  curtydudes

  committed
  88c2645

• revised the requested changes in controller, models and views

  curtydudes

  committed
  16a1dd2

• added lines in the portfolio index

  curtydudes

  committed
  d72cb47

• rubocop for home_controller

  curtydudes

  committed
  378eeab

• Merge pull request #9 from curtydudes/devise_gem_views_on_user_and_admin

  Show description for 051953c
  curtydudes

  authored
  051953c

• improved on user portfolio interface

  curtydudes

  committed
  604da13

• fixed the spacing in index

  curtydudes

  committed
  52a2f4c

• Merge pull request #10 from curtydudes/devise_gem_views_on_user_and_admin

  Show description for 350177b
  Stephdajon

  authored
  350177b

Commits on Sep 21, 2021

• adding columns to user to set up mailer

  curtydudes

  committed
  baec067

• Merge pull request #11 from curtydudes/devise_gem_views_on_user_and_admin

  Show description for d4b8b10
  Stephdajon

  authored
  d4b8b10

Commits on Sep 22, 2021

• Wallet: created model,controller and UI for wallet

  warda-nur

  committed
  0345cb1

• Wallet: created model, controller, UI for wallet and fixed rubocop error

  warda-nur

  committed
  7ba948d

• fixed rebase conflict and rubocop error

  warda-nur

  committed
  5b7bea1

• commented the pending message

  warda-nur

  committed
  e6a5f84

• commented admin spec contents

  warda-nur

  committed
  266a932

• Merge pull request #12 from curtydudes/wallet

  Show description for 57b53ba
  Stephdajon

  authored
  57b53ba

• Admin & Mailer: created controllers, views, mailers, models, routes

  curtydudes

  committed
  01d88a2

• rubocop mailers, controllers, models, views and routes

  curtydudes

  committed
  50708a6

• added needed changes for model user and approved mailer

  curtydudes

  committed
  b29221c

• Admin: views on adding user

  curtydudes

  committed
  9b73226

• registration controller: added autofocus, new file in user index, corrected the routes from the previous PR

  curtydudes

  committed
  b2bd25c

• deleted bootstrap in stylsheets, renamed mailer, changes text type in registrations, edited routes to route properly

  curtydudes

  committed
  4124bcc

• rubocop fix in registration controller

  curtydudes

  committed
  046f57b

Commits on Sep 23, 2021

• added extra lines to views admins, views layouts and added dummy email details to production.rb

  curtydudes

  committed
  07ad3e6

• reverted back to placeholder in envrionment and production and renamed approved mailer

  curtydudes

  committed
  08d9cfa

• deleted spaces so github will recognize it as newline for views admin,layout and users

  curtydudes

  committed
  303a6d2

• added the necessary credentials on the placeholder for gmailer

  curtydudes

  committed
  d4e3c50

• Merge pull request #13 from curtydudes/admin_login

  Show description for cdd3e41
  curtydudes

  authored
  cdd3e41

• App UI: updated login, sign up and homepage html.erb file

  warda-nur

  committed
  a04aab5

• App UI: created scss files for login, sign up, navbar and homepage

  warda-nur

  committed
  21bbc99

• deleted wallets.rb file for rspec error

  warda-nur

  committed
  3cec610

• fixed extra white space at the buttom

  warda-nur

  committed
  59640c2

• Merge pull request #15 from curtydudes/App-UI

  Show description for 127d343
  curtydudes

  authored
  127d343

• make it better

  curtydudes

  committed
  90db9f7

• commiting admin view and controller

  curtydudes

  committed
  120b7d7

• resolved conflicts on credentials and schema since my local is not updated

  Stephdajon

  committed
  0cf8802

• merging the commented out fields for a cleaner UI

  curtydudes

  committed
  0f439ee

• API: added stock model and iex

  Stephdajon

  committed
  07be645

• API: added font awesome rails for stock market UI

  Stephdajon

  committed
  f213bf8

• commiting deployment admin functions and UI

  curtydudes

  committed
  239e1f1

• Fixes and pushes to satisfy the deployment to Heroku

  curtydudes

  committed
  e9d0783

• Fixed commits to be able to push in previews and registrations

  curtydudes

  committed
  f127a1e

• fixing the routes to fix the database

  curtydudes

  committed
  c8bb643

• Merge pull request #16 from curtydudes/admin_login

  Show description for 226f039
  curtydudes

  authored
  226f039

• hotfix on credentials to deploy properly

  curtydudes

  committed
  b4c15ad

• Merge pull request #17 from curtydudes/hotfix/credentials

  Show description for 602e969
  analyn-cajocson

  authored
  602e969

• hotfix on production.rb

  curtydudes

  committed
  b75b4e3

• commenting out smtp settings

  curtydudes

  committed
  56b5b21

• added yarn.lock

  curtydudes

  committed
  a37f1ec

• add bootstrap install

  curtydudes

  committed
  3295063

• resolved conflict on credentials.yml.enc

  Stephdajon

  committed
  90b79aa

• API: removed imported bootstrap at application scss, put sample title at application html, deleted stock market view link at home header, render partial search file from portfolio, added UI on sign…

  Show description for 4a3922d
  Stephdajon

  committed
  4a3922d

• API: run rubocop test

  Stephdajon

  committed
  aa986d8

• API: define search on controller to fetch from api using the search bar, adjusted paddings and display on stock scss, create partial search files for search bar and alert errors

  Stephdajon

  committed
  8937e36

• API: removed partial file js since it's not yet working, removed alerts on stocks controller

  Stephdajon

  committed
  e97a292

• API: fixed rubocop error

  Stephdajon

  committed
  ef7f363

• API: added new lines on stock scss and partial file search

  Stephdajon

  committed
  f8b9608

• add package json and add bootstrap

  curtydudes

  committed
  d415ef2

• resolved conflicts accepted current changes

  Stephdajon

  committed
  9255adf

• resolved conflicts on credentials file

  Stephdajon

  committed
  fcdc23d

Commits on Sep 24, 2021

• Hotfix Mailer: Deleted duplicate and redundant data and files to organize and clean the mailer route

  curtydudes

  committed
  0f5c05c

• Fixed newlines for mailer files

  curtydudes

  committed
  d428352

• deleted the rspec mailers temporarily

  curtydudes

  committed
  05449c5

• Merge pull request #18 from curtydudes/hotfix/admin_mailer

  Show description for 5782eed
  curtydudes

  authored
  5782eed

• commented out gmailer

  curtydudes

  committed
  8f37e38

• Merge branch 'master' into api

  curtydudes

  authored
  cc296f4

• Merge pull request #14 from curtydudes/api

  Show description for a988f86
  curtydudes

  authored
  a988f86

• Admin Views and Controller: added Create, View and Edit user

  curtydudes

  committed
  552cdb5

• Merge pull request #19 from curtydudes/admin_edit_view_users

  Show description for e3cca25
  Stephdajon

  authored
  e3cca25

• App-UI: updated login, sign up and portfolio UI

  warda-nur

  committed
  5b30e5e

• App-UI: created search.scss file for the stock search bar

  warda-nur

  committed
  075db4d

• Merge pull request #20 from curtydudes/App-UI

  Show description for d26cd14
  Stephdajon

  authored
  d26cd14

• Feature in Mailer: Mailed welcome mail and approval mail

  curtydudes

  committed
  e0b679f

• fixed rubocop errors in controllers and models

  curtydudes

  committed
  821ea4a

• Add newlines to the user_portfolio and credentials file

  curtydudes

  committed
  d22021a

• Commented out the rspec test temporarily since it gives the error of in initializing environment.rb

  curtydudes

  committed
  57cabbf

• restored rspec and removed credentials

  curtydudes

  committed
  87d2ca7

• Merge pull request #21 from curtydudes/admin_mailer

  Show description for 9020d96
  curtydudes

  authored
  9020d96

• Commented out if statement calling if users are empty as this is in conflict with heroku deployment

  curtydudes

  committed
  cb9735b

• Merge pull request #22 from curtydudes/hotfix/admin_homepage

  Show description for 4a033f7
  curtydudes

  authored
  4a033f7

• commented out the end in the if function

  curtydudes

  committed
  c983483

Commits on Sep 25, 2021

• App-UI: updates app's login, signup, home page, portfolio, and admin's sign in

  warda-nur

  committed
  4f2102d

• Wallet: On goinh transaction history

  warda-nur

  committed
  37c659b

• Wallet: fixed rubocop Time.now error

  warda-nur

  committed
  b50eca4