From 7a6d95f70ccb12d61355ecd677eff40dd13260b7 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 14 Oct 2016 02:28:49 +0200 Subject: E-mail preferences page --- .../features/ui/components/navigation_bar.jsx | 2 +- app/assets/stylesheets/application.scss | 19 +++++++++++++++ app/controllers/settings/preferences_controller.rb | 27 ++++++++++++++++++++++ app/controllers/settings/profiles_controller.rb | 27 ++++++++++++++++++++++ app/controllers/settings_controller.rb | 27 ---------------------- app/helpers/settings_helper.rb | 2 -- app/views/auth/registrations/edit.html.haml | 3 +++ app/views/settings/preferences/show.html.haml | 22 ++++++++++++++++++ app/views/settings/profiles/show.html.haml | 19 +++++++++++++++ app/views/settings/shared/_links.html.haml | 7 ++++++ app/views/settings/show.html.haml | 17 -------------- 11 files changed, 125 insertions(+), 47 deletions(-) create mode 100644 app/controllers/settings/preferences_controller.rb create mode 100644 app/controllers/settings/profiles_controller.rb delete mode 100644 app/controllers/settings_controller.rb delete mode 100644 app/helpers/settings_helper.rb create mode 100644 app/views/settings/preferences/show.html.haml create mode 100644 app/views/settings/profiles/show.html.haml create mode 100644 app/views/settings/shared/_links.html.haml delete mode 100644 app/views/settings/show.html.haml (limited to 'app') diff --git a/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx b/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx index a16852541..68b660ee8 100644 --- a/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx +++ b/app/assets/javascripts/components/features/ui/components/navigation_bar.jsx @@ -19,7 +19,7 @@ const NavigationBar = React.createClass({
{this.props.account.get('acct')} - Settings · Public timeline · Logout + Settings · Public timeline · Logout
); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 60875a3b3..ac21c809f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -214,6 +214,25 @@ body { } } + .fields-group { + margin-bottom: 25px; + } + + .boolean-field { + margin-bottom: 5px; + + label { + font-family: 'Roboto'; + font-size: 14px; + color: #9baec8; + } + + input[type=checkbox] { + display: inline-block; + margin-bottom: -13px; + } + } + input[type=text], input[type=email], input[type=password], textarea { background: transparent; border: 0; diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb new file mode 100644 index 000000000..8a038f2fe --- /dev/null +++ b/app/controllers/settings/preferences_controller.rb @@ -0,0 +1,27 @@ +class Settings::PreferencesController < ApplicationController + layout 'auth' + + before_action :authenticate_user! + + def show + end + + def update + current_user.settings(:notification_emails).follow = user_params[:notification_emails][:follow] == '1' + current_user.settings(:notification_emails).reblog = user_params[:notification_emails][:reblog] == '1' + current_user.settings(:notification_emails).favourite = user_params[:notification_emails][:favourite] == '1' + current_user.settings(:notification_emails).mention = user_params[:notification_emails][:mention] == '1' + + if current_user.save + redirect_to settings_preferences_path, notice: 'Changes successfully saved!' + else + render action: :show + end + end + + private + + def user_params + params.require(:user).permit(notification_emails: [:follow, :reblog, :favourite, :mention]) + end +end diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb new file mode 100644 index 000000000..52b6369a6 --- /dev/null +++ b/app/controllers/settings/profiles_controller.rb @@ -0,0 +1,27 @@ +class Settings::ProfilesController < ApplicationController + layout 'auth' + + before_action :authenticate_user! + before_action :set_account + + def show + end + + def update + if @account.update(account_params) + redirect_to settings_profile_path, notice: 'Changes successfully saved!' + else + render action: :show + end + end + + private + + def account_params + params.require(:account).permit(:display_name, :note, :avatar, :header) + end + + def set_account + @account = current_user.account + end +end diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb deleted file mode 100644 index 299e1f3bc..000000000 --- a/app/controllers/settings_controller.rb +++ /dev/null @@ -1,27 +0,0 @@ -class SettingsController < ApplicationController - layout 'auth' - - before_action :authenticate_user! - before_action :set_account - - def show - end - - def update - if @account.update(account_params) - redirect_to settings_path, notice: 'Changes successfully saved!' - else - render action: :show - end - end - - private - - def account_params - params.require(:account).permit(:display_name, :note, :avatar, :header) - end - - def set_account - @account = current_user.account - end -end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb deleted file mode 100644 index ffbedbaf4..000000000 --- a/app/helpers/settings_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SettingsHelper -end diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml index 9a52af35c..78f4ef5dc 100644 --- a/app/views/auth/registrations/edit.html.haml +++ b/app/views/auth/registrations/edit.html.haml @@ -10,5 +10,8 @@ = f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm new password' .field = f.password_field :current_password, autocomplete: "off", placeholder: 'Current password' + .actions = f.button "Save changes", type: 'submit' + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml new file mode 100644 index 000000000..9c73d07c5 --- /dev/null +++ b/app/views/settings/preferences/show.html.haml @@ -0,0 +1,22 @@ +- content_for :page_title do + Preferences + += form_for current_user, url: settings_preferences_path, html: { method: :put } do |f| + = f.fields_for :notification_emails, current_user.settings(:notification_emails) do |ff| + .boolean-field + = ff.check_box :follow + = ff.label :follow, 'Send e-mail when someone follows you' + .boolean-field + = ff.check_box :reblog + = ff.label :reblog, 'Send e-mail when someone reblogs your status' + .boolean-field + = ff.check_box :favourite + = ff.label :favourite, 'Send e-mail when someone favourites your status' + .boolean-field + = ff.check_box :mention + = ff.label :mention, 'Send e-mail when someone mentions you' + + .actions + = f.button 'Save changes', type: :submit + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml new file mode 100644 index 000000000..2ff91beff --- /dev/null +++ b/app/views/settings/profiles/show.html.haml @@ -0,0 +1,19 @@ +- content_for :page_title do + Edit profile + += form_for @account, url: settings_profile_path, html: { method: :put } do |f| + .field + = f.text_field :display_name, placeholder: 'Display name' + .field + = f.text_area :note, placeholder: 'Bio' + .file-field + = f.label :avatar + = f.file_field :avatar + .file-field + = f.label :header + = f.file_field :header + + .actions + = f.button 'Save changes', type: :submit + +.form-footer= render "settings/shared/links" diff --git a/app/views/settings/shared/_links.html.haml b/app/views/settings/shared/_links.html.haml new file mode 100644 index 000000000..520300416 --- /dev/null +++ b/app/views/settings/shared/_links.html.haml @@ -0,0 +1,7 @@ +%ul.no-list + - if controller_name != 'profiles' + %li= link_to "Edit profile", settings_profile_path + - if controller_name != 'preferences' + %li= link_to "Preferences", settings_preferences_path + - if controller_name != 'registrations' + %li= link_to "Change password", edit_user_registration_path diff --git a/app/views/settings/show.html.haml b/app/views/settings/show.html.haml deleted file mode 100644 index fe4d37b55..000000000 --- a/app/views/settings/show.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -- content_for :page_title do - Edit profile - -= form_for @account, url: settings_path, html: { method: :put } do |f| - .field - = f.text_field :display_name, placeholder: 'Display name' - .field - = f.text_area :note, placeholder: 'Bio' - .file-field - = f.label :avatar - = f.file_field :avatar - .file-field - = f.label :header - = f.file_field :header - - .actions - = f.button 'Save changes', type: :submit -- cgit