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

Rating room #66

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundler/OrderedGems:
- 'Gemfile'

Metrics/LineLength:
Max: 120
Max: 135

Metrics/MethodLength:
Max: 20
Expand Down
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ gem "mini_magick", "~> 4.3"
gem "select2-rails"
gem "ransack"
gem "jquery-ui-rails"
gem "country_select"
gem "bootstrap-datepicker-rails", "~> 1.8", ">= 1.8.0.1"
gem "country_select", "~> 4.0"
gem "jquery-validation-rails"
gem "ratyrate"

group :development, :test do
gem "byebug", platforms: %i[mri mingw x64_mingw]
Expand Down
52 changes: 35 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (9.0.0)
Expand All @@ -56,16 +58,21 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
bootstrap-datepicker-rails (1.8.0.1)
railties (>= 3.0)
bootstrap4-kaminari-views (1.0.1)
kaminari (>= 0.13)
rails (>= 3.1)
builder (3.2.3)
byebug (11.0.1)
carrierwave (1.3.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
childprocess (1.0.1)
carrierwave (2.0.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
mimemagic (>= 0.3.0)
mini_mime (>= 0.1.3)
childprocess (2.0.0)
rake (< 13.0)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
Expand Down Expand Up @@ -94,7 +101,7 @@ GEM
crass (1.0.4)
database_cleaner (1.7.0)
deep_merge (1.2.1)
devise (4.7.0)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
Expand Down Expand Up @@ -133,8 +140,8 @@ GEM
dry-logic (~> 1.0, >= 1.0.2)
erubi (1.8.0)
execjs (2.7.0)
faker (2.2.0)
i18n (>= 0.8)
faker (2.2.2)
i18n (~> 1.6.0)
ffi (1.11.1)
figaro (1.1.1)
thor (~> 0.14)
Expand All @@ -145,6 +152,9 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
image_processing (1.9.3)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.13, < 3)
io-like (0.3.0)
jaro_winkler (1.5.3)
jbuilder (2.9.1)
Expand All @@ -155,6 +165,7 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
jquery-validation-rails (1.19.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand All @@ -179,9 +190,6 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_magick (4.9.5)
mini_mime (1.0.2)
Expand All @@ -194,14 +202,17 @@ GEM
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
parallel (1.17.0)
parser (2.6.3.0)
parser (2.6.4.0)
ast (~> 2.4.0)
polyamorous (2.3.0)
activerecord (>= 5.0)
popper_js (1.14.5)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
rack-test (1.1.0)
Expand Down Expand Up @@ -232,11 +243,13 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.3)
ransack (2.1.1)
ransack (2.3.0)
actionpack (>= 5.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
i18n
polyamorous (= 2.3.0)
ratyrate (1.2.2.alpha)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
Expand Down Expand Up @@ -268,8 +281,10 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
ruby-vips (2.0.15)
ffi (~> 1.9)
ruby_dep (1.5.0)
rubyzip (1.2.3)
rubyzip (1.2.4)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand All @@ -291,8 +306,8 @@ GEM
tilt
select2-rails (4.0.3)
thor (~> 0.14)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
selenium-webdriver (3.142.4)
childprocess (>= 0.5, < 3.0)
rubyzip (~> 1.2, >= 1.2.2)
shoulda-matchers (3.1.3)
activesupport (>= 4.0.0)
Expand Down Expand Up @@ -346,14 +361,15 @@ PLATFORMS
DEPENDENCIES
bootsnap (>= 1.1.0)
bootstrap (~> 4.3.1)
bootstrap-datepicker-rails (~> 1.8, >= 1.8.0.1)
bootstrap4-kaminari-views
byebug
carrierwave
chromedriver-helper
cocoon
coffee-rails (~> 4.2)
config (~> 2.0)
country_select
country_select (~> 4.0)
database_cleaner (~> 1.5)
devise
faker
Expand All @@ -362,6 +378,7 @@ DEPENDENCIES
jbuilder (~> 2.5)
jquery-rails
jquery-ui-rails
jquery-validation-rails
kaminari (~> 1.1, >= 1.1.1)
listen (>= 3.0.5, < 3.2)
mini_magick (~> 4.3)
Expand All @@ -370,6 +387,7 @@ DEPENDENCIES
puma (~> 3.11)
rails (~> 5.2.3)
ransack
ratyrate
rspec-rails (~> 3.8)
rubocop (~> 0.74.0)
sass-rails (~> 5.0)
Expand Down
Binary file added app/assets/images/anh4.jpg
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/big-star.png
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/cancel-off.png
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/cancel-on.png
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/lightpub.png
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/mid-star.png
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/star-half.png
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/star-off.png
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/star-on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
//= require jquery3
//= require popper
//= require bootstrap
//= require custom
//= require toastr
//= require multislider
//= require jquery-ui
//= require custom
//= require cocoon
//= require jquery.raty
//= require bootstrap-datepicker
//= require jquery.validate
//= require jquery.validate.additional-methods
//= require jquery.raty
//= require ratyrate

/*global toastr*/
toastr.options = {
Expand Down
Loading