diff --git a/app/assets/images/twemoji/account.svg b/app/assets/images/twemoji/account.svg new file mode 100644 index 000000000..5949e45bf --- /dev/null +++ b/app/assets/images/twemoji/account.svg @@ -0,0 +1,3 @@ + diff --git a/app/assets/images/twemoji/billing.svg b/app/assets/images/twemoji/billing.svg new file mode 100644 index 000000000..56f9a5cb2 --- /dev/null +++ b/app/assets/images/twemoji/billing.svg @@ -0,0 +1,6 @@ + diff --git a/app/assets/images/twemoji/customization.svg b/app/assets/images/twemoji/customization.svg new file mode 100644 index 000000000..652e85226 --- /dev/null +++ b/app/assets/images/twemoji/customization.svg @@ -0,0 +1,3 @@ + diff --git a/app/assets/images/twemoji/extensions.svg b/app/assets/images/twemoji/extensions.svg new file mode 100644 index 000000000..913b3fe42 --- /dev/null +++ b/app/assets/images/twemoji/extensions.svg @@ -0,0 +1,3 @@ + diff --git a/app/assets/images/twemoji/notifications.svg b/app/assets/images/twemoji/notifications.svg new file mode 100644 index 000000000..663204eeb --- /dev/null +++ b/app/assets/images/twemoji/notifications.svg @@ -0,0 +1,6 @@ + diff --git a/app/assets/images/twemoji/organization.svg b/app/assets/images/twemoji/organization.svg new file mode 100644 index 000000000..22cb695c4 --- /dev/null +++ b/app/assets/images/twemoji/organization.svg @@ -0,0 +1,11 @@ + diff --git a/app/assets/images/twemoji/profile.svg b/app/assets/images/twemoji/profile.svg new file mode 100644 index 000000000..938e32594 --- /dev/null +++ b/app/assets/images/twemoji/profile.svg @@ -0,0 +1,4 @@ + diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 958077651..eab2eaa95 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -235,14 +235,17 @@ class UsersController < ApplicationController return @tab = "profile" if @tab.blank? case @tab + when "profile" + handle_integrations_tab when "organization" handle_organization_tab - when "integrations" - handle_integrations_tab when "billing" handle_billing_tab when "response-templates" handle_response_templates_tab + when "extensions" + handle_integrations_tab + handle_response_templates_tab else not_found unless @tab.in?(Constants::Settings::TAB_LIST.map { |t| t.downcase.tr(" ", "-") }) end diff --git a/app/lib/constants/settings.rb b/app/lib/constants/settings.rb index c7d742e51..3e8dda9bf 100644 --- a/app/lib/constants/settings.rb +++ b/app/lib/constants/settings.rb @@ -2,15 +2,12 @@ module Constants module Settings TAB_LIST = %w[ Profile - UX - Integrations + Customization Notifications - Publishing\ from\ RSS - Organization - Response\ Templates - Billing Account - Misc + Billing + Organization + Extensions ].freeze end end diff --git a/app/views/users/_account.html.erb b/app/views/users/_account.html.erb index 4d1576811..7ae5e757f 100644 --- a/app/views/users/_account.html.erb +++ b/app/views/users/_account.html.erb @@ -47,7 +47,32 @@
You have recently requested an export of your content. Please check your email.
+You can request an export of all your content. Currently we only support the export of your posts and comments. They will be emailed to your inbox.
+ + <%= form_for(@user, html: { id: nil }) do |f| %> +Deleting your account will:
As an alternative to signing in via linked social accounts, you may create a password.
++ As an alternative to signing in via linked social accounts, you may create a password. +
+ You have the option to remove sponsor messaging (where it is practical + to do so). Our wonderful sponsors help sustain the platform and improve + your experience, and we strive to make their presence constructive to + the community, but feel free to use this setting if you wish. +
++ Announcements inform you on important site-wide + information, like updates and events. +
+Open your inbox to messages from people you don't follow or keep your inbox private to mutual follows.
+ <%= f.select :inbox_type, [%w[Open open], %w[Private private]], {}, { class: "crayons-select" } %> ++ Optional +
+ + <%= f.text_area :inbox_guidelines, maxlength: 200, class: "crayons-textfield", rows: 5, placeholder: "For example: + - Only contact me about consulting opportunities. + - I'm happy to help beginners with CSS. + - Allow for a few days to respond. + - etc. + " %> ++ Receive micropayments for time spent reading your posts directy. Learn more +
+ +Automatically generate a self-hosted static blog feed from your <%= community_name %> posts.
- ++ Automatically generate a self-hosted static blog feed from your <%= community_name %> posts. +
+ + Get Started + <% end %>+ Pin your GitHub repositories to your profile +
+Select which languages you'd prefer to see in your feed.
This setting controls which languages you are more likely to see throughout the site, but you may still see other languages, especially English.
-This feature is in beta and will improve over time. Another way to tailor your feed is to discover and follow members who write in your preferred language.
-