Skip to content
Open
2 changes: 2 additions & 0 deletions client/styles/abstracts/_functions.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "variables";

@function map-fetch($map, $keys) {
$key: nth($keys, 1);
$length: length($keys);
Expand Down
137 changes: 113 additions & 24 deletions client/styles/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,44 @@ $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,
Comment on lines -122 to -129
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are all these variables being deleted?


Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've recently made changes to alphabetize all the css variables in file—would you be able to update your changes with the new sorting preference?

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,
Expand Down Expand Up @@ -215,14 +245,42 @@ $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,

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,
Expand Down Expand Up @@ -311,13 +369,44 @@ $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,

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,
)
);

$toast-background-color: $medium-dark;
$toast-text-color: $lightest;
1 change: 1 addition & 0 deletions client/styles/components/_asset-size.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

@include themify() {
background-color: getThemifyVariable('progress-bar-background-color');
border-color: getThemifyVariable('progress-bar-border-color');
}
}

Expand Down
15 changes: 8 additions & 7 deletions server/models/__test__/user.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please provide an explanation in your PR on why modifications to user.test.ts, and apiKey.ts were necessary in the implementation of the changes requested in the associated issue

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file and apiKey.ts seem to be outside of the scope of the original issue, which focuses on updating the color contrast within the asset storage bar. Ideally, we want to make sure that pull requests stay within the purview of each issue to make tracking and reviewing changes easier.

Would you be able to remove the additions to these two files?


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({});
});
Expand Down
2 changes: 2 additions & 0 deletions server/types/apiKey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { Error, RouteParam } from './express';
// -------- MONGOOSE --------
/** Full Api Key interface */
export interface IApiKey extends VirtualId, MongooseTimestamps {
_id: Types.ObjectId;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted in comment for user.test.ts

__v: number;
label: string;
lastUsedAt?: Date;
hashedKey: string;
Expand Down