From efb6b69626245ca31905bd4ef74c61f25f3a7adf Mon Sep 17 00:00:00 2001 From: nishuldhakar Date: Thu, 12 Feb 2026 21:53:40 +0530 Subject: [PATCH 1/4] Improve storage bar contrast to meet WCAG 3:1 requirement --- client/styles/abstracts/_functions.scss | 2 ++ client/styles/abstracts/_variables.scss | 15 ++++++++++----- client/styles/components/_asset-size.scss | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/styles/abstracts/_functions.scss b/client/styles/abstracts/_functions.scss index a4756f0803..71921bad0f 100644 --- a/client/styles/abstracts/_functions.scss +++ b/client/styles/abstracts/_functions.scss @@ -1,3 +1,5 @@ +@use "variables"; + @function map-fetch($map, $keys) { $key: nth($keys, 1); $length: length($keys); diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index 361ad57a38..692d1a06b4 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -95,9 +95,11 @@ $themes: ( table-button-hover-color: $lightest, table-button-background-hover-color: $p5js-pink, - progress-bar-background-color: $middle-gray, + progress-bar-background-color: $light, progress-bar-active-color: $p5js-active-pink, + progress-bar-border-color:$middle-gray, + form-title-color: rgba(51, 51, 51, 0.87), form-secondary-title-color: $medium-dark, form-input-text-color: $dark, @@ -196,9 +198,11 @@ $themes: ( table-button-hover-color: $lightest, table-button-background-hover-color: $p5js-pink, - progress-bar-background-color: $middle-gray, + progress-bar-background-color: $darker, progress-bar-active-color: $p5js-active-pink, + progress-bar-border-color:$middle-dark, + form-title-color: $lightest, form-secondary-title-color: $medium-light, form-navigation-options-color: $middle-light, @@ -295,8 +299,10 @@ $themes: ( table-button-hover-color: $dark, table-button-background-hover-color: $yellow, - progress-bar-background-color: $middle-gray, - progress-bar-active-color: $p5js-active-pink, + progress-bar-background-color: $darker, + progress-bar-active-color: $yellow, + + progress-bar-border-color:$middle-light, form-title-color: $lightest, form-secondary-title-color: $medium-light, @@ -333,4 +339,3 @@ $themes: ( $toast-background-color: $medium-dark; $toast-text-color: $lightest; - diff --git a/client/styles/components/_asset-size.scss b/client/styles/components/_asset-size.scss index d664415c37..67f62f8029 100644 --- a/client/styles/components/_asset-size.scss +++ b/client/styles/components/_asset-size.scss @@ -20,6 +20,7 @@ @include themify() { background-color: getThemifyVariable('progress-bar-background-color'); + border-color: getThemifyVariable('progress-bar-border-color'); } } From d6bec1ab2cd83c5c13a16cfd75d631cbdbec45b1 Mon Sep 17 00:00:00 2001 From: nishuldhakar Date: Thu, 12 Feb 2026 23:39:10 +0530 Subject: [PATCH 2/4] fix(test): resolve MongoMemoryServer timeout + correct ApiKeyDocument typing --- server/models/__test__/user.test.ts | 15 ++++++++------- server/types/apiKey.ts | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server/models/__test__/user.test.ts b/server/models/__test__/user.test.ts index 2abc77873c..92c5fceebd 100644 --- a/server/models/__test__/user.test.ts +++ b/server/models/__test__/user.test.ts @@ -8,19 +8,20 @@ jest.setTimeout(30000); // give enough time for MongoMemoryServer let mongoServer: MongoMemoryServer; beforeAll(async () => { - mongoServer = await MongoMemoryServer.create({ - binary: { version: '7.0.0' } // or latest supported stable version - }); + await mongoose.disconnect(); // kill any previous connection + + mongoServer = await MongoMemoryServer.create(); const uri = mongoServer.getUri(); + await mongoose.connect(uri); }); afterAll(async () => { - await mongoose.connection.dropDatabase(); - await mongoose.connection.close(); - await mongoServer.stop(); + await mongoose.disconnect(); + if (mongoServer) { + await mongoServer.stop(); + } }); - beforeEach(async () => { await User.deleteMany({}); }); diff --git a/server/types/apiKey.ts b/server/types/apiKey.ts index be21dfdbcd..4de243c809 100644 --- a/server/types/apiKey.ts +++ b/server/types/apiKey.ts @@ -5,6 +5,8 @@ import { Error, RouteParam } from './express'; // -------- MONGOOSE -------- /** Full Api Key interface */ export interface IApiKey extends VirtualId, MongooseTimestamps { + _id: Types.ObjectId; + __v: number; label: string; lastUsedAt?: Date; hashedKey: string; From a8af21e1d405629199c7b04a1999b9f335463064 Mon Sep 17 00:00:00 2001 From: nishuldhakar Date: Sat, 11 Apr 2026 13:56:51 +0530 Subject: [PATCH 3/4] fix: alphabetize progress-bar variables and remove out-of-scope changes --- client/styles/abstracts/_variables.scss | 121 ++---------------------- server/models/__test__/user.test.ts | 15 ++- server/types/apiKey.ts | 2 - 3 files changed, 14 insertions(+), 124 deletions(-) diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index c02ee28791..3a5fe08796 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -108,7 +108,8 @@ $themes: ( preferences-warning-color: $p5js-pink, primary-text-color: $dark, progress-bar-active-color: $p5js-active-pink, - progress-bar-background-color: $middle-gray, + progress-bar-background-color: $light, + progress-bar-border-color: $middle-gray, search-background-color: $lightest, search-clear-background-color: $light, search-hover-background-color: $medium-dark, @@ -119,44 +120,6 @@ $themes: ( table-button-background-active-color: #00A1D3, table-button-background-color: $middle-gray, table-button-background-hover-color: $p5js-pink, - - progress-bar-background-color: $light, - progress-bar-active-color: $p5js-active-pink, - - progress-bar-border-color:$middle-gray, - - form-title-color: rgba(51, 51, 51, 0.87), - form-secondary-title-color: $medium-dark, - form-input-text-color: $dark, - form-input-placeholder-text-color: $middle-light, - form-navigation-options-color: $middle-dark, - - hint-background-color: $white, - hint-text-color: $dark, - hint-item-border-bottom-color: $white, - hint-fun-text-color: #0B7CA9, - hint-var-text-color: #D52889, - hint-keyword-text-color: #7A5A3A, - hint-type-text-color: $medium-dark, - hint-arrow-color: $lightest, - hint-arrow-background-color: #ed225ddd, - hint-arrow-background-active-color: $p5js-active-pink, - hint-arrow-focus-outline-color: $middle-dark, - hint-no-link-background-color: $medium-light, - hint-item-hover-background-color: #f4f4f4, - hint-item-active-text-color: $white, - hint-item-active-background-color: $middle-gray, - hint-fun-active-border-bottom-color: #0B7CA9, - hint-var-active-border-bottom-color: #D52889, - hint-item-active-type-text-color: $white, - hint-item-active-outline: none, - hint-item-active-outline-offset: 0, - hint-inline-text-color-light: $middle-light, - hint-inline-text-color: $middle-gray, - - admonition-border: #22C8ED, - admonition-background: #E4F8FF, - admonition-text: #075769, ), dark: ( admonition-background: #105A7F, @@ -235,7 +198,8 @@ $themes: ( preferences-warning-color: $yellow, primary-text-color: $lightest, progress-bar-active-color: $p5js-active-pink, - progress-bar-background-color: $middle-gray, + progress-bar-background-color: $darker, + progress-bar-border-color: $middle-dark, search-background-color: $darker, search-clear-background-color: $medium-dark, search-hover-background-color: $p5js-pink, @@ -246,42 +210,6 @@ $themes: ( table-button-background-active-color: #00A1D3, table-button-background-color: $middle-gray, table-button-background-hover-color: $p5js-pink, - - progress-bar-background-color: $darker, - progress-bar-active-color: $p5js-active-pink, - - progress-bar-border-color:$middle-dark, - - form-title-color: $lightest, - form-secondary-title-color: $medium-light, - form-navigation-options-color: $middle-light, - - hint-background-color: $darker, - hint-text-color: $light, - hint-item-border-bottom-color: $darker, - hint-fun-text-color: #0F9DD7, - hint-var-text-color: #DE4A9B, - hint-keyword-text-color: #B58318, - hint-type-text-color: $light, - hint-arrow-color: $lightest, - hint-arrow-background-color: #ed225ddd, - hint-arrow-background-active-color: $p5js-active-pink, - hint-arrow-focus-outline-color: #cfcfcf, - hint-no-link-background-color: $medium-dark, - hint-item-hover-background-color: $medium-dark, - hint-item-active-text-color: $darker, - hint-item-active-background-color: #cfcfcf, - hint-fun-active-border-bottom-color: #0F9DD7, - hint-var-active-border-bottom-color: #DE4A9B, - hint-item-active-type-text-color: $darker, - hint-item-active-outline: none, - hint-item-active-outline-offset: 0, - hint-inline-text-color-light: $middle-gray, - hint-inline-text-color: #cfcfcf, - - admonition-border: #22C8ED, - admonition-background: #105A7F, - admonition-text: #FFFFFF, ), contrast: ( admonition-background: #000000, @@ -358,8 +286,9 @@ $themes: ( preferences-button-background-color: $medium-light, preferences-warning-color: $yellow, primary-text-color: $lightest, - progress-bar-active-color: $p5js-active-pink, - progress-bar-background-color: $middle-gray, + progress-bar-active-color: $yellow, + progress-bar-background-color: $darker, + progress-bar-border-color: $middle-light, search-background-color: $darker, search-clear-background-color: $medium-dark, search-hover-background-color: $yellow, @@ -370,42 +299,6 @@ $themes: ( table-button-background-active-color: #00FFFF, table-button-background-color: $middle-gray, table-button-background-hover-color: $yellow, - - progress-bar-background-color: $darker, - progress-bar-active-color: $yellow, - - progress-bar-border-color:$middle-light, - - form-title-color: $lightest, - form-secondary-title-color: $medium-light, - form-navigation-options-color: $middle-light, - - hint-background-color: $darkest, - hint-text-color: $medium-light, - hint-item-border-bottom-color: $medium-dark, - hint-fun-text-color: #00FFFF, - hint-var-text-color: #FFA9D9, - hint-keyword-text-color: #F5DC23, - hint-type-text-color: $middle-light, - hint-arrow-color: $darker, - hint-arrow-background-color: #F5DC23DD, - hint-arrow-background-active-color: #F5DC23, - hint-arrow-focus-outline-color: $lighter, - hint-no-link-background-color: $medium-dark, - hint-item-hover-background-color: $dark, - hint-item-active-text-color: $lighter, - hint-item-active-background-color: unset, - hint-fun-active-border-bottom-color: none, - hint-var-active-border-bottom-color: none, - hint-item-active-type-text-color: $lighter, - hint-item-active-outline: 2px solid $lighter, - hint-item-active-outline-offset: -2px, - hint-inline-text-color-light: $middle-gray, - hint-inline-text-color: #cfcfcf, - - admonition-border: #22C8ED, - admonition-background: #000000, - admonition-text: #ffffff, ) ); diff --git a/server/models/__test__/user.test.ts b/server/models/__test__/user.test.ts index 92c5fceebd..2abc77873c 100644 --- a/server/models/__test__/user.test.ts +++ b/server/models/__test__/user.test.ts @@ -8,20 +8,19 @@ jest.setTimeout(30000); // give enough time for MongoMemoryServer let mongoServer: MongoMemoryServer; beforeAll(async () => { - await mongoose.disconnect(); // kill any previous connection - - mongoServer = await MongoMemoryServer.create(); + mongoServer = await MongoMemoryServer.create({ + binary: { version: '7.0.0' } // or latest supported stable version + }); const uri = mongoServer.getUri(); - await mongoose.connect(uri); }); afterAll(async () => { - await mongoose.disconnect(); - if (mongoServer) { - await mongoServer.stop(); - } + await mongoose.connection.dropDatabase(); + await mongoose.connection.close(); + await mongoServer.stop(); }); + beforeEach(async () => { await User.deleteMany({}); }); diff --git a/server/types/apiKey.ts b/server/types/apiKey.ts index 4de243c809..be21dfdbcd 100644 --- a/server/types/apiKey.ts +++ b/server/types/apiKey.ts @@ -5,8 +5,6 @@ import { Error, RouteParam } from './express'; // -------- MONGOOSE -------- /** Full Api Key interface */ export interface IApiKey extends VirtualId, MongooseTimestamps { - _id: Types.ObjectId; - __v: number; label: string; lastUsedAt?: Date; hashedKey: string; From e5fbff061e0762ec4287b49c8d5e7c1c7affddf0 Mon Sep 17 00:00:00 2001 From: nishuldhakar Date: Wed, 13 May 2026 10:31:49 +0530 Subject: [PATCH 4/4] fix: restore deleted variables, apply correct progress-bar theme changes --- client/styles/abstracts/_functions.scss | 2 -- client/styles/abstracts/_variables.scss | 29 +++++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/client/styles/abstracts/_functions.scss b/client/styles/abstracts/_functions.scss index 71921bad0f..a4756f0803 100644 --- a/client/styles/abstracts/_functions.scss +++ b/client/styles/abstracts/_functions.scss @@ -1,5 +1,3 @@ -@use "variables"; - @function map-fetch($map, $keys) { $key: nth($keys, 1); $length: length($keys); diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index 3a5fe08796..46bdd7bc1b 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -120,6 +120,14 @@ $themes: ( table-button-background-active-color: #00A1D3, table-button-background-color: $middle-gray, table-button-background-hover-color: $p5js-pink, + table-button-color: $lightest, + table-button-hover-color: $lightest, + table-row-stripe-color-alternate: $medium-light, + table-row-stripe-color: $medium-light, + toast-background-color: $medium-dark, + toast-text-color: $lightest, + toolbar-button-background-color: $medium-light, + toolbar-button-color: $dark, ), dark: ( admonition-background: #105A7F, @@ -199,7 +207,7 @@ $themes: ( primary-text-color: $lightest, progress-bar-active-color: $p5js-active-pink, progress-bar-background-color: $darker, - progress-bar-border-color: $middle-dark, + progress-bar-border-color: $middle-gray, search-background-color: $darker, search-clear-background-color: $medium-dark, search-hover-background-color: $p5js-pink, @@ -210,6 +218,14 @@ $themes: ( table-button-background-active-color: #00A1D3, table-button-background-color: $middle-gray, table-button-background-hover-color: $p5js-pink, + table-button-color: $lightest, + table-button-hover-color: $lightest, + table-row-stripe-color-alternate: $darker, + table-row-stripe-color: $dark, + toast-background-color: $medium-light, + toast-text-color: $dark, + toolbar-button-background-color: $medium-dark, + toolbar-button-color: $lightest, ), contrast: ( admonition-background: #000000, @@ -299,8 +315,13 @@ $themes: ( table-button-background-active-color: #00FFFF, table-button-background-color: $middle-gray, table-button-background-hover-color: $yellow, + table-button-color: $dark, + table-button-hover-color: $dark, + table-row-stripe-color-alternate: $darker, + table-row-stripe-color: $dark, + toast-background-color: $medium-light, + toast-text-color: $darker, + toolbar-button-background-color: $medium-light, + toolbar-button-color: $dark, ) ); - -$toast-background-color: $medium-dark; -$toast-text-color: $lightest;