viewをhamlに変換

yumayo14 · Jan 23, 2018 · 3a1daa0 · 3a1daa0
1 parent 865d16f
commit 3a1daa0
Show file tree

Hide file tree

Showing 36 changed files with 257 additions and 318 deletions.
diff --git a/Gemfile b/Gemfile
@@ -48,3 +48,5 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'devise'
 gem 'bootstrap-sass'
+gem 'haml-rails'
+gem 'erb2haml'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -63,11 +63,28 @@ GEM
  railties (>= 4.1.0, < 5.2)
  responders
  warden (~> 1.2.3)
+ erb2haml (0.1.5)
+ html2haml
  erubi (1.7.0)
+ erubis (2.7.0)
  execjs (2.7.0)
  ffi (1.9.18)
  globalid (0.4.1)
  activesupport (>= 4.2.0)
+ haml (5.0.4)
+ temple (>= 0.8.0)
+ tilt
+ haml-rails (1.0.0)
+ actionpack (>= 4.0.1)
+ activesupport (>= 4.0.1)
+ haml (>= 4.0.6, < 6.0)
+ html2haml (>= 1.0.1)
+ railties (>= 4.0.1)
+ html2haml (2.2.0)
+ erubis (~> 2.7.0)
+ haml (>= 4.0, < 6)
+ nokogiri (>= 1.6.0)
+ ruby_parser (~> 3.5)
  i18n (0.9.1)
  concurrent-ruby (~> 1.0)
  jbuilder (2.7.0)
@@ -127,6 +144,8 @@ GEM
  actionpack (>= 4.2.0, < 5.3)
  railties (>= 4.2.0, < 5.3)
  ruby_dep (1.5.0)
+ ruby_parser (3.10.1)
+ sexp_processor (~> 4.9)
  sass (3.5.3)
  sass-listen (~> 4.0.0)
  sass-listen (4.0.0)
@@ -138,6 +157,7 @@ GEM
  sprockets (>= 2.8, < 4.0)
  sprockets-rails (>= 2.0, < 4.0)
  tilt (>= 1.1, < 3)
+ sexp_processor (4.10.0)
  spring (2.0.2)
  activesupport (>= 4.2)
  spring-watcher-listen (2.0.1)
@@ -150,6 +170,7 @@ GEM
  actionpack (>= 4.0)
  activesupport (>= 4.0)
  sprockets (>= 3.0.0)
+ temple (0.8.0)
  thor (0.20.0)
  thread_safe (0.3.6)
  tilt (2.0.8)
@@ -176,6 +197,8 @@ DEPENDENCIES
  byebug
  coffee-rails (~> 4.2)
  devise
+ erb2haml
+ haml-rails
  jbuilder (~> 2.5)
  listen (>= 3.0.5, < 3.2)
  pg (~> 0.18)

diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
@@ -0,0 +1,10 @@
+%h2 Resend confirmation instructions
+= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+ = devise_error_messages!
+ .field
+ = f.label :email
+ %br/
+ = f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email)
+ .actions
+ = f.submit "Resend confirmation instructions"
+= render "devise/shared/links"
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -0,0 +1,4 @@
+%p
+ Welcome #{@email}!
+%p You can confirm your account email through the link below:
+%p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token)
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
diff --git a/app/views/devise/mailer/email_changed.html.haml b/app/views/devise/mailer/email_changed.html.haml
@@ -0,0 +1,8 @@
+%p
+ Hello #{@email}!
+- if @resource.try(:unconfirmed_email?)
+ %p
+ We're contacting you to notify you that your email is being changed to #{@resource.unconfirmed_email}.
+- else
+ %p
+ We're contacting you to notify you that your email has been changed to #{@resource.email}.
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
diff --git a/app/views/devise/mailer/password_change.html.haml b/app/views/devise/mailer/password_change.html.haml
@@ -0,0 +1,3 @@
+%p
+ Hello #{@resource.email}!
+%p We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -0,0 +1,6 @@
+%p
+ Hello #{@resource.email}!
+%p Someone has requested a link to change your password. You can do this through the link below.
+%p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token)
+%p If you didn't request this, please ignore this email.
+%p Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -0,0 +1,5 @@
+%p
+ Hello #{@resource.email}!
+%p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+%p Click the link below to unlock your account:
+%p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token)
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
@@ -0,0 +1,19 @@
+%h2 Change your password
+= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+ = devise_error_messages!
+ = f.hidden_field :reset_password_token
+ .field
+ = f.label :password, "New password"
+ %br/
+ - if @minimum_password_length
+ %em
+ (#{@minimum_password_length} characters minimum)
+ %br/
+ = f.password_field :password, autofocus: true, autocomplete: "off"
+ .field
+ = f.label :password_confirmation, "Confirm new password"
+ %br/
+ = f.password_field :password_confirmation, autocomplete: "off"
+ .actions
+ = f.submit "Change my password"
+= render "devise/shared/links"
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
@@ -0,0 +1,10 @@
+%h2 Forgot your password?
+= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+ = devise_error_messages!
+ .field
+ = f.label :email
+ %br/
+ = f.email_field :email, autofocus: true, autocomplete: "email"
+ .actions
+ = f.submit "Send me reset password instructions"
+= render "devise/shared/links"
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
@@ -0,0 +1,36 @@
+%h2
+ Edit #{resource_name.to_s.humanize}
+= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+ = devise_error_messages!
+ .field
+ = f.label :email
+ %br/
+ = f.email_field :email, autofocus: true, autocomplete: "email"
+ - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+ %div
+ Currently waiting confirmation for: #{resource.unconfirmed_email}
+ .field
+ = f.label :password
+ %i (leave blank if you don't want to change it)
+ %br/
+ = f.password_field :password, autocomplete: "off"
+ - if @minimum_password_length
+ %br/
+ %em
+ = @minimum_password_length
+ characters minimum
+ .field
+ = f.label :password_confirmation
+ %br/
+ = f.password_field :password_confirmation, autocomplete: "off"
+ .field
+ = f.label :current_password
+ %i (we need your current password to confirm your changes)
+ %br/
+ = f.password_field :current_password, autocomplete: "off"
+ .actions
+ = f.submit "Update"
+%h3 Cancel my account
+%p
+ Unhappy? #{button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete}
+= link_to "Back", :back
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
@@ -0,0 +1,27 @@
+.container
+ %nav.navbar.navbar-expand-lg.navbar-light.bg-faded
+ .navbar-brand
+ %a.nav-link{"data-method" => "get", :href => "/"} e-Navigator
+ %h2 ユーザー登録
+ = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+ = devise_error_messages!
+ .field
+ = f.label :email, class: "user_email"
+ %br/
+ = f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control", id: "user_email"
+ .field
+ = f.label :password, class: "user_password", id: "user_password"
+ - if @minimum_password_length
+ %em
+ (#{@minimum_password_length} characters minimum)
+ %br/
+ = f.password_field :password, class: "form-control", id: "user_password", autocomplete: "off"
+ .field
+ = f.label :password_confirmation
+ %br/
+ = f.password_field :password_confirmation, class: "form-control", id: "user_password_confirmation", autocomplete: "off"
+ %br/
+ .actions
+ = f.submit "登録", class: "btn btn-primary"
+ %br/
+ = render "devise/shared/links"