Skip to content

Commit f208fea

Browse files
pglombardopglombardo
authored
Merge branch 'master' into dependabot/bundler/multi_json-1.18.0
2 parents cd025f7 + 121b467 commit f208fea

12 files changed

Lines changed: 787 additions & 15 deletions

File tree

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gem "lockbox"
7171
gem "terser", "~> 1.2"
7272
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
7373
gem "bootstrap"
74-
gem "json", "~> 2.16" # Legacy carry-over
74+
gem "json", "~> 2.17" # Legacy carry-over
7575

7676
# Use Redis adapter to run Action Cable in production
7777
# gem 'redis', '~> 4.0'
@@ -115,4 +115,4 @@ gem "turnout2024", require: "turnout"
115115
gem "mission_control-jobs", "~> 1.1.0"
116116
gem "overmind", "~> 2.5", group: :development
117117

118-
gem "dotenv", "~> 3.1"
118+
gem "dotenv", "~> 3.2"

‎Gemfile.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ GEM
9090
activesupport (>= 5.0)
9191
ast (2.4.3)
9292
aws-eventstream (1.4.0)
93-
aws-partitions (1.1188.0)
93+
aws-partitions (1.1190.0)
9494
aws-sdk-core (3.239.2)
9595
aws-eventstream (~> 1, >= 1.3.0)
9696
aws-partitions (~> 1, >= 1.992.0)
@@ -102,7 +102,7 @@ GEM
102102
aws-sdk-kms (1.118.0)
103103
aws-sdk-core (~> 3, >= 3.239.1)
104104
aws-sigv4 (~> 1.5)
105-
aws-sdk-s3 (1.205.0)
105+
aws-sdk-s3 (1.206.0)
106106
aws-sdk-core (~> 3, >= 3.234.0)
107107
aws-sdk-kms (~> 1)
108108
aws-sigv4 (~> 1.5)
@@ -177,7 +177,7 @@ GEM
177177
rails-i18n
178178
digest-crc (0.7.0)
179179
rake (>= 12.0.0, < 14.0.0)
180-
dotenv (3.1.8)
180+
dotenv (3.2.0)
181181
drb (2.2.3)
182182
ed25519 (1.4.0)
183183
erb (6.0.0)
@@ -339,7 +339,7 @@ GEM
339339
jmespath (1.6.2)
340340
jsbundling-rails (1.3.1)
341341
railties (>= 6.0.0)
342-
json (2.16.0)
342+
json (2.17.0)
343343
jwt (3.1.2)
344344
base64
345345
kamal (2.9.0)
@@ -805,7 +805,7 @@ DEPENDENCIES
805805
debug
806806
devise (>= 4.9.0)
807807
devise-i18n
808-
dotenv (~> 3.1)
808+
dotenv (~> 3.2)
809809
erb_lint (~> 0.9.0)
810810
foreman
811811
google-cloud-storage (~> 1.57)
@@ -815,7 +815,7 @@ DEPENDENCIES
815815
invisible_captcha (~> 2.3)
816816
jbuilder
817817
jsbundling-rails
818-
json (~> 2.16)
818+
json (~> 2.17)
819819
kamal
820820
kaminari (~> 1.2)
821821
kramdown

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.63.6
1+
1.64.1

‎app/controllers/users/registrations_controller.rb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
3030
# end
3131

3232
# DELETE /resource
33-
# def destroy
34-
# super
35-
# end
33+
def destroy
34+
# Call Devise's default destroy behavior
35+
super
36+
end
3637

3738
# GET /resource/cancel
3839
# Forces the session data which is usually expired after sign

‎app/views/admin/_javascript.html.erb‎

Lines changed: 309 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,313 @@
3434
background-color: rgba(13, 110, 253, 0.1);
3535
font-weight: 600;
3636
}
37+
38+
/* Dark Theme Support */
39+
@media (prefers-color-scheme: dark) {
40+
/* Body and Background */
41+
body {
42+
background-color: #121212 !important;
43+
color: #e9ecef !important;
44+
}
45+
46+
body.bg-light {
47+
background-color: #121212 !important;
48+
}
49+
50+
/* Sidebar */
51+
aside.bg-white {
52+
background-color: #1e1e1e !important;
53+
border-color: #2d2d2d !important;
54+
}
55+
56+
/* Header/Top Bar */
57+
header.bg-white {
58+
background-color: #1e1e1e !important;
59+
border-color: #2d2d2d !important;
60+
}
61+
62+
/* Navigation Links - Default State */
63+
.text-dark {
64+
color: #e9ecef !important;
65+
}
66+
67+
.text-muted {
68+
color: #adb5bd !important;
69+
}
70+
71+
/* Headings */
72+
h1, h2, h3, h4, h5, h6,
73+
.h1, .h2, .h3, .h4, .h5, .h6 {
74+
color: #e9ecef !important;
75+
}
76+
77+
/* Cards */
78+
.card {
79+
background-color: #1e1e1e !important;
80+
border-color: #2d2d2d !important;
81+
color: #e9ecef !important;
82+
}
83+
84+
.card-body {
85+
background-color: #1e1e1e !important;
86+
}
87+
88+
/* Alerts */
89+
.alert-danger {
90+
background-color: #2d1f1f !important;
91+
border-color: #5c3333 !important;
92+
color: #f8d7da !important;
93+
}
94+
95+
.alert-info {
96+
background-color: #1a2730 !important;
97+
border-color: #2d4a5c !important;
98+
color: #cfe2ff !important;
99+
}
100+
101+
.alert-warning {
102+
background-color: #332b1f !important;
103+
border-color: #664d26 !important;
104+
color: #fff3cd !important;
105+
}
106+
107+
.alert-heading {
108+
color: inherit !important;
109+
}
110+
111+
.text-danger-emphasis,
112+
.text-info-emphasis,
113+
.text-warning-emphasis,
114+
.text-primary-emphasis {
115+
color: inherit !important;
116+
}
117+
118+
/* Backgrounds */
119+
.bg-light {
120+
background-color: #2d2d2d !important;
121+
}
122+
123+
.bg-white {
124+
background-color: #1e1e1e !important;
125+
}
126+
127+
.bg-primary.bg-gradient {
128+
background-color: #4169E1 !important;
129+
}
130+
131+
/* Borders */
132+
.border-bottom,
133+
.border-end,
134+
.border {
135+
border-color: #2d2d2d !important;
136+
}
137+
138+
.border-primary {
139+
border-color: #4169E1 !important;
140+
}
141+
142+
/* Hover States */
143+
.hover-bg-light:hover {
144+
background-color: rgba(255, 255, 255, 0.1) !important;
145+
}
146+
147+
/* Active States */
148+
.bg-primary.bg-opacity-10 {
149+
background-color: rgba(65, 105, 225, 0.2) !important;
150+
}
151+
152+
.bg-success.bg-opacity-10 {
153+
background-color: rgba(119, 179, 0, 0.2) !important;
154+
}
155+
156+
.bg-warning.bg-opacity-10 {
157+
background-color: rgba(255, 136, 0, 0.2) !important;
158+
}
159+
160+
.bg-info.bg-opacity-10 {
161+
background-color: rgba(153, 51, 204, 0.2) !important;
162+
}
163+
164+
.bg-danger.bg-opacity-10 {
165+
background-color: rgba(204, 0, 0, 0.2) !important;
166+
}
167+
168+
/* Text Colors for Active/Emphasis States */
169+
.text-primary {
170+
color: #6495ed !important;
171+
}
172+
173+
.text-success {
174+
color: #77b300 !important;
175+
}
176+
177+
.text-warning {
178+
color: #f80 !important;
179+
}
180+
181+
.text-info {
182+
color: #93c !important;
183+
}
184+
185+
.text-danger {
186+
color: #ff6b6b !important;
187+
}
188+
189+
/* Buttons */
190+
.btn-outline-secondary {
191+
color: #adb5bd !important;
192+
border-color: #495057 !important;
193+
}
194+
195+
.btn-outline-secondary:hover {
196+
background-color: #495057 !important;
197+
color: #fff !important;
198+
}
199+
200+
.btn-outline-primary {
201+
color: #6495ed !important;
202+
border-color: #4169E1 !important;
203+
}
204+
205+
.btn-outline-primary:hover {
206+
background-color: #4169E1 !important;
207+
color: #fff !important;
208+
}
209+
210+
.btn-outline-success {
211+
color: #77b300 !important;
212+
border-color: #77b300 !important;
213+
}
214+
215+
.btn-outline-success:hover {
216+
background-color: #77b300 !important;
217+
color: #fff !important;
218+
}
219+
220+
.btn-primary {
221+
background-color: #4169E1 !important;
222+
border-color: #4169E1 !important;
223+
}
224+
225+
.btn-warning {
226+
background-color: #f80 !important;
227+
border-color: #f80 !important;
228+
color: #000 !important;
229+
}
230+
231+
/* Badges */
232+
.badge.bg-warning {
233+
background-color: #f80 !important;
234+
color: #000 !important;
235+
}
236+
237+
.badge.bg-primary {
238+
background-color: #4169E1 !important;
239+
}
240+
241+
.badge.bg-success {
242+
background-color: #77b300 !important;
243+
}
244+
245+
.badge.bg-danger {
246+
background-color: #c00 !important;
247+
}
248+
249+
/* Form Elements */
250+
input[type="text"],
251+
input[type="email"],
252+
input[type="password"],
253+
input[type="number"],
254+
input[type="datetime-local"],
255+
select,
256+
textarea {
257+
background-color: #2d2d2d !important;
258+
border-color: #495057 !important;
259+
color: #e9ecef !important;
260+
}
261+
262+
input[type="text"]:focus,
263+
input[type="email"]:focus,
264+
input[type="password"]:focus,
265+
input[type="number"]:focus,
266+
input[type="datetime-local"]:focus,
267+
select:focus,
268+
textarea:focus {
269+
background-color: #2d2d2d !important;
270+
border-color: #6495ed !important;
271+
color: #e9ecef !important;
272+
}
273+
274+
/* Tables */
275+
.table {
276+
color: #e9ecef !important;
277+
}
278+
279+
.table thead th {
280+
background-color: #282828 !important;
281+
color: #e9ecef !important;
282+
border-color: #2d2d2d !important;
283+
}
284+
285+
.table > :not(caption) > * > * {
286+
background-color: #282828 !important;
287+
color: #e9ecef !important;
288+
border-color: #2d2d2d !important;
289+
}
290+
291+
.table-striped > tbody > tr:nth-of-type(2n+1) > * {
292+
background-color: #212529 !important;
293+
color: #e9ecef !important;
294+
}
295+
296+
/* Links */
297+
a {
298+
color: #6495ed !important;
299+
}
300+
301+
a:hover {
302+
color: #5080e0 !important;
303+
}
304+
305+
/* Breadcrumb */
306+
.breadcrumb-item a {
307+
color: #adb5bd !important;
308+
}
309+
310+
.breadcrumb-item.active {
311+
color: #e9ecef !important;
312+
}
313+
314+
/* SVG Icons */
315+
svg {
316+
filter: brightness(1.2);
317+
}
318+
319+
/* Specific overrides for navigation */
320+
nav a.text-decoration-none {
321+
color: #adb5bd !important;
322+
}
323+
324+
nav a.text-decoration-none:hover {
325+
color: #e9ecef !important;
326+
}
327+
328+
/* Footer */
329+
footer a {
330+
color: #adb5bd !important;
331+
}
332+
333+
footer a:hover {
334+
color: #e9ecef !important;
335+
}
336+
337+
/* Display headings */
338+
.display-4 {
339+
color: #e9ecef !important;
340+
}
341+
342+
.lead {
343+
color: #adb5bd !important;
344+
}
345+
}
37346
</style>

0 commit comments

Comments
 (0)