Skip to content

Commit

Permalink
Merge pull request #50 from CH1006/180
Browse files Browse the repository at this point in the history
180: signup,login,forgotpass
  • Loading branch information
N-Viet-ruby-dev authored Aug 30, 2019
2 parents 05a2050 + 3f167e6 commit d56b06e
Show file tree
Hide file tree
Showing 62 changed files with 1,124 additions and 131 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ AllCops:
- 'db/migrate/*.rb'
- 'db/*.rb'
- 'bin/**/*'
- 'config/environments/*.rb'

Style/Documentation:
Enabled: false
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem "bootstrap4-kaminari-views"
gem "config", "~> 2.0"
gem "cocoon"
gem "figaro"
gem "carrierwave", "~> 0.10.0"
gem "carrierwave"
gem "mini_magick", "~> 4.3"

group :development, :test do
Expand Down
18 changes: 8 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ GEM
execjs
bcrypt (3.1.13)
bindex (0.8.1)
bootsnap (1.4.4)
bootsnap (1.4.5)
msgpack (~> 1.0)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
Expand All @@ -61,10 +61,9 @@ GEM
rails (>= 3.1)
builder (3.2.3)
byebug (11.0.1)
carrierwave (0.10.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
carrierwave (1.3.1)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
childprocess (1.0.1)
rake (< 13.0)
Expand Down Expand Up @@ -127,7 +126,7 @@ GEM
dry-logic (~> 1.0, >= 1.0.2)
erubi (1.8.0)
execjs (2.7.0)
faker (2.1.2)
faker (2.2.0)
i18n (>= 0.8)
ffi (1.11.1)
figaro (1.1.1)
Expand All @@ -146,7 +145,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.2.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand Down Expand Up @@ -181,7 +179,7 @@ GEM
minitest (5.11.3)
msgpack (1.3.1)
mysql2 (0.5.2)
nio4r (2.4.0)
nio4r (2.5.1)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
Expand Down Expand Up @@ -268,7 +266,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.1.0-x86_64-linux)
sassc (2.2.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
Expand Down Expand Up @@ -329,7 +327,7 @@ DEPENDENCIES
bootstrap (~> 4.3.1)
bootstrap4-kaminari-views
byebug
carrierwave (~> 0.10.0)
carrierwave
chromedriver-helper
cocoon
coffee-rails (~> 4.2)
Expand Down
Binary file added app/assets/images/backpack@2x.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/coins@2x.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/location_2.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/location_6.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/location_7.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/location_8.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/location_9.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/nature.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/top-sales@2x.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/wallet@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
//= require rails-ujs
//= require activestorage
//= require cable
//= require jquery3
//= require popper
//= require bootstrap
//= require custom
//= require toastr
40 changes: 40 additions & 0 deletions app/assets/javascripts/custom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
$(document).ready(function() {
var $headline = $('.headline'),
$inner = $('.inner'),
$nav = $('nav'),
navHeight = 75;

$(window).scroll(function() {
var scrollTop = $(this).scrollTop(),
headlineHeight = $headline.outerHeight() - navHeight,
navOffset = $nav.offset().top;

$headline.css({
'opacity': (1 - scrollTop / headlineHeight)
});

$inner.children().css({
'transform': 'translateY('+ scrollTop * 0.4 +'px)'
});
if (navOffset > headlineHeight) {
$nav.addClass('scrolled');
} else {
$nav.removeClass('scrolled');
}
});

$(".preview-signup").change(function() {
readURL(this, '#img-prev-signup');
});
});

function readURL(f, previewId) {
if (f.files && f.files[0]) {
var reader = new FileReader();
reader.onload = function (e) {
$(previewId)
.attr('src', e.target.result);
};
reader.readAsDataURL(f.files[0]);
}
}
2 changes: 2 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/*
*= require custom
.*= require toastr
*= require_self
*/
Loading

0 comments on commit d56b06e

Please sign in to comment.