card-mod-account 0.15.0 → 0.15.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6746b209fb026dba9a6d3954907e85d8e2d7fe41d0f3b19e7abccbe564e75b19
4
- data.tar.gz: 84fa785cfd4022c10b6b491aaacdfa352903f86c9a2f2e1379c352508b74df51
3
+ metadata.gz: 1f0b2eb3102fc1620cdba0891d44b6f280fc5b59d63316d10fa25cf14d040d2f
4
+ data.tar.gz: 6f7eafcffab4bd8690f92cb2bccee34ff278d2a21af45e5fa4ad97ba563b0e0f
5
5
  SHA512:
6
- metadata.gz: 47734b784a923c88b2720564c86b55ef8c335f84beaf1d6ccb40e90b8fa786a45e0497d32f9f12f41c3f62778ca2d9f06426803f8754b0a911be451e2372904c
7
- data.tar.gz: c50dbdc1ef16286cc8c80957fdf30e8ad7e5c6bf176838b87377bb086bcb20bf21d6e81fc9eb5abe9efd37fcd650541e2d31031c09e93c88a42db9605dc4cedb
6
+ metadata.gz: fec1d4725ccfdaaf3e6150eaa665e46762fcc8647e031badd84d8dd2f7bca3924686bc7d2b9740e10a8af6372f2c7adb76857a66bafadc68726ac8e60d088ee1
7
+ data.tar.gz: f13e4f3cb780c55546bd6b4f7d84442957edb41de1bd2d7a35c70151a8180314b04704ff4502d75d82d421e3c679ea0c4a4161e029dc4b9ee9b2203918df5914
@@ -1,5 +1,25 @@
1
1
  /*----------- (Account Request)--------------*/
2
2
 
3
+ .SELF-Xsignin {
4
+ > .d0-card-body {
5
+ display: flex;
6
+ justify-content: center;
7
+ > .card-form {
8
+ width: 400px;
9
+ max-width: 400px;
10
+ }
11
+ .signin-buttons > div {
12
+ margin-bottom: 1em;
13
+ button {
14
+ width: 100%
15
+ }
16
+ }
17
+ .signup-button {
18
+ text-align: center;
19
+ }
20
+ }
21
+ }
22
+
3
23
  .invite-links {
4
24
  padding: 10px;
5
25
  margin-top: 10px;
@@ -31,6 +51,6 @@
31
51
  }
32
52
 
33
53
  // FIXME - decko should handle better
34
- #my-card-link {
35
- padding-right: 0.6em;
36
- }
54
+ //#my-card-link {
55
+ // padding-right: 0.6em;
56
+ //}
@@ -41,10 +41,8 @@
41
41
  or_sign_up: '...oder registrieren!'
42
42
  reset_password: PASSWORT ZURÜCKSETZEN
43
43
  forgot_password: Passwort vergessen
44
- reset_my_password: Setze mein Passwort zurück
45
44
  check_email: Sie erhalten in Kürze eine E-Mail mit einem Link um ihr Passwort zurück zu setzen.
46
45
  error_unknown_email: Unbekannte E-Mail-Adresse.
47
- error_not_active: Entschuldigung, der Account ist nicht aktiviert.
48
46
  error_wrong_password: Falsches Passwort
49
47
  error_blank: fehlt
50
48
  email_missing: E-Mail-Addresse fehlt
@@ -86,7 +84,7 @@ de:
86
84
  account_deny_email_restricted: E-Mail-Adresse ist nur für Administratoren und Kontoinhaber
87
85
  account_deny_not_change_own_account: den Status des eigenen Kontos ändern
88
86
  account_email_missing: E-Mail darf nicht frei bleiben
89
- account_encrypted: verschlüssel
87
+ account_encrypted: verschlüsselt
90
88
  account_error_blank: darf nicht frei bleiben
91
89
  account_error_invalid_address: muss eine gültige Adresse sein
92
90
  account_error_not_active: Sorry, dieses Konto ist nicht aktiviert
@@ -103,7 +101,6 @@ de:
103
101
  account_password_length: muss mindestens 4 Zeichen lang sein
104
102
  account_password_missing: Passwort muss angegeben werden
105
103
  account_private_data: Private Daten
106
- account_reset_my_password: Passwort zurücksetzen
107
104
  account_reset_password: Password Zurücksetzen
108
105
  account_search_email_duplicate: E-Mail-Duplikat? (%{content})
109
106
  account_sign_in: Anmelden
@@ -111,4 +108,4 @@ de:
111
108
  account_sign_out: Abmelden
112
109
  account_sign_up: Registrieren
113
110
  account_sorry_email_reset:
114
- Sorry, %{error_msg}. Bitte prüfen Sie Ihre E-Mail auf einen neuen Link zum Zurücksetzen des Passworts.
111
+ Sorry, %{error_msg}. Bitte prüfen Sie Ihre E-Mail auf einen neuen Link zum Zurücksetzen des Passworts.
@@ -20,8 +20,7 @@ en:
20
20
  account_password_length: must be at least 4 characters
21
21
  account_password_missing: password can't be blank
22
22
  account_private_data: Private data
23
- account_reset_my_password: Reset my password
24
- account_reset_password: Reset Password
23
+ account_reset_password: Reset password
25
24
  account_search_email_duplicate: email duplicate? (%{content})
26
25
  account_sign_in: Sign in
27
26
  account_sign_in_title: Sign In
@@ -0,0 +1,10 @@
1
+ .signin-fields
2
+ = _render_content_formgroups
3
+
4
+ .form-group.signin-buttons
5
+ .reset-password-link
6
+ = reset_password_link
7
+ .signin-button
8
+ = signin_button
9
+ .signup-button
10
+ = signup_link
data/set/self/signin.rb CHANGED
@@ -22,7 +22,7 @@ event :signout, :validate, on: :delete do
22
22
  abort :success
23
23
  end
24
24
 
25
- # triggered by clicking "Reset my Password", this sends out the verification password
25
+ # triggered by clicking "Reset Password", this sends out the verification password
26
26
  # and aborts (does not sign in)
27
27
  event :send_reset_password_token, before: :signin, on: :update, trigger: :required do
28
28
  aborting do
@@ -112,14 +112,14 @@ def signin_error_key account
112
112
  end
113
113
 
114
114
  format :html do
115
- view :core, cache: :never do
115
+ before :core do
116
116
  voo.edit_structure = [signin_field(:email), signin_field(:password)]
117
+ end
118
+
119
+ view :core, cache: :never do
117
120
  with_nest_mode :edit do
118
121
  card_form :update, recaptcha: :off, success: signin_success do
119
- [
120
- _render_content_formgroups,
121
- _render_signin_buttons
122
- ]
122
+ haml :core
123
123
  end
124
124
  end
125
125
  end
@@ -150,16 +150,6 @@ format :html do
150
150
  frame { t :account_check_email }
151
151
  end
152
152
 
153
- view :signin_buttons do
154
- class_up "button-form-group", "signin-buttons justify-content-between"
155
- button_formgroup do
156
- [
157
- wrap_with("div", class: "pe-2") { [signin_button, signup_link] },
158
- reset_password_link
159
- ]
160
- end
161
- end
162
-
163
153
  # FORGOT PASSWORD
164
154
  view :edit do
165
155
  reset_password_voo
@@ -173,7 +163,7 @@ format :html do
173
163
  end
174
164
 
175
165
  view :edit_buttons do
176
- button_tag t(:account_reset_my_password),
166
+ button_tag t(:account_reset_password),
177
167
  situation: "primary", class: "_close-modal-on-success"
178
168
  end
179
169
 
@@ -186,13 +176,13 @@ format :html do
186
176
  end
187
177
 
188
178
  def signup_link
189
- subformat(Card[:account_links]).render! :sign_up, title: t(:account_or_sign_up)
179
+ link_to_card :signup, t(:account_or_sign_up),
180
+ path: { action: :new, mark: :signup }
190
181
  end
191
182
 
192
183
  def reset_password_link
193
184
  link_to_view :edit, t(:account_reset_password),
194
- path: { slot: { hide: :bridge_link } },
195
- class: "btn btn-secondary btn-reset-password"
185
+ path: { slot: { hide: :bridge_link } }
196
186
  end
197
187
 
198
188
  def edit_view_hidden
@@ -9,7 +9,7 @@ format :html do
9
9
  end
10
10
 
11
11
  view :content_formgroups do
12
- [account_formgroups, (card.structure ? edit_slot : "")].join
12
+ [account_formgroups, (multi_card_editor? ? multi_card_edit(true) : "")].join
13
13
  end
14
14
 
15
15
  view :new_buttons, cache: :never do
@@ -29,6 +29,7 @@ format :html do
29
29
  @body = process_content _render_raw
30
30
  end
31
31
 
32
+ # TODO: localize
32
33
  def signup_line
33
34
  ["<strong>#{safe_name}</strong>",
34
35
  ("was" if invited?),
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card-mod-account
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0
4
+ version: 0.15.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2023-01-04 00:00:00.000000000 Z
13
+ date: 2023-03-29 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: card
@@ -18,84 +18,84 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.105.0
21
+ version: 1.105.1
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 1.105.0
28
+ version: 1.105.1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: card-mod-email
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.15.0
35
+ version: 0.15.1.1
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.15.0
42
+ version: 0.15.1.1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: card-mod-permissions
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.15.0
49
+ version: 0.15.1.1
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.15.0
56
+ version: 0.15.1.1
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: card-mod-list
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - '='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.15.0
63
+ version: 0.15.1.1
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.15.0
70
+ version: 0.15.1.1
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: card-mod-integrate
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.15.0
77
+ version: 0.15.1.1
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.15.0
84
+ version: 0.15.1.1
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: card-mod-edit
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.15.0
91
+ version: 0.15.1.1
92
92
  type: :runtime
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - '='
97
97
  - !ruby/object:Gem::Version
98
- version: 0.15.0
98
+ version: 0.15.1.1
99
99
  description: ''
100
100
  email:
101
101
  - info@decko.org
@@ -105,10 +105,10 @@ extra_rdoc_files: []
105
105
  files:
106
106
  - README.md
107
107
  - assets/style/account.scss
108
+ - config/locales/de.yml
109
+ - config/locales/en.yml
108
110
  - data/real.yml
109
111
  - db/migrate_core_cards/20220815112551_move_roles.rb
110
- - locales/de.yml
111
- - locales/en.yml
112
112
  - set/abstract/account_field.rb
113
113
  - set/abstract/accountable.rb
114
114
  - set/all/account.rb
@@ -122,6 +122,7 @@ files:
122
122
  - set/right/status.rb
123
123
  - set/self/role.rb
124
124
  - set/self/signin.rb
125
+ - set/self/signin/core.haml
125
126
  - set/type/role.rb
126
127
  - set/type/signup.rb
127
128
  - set/type/signup/core.haml