about summary refs log tree commit diff stats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/devise/confirmations/new.html.erb16
-rw-r--r--app/views/devise/mailer/confirmation_instructions.html.erb5
-rw-r--r--app/views/devise/mailer/email_changed.html.erb7
-rw-r--r--app/views/devise/mailer/password_change.html.erb3
-rw-r--r--app/views/devise/mailer/reset_password_instructions.html.erb8
-rw-r--r--app/views/devise/mailer/unlock_instructions.html.erb7
-rw-r--r--app/views/devise/passwords/edit.html.erb25
-rw-r--r--app/views/devise/passwords/new.html.erb16
-rw-r--r--app/views/devise/registrations/edit.html.erb43
-rw-r--r--app/views/devise/registrations/new.html.erb29
-rw-r--r--app/views/devise/shared/_links.html.erb25
-rw-r--r--app/views/devise/unlocks/new.html.erb16
-rw-r--r--app/views/layouts/application.html.haml18
-rw-r--r--app/views/layouts/userdata.html.haml18
-rw-r--r--app/views/users/sessions/.new.html.haml.swobin0 -> 12288 bytes
-rw-r--r--app/views/users/sessions/new.html.haml15
16 files changed, 248 insertions, 3 deletions
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..2dc668f --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb
@@ -0,0 +1,16 @@
1<h2>Resend confirmation instructions</h2>
2
3<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
4 <%= devise_error_messages! %>
5
6 <div class="field">
7 <%= f.label :email %><br />
8 <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
9 </div>
10
11 <div class="actions">
12 <%= f.submit "Resend confirmation instructions" %>
13 </div>
14<% end %>
15
16<%= render "devise/shared/links" %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000..dc55f64 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
1<p>Welcome <%= @email %>!</p>
2
3<p>You can confirm your account email through the link below:</p>
4
5<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb new file mode 100644 index 0000000..32f4ba8 --- /dev/null +++ b/app/views/devise/mailer/email_changed.html.erb
@@ -0,0 +1,7 @@
1<p>Hello <%= @email %>!</p>
2
3<% if @resource.try(:unconfirmed_email?) %>
4 <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p>
5<% else %>
6 <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p>
7<% end %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 0000000..b41daf4 --- /dev/null +++ b/app/views/devise/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
1<p>Hello <%= @resource.email %>!</p>
2
3<p>We're contacting you to notify you that your password has been changed.</p>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..f667dc1 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
1<p>Hello <%= @resource.email %>!</p>
2
3<p>Someone has requested a link to change your password. You can do this through the link below.</p>
4
5<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
6
7<p>If you didn't request this, please ignore this email.</p>
8<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..41e148b --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
1<p>Hello <%= @resource.email %>!</p>
2
3<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
4
5<p>Click the link below to unlock your account:</p>
6
7<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..6a796b0 --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb
@@ -0,0 +1,25 @@
1<h2>Change your password</h2>
2
3<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
4 <%= devise_error_messages! %>
5 <%= f.hidden_field :reset_password_token %>
6
7 <div class="field">
8 <%= f.label :password, "New password" %><br />
9 <% if @minimum_password_length %>
10 <em>(<%= @minimum_password_length %> characters minimum)</em><br />
11 <% end %>
12 <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
13 </div>
14
15 <div class="field">
16 <%= f.label :password_confirmation, "Confirm new password" %><br />
17 <%= f.password_field :password_confirmation, autocomplete: "off" %>
18 </div>
19
20 <div class="actions">
21 <%= f.submit "Change my password" %>
22 </div>
23<% end %>
24
25<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000..3d6d11a --- /dev/null +++ b/app/views/devise/passwords/new.html.erb
@@ -0,0 +1,16 @@
1<h2>Forgot your password?</h2>
2
3<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
4 <%= devise_error_messages! %>
5
6 <div class="field">
7 <%= f.label :email %><br />
8 <%= f.email_field :email, autofocus: true %>
9 </div>
10
11 <div class="actions">
12 <%= f.submit "Send me reset password instructions" %>
13 </div>
14<% end %>
15
16<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000..1e66f3d --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb
@@ -0,0 +1,43 @@
1<h2>Edit <%= resource_name.to_s.humanize %></h2>
2
3<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
4 <%= devise_error_messages! %>
5
6 <div class="field">
7 <%= f.label :email %><br />
8 <%= f.email_field :email, autofocus: true %>
9 </div>
10
11 <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
12 <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
13 <% end %>
14
15 <div class="field">
16 <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
17 <%= f.password_field :password, autocomplete: "off" %>
18 <% if @minimum_password_length %>
19 <br />
20 <em><%= @minimum_password_length %> characters minimum</em>
21 <% end %>
22 </div>
23
24 <div class="field">
25 <%= f.label :password_confirmation %><br />
26 <%= f.password_field :password_confirmation, autocomplete: "off" %>
27 </div>
28
29 <div class="field">
30 <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
31 <%= f.password_field :current_password, autocomplete: "off" %>
32 </div>
33
34 <div class="actions">
35 <%= f.submit "Update" %>
36 </div>
37<% end %>
38
39<h3>Cancel my account</h3>
40
41<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
42
43<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000..5a238ce --- /dev/null +++ b/app/views/devise/registrations/new.html.erb
@@ -0,0 +1,29 @@
1<h2>Sign up</h2>
2
3<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
4 <%= devise_error_messages! %>
5
6 <div class="field">
7 <%= f.label :email %><br />
8 <%= f.email_field :email, autofocus: true %>
9 </div>
10
11 <div class="field">
12 <%= f.label :password %>
13 <% if @minimum_password_length %>
14 <em>(<%= @minimum_password_length %> characters minimum)</em>
15 <% end %><br />
16 <%= f.password_field :password, autocomplete: "off" %>
17 </div>
18
19 <div class="field">
20 <%= f.label :password_confirmation %><br />
21 <%= f.password_field :password_confirmation, autocomplete: "off" %>
22 </div>
23
24 <div class="actions">
25 <%= f.submit "Sign up" %>
26 </div>
27<% end %>
28
29<%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb new file mode 100644 index 0000000..e6a3e41 --- /dev/null +++ b/app/views/devise/shared/_links.html.erb
@@ -0,0 +1,25 @@
1<%- if controller_name != 'sessions' %>
2 <%= link_to "Log in", new_session_path(resource_name) %><br />
3<% end -%>
4
5<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6 <%= link_to "Sign up", new_registration_path(resource_name) %><br />
7<% end -%>
8
9<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
10 <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
11<% end -%>
12
13<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
14 <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
15<% end -%>
16
17<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
18 <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
19<% end -%>
20
21<%- if devise_mapping.omniauthable? %>
22 <%- resource_class.omniauth_providers.each do |provider| %>
23 <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
24 <% end -%>
25<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..16586bc --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb
@@ -0,0 +1,16 @@
1<h2>Resend unlock instructions</h2>
2
3<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
4 <%= devise_error_messages! %>
5
6 <div class="field">
7 <%= f.label :email %><br />
8 <%= f.email_field :email, autofocus: true %>
9 </div>
10
11 <div class="actions">
12 <%= f.submit "Resend unlock instructions" %>
13 </div>
14<% end %>
15
16<%= render "devise/shared/links" %>
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 55d7805..e9d8dfd 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml
@@ -5,12 +5,24 @@
5 = csrf_meta_tags 5 = csrf_meta_tags
6 = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' 6 = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' 7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
8 %body 8 %body#main-body
9 - if flash[:alert]
10 %div#flash.flash-alert= flash[:alert]
11 - if flash[:notice]
12 %div#flash.flash-notice= flash[:notice]
9 #container 13 #container
10 #banner 14 #banner
11 %h1= link_to "Thoughts", root_url 15 %h1= link_to "Thoughts", root_url
12 #main 16 #main
13 #content= yield 17 #content= yield
14 #sidebar 18 #sidebar
15 %h2 I'm Fef. 19 .sidebar-module
16 %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot. 20 %h2 I'm Fef.
21 %p I'm a computer science undergrad at Carnegie Mellon University. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
22 .sidebar-module
23 %h2 Meta
24 %ul
25 - if not user_signed_in?
26 %li= link_to "Log in", new_user_session_path
27 - if user_signed_in?
28 %li= link_to "Log out", destroy_user_session_path, method: :delete
diff --git a/app/views/layouts/userdata.html.haml b/app/views/layouts/userdata.html.haml new file mode 100644 index 0000000..f6e3b57 --- /dev/null +++ b/app/views/layouts/userdata.html.haml
@@ -0,0 +1,18 @@
1!!! 5
2%html
3 %head
4 %title Thoughts
5 = csrf_meta_tags
6 = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
7 = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
8 %body#userdata-body
9 #userdata-container
10 - if flash[:alert]
11 #userdata-flash.userdata-flash-alert
12 %span.userdata-flash-tag ERROR:
13 = flash.alert
14 - if flash[:notice]
15 #userdata-flash.userdata-flash-notice
16 %span.userdata-flash-tag NOTICE:
17 = flash.notice
18 = yield
diff --git a/app/views/users/sessions/.new.html.haml.swo b/app/views/users/sessions/.new.html.haml.swo new file mode 100644 index 0000000..85950d9 --- /dev/null +++ b/app/views/users/sessions/.new.html.haml.swo
Binary files differ
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml new file mode 100644 index 0000000..fbdf8be --- /dev/null +++ b/app/views/users/sessions/new.html.haml
@@ -0,0 +1,15 @@
1#userdata-form
2 = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
3 .field
4 = f.label :login
5 = f.text_field :login, autofocus: true
6 .field
7 = f.label :password
8 = f.password_field :password, autocomplete: "off"
9 .remember-me-field
10 = f.check_box :remember_me
11 = f.label :remember_me
12 .submit-field
13 = f.submit "Log in"
14.userdata-link= link_to "Forgot your password?", new_password_path(resource_name)
15.userdata-link= link_to "← Back to thoughts", root_url
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-26 13:03:38 +0000