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.

Sign up for GitHub

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 link "change course" in setting #79

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+14 −174
Open

add link "change course" in setting #79

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3aeed3
add link "change course" in setting
Apachina Aug 31, 2018
80f6470
add simple styles for links 'delete account' and 'change course'
Apachina Aug 31, 2018
77471e0
Update index.html.slim
Apachina Sep 1, 2018
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
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ gem "administrate-field-carrierwave", "0.3.2"
gem "gdpr_rails", "0.3.3"
gem "omniauth-facebook", "5.0.0"
gem "friendly_id", "5.2.0"
gem "fog-aws", "3.0.0"

group :development, :test do
gem "pry-rails", "0.3.6"
Expand All @@ -58,7 +59,7 @@ group :test do
end

group :production do
gem "fog", "1.42"
gem "fog-aws", "3.0.0"
end

gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
177 changes: 6 additions & 171 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.6)
aasm (5.0.0)
concurrent-ruby (~> 1.0)
actioncable (5.2.0)
Expand Down Expand Up @@ -122,8 +121,6 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.3)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
erubi (1.7.1)
erubis (2.7.0)
Expand All @@ -137,158 +134,19 @@ GEM
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
fission (0.5.0)
CFPropertyList (~> 2.2)
fog (1.42.0)
fog-aliyun (>= 0.1.0)
fog-atmos
fog-aws (>= 0.6.0)
fog-brightbox (~> 0.4)
fog-cloudatcost (~> 0.1.0)
fog-core (~> 1.45)
fog-digitalocean (>= 0.3.0)
fog-dnsimple (~> 1.0)
fog-dynect (~> 0.0.2)
fog-ecloud (~> 0.1)
fog-google (<= 0.1.0)
fog-internet-archive
fog-joyent
fog-json
fog-local
fog-openstack
fog-ovirt
fog-powerdns (>= 0.1.1)
fog-profitbricks
fog-rackspace
fog-radosgw (>= 0.0.2)
fog-riakcs
fog-sakuracloud (>= 0.0.4)
fog-serverlove
fog-softlayer
fog-storm_on_demand
fog-terremark
fog-vmfusion
fog-voxel
fog-vsphere (>= 0.4.0)
fog-xenserver
fog-xml (~> 0.1.1)
ipaddress (~> 0.5)
json (~> 2.0)
fog-aliyun (0.3.2)
fog-core
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-atmos (0.1.0)
fog-core
fog-xml
fog-aws (2.0.1)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-brightbox (0.15.0)
fog-core (~> 1.22)
fog-json
inflecto (~> 0.0.2)
mime-types
fog-cloudatcost (0.1.2)
fog-core (~> 1.36)
fog-json (~> 1.0)
fog-aws (3.0.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.45.0)
fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
fog-digitalocean (0.4.0)
fog-core
fog-json
fog-xml
ipaddress (>= 0.5)
fog-dnsimple (1.0.0)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-dynect (0.0.3)
fog-core
fog-json
fog-xml
fog-ecloud (0.3.0)
fog-core
fog-xml
fog-google (0.1.0)
fog-core
fog-json
fog-xml
fog-internet-archive (0.0.1)
fog-core
fog-json
fog-xml
fog-joyent (0.0.1)
fog-core (~> 1.42)
fog-json (>= 1.0)
mime-types
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
fog-local (0.5.0)
fog-core (>= 1.27, < 3.0)
fog-openstack (0.2.0)
fog-core (~> 1.45.0)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-ovirt (1.1.2)
fog-core
fog-json
fog-xml
ovirt-engine-sdk (>= 4.1.3)
rbovirt (~> 0.1.5)
fog-powerdns (0.2.0)
fog-core
fog-json
fog-xml
fog-profitbricks (4.1.1)
fog-core (~> 1.42)
fog-json (~> 1.0)
fog-rackspace (0.1.6)
fog-core (>= 1.35)
fog-json (>= 1.0)
fog-xml (>= 0.1)
ipaddress (>= 0.8)
fog-radosgw (0.0.5)
fog-core (>= 1.21.0)
fog-json
fog-xml (>= 0.0.1)
fog-riakcs (0.1.0)
fog-core
fog-json
fog-xml
fog-sakuracloud (1.7.5)
fog-core
fog-json
fog-serverlove (0.1.2)
fog-core
fog-json
fog-softlayer (1.1.4)
fog-core
fog-json
fog-storm_on_demand (0.1.1)
fog-core
fog-json
fog-terremark (0.1.0)
fog-core
fog-xml
fog-vmfusion (0.1.0)
fission
fog-core
fog-voxel (0.1.0)
fog-core
fog-xml
fog-vsphere (2.3.0)
fog-core
rbvmomi (~> 1.9)
fog-xenserver (0.3.0)
fog-core
fog-xml
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
Expand All @@ -309,12 +167,9 @@ GEM
groupdate (4.0.0)
activesupport (>= 4.2)
hashie (3.5.7)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.1.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
inflecto (0.0.2)
io-like (0.3.0)
ipaddress (0.8.3)
jaro_winkler (1.5.1)
Expand Down Expand Up @@ -372,7 +227,6 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
Expand All @@ -391,8 +245,6 @@ GEM
oauth2 (~> 1.1)
omniauth (~> 1.2)
orm_adapter (0.5.0)
ovirt-engine-sdk (4.2.4)
json (>= 1, < 3)
paperclip (6.1.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -461,14 +313,6 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rbovirt (0.1.7)
nokogiri
rest-client (> 1.7.0)
rbvmomi (1.13.0)
builder (~> 3.0)
json (>= 1.8)
nokogiri (~> 1.5)
trollop (~> 2.1)
redcarpet (3.4.0)
reek (5.0.2)
codeclimate-engine-rb (~> 0.4.0)
Expand All @@ -479,10 +323,6 @@ GEM
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
Expand Down Expand Up @@ -558,14 +398,10 @@ GEM
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
trollop (2.9.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.18)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
virtus (1.0.5)
axiom-types (~> 0.1)
Expand All @@ -585,7 +421,6 @@ GEM
whenever (0.10.0)
chronic (>= 0.6.3)
will_paginate (3.1.6)
xml-simple (1.1.5)
xpath (3.1.0)
nokogiri (~> 1.8)

Expand All @@ -605,7 +440,7 @@ DEPENDENCIES
chromedriver-helper (= 1.2.0)
devise (= 4.4.3)
factory_bot_rails (= 4.10.0)
fog (= 1.42)
fog-aws (= 3.0.0)
friendly_id (= 5.2.0)
gdpr_rails (= 0.3.3)
jbuilder (= 2.7.0)
Expand Down
8 changes: 6 additions & 2 deletions app/views/devise/registrations/edit.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,9 @@ h2
= f.button :submit
.btn
= link_to t('devise.shared.links.back'), :back
.btn
= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete
br
br
= link_to t('.cancel_my_account'), registration_path(resource_name), data: { confirm: t('.are_you_sure') }, method: :delete, class:"alert alert-danger"
br
br
= link_to t('.change_course'), level_users_path, data: {confirm:"If you change your course you lost all information about befor course"}, class:"alert alert-success"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Без локализации? :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 changes: 1 addition & 1 deletion app/views/static_pages/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
p
| Free 15-minute
p
| English lessons
| English lessons
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

p
| Every day
== link_to 'Let\'s Start', new_user_registration_path, class: 'content-btn', id: 'hdr-btn'