Code

UI usersignin#122

Code

Open

annoraischia wants to merge 134 commits intoavionschool:masteravionschool/rails-base-project:masterfrom jujubean22:ui_usersigninjujubean22/rails-swift-app:ui_usersigninCopy head branch name to clipboard

+11,889-38

Commits

Commits on Dec 8, 2021

• updated dependencies

  jujubean22

  committed
  bcfdca3

  Copy full SHA for bcfdca3

• added stockqoute gem & initial homepage

  jujubean22

  committed
  372b293

  Copy full SHA for 372b293

• Merge pull request #1 from jujubean22/testing_branch

  Show description for 56eca9f
  jujubean22

  authored
  56eca9f

  Copy full SHA for 56eca9f

• initial set-up for devise views, models and database

  jujubean22

  committed
  6370257

  Copy full SHA for 6370257

• Merge pull request #2 from jujubean22/testing_branch

  Show description for 2da1381
  jujubean22

  authored
  2da1381

  Copy full SHA for 2da1381

Commits on Dec 9, 2021

• changed application.css to .scss

  

  annora

  authored and

  annora

  committed
  f26f6c2

  Copy full SHA for f26f6c2

Commits on Dec 10, 2021

• Merge pull request #3 from jujubean22/ui_usersignin

  Show description for 77587db
  jujubean22

  authored
  77587db

  Copy full SHA for 77587db

Commits on Dec 11, 2021

• logo applied on main index

  

  annora

  authored and

  annora

  committed
  8fb2ab7

  Copy full SHA for 8fb2ab7

Commits on Dec 12, 2021

• static landing navbar added

  

  annora

  authored and

  annora

  committed
  aeefbed

  Copy full SHA for aeefbed

• v1 element testing on landing page, added test fonts and layout

  

  annora

  authored and

  annora

  committed
  d7249db

  Copy full SHA for d7249db

• added landing page animation

  

  annora

  authored and

  annora

  committed
  b71206b

  Copy full SHA for b71206b

Commits on Dec 13, 2021

• uncomment devise migrations

  jujubean22

  committed
  d16cf57

  Copy full SHA for d16cf57

• added validations and relationships on buyer, broker and admin

  jujubean22

  committed
  435c4aa

  Copy full SHA for 435c4aa

• fixed syntax error

  jujubean22

  committed
  fbb96ca

  Copy full SHA for fbb96ca

• conditional rendering in home

  jujubean22

  committed
  f3e1a4a

  Copy full SHA for f3e1a4a

• Merge pull request #4 from jujubean22/Migration

  Show description for 72504a2
  jujubean22

  authored
  72504a2

  Copy full SHA for 72504a2

• Merge pull request #5 from jujubean22/ui_usersignin

  Show description for 617073e
  jujubean22

  authored
  617073e

  Copy full SHA for 617073e

• Merge branch 'master' into home-rendering

  jujubean22

  authored
  0d70e0d

  Copy full SHA for 0d70e0d

• Merge pull request #6 from jujubean22/home-rendering

  Show description for 8d560c1
  jujubean22

  authored
  8d560c1

  Copy full SHA for 8d560c1

• landing page design by annora

  jujubean22

  committed
  21cd182

  Copy full SHA for 21cd182

• Merge pull request #7 from jujubean22/home-rendering

  Show description for 325f2ed
  jujubean22

  authored
  325f2ed

  Copy full SHA for 325f2ed

Commits on Dec 14, 2021

• added onclick routing on landing page navbar links

  

  annora

  authored and

  annora

  committed
  76286a5

  Copy full SHA for 76286a5

Commits on Dec 16, 2021

• added skeleton elements for buyer signin and signup pages

  

  annora

  authored and

  annora

  committed
  5cce5d6

  Copy full SHA for 5cce5d6

Commits on Jan 3, 2022

• uncomment devise in database

  jujubean22

  committed
  a608a28

  Copy full SHA for a608a28

• added stocks table in database

  jujubean22

  committed
  ffe0cdf

  Copy full SHA for ffe0cdf

• added buyer stocks table in database

  jujubean22

  committed
  9b15d5a

  Copy full SHA for 9b15d5a

• added transactions table in database

  jujubean22

  committed
  a0d1352

  Copy full SHA for a0d1352

• added references to buyer and broker

  jujubean22

  committed
  f63c798

  Copy full SHA for f63c798

• Merge pull request #8 from jujubean22/Database

  Show description for 81decb3
  jujubean22

  authored
  81decb3

  Copy full SHA for 81decb3

• added an admin

  jujubean22

  committed
  cfe865c

  Copy full SHA for cfe865c

Commits on Jan 4, 2022

• override registrations controller

  jujubean22

  committed
  00f02ce

  Copy full SHA for 00f02ce

• Merge pull request #9 from jujubean22/controllers

  Show description for d9b1143
  jujubean22

  authored
  d9b1143

  Copy full SHA for d9b1143

Commits on Jan 5, 2022

• added static draft for log-in and sign-up

  

  annora

  authored and

  annora

  committed
  f9b860e

  Copy full SHA for f9b860e

• initial homepage for each user

  jujubean22

  committed
  0a0f93c

  Copy full SHA for 0a0f93c

• Separated sign-up from log-in form, added animation, bg, and font styling

  

  annora

  authored and

  annora

  committed
  4a81dbb

  Copy full SHA for 4a81dbb

• fixed conditional navbar

  jujubean22

  committed
  892bc54

  Copy full SHA for 892bc54

• Merge pull request #10 from jujubean22/initial_homepage

  Show description for 1d57cee
  jujubean22

  authored
  1d57cee

  Copy full SHA for 1d57cee

• added encrypted api_key

  jujubean22

  committed
  eecf487

  Copy full SHA for eecf487

• Merge pull request #11 from jujubean22/hidden_credentials

  Show description for 0481e40
  jujubean22

  authored
  0481e40

  Copy full SHA for 0481e40

Commits on Jan 6, 2022

• added color to input focus, adjusted input width, and put styling on links

  

  annora

  authored and

  annora

  committed
  33f7a80

  Copy full SHA for 33f7a80

• added static password toggle

  

  annora

  authored and

  annora

  committed
  f3f9c19

  Copy full SHA for f3f9c19

Commits on Jan 7, 2022

• added controller for admin, broker and buyers

  jujubean22

  committed
  0024779

  Copy full SHA for 0024779

• merge all branches to master

  jujubean22

  committed
  8b7ec61

  Copy full SHA for 8b7ec61

• added bg, font, and layout styling to registration pages

  

  annora

  authored and

  annora

  committed
  ac2368a

  Copy full SHA for ac2368a

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  e775c31

  Copy full SHA for e775c31

• Merge pull request #12 from jujubean22/ui_usersignin

  Show description for b859ca8
  annoraischia

  authored
  b859ca8

  Copy full SHA for b859ca8

• updated gemfile to align with julie mae

  

  annora

  authored and

  annora

  committed
  01307b0

  Copy full SHA for 01307b0

• gemfile updated to align with julie mae

  

  annora

  authored and

  annora

  committed
  e4ef9b6

  Copy full SHA for e4ef9b6

• fixed syntax error on line 34 of registrations new.html.erb

  

  annora

  authored and

  annora

  committed
  8ad1b8d

  Copy full SHA for 8ad1b8d

• Merge pull request #13 from jujubean22/ui_usersignin

  annoraischia

  authored
  25f228a

  Copy full SHA for 25f228a

Commits on Jan 8, 2022

• Eye PW Toggle for Login now functional

  

  annora

  authored and

  annora

  committed
  afa7e6e

  Copy full SHA for afa7e6e

• Merge pull request #14 from jujubean22/ui_usersignin

  Show description for 0c71a10
  annoraischia

  authored
  0c71a10

  Copy full SHA for 0c71a10

• removed temporary navbar and added admin navlink to landing page

  

  annora

  authored and

  annora

  committed
  71ca02e

  Copy full SHA for 71ca02e

• Merge pull request #15 from jujubean22/ui_usersignin

  Show description for 4489692
  annoraischia

  authored
  4489692

  Copy full SHA for 4489692

• added shared navbar to all pages

  jujubean22

  committed
  139b8e5

  Copy full SHA for 139b8e5

• adjusted vh of landing page body to remove scrolling

  

  annora

  authored and

  annora

  committed
  10ad160

  Copy full SHA for 10ad160

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  8d358e1

  Copy full SHA for 8d358e1

• Merge pull request #16 from jujubean22/ui_usersignin

  Show description for 13d0e2c
  annoraischia

  authored
  13d0e2c

  Copy full SHA for 13d0e2c

• adjusted vh and border radius for login/registration pages, removed overlapping navbar in registration page

  

  annora

  authored and

  annora

  committed
  ef2e9a1

  Copy full SHA for ef2e9a1

• removed excess scss code for navbar

  

  annora

  authored and

  annora

  committed
  b8f7fd6

  Copy full SHA for b8f7fd6

• added functionality of password toggle for broker and admin login

  

  annora

  authored and

  annora

  committed
  d6bf239

  Copy full SHA for d6bf239

• adjusted input width and background color for admin and broker registration pages

  

  annora

  authored and

  annora

  committed
  867502f

  Copy full SHA for 867502f

Commits on Jan 10, 2022

• added conditional rendering for log in pages

  

  annora

  authored and

  annora

  committed
  d522562

  Copy full SHA for d522562

• Merge pull request #17 from jujubean22/ui_usersignin

  Show description for 34ec125
  annoraischia

  authored
  34ec125

  Copy full SHA for 34ec125

• added iex gem

  jujubean22

  committed
  04acac8

  Copy full SHA for 04acac8

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

  jujubean22

  committed
  c6f1c28

  Copy full SHA for c6f1c28

• added broker controller

  jujubean22

  committed
  8fff7cf

  Copy full SHA for 8fff7cf

• modified registrations and stocks controller

  jujubean22

  committed
  4f9fa81

  Copy full SHA for 4f9fa81

• modified broker, stock, and broker_stock models

  jujubean22

  committed
  27380ae

  Copy full SHA for 27380ae

• updated credentials for pk

  jujubean22

  committed
  a4fe915

  Copy full SHA for a4fe915

• added broker_stocks in db

  jujubean22

  committed
  63016a5

  Copy full SHA for 63016a5

• added index page for admin, buyer, broker and portfolio

  jujubean22

  committed
  d765d94

  Copy full SHA for d765d94

• added broker_stocks, buyer and sessions_controller

  jujubean22

  committed
  2570335

  Copy full SHA for 2570335

• added initial views for admin,broker and buyer

  jujubean22

  committed
  98a1844

  Copy full SHA for 98a1844

• configure iex gem

  jujubean22

  committed
  3640381

  Copy full SHA for 3640381

• auto generated files

  jujubean22

  committed
  57db361

  Copy full SHA for 57db361

• added honeypot recaptcha for bot prevention

  

  annora

  authored and

  annora

  committed
  5ef81e7

  Copy full SHA for 5ef81e7

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  a501020

  Copy full SHA for a501020

• Merge pull request #18 from jujubean22/ui_usersignin

  Show description for d1fec4c
  annoraischia

  authored
  d1fec4c

  Copy full SHA for d1fec4c

Commits on Jan 11, 2022

• added background on admin navlink button in landing page

  

  annora

  authored and

  annora

  committed
  41ee5ec

  Copy full SHA for 41ee5ec

• finalized color of admin navlink bg

  

  annora

  authored and

  annora

  committed
  1475288

  Copy full SHA for 1475288

• final edit for admin button bg color

  

  annora

  authored and

  annora

  committed
  fee5bf7

  Copy full SHA for fee5bf7

• fixed rendering for broker's search stock

  jujubean22

  committed
  dc1edeb

  Copy full SHA for dc1edeb

• Merge pull request #19 from jujubean22/search_stock_for_broker

  Show description for 7ec345a
  jujubean22

  authored
  7ec345a

  Copy full SHA for 7ec345a

• Merge pull request #20 from jujubean22/ui_usersignin

  Show description for 9cce4b8
  annoraischia

  authored
  9cce4b8

  Copy full SHA for 9cce4b8

• added destroy method and button, and back button

  jujubean22

  committed
  08bc762

  Copy full SHA for 08bc762

• Merge pull request #21 from jujubean22/destroy_button

  Show description for 967fdb5
  jujubean22

  authored
  967fdb5

  Copy full SHA for 967fdb5

• added logo, broker's id

  jujubean22

  committed
  9500e2a

  Copy full SHA for 9500e2a

• Merge pull request #22 from jujubean22/logo

  Show description for 3515127
  jujubean22

  authored
  3515127

  Copy full SHA for 3515127

• added api for stock news

  

  annora

  authored and

  annora

  committed
  a3bbc7f

  Copy full SHA for a3bbc7f

• added error rendering for news api

  

  annora

  authored and

  annora

  committed
  5a39ae4

  Copy full SHA for 5a39ae4

• added status codes in api news

  

  annora

  authored and

  annora

  committed
  a41bd38

  Copy full SHA for a41bd38

• added api controller and routes

  

  annora

  authored and

  annora

  committed
  df6a033

  Copy full SHA for df6a033

• Merge pull request #23 from jujubean22/ui_usersignin

  Show description for 5bd6a01
  annoraischia

  authored
  5bd6a01

  Copy full SHA for 5bd6a01

Commits on Jan 12, 2022

• added portfolio to buyers stocks and cleaned code on broker stocks

  jujubean22

  committed
  007246d

  Copy full SHA for 007246d

• Merge branch 'master' into buyer_page

  jujubean22

  authored
  41e4c03

  Copy full SHA for 41e4c03

• Merge pull request #24 from jujubean22/buyer_page

  Show description for 5eb915c
  jujubean22

  authored
  5eb915c

  Copy full SHA for 5eb915c

• added div broker index

  

  annora

  authored and

  annora

  committed
  a908c54

  Copy full SHA for a908c54

• added buyer index welcome div

  

  annora

  authored and

  annora

  committed
  62695c7

  Copy full SHA for 62695c7

• added stock ticker to buyer index

  

  annora

  authored and

  annora

  committed
  1e17771

  Copy full SHA for 1e17771

• uncommented news api code

  

  annora

  authored and

  annora

  committed
  d5f3394

  Copy full SHA for d5f3394

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  e16340c

  Copy full SHA for e16340c

• Merge pull request #25 from jujubean22/ui_usersignin

  Show description for 087e666
  annoraischia

  authored
  087e666

  Copy full SHA for 087e666

• updated api token for wrapper

  jujubean22

  committed
  985c609

  Copy full SHA for 985c609

• added notices for failed signup

  jujubean22

  committed
  4bb57c9

  Copy full SHA for 4bb57c9

• added portfolio for buyer in controllers

  jujubean22

  committed
  0ff13f5

  Copy full SHA for 0ff13f5

• added api wrapper in home index controller

  jujubean22

  committed
  40692d0

  Copy full SHA for 40692d0

• added relationship to buyer_stocks and function for buying stocks

  jujubean22

  committed
  539e0bd

  Copy full SHA for 539e0bd

• added relationship to broker_stocks and dependent when destroyed

  jujubean22

  committed
  b077b1a

  Copy full SHA for b077b1a

• added buyer portfolio view and broker_stocks view

  jujubean22

  committed
  37413d9

  Copy full SHA for 37413d9

• added $ on prices

  jujubean22

  committed
  d2daa15

  Copy full SHA for d2daa15

• added controllers and models for buyer_stocks

  jujubean22

  committed
  4f2e892

  Copy full SHA for 4f2e892

• added views for buyer

  jujubean22

  committed
  21f41e4

  Copy full SHA for 21f41e4

• cleaned code in sessions controller

  jujubean22

  committed
  d72ed41

  Copy full SHA for d72ed41

• :try api wrapper rendering in buyer's partial home and added routes for broker and buyer portfolio

  jujubean22

  committed
  b2329ae

  Copy full SHA for b2329ae

• Merge branch 'master' into buyer_page

  jujubean22

  authored
  71f34b6

  Copy full SHA for 71f34b6

• Merge pull request #26 from jujubean22/buyer_page

  Show description for 0a69270
  jujubean22

  authored
  0a69270

  Copy full SHA for 0a69270

• added stock chart on broker index

  

  annora

  authored and

  annora

  committed
  906ef83

  Copy full SHA for 906ef83

• fixed syntax error and commented api_wrapper

  jujubean22

  committed
  0808211

  Copy full SHA for 0808211

• Merge pull request #27 from jujubean22/buyer_page

  Show description for 9bcb1da
  jujubean22

  authored
  9bcb1da

  Copy full SHA for 9bcb1da

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  5f9d2b4

  Copy full SHA for 5f9d2b4

Commits on Jan 13, 2022

• added broker name in devise views and updated the navbar

  jujubean22

  committed
  f81ebd6

  Copy full SHA for f81ebd6

• Merge pull request #29 from jujubean22/broker_name

  Show description for 94e5c24
  jujubean22

  authored
  94e5c24

  Copy full SHA for 94e5c24

• added views and controller for transactions

  jujubean22

  committed
  4c3b66c

  Copy full SHA for 4c3b66c

• added create transactions in every buy of buyer

  jujubean22

  committed
  5836b24

  Copy full SHA for 5836b24

• configure routes for transactions

  jujubean22

  committed
  2ff98e5

  Copy full SHA for 2ff98e5

• added dependent destroy to broker stocks and validation for broke_name

  jujubean22

  committed
  77cb750

  Copy full SHA for 77cb750

• broker name instead of broker id and updated nav links

  jujubean22

  committed
  801ba17

  Copy full SHA for 801ba17

• Merge pull request #30 from jujubean22/transactions

  Show description for 9a5c345
  jujubean22

  authored
  9a5c345

  Copy full SHA for 9a5c345

• aligned, adjusted font, color, and spacing of stock list on buyer index

  

  annora

  authored and

  annora

  committed
  7975978

  Copy full SHA for 7975978

• added link to buyer portfolio on buyer index

  

  annora

  authored and

  annora

  committed
  1ea0446

  Copy full SHA for 1ea0446

• Merge branch 'master' into ui_usersignin

  annoraischia

  authored
  9cc1c5c

  Copy full SHA for 9cc1c5c

• added transactions link and portfolio link on buyer index

  

  annora

  authored and

  annora

  committed
  3b1a16e

  Copy full SHA for 3b1a16e

• added stock daily updates widget to buyer portfolio and completed styling

  

  annora

  authored and

  annora

  committed
  7f6e100

  Copy full SHA for 7f6e100