Code

Adding pagination#60

Code

Open

Eileenandrea wants to merge 184 commits intoavionschool:masteravionschool/rails-base-project:masterfrom dlanoronald123:adding-paginationdlanoronald123/TravelApp:adding-paginationCopy head branch name to clipboard

+8,596-19

Commits

Commits on Jul 12, 2021

• Added models

  dlanoronald123

  committed
  a5ca8e8

• Update model validations

  dlanoronald123

  committed
  1cbc9b5

• Added Bootstrap for styling

  dlanoronald123

  committed
  075aa3d

Commits on Jul 16, 2021

• add approved column to users table

  TheEyePatch

  committed
  e5ab864

• add chat room model and table

  TheEyePatch

  committed
  aea760e

• add action text cable for rich text area

  TheEyePatch

  committed
  f05d2d0

• add chat rooms and messages

  TheEyePatch

  committed
  a0c30c5

• create active storage for photo upload

  TheEyePatch

  committed
  26b4300

• generate message model

  TheEyePatch

  committed
  ed9f785

• generate chat_room model

  TheEyePatch

  committed
  80f7167

• generate chat_room model

  TheEyePatch

  committed
  1afffa1

• add action text for rich text area

  TheEyePatch

  committed
  69bf0a0

• generate tests

  TheEyePatch

  committed
  cb06020

• add gems: image_processing and mini_magick

  TheEyePatch

  committed
  101de21

• add associations to all models and added admin model inherited from devise user

  TheEyePatch

  committed
  853207e

• add dependent value to all model that has has_many

  TheEyePatch

  committed
  b3e5cac

• Merge pull request #1 from dlanoronald123/add-migrations

  Show description for 043507a
  dlanoronald123

  authored
  043507a

• add integration helpers for rspec sign in

  TheEyePatch

  committed
  6e120dd

• add resources and devise routes

  TheEyePatch

  committed
  cd16cc1

• generate controller and rspec test for admins

  TheEyePatch

  committed
  3903333

• add devise views

  TheEyePatch

  committed
  853531d

• generate admin views

  TheEyePatch

  committed
  ef5e70f

• add nav bar and error partials

  TheEyePatch

  committed
  e49bf36

• add scss and helper admin

  TheEyePatch

  committed
  e359fe2

• add render errors on application html

  TheEyePatch

  committed
  7a08f52

• add home page

  TheEyePatch

  committed
  3b835e0

• add errors on application page

  TheEyePatch

  committed
  5baa7b9

• add credentials

  TheEyePatch

  committed
  ec2cac3

• Add master key

  dlanoronald123

  committed
  392c1a1

• modify credentials

  TheEyePatch

  committed
  0d0dbbd

• fixed credentials error

  TheEyePatch

  committed
  84eade3

• Merge pull request #2 from dlanoronald123/add-admin

  Show description for 3fb17fb
  TheEyePatch

  authored
  3fb17fb

Commits on Jul 17, 2021

• add required resources for controllers

  TheEyePatch

  committed
  e571824

• add agency controller and views with rspec tests

  TheEyePatch

  committed
  b78d34b

• add tourists controller and views with rspec tests

  TheEyePatch

  committed
  2d25dfb

• added models

  morpheus17

  committed
  c7bcf20

• added changes in rspec models

  morpheus17

  committed
  51e5ea4

• Merge pull request #3 from dlanoronald123/rspec_model

  Show description for 73740b9
  morpheus17

  authored
  73740b9

• Add styling to welcome page

  dlanoronald123

  committed
  a2caf7b

• add .where(approved: true) to Agency when tourist_signed_in

  TheEyePatch

  committed
  e8f6075

• modify views

  TheEyePatch

  committed
  4e8a661

• Merge pull request #4 from dlanoronald123/Styling

  Show description for db80987
  TheEyePatch

  authored
  db80987

• Merge pull request #5 from dlanoronald123/add-tourists-and-agencies

  Show description for 2a55ad6
  TheEyePatch

  authored
  2a55ad6

• modify routes add tourist_tour routes

  Eileenandrea

  committed
  309d01e

• adding test factory_bot

  Eileenandrea

  committed
  10a3430

• tourist tour controllers and rspec request test

  Eileenandrea

  committed
  20e8c46

• changing contact number from integer to string due to error in long number

  Eileenandrea

  committed
  fca7c49

• adding tourist_tours view

  Eileenandrea

  committed
  5fd0dee

• adding image to assets

  Eileenandrea

  committed
  19b8488

• Merge pull request #6 from dlanoronald123/tourist_tour_controller

  Show description for cebc66d
  Eileenandrea

  authored
  cebc66d

• travel_transaction factory_bot

  Eileenandrea

  committed
  2b38747

• travel_transaction rspec test

  Eileenandrea

  committed
  2a65332

• travel_transaction views

  Eileenandrea

  committed
  d51178b

• add image_preview.js

  TheEyePatch

  committed
  d3f7d47

• travel_transaction controller

  Eileenandrea

  committed
  b5e1097

• add

  TheEyePatch

  committed
  502dee8

• rubocop fix

  Eileenandrea

  committed
  a1ec9fb

• modify home and tour views

  TheEyePatch

  committed
  38c395d

• add update test for tour controller

  TheEyePatch

  committed
  cfdec63

• Merge pull request #7 from dlanoronald123/travel_transaction_vct

  Show description for 8e49ba5
  TheEyePatch

  authored
  8e49ba5

• Merge pull request #8 from dlanoronald123/add-tours-and-tourist_tours

  Show description for 8e3c497
  TheEyePatch

  authored
  8e3c497

• add edit method for agencies resources

  TheEyePatch

  committed
  f21b96a

• modify agency email

  TheEyePatch

  committed
  a3bf7c6

• add authentication for user approved column

  TheEyePatch

  committed
  d313e8b

• add agency update method

  TheEyePatch

  committed
  9efe861

• add verified by

  TheEyePatch

  committed
  0176669

• add approve button

  TheEyePatch

  committed
  84128b5

Commits on Jul 18, 2021

• Merge pull request #9 from dlanoronald123/add-approve-button

  Show description for 8878b27
  TheEyePatch

  authored
  8878b27

• edit tourist factories to make email more dynamic

  Eileenandrea

  committed
  716c912

• chat room rspec request test

  Eileenandrea

  committed
  e8c5c09

• edit tourist, agency and chat room model to fix association issue

  Eileenandrea

  committed
  2be09c5

• chat_room and messages controller

  Eileenandrea

  committed
  47c70d0

• room channel

  Eileenandrea

  committed
  87176db

• chat rooms and messages views

  Eileenandrea

  committed
  7c6850a

• adding chat_room routes

  Eileenandrea

  committed
  5779e76

• Merge pull request #10 from dlanoronald123/chat_room_controller

  Show description for d61b2fd
  TheEyePatch

  authored
  d61b2fd

• Added favicon

  dlanoronald123

  authored
  1906452

• Add font awesome gem

  dlanoronald123

  committed
  c6316d2

• Update home page

  dlanoronald123

  committed
  de3ff4a

• Update flash messages, move navbar on top{

  dlanoronald123

  committed
  e013fb0

• Update agency show page

  dlanoronald123

  committed
  b3a4b83

• Update tourist how page

  dlanoronald123

  committed
  dad313e

• Update user edit page

  dlanoronald123

  committed
  30fceb2

• Update team section on home page

  dlanoronald123

  committed
  5ba07d3

• Update home page

  dlanoronald123

  committed
  f96592e

Commits on Jul 19, 2021

• Merge pull request #11 from dlanoronald123/Styling

  Show description for 476014c
  dlanoronald123

  authored
  476014c

• Add logo

  dlanoronald123

  committed
  1832d1c

• Merge pull request #12 from dlanoronald123/Styling

  Show description for f6502b1
  dlanoronald123

  authored
  f6502b1

• update styling on all pages

  dlanoronald123

  committed
  6c24578

• Merge pull request #13 from dlanoronald123/Styling

  Show description for 85e1013
  dlanoronald123

  authored
  85e1013

• modified navbar

  dlanoronald123

  committed
  f0284bb

• modified navbar

  dlanoronald123

  committed
  7385337

• Merge pull request #14 from dlanoronald123/Styling

  Show description for 796df9b
  dlanoronald123

  authored
  796df9b

• Update styles

  dlanoronald123

  committed
  dc0388e

• Merge pull request #15 from dlanoronald123/Styling

  Show description for d1e0511
  dlanoronald123

  authored
  d1e0511

Commits on Jul 20, 2021

• update pages

  dlanoronald123

  committed
  b50ad8f

• Merge pull request #16 from dlanoronald123/Styling

  Show description for 5b1fdcd
  dlanoronald123

  authored
  5b1fdcd

• add redis and stripe gem

  TheEyePatch

  committed
  5a8f033

• generate checkouts controller and checkout views

  TheEyePatch

  committed
  4a8e540

• add stripe api keys

  TheEyePatch

  committed
  24105a5

• add webhooks controller

  TheEyePatch

  committed
  8feec6a

• add stripe script

  TheEyePatch

  committed
  56bf21b

• add checkouts and webhools resources

  TheEyePatch

  committed
  f926b89

• change form url to checkouts_path

  TheEyePatch

  committed
  2d17931

• add new_tourist_tour link

  TheEyePatch

  committed
  cf0245a

• fixed rubocop errors

  TheEyePatch

  committed
  e309ca0

• Merge pull request #17 from dlanoronald123/add-checkout-payment

  Show description for fecf3b0
  TheEyePatch

  authored
  fecf3b0

• Update styling

  dlanoronald123

  committed
  1c31ba4

• Update styles

  dlanoronald123

  committed
  eedb31d

• modify webhook secret key

  TheEyePatch

  committed
  ad76f22

• modify stripe api keys

  TheEyePatch

  committed
  4b934c7

• Merge pull request #18 from dlanoronald123/add-checkout-payment

  Show description for 39fb62d
  TheEyePatch

  authored
  39fb62d

• modify stripe api key

  TheEyePatch

  committed
  e0e8955

• Update show and index page on tours

  dlanoronald123

  committed
  f8276be

• Merge pull request #19 from dlanoronald123/Styling

  Show description for 5edb27c
  dlanoronald123

  authored
  5edb27c

• Update styling on pages

  dlanoronald123

  committed
  7e5b04e

• Merge pull request #20 from dlanoronald123/Styling

  Show description for 3102c9b
  dlanoronald123

  authored
  3102c9b

• Update chat room pages style

  dlanoronald123

  committed
  5dea3c8

• Merge pull request #21 from dlanoronald123/Styling

  Show description for 0b0937b
  dlanoronald123

  authored
  0b0937b

• Update imgage size width on show tour page

  dlanoronald123

  committed
  3e563cf

• edit devise registration

  TheEyePatch

  committed
  646e6f1

• Update credentials

  dlanoronald123

  committed
  00d07be

• Merge pull request #22 from dlanoronald123/Styling

  Show description for ce394be
  dlanoronald123

  authored
  ce394be

• Merge pull request #23 from dlanoronald123/edit-registration

  Show description for d78b1d2
  TheEyePatch

  authored
  d78b1d2

• Merge branch 'master' of github.com:dlanoronald123/TravelApp into Styling

  dlanoronald123

  committed
  b62988a

• implement chat auto scroll and clear message input

  Eileenandrea

  committed
  c0a1169

• Merge pull request #24 from dlanoronald123/add_chat_auto_scroll

  Show description for 5e58eef
  dlanoronald123

  authored
  5e58eef

• Update edit profile page

  dlanoronald123

  committed
  f419ae0

• Merge pull request #25 from dlanoronald123/Styling

  Show description for 3c1aa1c
  dlanoronald123

  authored
  3c1aa1c

Commits on Jul 21, 2021

• Update styles on pages

  dlanoronald123

  committed
  954958f

• Update style on pages

  dlanoronald123

  committed
  3c6b679

• Merge pull request #26 from dlanoronald123/Styling

  Show description for 1380215
  dlanoronald123

  authored
  1380215

• Add chat room link on navbar

  dlanoronald123

  committed
  5693347

• Merge pull request #27 from dlanoronald123/Styling

  Show description for 43aa898
  dlanoronald123

  authored
  43aa898

Commits on Jul 22, 2021

• Update navbar and pages

  dlanoronald123

  committed
  ecde0b5

• Merge pull request #28 from dlanoronald123/Styling

  Show description for 278f098
  dlanoronald123

  authored
  278f098

Commits on Jul 23, 2021

• add search method for tour

  TheEyePatch

  committed
  0999852

• modify search design

  TheEyePatch

  committed
  97c260b

• edit configuration file adding smtp

  Eileenandrea

  committed
  a6ad503

• user mailer

  Eileenandrea

  committed
  f46afe9

• add aftercreate action sending welcome messages

  Eileenandrea

  committed
  2d756f7

• Merge pull request #29 from dlanoronald123/adding_mailers

  Show description for b4cf8bf
  Eileenandrea

  authored
  b4cf8bf

• fixed rubocop errors

  TheEyePatch

  committed
  b4399e8

• Merge pull request #30 from dlanoronald123/add-search-bar

  Show description for b313a83
  TheEyePatch

  authored
  b313a83

• adding destroy action and add approve_account or reject_account method

  Eileenandrea

  committed
  526071b

• admin mailer to notify new agency sign up

  Eileenandrea

  committed
  49cedd2

• user mailer add method approved_account and reject_account mailer

  Eileenandrea

  committed
  3084a4d

• add agencies destroy routes

  Eileenandrea

  committed
  3843587

• adding reject link to pending users

  Eileenandrea

  committed
  2d8b124

• editing rspec code to pass the new code modification

  Eileenandrea

  committed
  96b25c2

• Merge pull request #31 from dlanoronald123/user_mailer_account_approve/reject

  Show description for 2792d74
  Eileenandrea

  authored
  2792d74

• added reviews

  morpheus17

  committed
  e298284

• fixed rubocop errors

  morpheus17

  committed
  d23da6a

• fix search bar bug

  TheEyePatch

  committed
  524380f

• fixed rspec errors

  morpheus17

  committed
  5f13110

• Merge pull request #32 from dlanoronald123/reviews

  Show description for 2e36643
  morpheus17

  authored
  2e36643

• Add files via upload

  dlanoronald123

  authored
  4d0e0b4

• Merge pull request #33 from dlanoronald123/add-search-bar

  Show description for cb49261
  dlanoronald123

  authored
  cb49261

• added review links to agency

  morpheus17

  committed
  5dd2a34

• Merge pull request #34 from dlanoronald123/reviews

  Show description for afde18e
  morpheus17

  authored
  afde18e

• added missing raty plugin

  morpheus17

  committed
  f79a638

• Merge pull request #35 from dlanoronald123/reviews

  Show description for 8e39828
  morpheus17

  authored
  8e39828

• update home page

  dlanoronald123

  committed
  f1195aa

• added missing script params

  morpheus17

  committed
  f68593f

• Merge pull request #36 from dlanoronald123/Styling

  Show description for 21a864f
  dlanoronald123

  authored
  21a864f

• Merge pull request #37 from dlanoronald123/reviews

  Show description for 443d5cb
  morpheus17

  authored
  443d5cb

• add gmail account for mailer

  TheEyePatch

  committed
  7522db9

• modify show page

  TheEyePatch

  committed
  d155155

• installing will paginate

  Eileenandrea

  committed
  5b3a761

• adding pagination to tour index

  Eileenandrea

  committed
  01ad805

• Merge pull request #38 from dlanoronald123/modify-show

  Show description for 8faf09c
  TheEyePatch

  authored
  8faf09c

• Update index on home page

  dlanoronald123

  committed
  1e0be21

• Merge pull request #39 from dlanoronald123/Styling

  Show description for e8ae339
  dlanoronald123

  authored
  e8ae339

• add fix for ratings breakdown

  morpheus17

  committed
  f3a0c3e

• Merge pull request #40 from dlanoronald123/reviews

  Show description for 2c4dbf8
  morpheus17

  authored
  2c4dbf8

• Merge pull request #41 from dlanoronald123/adding-pagination

  Show description for 4663300
  Eileenandrea

  authored
  4663300

• editing mailler subjects

  Eileenandrea

  committed
  8257c4c

• Merge pull request #42 from dlanoronald123/fix_mailer_bug

  Show description for 0915bb2
  Eileenandrea

  authored
  0915bb2

• na_bar

  TheEyePatch

  committed
  1a64735

• all users pagination

  Eileenandrea

  committed
  9addf48

• all agencies pagination

  Eileenandrea

  committed
  b3cc6d4

• all tourist tours pagination

  Eileenandrea

  committed
  58a07a9

• all travel transactions pagination

  Eileenandrea

  committed
  92c19cb

• tour pagination

  Eileenandrea

  committed
  87887b6