Merge pull request 'Add user preferences and configurable notifications' (#113) from feature/user_preferences into master

Reviewed-on: #113
Reviewed-by: galfert <garret.alfert@gmail.com>

app/views/admin/users/show.html.erb

@@ -135,7 +135,7 @@
           <td>XMPP (ejabberd)</td>
           <td>
             <%= render FormElements::ToggleComponent.new(
-              enabled: @services_enabled.include?("ejabberd"),
+              enabled: @services_enabled.include?("xmpp"),
               input_enabled: false
             ) %>
           </td>

app/views/icons/_bell.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bell"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path><path d="M13.73 21a2 2 0 0 1-3.46 0"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-bell <%= custom_class %>"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path><path d="M13.73 21a2 2 0 0 1-3.46 0"></path></svg>

app/views/icons/_message-circle.html.erb

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-message-circle"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-message-circle <%= custom_class %>"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>

app/views/notification_mailer/lightning_sats_received.text.erb

@@ -0,0 +1,3 @@
+You just received <%= number_with_delimiter @amount_sats %> sats in your Lightning account (<%= @user.address %>). Check your wallet app, or open the account page for details:
+
+<%= wallet_transactions_url %>

app/views/settings/_account.html.erb

@@ -0,0 +1,19 @@
+<section>
+  <h3>E-Mail</h3>
+  <p class="mb-2">
+    <%= label :email, 'Address', class: 'font-bold' %>
+  </p>
+  <p class="flex gap-1 mb-2 sm:w-3/5">
+    <input type="text" id="email" class="grow"
+           value=<%= current_user.email %> disabled="disabled" />
+  </p>
+</section>
+<section>
+  <h3>Password</h3>
+  <p class="mb-8">Use the following button to request an email with a password reset link:</p>
+  <%= form_with(url: reset_password_settings_path, method: :post) do %>
+    <p>
+      <%= submit_tag("Send me a password reset link", class: 'btn-md btn-gray w-full sm:w-auto') %>
+    </p>
+  <% end %>
+</section>

app/views/settings/_lightning.html.erb

@@ -0,0 +1,25 @@
+<%= form_for @user, url: setting_path(:lightning), html: { :method => :put } do |f| %>
+<section>
+  <h3>Notifications</h3>
+  <ul role="list">
+    <%= render FormElements::FieldsetComponent.new(
+      positioning: :horizontal,
+      title: "Sats received",
+      description: "Notify me when sats are sent to my Lightning Address"
+    ) do %>
+      <% f.fields_for :preferences do |p| %>
+        <%= p.select :lightning_notify_sats_received, options_for_select([
+          ["off", "disabled"],
+          ["Chat (Jabber)", "xmpp"],
+          ["E-Mail", "email"]
+        ], selected: @user.preferences[:lightning_notify_sats_received]) %>
+      <% end %>
+    <% end %>
+  </ul>
+</section>
+<section>
+  <p class="pt-6 border-t border-gray-200 text-right">
+    <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
+  </p>
+</section>
+<% end %>

app/views/settings/_notifications.html.erb

@@ -0,0 +1,16 @@
+<section>
+  <h3>Lightning Wallet</h3>
+
+  <ul role="list">
+    <%= render FormElements::FieldsetComponent.new(
+      positioning: :horizontal,
+      title: "Sats received",
+      description: "Notify when sats are sent to my Lightning Address"
+    ) do %>
+    <%= select_tag :sats_received, options_for_select([
+      ["off", "off"],
+      ["Chat (Jabber)", "xmpp"]
+    ]) %>
+    <% end %>
+  </ul>
+</section>

app/views/settings/_profile.html.erb

@@ -0,0 +1,30 @@
+<section>
+  <h3>Profile</h3>
+  <p class="mb-2">
+    <%= label :user_address, 'User address', class: 'font-bold' %>
+  </p>
+  <p data-controller="clipboard" class="flex gap-1 mb-2 sm:w-3/5">
+    <input type="text" id="user_address" class="grow"
+           value=<%= @user.address %> disabled="disabled"
+           data-clipboard-target="source" />
+    <button id="copy-user-address" class="btn-md btn-icon btn-blue shrink-0"
+            data-clipboard-target="trigger" data-action="clipboard#copy"
+            title="Copy to clipboard">
+      <span class="content-initial">
+        <%= render partial: "icons/copy", locals: { custom_class: "text-white h-4 w-4 inline" } %>
+      </span>
+      <span class="content-active hidden">
+        <%= render partial: "icons/check", locals: { custom_class: "text-white h-4 w-4 inline" } %>
+      </span>
+    </button>
+  </p>
+  <p class="text-sm text-gray-500">
+    Your user address for Chat and Lightning Network.
+  </p>
+
+  <%# <%= form_for(@user, as: "profile", url: settings_profile_path) do |f| %>
+  <%#   <p class="mt-8">
+  <%#     <%= f.submit "Save changes", class: 'btn-md btn-blue w-full sm:w-auto' %>
+  <%#   </p>
+  <%# <% end %>
+</section>

app/views/settings/_xmpp.html.erb

@@ -0,0 +1,18 @@
+<%= form_for @user, url: setting_path(:xmpp), html: { :method => :put } do |f| %>
+<section>
+  <h3>Contacts</h3>
+  <ul role="list">
+    <%= render FormElements::FieldsetToggleComponent.new(
+      field_name: "user[preferences][xmpp_exchange_contacts_with_invitees]",
+      enabled: @user.preferences[:xmpp_exchange_contacts_with_invitees],
+      title: "Exchange contacts when invited user signs up",
+      description: "Add each others contacts, so you can chat with them immediately"
+    ) %>
+  </ul>
+</section>
+<section>
+  <p class="pt-6 border-t border-gray-200 text-right">
+    <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
+  </p>
+</section>
+<% end %>

app/views/settings/account/index.html.erb

@@ -1,23 +0,0 @@
-<%= render HeaderComponent.new(title: "Settings") %>
-
-<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/sidenav_settings') do %>
-  <section>
-    <h3>E-Mail</h3>
-    <p class="mb-2">
-      <%= label :email, 'Address', class: 'font-bold' %>
-    </p>
-    <p class="flex gap-1 mb-2 sm:w-3/5">
-      <input type="text" id="email" class="grow"
-             value=<%= current_user.email %> disabled="disabled" />
-    </p>
-  </section>
-  <section>
-    <h3>Password</h3>
-    <p class="mb-8">Use the following button to request an email with a password reset link:</p>
-    <%= form_with(url: settings_reset_password_path, method: :post) do %>
-      <p>
-        <%= submit_tag("Send me a password reset link", class: 'btn-md btn-gray w-full sm:w-auto') %>
-      </p>
-    <% end %>
-  </section>
-<% end %>

app/views/settings/profile/index.html.erb

@@ -1,34 +0,0 @@
-<%= render HeaderComponent.new(title: "Settings") %>
-
-<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/sidenav_settings') do %>
-  <section>
-    <h3>Profile</h3>
-    <p class="mb-2">
-      <%= label :user_address, 'User address', class: 'font-bold' %>
-    </p>
-    <p data-controller="clipboard" class="flex gap-1 mb-2 sm:w-3/5">
-      <input type="text" id="user_address" class="grow"
-             value=<%= @user.address %> disabled="disabled"
-             data-clipboard-target="source" />
-      <button id="copy-user-address" class="btn-md btn-icon btn-blue shrink-0"
-              data-clipboard-target="trigger" data-action="clipboard#copy"
-              title="Copy to clipboard">
-        <span class="content-initial">
-          <%= render partial: "icons/copy", locals: { custom_class: "text-white h-4 w-4 inline" } %>
-        </span>
-        <span class="content-active hidden">
-          <%= render partial: "icons/check", locals: { custom_class: "text-white h-4 w-4 inline" } %>
-        </span>
-      </button>
-    </p>
-    <p class="text-sm text-gray-500">
-      Your user address for Chat and Lightning Network.
-    </p>
-
-    <%# <%= form_for(@user, as: "profile", url: settings_profile_path) do |f| %>
-    <%#   <p class="mt-8">
-    <%#     <%= f.submit "Save changes", class: 'btn-md btn-blue w-full sm:w-auto' %>
-    <%#   </p>
-    <%# <% end %>
-  </section>
-<% end %>

app/views/settings/show.html.erb

@@ -0,0 +1,5 @@
+<%= render HeaderComponent.new(title: "Settings") %>
+
+<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/sidenav_settings') do %>
+  <%= render partial: @settings_section %>
+<% end %>

app/views/shared/_main_nav.html.erb

@@ -6,5 +6,5 @@
       class: main_nav_class(@current_section, :invitations) %>
 <%= link_to "Wallet", wallet_path,
       class: main_nav_class(@current_section, :wallet) %>
-<%= link_to "Settings", settings_profile_path,
+<%= link_to "Settings", settings_path,
       class: main_nav_class(@current_section, :settings) %>

app/views/shared/_sidenav_settings.html.erb

@@ -1,11 +1,20 @@
 <%= render SidenavLinkComponent.new(
-  name: "Profile", path: settings_profile_path, icon: "user",
-  active: current_page?(settings_profile_path)
+  name: "Profile", path: setting_path(:profile), icon: "user",
+  active: current_page?(setting_path(:profile))
 ) %>
 <%= render SidenavLinkComponent.new(
-  name: "Account", path: settings_account_path, icon: "key",
-  active: current_page?(settings_account_path)
+  name: "Account", path: setting_path(:account), icon: "key",
+  active: current_page?(setting_path(:account))
 ) %>
+<% if Setting.ejabberd_enabled %>
 <%= render SidenavLinkComponent.new(
-  name: "Security", path: "#", icon: "shield", disabled: true
+  name: "Chat", path: setting_path(:xmpp), icon: "message-circle",
+  active: current_page?(setting_path(:xmpp))
 ) %>
+<% end %>
+<% if Setting.lndhub_enabled %>
+<%= render SidenavLinkComponent.new(
+  name: "Wallet", path: setting_path(:lightning), icon: "zap",
+  active: current_page?(setting_path(:lightning))
+) %>
+<% end %>