Merge pull request 'Add configurable settings, admin settings pages, reserved usernames' (#81) from feature/settings into feature/admin_stats

Reviewed-on: #81

app/assets/stylesheets/components/forms.css

@@ -1,6 +1,6 @@
 @layer components {
   input[type=text], input[type=email], input[type=password],
-  input[type=number], select {
+  input[type=number], select, textarea {
     @apply mt-1 rounded-md bg-gray-100 focus:bg-white
            border-transparent focus:border-transparent focus:ring-2
            focus:ring-blue-600 focus:ring-opacity-75;

app/controllers/admin/donations_controller.rb

@@ -33,7 +33,11 @@ class Admin::DonationsController < Admin::BaseController
 
     respond_to do |format|
       if @donation.save
-        format.html { redirect_to admin_donation_url(@donation), notice: 'Donation was successfully created.' }
+        format.html do
+          redirect_to admin_donation_url(@donation), flash: {
+            success: 'Donation was successfully created.'
+          }
+        end
         format.json { render :show, status: :created, location: @donation }
       else
         format.html { render :new }
@@ -47,7 +51,11 @@ class Admin::DonationsController < Admin::BaseController
   def update
     respond_to do |format|
       if @donation.update(donation_params)
-        format.html { redirect_to admin_donation_url(@donation), notice: 'Donation was successfully updated.' }
+        format.html do
+          redirect_to admin_donation_url(@donation), flash: {
+            success: 'Donation was successfully updated.'
+          }
+        end
         format.json { render :show, status: :ok, location: @donation }
       else
         format.html { render :edit }
@@ -61,7 +69,10 @@ class Admin::DonationsController < Admin::BaseController
   def destroy
     @donation.destroy
     respond_to do |format|
-      format.html { redirect_to admin_donations_url, notice: 'Donation was successfully destroyed.' }
+      format.html do redirect_to admin_donations_url, flash: {
+        success: 'Donation was successfully destroyed.'
+      }
+      end
       format.json { head :no_content }
     end
   end

app/controllers/admin/lightning_controller.rb

@@ -13,7 +13,7 @@ class Admin::LightningController < Admin::BaseController
   end
 
   def check_feature_enabled
-    if ENV["LNDHUB_ADMIN_UI"].empty?
+    if !Setting.lndhub_admin_enabled?
       flash[:alert] = "Lightning Admin UI not enabled"
       redirect_to admin_root_path and return
     end

app/controllers/admin/settings/registrations_controller.rb

@@ -0,0 +1,38 @@
+class Admin::Settings::RegistrationsController < Admin::SettingsController
+
+  def index
+  end
+
+  def create
+    @errors = ActiveModel::Errors.new(Setting.new)
+
+    setting_params.keys.each do |key|
+      next if setting_params[key].nil?
+
+      setting = Setting.new(var: key)
+      setting.value = setting_params[key].strip
+      unless setting.valid?
+        @errors.merge!(setting.errors)
+      end
+    end
+
+    if @errors.any?
+      render :index
+    end
+
+    setting_params.keys.each do |key|
+      Setting.send("#{key}=", setting_params[key].strip) unless setting_params[key].nil?
+    end
+
+    redirect_to admin_settings_registrations_path, flash: {
+      success: "Settings saved"
+    }
+  end
+
+  private
+
+  def setting_params
+    params.require(:setting).permit(:reserved_usernames)
+  end
+
+end

app/controllers/admin/settings/services_controller.rb

@@ -0,0 +1,9 @@
+class Admin::Settings::ServicesController < Admin::SettingsController
+
+  def index
+  end
+
+  def update
+  end
+
+end

app/controllers/admin/settings_controller.rb

@@ -0,0 +1,12 @@
+class Admin::SettingsController < Admin::BaseController
+  before_action :set_current_section
+
+  def index
+  end
+
+  private
+
+  def set_current_section
+    @current_section = :settings
+  end
+end

app/controllers/invitations_controller.rb

@@ -27,7 +27,10 @@ class InvitationsController < ApplicationController
 
     respond_to do |format|
       if @invitation.save
-        format.html { redirect_to @invitation, notice: 'Invitation was successfully created.' }
+        format.html do redirect_to @invitation, flash: {
+          success: 'Invitation was successfully created.'
+        }
+        end
         format.json { render :show, status: :created, location: @invitation }
       else
         format.html { render :new }

app/models/setting.rb

@@ -0,0 +1,11 @@
+# RailsSettings Model
+class Setting < RailsSettings::Base
+  cache_prefix { "v1" }
+
+  field :reserved_usernames, type: :array, default: %w[
+    account accounts admin donations mail webmaster support
+  ]
+
+  field :lndhub_enabled, default: (ENV["LNDHUB_API_URL"].present?.to_s || "false"), type: :boolean
+  field :lndhub_admin_enabled, default: (ENV["LNDHUB_ADMIN_UI"] || "false"), type: :boolean
+end

app/models/user.rb

@@ -12,6 +12,15 @@ class User < ApplicationRecord
 
   validates_uniqueness_of :cn
   validates_length_of :cn, :minimum => 3
+  validates_format_of :cn, with: /\A([a-z0-9\-])*\z/,
+                           if: Proc.new{ |u| u.cn.present? },
+                           message: "is invalid. Please use only letters, numbers and -"
+  validates_format_of :cn, without: /\A-/,
+                           if: Proc.new{ |u| u.cn.present? },
+                           message: "is invalid. Usernames need to start with a letter."
+  validates_format_of :cn, without: /\A(#{Setting.reserved_usernames.join('|')})\z/i,
+                           message: "has already been taken"
+
   validates_uniqueness_of :email
   validates :email, email: true
 

app/views/admin/settings/registrations/index.html.erb

@@ -0,0 +1,37 @@
+<%= render HeaderComponent.new(title: "Settings") %>
+
+<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/admin_sidenav_settings') do %>
+  <%= form_for(Setting.new, url: admin_settings_registrations_path) do |f| %>
+    <section>
+      <h3>Registrations</h3>
+      <% if @errors && @errors.any? %>
+        <div>
+          <ul>
+            <% @errors.full_messages.each do |msg| %>
+              <li><%= msg %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+
+      <label class="block">
+        <p class="font-bold mb-1">Reserved usernames</p>
+        <p class="text-gray-500">
+          These usernames cannot be registered as accounts:
+        </p>
+        <%= f.text_area :reserved_usernames,
+          value: Setting.reserved_usernames.join("\n"),
+          class: "h-44 mb-2" %>
+        <p class="mb-0 text-sm text-gray-500">
+          One username per line
+        </p>
+      </label>
+    </section>
+
+    <section>
+      <p class="mb-0 pt-6 border-t border-gray-200">
+        <%= f.submit 'Save', class: "btn-md btn-blue w-full md:w-auto" %>
+      </p>
+    </section>
+  <% end %>
+<% end %>

app/views/admin/settings/services/index.html.erb

@@ -0,0 +1,39 @@
+<%= render HeaderComponent.new(title: "Settings") %>
+
+<%= render MainWithSidenavComponent.new(sidenav_partial: 'shared/admin_sidenav_settings') do %>
+  <section>
+    <h3>Lightning Network</h3>
+    <%= form_for(Setting.new, url: admin_settings_services_path) do |f| %>
+      <% if @errors && @errors.any? %>
+        <div>
+          <ul>
+            <% @errors.full_messages.each do |msg| %>
+              <li><%= msg %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
+
+      <ul role="list" class="mt-2 divide-y divide-gray-200">
+        <li class="flex items-center justify-between py-6">
+          <div class="flex flex-col">
+            <label class="font-bold mb-1">Enable LNDHub integration</label>
+            <p class="text-gray-500 mb-0">LNDHub configuration present and wallet features enabled</p>
+          </div>
+          <%= f.check_box :lndhub_enabled, checked: Setting.lndhub_enabled?,
+                          disabled: true,
+                          class: "relative ml-4 inline-flex flex-shrink-0" %>
+        </li>
+        <li class="flex items-center justify-between py-6">
+          <div class="flex flex-col">
+            <label class="font-bold mb-1">Enable LNDHub admin panel</label>
+            <p class="text-gray-500 mb-0">LNDHub database configuration present and admin panel enabled</p>
+          </div>
+          <%= f.check_box :lndhub_admin_enabled, checked: Setting.lndhub_admin_enabled?,
+                          disabled: true,
+                          class: "relative ml-4 inline-flex flex-shrink-0" %>
+        </li>
+      </ul>
+    <% end %>
+  </section>
+<% end %>

app/views/icons/_grid.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-grid"><rect x="3" y="3" width="7" height="7"></rect><rect x="14" y="3" width="7" height="7"></rect><rect x="14" y="14" width="7" height="7"></rect><rect x="3" y="14" width="7" height="7"></rect></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-grid <%= custom_class %>"><rect x="3" y="3" width="7" height="7"></rect><rect x="14" y="3" width="7" height="7"></rect><rect x="14" y="14" width="7" height="7"></rect><rect x="3" y="14" width="7" height="7"></rect></svg>

app/views/shared/_admin_nav.html.erb

@@ -6,7 +6,9 @@
       class: main_nav_class(@current_section, :invitations) %>
 <%= link_to "Donations", admin_donations_path,
       class: main_nav_class(@current_section, :donations) %>
-<% if ENV["LNDHUB_ADMIN_UI"] %>
+<% if Setting.lndhub_admin_enabled? %>
   <%= link_to "Lightning", admin_lightning_path,
         class: main_nav_class(@current_section, :lightning) %>
 <% end %>
+<%= link_to "Settings", admin_settings_registrations_path,
+      class: main_nav_class(@current_section, :settings) %>

app/views/shared/_admin_sidenav_settings.html.erb

@@ -0,0 +1,11 @@
+<%= render SidenavLinkComponent.new(
+  name: "Registrations", path: admin_settings_registrations_path, icon: "user",
+  active: current_page?(admin_settings_registrations_path)
+) %>
+<%= render SidenavLinkComponent.new(
+  name: "Services", path: admin_settings_services_path, icon: "grid",
+  active: current_page?(admin_settings_services_path)
+) %>
+<%= render SidenavLinkComponent.new(
+  name: "Security", path: "#", icon: "shield", disabled: true
+) %>