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

Add chat auto scroll #56

Open
wants to merge 120 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
a5ca8e8
Added models
dlanoronald123 Jul 12, 2021
1cbc9b5
Update model validations
dlanoronald123 Jul 12, 2021
075aa3d
Added Bootstrap for styling
dlanoronald123 Jul 12, 2021
e5ab864
add approved column to users table
TheEyePatch Jul 16, 2021
aea760e
add chat room model and table
TheEyePatch Jul 16, 2021
f05d2d0
add action text cable for rich text area
TheEyePatch Jul 16, 2021
a0c30c5
add chat rooms and messages
TheEyePatch Jul 16, 2021
26b4300
create active storage for photo upload
TheEyePatch Jul 16, 2021
ed9f785
generate message model
TheEyePatch Jul 16, 2021
80f7167
generate chat_room model
TheEyePatch Jul 16, 2021
1afffa1
generate chat_room model
TheEyePatch Jul 16, 2021
69bf0a0
add action text for rich text area
TheEyePatch Jul 16, 2021
cb06020
generate tests
TheEyePatch Jul 16, 2021
101de21
add gems: image_processing and mini_magick
TheEyePatch Jul 16, 2021
853207e
add associations to all models and added admin model inherited from d…
TheEyePatch Jul 16, 2021
b3e5cac
add dependent value to all model that has has_many
TheEyePatch Jul 16, 2021
043507a
Merge pull request #1 from dlanoronald123/add-migrations
dlanoronald123 Jul 16, 2021
6e120dd
add integration helpers for rspec sign in
TheEyePatch Jul 16, 2021
cd16cc1
add resources and devise routes
TheEyePatch Jul 16, 2021
3903333
generate controller and rspec test for admins
TheEyePatch Jul 16, 2021
853531d
add devise views
TheEyePatch Jul 16, 2021
ef5e70f
generate admin views
TheEyePatch Jul 16, 2021
e49bf36
add nav bar and error partials
TheEyePatch Jul 16, 2021
e359fe2
add scss and helper admin
TheEyePatch Jul 16, 2021
7a08f52
add render errors on application html
TheEyePatch Jul 16, 2021
3b835e0
add home page
TheEyePatch Jul 16, 2021
5baa7b9
add errors on application page
TheEyePatch Jul 16, 2021
ec2cac3
add credentials
TheEyePatch Jul 16, 2021
392c1a1
Add master key
dlanoronald123 Jul 16, 2021
0d0dbbd
modify credentials
TheEyePatch Jul 16, 2021
84eade3
fixed credentials error
TheEyePatch Jul 16, 2021
3fb17fb
Merge pull request #2 from dlanoronald123/add-admin
TheEyePatch Jul 16, 2021
e571824
add required resources for controllers
TheEyePatch Jul 17, 2021
b78d34b
add agency controller and views with rspec tests
TheEyePatch Jul 17, 2021
2d25dfb
add tourists controller and views with rspec tests
TheEyePatch Jul 17, 2021
c7bcf20
added models
morpheus17 Jul 17, 2021
51e5ea4
added changes in rspec models
morpheus17 Jul 17, 2021
73740b9
Merge pull request #3 from dlanoronald123/rspec_model
morpheus17 Jul 17, 2021
a2caf7b
Add styling to welcome page
dlanoronald123 Jul 17, 2021
e8f6075
add .where(approved: true) to Agency when tourist_signed_in
TheEyePatch Jul 17, 2021
4e8a661
modify views
TheEyePatch Jul 17, 2021
db80987
Merge pull request #4 from dlanoronald123/Styling
TheEyePatch Jul 17, 2021
2a55ad6
Merge pull request #5 from dlanoronald123/add-tourists-and-agencies
TheEyePatch Jul 17, 2021
309d01e
modify routes add tourist_tour routes
Eileenandrea Jul 17, 2021
10a3430
adding test factory_bot
Eileenandrea Jul 17, 2021
20e8c46
tourist tour controllers and rspec request test
Eileenandrea Jul 17, 2021
fca7c49
changing contact number from integer to string due to error in long n…
Eileenandrea Jul 17, 2021
5fd0dee
adding tourist_tours view
Eileenandrea Jul 17, 2021
19b8488
adding image to assets
Eileenandrea Jul 17, 2021
cebc66d
Merge pull request #6 from dlanoronald123/tourist_tour_controller
Eileenandrea Jul 17, 2021
2b38747
travel_transaction factory_bot
Eileenandrea Jul 17, 2021
2a65332
travel_transaction rspec test
Eileenandrea Jul 17, 2021
d51178b
travel_transaction views
Eileenandrea Jul 17, 2021
d3f7d47
add image_preview.js
TheEyePatch Jul 17, 2021
b5e1097
travel_transaction controller
Eileenandrea Jul 17, 2021
502dee8
add
TheEyePatch Jul 17, 2021
a1ec9fb
rubocop fix
Eileenandrea Jul 17, 2021
38c395d
modify home and tour views
TheEyePatch Jul 17, 2021
cfdec63
add update test for tour controller
TheEyePatch Jul 17, 2021
8e49ba5
Merge pull request #7 from dlanoronald123/travel_transaction_vct
TheEyePatch Jul 17, 2021
8e3c497
Merge pull request #8 from dlanoronald123/add-tours-and-tourist_tours
TheEyePatch Jul 17, 2021
f21b96a
add edit method for agencies resources
TheEyePatch Jul 17, 2021
a3bf7c6
modify agency email
TheEyePatch Jul 17, 2021
d313e8b
add authentication for user approved column
TheEyePatch Jul 17, 2021
9efe861
add agency update method
TheEyePatch Jul 17, 2021
0176669
add verified by
TheEyePatch Jul 17, 2021
84128b5
add approve button
TheEyePatch Jul 17, 2021
8878b27
Merge pull request #9 from dlanoronald123/add-approve-button
TheEyePatch Jul 18, 2021
716c912
edit tourist factories to make email more dynamic
Eileenandrea Jul 18, 2021
e8c5c09
chat room rspec request test
Eileenandrea Jul 18, 2021
2be09c5
edit tourist, agency and chat room model to fix association issue
Eileenandrea Jul 18, 2021
47c70d0
chat_room and messages controller
Eileenandrea Jul 18, 2021
87176db
room channel
Eileenandrea Jul 18, 2021
7c6850a
chat rooms and messages views
Eileenandrea Jul 18, 2021
5779e76
adding chat_room routes
Eileenandrea Jul 18, 2021
d61b2fd
Merge pull request #10 from dlanoronald123/chat_room_controller
TheEyePatch Jul 18, 2021
1906452
Added favicon
dlanoronald123 Jul 18, 2021
c6316d2
Add font awesome gem
dlanoronald123 Jul 18, 2021
de3ff4a
Update home page
dlanoronald123 Jul 18, 2021
e013fb0
Update flash messages, move navbar on top{
dlanoronald123 Jul 18, 2021
b3a4b83
Update agency show page
dlanoronald123 Jul 18, 2021
dad313e
Update tourist how page
dlanoronald123 Jul 18, 2021
30fceb2
Update user edit page
dlanoronald123 Jul 18, 2021
5ba07d3
Update team section on home page
dlanoronald123 Jul 18, 2021
f96592e
Update home page
dlanoronald123 Jul 18, 2021
476014c
Merge pull request #11 from dlanoronald123/Styling
dlanoronald123 Jul 19, 2021
1832d1c
Add logo
dlanoronald123 Jul 19, 2021
f6502b1
Merge pull request #12 from dlanoronald123/Styling
dlanoronald123 Jul 19, 2021
6c24578
update styling on all pages
dlanoronald123 Jul 19, 2021
85e1013
Merge pull request #13 from dlanoronald123/Styling
dlanoronald123 Jul 19, 2021
f0284bb
modified navbar
dlanoronald123 Jul 19, 2021
7385337
modified navbar
dlanoronald123 Jul 19, 2021
796df9b
Merge pull request #14 from dlanoronald123/Styling
dlanoronald123 Jul 19, 2021
dc0388e
Update styles
dlanoronald123 Jul 19, 2021
d1e0511
Merge pull request #15 from dlanoronald123/Styling
dlanoronald123 Jul 19, 2021
b50ad8f
update pages
dlanoronald123 Jul 20, 2021
5b1fdcd
Merge pull request #16 from dlanoronald123/Styling
dlanoronald123 Jul 20, 2021
5a8f033
add redis and stripe gem
TheEyePatch Jul 20, 2021
4a8e540
generate checkouts controller and checkout views
TheEyePatch Jul 20, 2021
24105a5
add stripe api keys
TheEyePatch Jul 20, 2021
8feec6a
add webhooks controller
TheEyePatch Jul 20, 2021
56bf21b
add stripe script
TheEyePatch Jul 20, 2021
f926b89
add checkouts and webhools resources
TheEyePatch Jul 20, 2021
2d17931
change form url to checkouts_path
TheEyePatch Jul 20, 2021
cf0245a
add new_tourist_tour link
TheEyePatch Jul 20, 2021
e309ca0
fixed rubocop errors
TheEyePatch Jul 20, 2021
fecf3b0
Merge pull request #17 from dlanoronald123/add-checkout-payment
TheEyePatch Jul 20, 2021
1c31ba4
Update styling
dlanoronald123 Jul 20, 2021
eedb31d
Update styles
dlanoronald123 Jul 20, 2021
ad76f22
modify webhook secret key
TheEyePatch Jul 20, 2021
4b934c7
modify stripe api keys
TheEyePatch Jul 20, 2021
39fb62d
Merge pull request #18 from dlanoronald123/add-checkout-payment
TheEyePatch Jul 20, 2021
e0e8955
modify stripe api key
TheEyePatch Jul 20, 2021
f8276be
Update show and index page on tours
dlanoronald123 Jul 20, 2021
5edb27c
Merge pull request #19 from dlanoronald123/Styling
dlanoronald123 Jul 20, 2021
7e5b04e
Update styling on pages
dlanoronald123 Jul 20, 2021
3102c9b
Merge pull request #20 from dlanoronald123/Styling
dlanoronald123 Jul 20, 2021
5dea3c8
Update chat room pages style
dlanoronald123 Jul 20, 2021
0b0937b
Merge pull request #21 from dlanoronald123/Styling
dlanoronald123 Jul 20, 2021
c0a1169
implement chat auto scroll and clear message input
Eileenandrea Jul 20, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

# Ignore master key for decrypting credentials and more.
/config/master.key
/config/database.yml

/public/packs
/public/packs-test
Expand Down
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@ gem 'jbuilder', '~> 2.7'
gem 'bootsnap', '>= 1.4.2', require: false
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'image_processing'
gem 'devise'
gem 'hamlit-rails'
gem "aws-sdk-s3", require: false
gem "mini_magick"
gem "font-awesome-rails"
gem "stripe"
gem "hirb"
gem 'redis'

group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
Expand Down
40 changes: 39 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
aws-eventstream (1.1.1)
aws-partitions (1.476.0)
aws-sdk-core (3.116.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.96.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.4)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bindex (0.8.1)
bootsnap (1.7.3)
Expand All @@ -84,6 +100,8 @@ GEM
factory_bot (~> 6.1.0)
railties (>= 5.0.0)
ffi (1.15.0)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
globalid (0.4.2)
activesupport (>= 4.2.0)
hamlit (2.15.0)
Expand All @@ -96,10 +114,15 @@ GEM
hamlit (>= 1.2.0)
railties (>= 4.0.1)
hashdiff (1.0.1)
hirb (0.7.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
jmespath (1.4.0)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand All @@ -110,11 +133,14 @@ GEM
mini_mime (>= 0.1.1)
marcel (1.0.1)
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.1.0)
mini_portile2 (2.5.3)
minitest (5.14.4)
msgpack (1.4.2)
nio4r (2.5.7)
nokogiri (1.11.3-x86_64-darwin)
nokogiri (1.11.3)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.3-x86_64-linux)
racc (~> 1.4)
Expand Down Expand Up @@ -163,6 +189,7 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.3.1)
regexp_parser (2.1.1)
responders (3.0.1)
actionpack (>= 5.0)
Expand Down Expand Up @@ -204,6 +231,8 @@ GEM
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
ruby-progressbar (1.11.0)
ruby-vips (2.1.2)
ffi (~> 1.12)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
Expand All @@ -227,6 +256,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stripe (5.37.0)
temple (0.8.2)
thor (1.1.0)
thread_safe (0.3.6)
Expand Down Expand Up @@ -259,27 +289,35 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
aws-sdk-s3
bootsnap (>= 1.4.2)
byebug
database_rewinder
devise
factory_bot_rails
font-awesome-rails
hamlit-rails
hirb
image_processing
jbuilder (~> 2.7)
listen (~> 3.2)
mini_magick
pg
puma (~> 4.1)
rails (~> 6.0.3, >= 6.0.3.4)
redis
rspec-rails
rubocop-rails
rubocop-rspec
sass-rails (>= 6)
shoulda-matchers
spring
spring-watcher-listen (~> 2.0.0)
stripe
turbolinks (~> 5)
tzinfo-data
vcr
Expand Down
Binary file added app/assets/images/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions app/assets/images/journey-animate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/upload_image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions app/assets/stylesheets/actiontext.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
// the trix-editor content (whether displayed or under editing). Feel free to incorporate this
// inclusion directly in any other asset bundle and remove this file.
//
//= require trix/dist/trix

// We need to override trix.css’s image gallery styles to accommodate the
// <action-text-attachment> element we wrap around attachments. Otherwise,
// images in galleries will be squished by the max-width: 33%; rule.
.trix-content {
.attachment-gallery {
> action-text-attachment,
> .attachment {
flex: 1 0 33%;
padding: 0 0.5em;
max-width: 33%;
}

&.attachment-gallery--2,
&.attachment-gallery--4 {
> action-text-attachment,
> .attachment {
flex-basis: 50%;
max-width: 50%;
}
}
}

action-text-attachment {
.attachment {
padding: 0 !important;
max-width: 100% !important;
}
}
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/admins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the admins controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/agencies.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the agencies controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: https://sass-lang.com/
Loading