keystone_ui-colors 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e19d4ac1360f6f858edb7466444b610d3aa41f27c41c770f9d2b1674e51d04b
-  data.tar.gz: 53bc07b0653b12cd9b36f9b94908a6aebdb8cc79370618c0ba70f22a27fdf21a
+  metadata.gz: 38f16013fcde298d6fcd2f84959388d11b7841ed2a6b11c3849ef61cd06cbb00
+  data.tar.gz: ab00d43dc97d34bffc137fbbd3833e9ef0b369e888d059d3fbd9a85349264e17
 SHA512:
-  metadata.gz: e9e76f7316025de47b02b16e490c674dbacc7fd2eb43d0122c9a84b1d60c0350bda35a4514993a550ffa28e4b624ef7961cb72aee95bc7aeb62f576e5a3675cb
-  data.tar.gz: b2f238d93c3fd4384d99e94891ef4afff962dded85eb3809f6fd8ac111eb17c9513e9cda2d61f102da557deef1f9093a1f4d46598c9e3058cbd81d8d9365db79
+  metadata.gz: 6eace9b9bdd5bd5bfc6c3688d2e814f96e8b3a270b4d3f7403a87a325d9cc463249f4b760fbb747dc57e99ef426fff461b6041d34520a11cb3ccd928a6288f8f
+  data.tar.gz: a92a25c9de14ce01b44938358c1be525fc713a09c123e42850a6573d8c6c85cdc09c6f6eb07c554d615947c9cbaf95743836f41e6caef1890afb15631138faa3

data/README.md

@@ -184,8 +184,11 @@ or for the host's default when the account's look is not registered either. The
 settings page then shows no look selected and still saves. While an account's colours apply, the
 page still shows the user's own look.
 
-The colours settings page lists every registered look, with the user's current
-look chosen, and saves the one they pick. A name the host does not register is
+The colours settings page lists the app's own look first and then every
+registered look, with the user's current look chosen, and saves the one they
+pick. The app's own look is labelled "Classic" unless the app sets
+`app_look_label`, is chosen when no look is saved, and saving it clears the saved
+look, so the page goes back to the account's look or the app's default. A name the host does not register is
 refused with a message and nothing is stored. With no looks registered the page
 shows no look choice.
 

data/app/models/keystone_ui/colors/colour_choice.rb

@@ -46,13 +46,16 @@ module KeystoneUi
       private
 
       def own_preference
-        @own_preference ||= ThemePreference.find_by(owner: @person)
+        return @own_preference if defined?(@own_preference)
+
+        @own_preference = ThemePreference.find_by(owner: @person)
       end
 
       def account_preference
         return nil unless @account
+        return @account_preference if defined?(@account_preference)
 
-        @account_preference ||= ThemePreference.find_by(owner: @account)
+        @account_preference = ThemePreference.find_by(owner: @account)
       end
     end
   end

data/app/models/keystone_ui/colors/pick_colours.rb

@@ -12,7 +12,7 @@ module KeystoneUi
 
       def call
         preference.assign_attributes(chosen_colours)
-        preference.look = @values[:look] if @values.key?(:look) && @look_allowed
+        preference.look = @values[:look].presence if @values.key?(:look) && @look_allowed
 
         return Refusal.new(preference.errors.full_messages.first) unless preference.save
 

data/app/views/keystone_ui/colors/settings/_looks.html.erb

@@ -1,7 +1,8 @@
 <%= ui_section(title: "Look", spacing: :sm) do %>
   <div style="display: flex; flex-wrap: wrap; gap: 0.5rem;">
+    <%= ui_radio_card(name: "look", value: "", label: KeystoneUi::Colors.configuration.app_look_label, checked: preference.look.nil?) %>
     <% KeystoneUi.configuration.looks.each_key do |look| %>
-      <%= ui_radio_card(name: "look", value: look, label: look.humanize, checked: (preference.look || KeystoneUi.configuration.default_look) == look) %>
+      <%= ui_radio_card(name: "look", value: look, label: look.humanize, checked: preference.look == look) %>
     <% end %>
   </div>
 <% end %>

data/lib/keystone_ui/colors/configuration.rb

@@ -3,7 +3,7 @@
 module KeystoneUi
   module Colors
     class Configuration
-      attr_accessor :current_owner_method, :authentication_method, :default_template, :default_accent, :default_surface, :default_mode, :default_background, :default_text, :account_colors, :current_account_method, :layout, :user_looks, :account_looks
+      attr_accessor :current_owner_method, :authentication_method, :default_template, :default_accent, :default_surface, :default_mode, :default_background, :default_text, :account_colors, :current_account_method, :layout, :user_looks, :account_looks, :app_look_label
 
       def initialize
         @current_owner_method = :current_user
@@ -19,6 +19,7 @@ module KeystoneUi
         @layout = "application"
         @user_looks = true
         @account_looks = true
+        @app_look_label = "Classic"
       end
     end
 

data/lib/keystone_ui/colors/version.rb

@@ -2,6 +2,6 @@
 
 module KeystoneUi
   module Colors
-    VERSION = "0.5.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keystone_ui-colors
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tyler Schneider