card-mod-account 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6746b209fb026dba9a6d3954907e85d8e2d7fe41d0f3b19e7abccbe564e75b19
-  data.tar.gz: 84fa785cfd4022c10b6b491aaacdfa352903f86c9a2f2e1379c352508b74df51
+  metadata.gz: 7b83b1dace27f150876facb4ed43c0a10d8ec9bece44db60bf1f9d72a5a5077f
+  data.tar.gz: b2a168fb461984653318cddd41107ecdf05daa26711677ee0ba3feee4200f530
 SHA512:
-  metadata.gz: 47734b784a923c88b2720564c86b55ef8c335f84beaf1d6ccb40e90b8fa786a45e0497d32f9f12f41c3f62778ca2d9f06426803f8754b0a911be451e2372904c
-  data.tar.gz: c50dbdc1ef16286cc8c80957fdf30e8ad7e5c6bf176838b87377bb086bcb20bf21d6e81fc9eb5abe9efd37fcd650541e2d31031c09e93c88a42db9605dc4cedb
+  metadata.gz: c9a9d6bfcddf2b26f682fa266ead5c99d9834dc39475c9e19c106b573086c8a787f3a0ad25e9da552f365a54759a841d187e4e8a371e22d242508aacb8955be1
+  data.tar.gz: 51ec9397ba5326df51c94f4e73c378b58d273a23ca3d2a74b1b1f8c55b16f1a003ce53c2598fff1a4c0c159302f62c8b8afc34608c529ed104ad968cf72dec78

data/assets/style/account.scss

@@ -1,5 +1,25 @@
 /*----------- (Account Request)--------------*/
 
+.SELF-Xsignin {
+  > .d0-card-body {
+    display: flex;
+    justify-content: center;
+    > .card-form {
+      width: 400px;
+      max-width: 400px;
+    }
+    .signin-buttons > div {
+      margin-bottom: 1em;
+      button {
+        width: 100%
+      }
+    }
+    .signup-button {
+      text-align: center;
+    }
+  }
+}
+
 .invite-links {
   padding: 10px;
   margin-top: 10px;
@@ -31,6 +51,6 @@
 }
 
 // FIXME - decko should handle better
-#my-card-link {
-  padding-right: 0.6em;
-}
+//#my-card-link {
+//  padding-right: 0.6em;
+//}

data/{locales → config/locales}/de.yml

@@ -41,10 +41,8 @@
         or_sign_up: '...oder registrieren!'
         reset_password: PASSWORT ZURÜCKSETZEN
         forgot_password: Passwort vergessen
-        reset_my_password: Setze mein Passwort zurück
         check_email: Sie erhalten in Kürze eine E-Mail mit einem Link um ihr Passwort zurück zu setzen.
         error_unknown_email: Unbekannte E-Mail-Adresse.
-        error_not_active: Entschuldigung, der Account ist nicht aktiviert.
         error_wrong_password: Falsches Passwort
         error_blank: fehlt
         email_missing: E-Mail-Addresse fehlt
@@ -86,7 +84,7 @@ de:
   account_deny_email_restricted: E-Mail-Adresse ist nur für Administratoren und Kontoinhaber
   account_deny_not_change_own_account: den Status des eigenen Kontos ändern
   account_email_missing: E-Mail darf nicht frei bleiben
-  account_encrypted: verschlüssel
+  account_encrypted: verschlüsselt
   account_error_blank: darf nicht frei bleiben
   account_error_invalid_address: muss eine gültige Adresse sein
   account_error_not_active: Sorry, dieses Konto ist nicht aktiviert
@@ -103,7 +101,6 @@ de:
   account_password_length: muss mindestens 4 Zeichen lang sein
   account_password_missing: Passwort muss angegeben werden
   account_private_data: Private Daten
-  account_reset_my_password: Passwort zurücksetzen
   account_reset_password: Password Zurücksetzen
   account_search_email_duplicate: E-Mail-Duplikat? (%{content})
   account_sign_in: Anmelden
@@ -111,4 +108,4 @@ de:
   account_sign_out: Abmelden
   account_sign_up: Registrieren
   account_sorry_email_reset:
-    Sorry, %{error_msg}. Bitte prüfen Sie Ihre E-Mail auf einen neuen Link zum Zurücksetzen des Passworts.
+    Sorry, %{error_msg}. Bitte prüfen Sie Ihre E-Mail auf einen neuen Link zum Zurücksetzen des Passworts.

data/{locales → config/locales}/en.yml

@@ -20,8 +20,7 @@ en:
   account_password_length: must be at least 4 characters
   account_password_missing: password can't be blank
   account_private_data: Private data
-  account_reset_my_password: Reset my password
-  account_reset_password: Reset Password
+  account_reset_password: Reset password
   account_search_email_duplicate: email duplicate? (%{content})
   account_sign_in: Sign in
   account_sign_in_title: Sign In

data/set/self/signin/core.haml

@@ -0,0 +1,10 @@
+.signin-fields
+  = _render_content_formgroups
+
+.form-group.signin-buttons
+  .reset-password-link
+    = reset_password_link
+  .signin-button
+    = signin_button
+  .signup-button
+    = signup_link

data/set/self/signin.rb

@@ -22,7 +22,7 @@ event :signout, :validate, on: :delete do
   abort :success
 end
 
-# triggered by clicking "Reset my Password", this sends out the verification password
+# triggered by clicking "Reset Password", this sends out the verification password
 # and aborts (does not sign in)
 event :send_reset_password_token, before: :signin, on: :update, trigger: :required do
   aborting do
@@ -112,14 +112,14 @@ def signin_error_key account
 end
 
 format :html do
-  view :core, cache: :never do
+  before :core do
     voo.edit_structure = [signin_field(:email), signin_field(:password)]
+  end
+
+  view :core, cache: :never do
     with_nest_mode :edit do
       card_form :update, recaptcha: :off, success: signin_success do
-        [
-          _render_content_formgroups,
-          _render_signin_buttons
-        ]
+        haml :core
       end
     end
   end
@@ -150,16 +150,6 @@ format :html do
     frame { t :account_check_email }
   end
 
-  view :signin_buttons do
-    class_up "button-form-group", "signin-buttons justify-content-between"
-    button_formgroup do
-      [
-        wrap_with("div", class: "pe-2") { [signin_button, signup_link] },
-        reset_password_link
-      ]
-    end
-  end
-
   # FORGOT PASSWORD
   view :edit do
     reset_password_voo
@@ -173,7 +163,7 @@ format :html do
   end
 
   view :edit_buttons do
-    button_tag t(:account_reset_my_password),
+    button_tag t(:account_reset_password),
                situation: "primary", class: "_close-modal-on-success"
   end
 
@@ -186,13 +176,13 @@ format :html do
   end
 
   def signup_link
-    subformat(Card[:account_links]).render! :sign_up, title: t(:account_or_sign_up)
+    link_to_card :signup, t(:account_or_sign_up),
+                 path: { action: :new, mark: :signup }
   end
 
   def reset_password_link
     link_to_view :edit, t(:account_reset_password),
-                 path: { slot: { hide: :bridge_link } },
-                 class: "btn btn-secondary btn-reset-password"
+                 path: { slot: { hide: :bridge_link } }
   end
 
   def edit_view_hidden

data/set/type/signup/views.rb

@@ -9,7 +9,7 @@ format :html do
   end
 
   view :content_formgroups do
-    [account_formgroups, (card.structure ? edit_slot : "")].join
+    [account_formgroups, (multi_card_editor? ? multi_card_edit(true) : "")].join
   end
 
   view :new_buttons, cache: :never do
@@ -29,6 +29,7 @@ format :html do
     @body = process_content _render_raw
   end
 
+  # TODO: localize
   def signup_line
     ["<strong>#{safe_name}</strong>",
      ("was" if invited?),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-account
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,84 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-email
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-integrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -105,10 +105,10 @@ extra_rdoc_files: []
 files:
 - README.md
 - assets/style/account.scss
+- config/locales/de.yml
+- config/locales/en.yml
 - data/real.yml
 - db/migrate_core_cards/20220815112551_move_roles.rb
-- locales/de.yml
-- locales/en.yml
 - set/abstract/account_field.rb
 - set/abstract/accountable.rb
 - set/all/account.rb
@@ -122,6 +122,7 @@ files:
 - set/right/status.rb
 - set/self/role.rb
 - set/self/signin.rb
+- set/self/signin/core.haml
 - set/type/role.rb
 - set/type/signup.rb
 - set/type/signup/core.haml