btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: update environments colour schema

Browse Source
This commit is contained in:
nivedin
2024-02-22 13:58:00 +05:30
committed by Andrew Bastin
parent 9704b3324b
commit e30b59e1b5
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/hoppscotch-common/assets/scss/styles.scss
View File

@@ -563,12 +563,22 @@ details[open] summary .indicator {
.env-highlight { .env-highlight {
@apply text-accentContrast; @apply text-accentContrast;
&.env-found { &.request-variable-highlight {
@apply bg-accentDark; @apply bg-amber-500;
@apply hover:bg-accent; @apply hover:bg-amber-300;
} }
&.env-not-found { &.environment-variable-highlight {
@apply bg-green-500;
@apply hover:bg-green-300;
}
&.global-variable-highlight {
@apply bg-blue-500;
@apply hover:bg-blue-300;
}
&.environment-not-found-highlight {
@apply bg-red-500; @apply bg-red-500;
@apply hover:bg-red-600; @apply hover:bg-red-600;
} }

20
packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts
View File

@@ -29,8 +29,11 @@ const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
const HOPP_ENV_HIGHLIGHT = const HOPP_ENV_HIGHLIGHT =
"cursor-help transition rounded px-1 focus:outline-none mx-0.5 env-highlight" "cursor-help transition rounded px-1 focus:outline-none mx-0.5 env-highlight"
const HOPP_ENV_HIGHLIGHT_FOUND = "env-found"
const HOPP_ENV_HIGHLIGHT_NOT_FOUND = "env-not-found" const HOPP_REQUEST_VARIABLE_HIGHLIGHT = "request-variable-highlight"
const HOPP_ENVIRONMENT_HIGHLIGHT = "environment-variable-highlight"
const HOPP_GLOBAL_ENVIRONMENT_HIGHLIGHT = "global-variable-highlight"
const HOPP_ENV_HIGHLIGHT_NOT_FOUND = "environment-not-found-highlight"
const secretEnvironmentService = getService(SecretEnvironmentService) const secretEnvironmentService = getService(SecretEnvironmentService)
const restTabs = getService(RESTTabService) const restTabs = getService(RESTTabService)
@@ -172,11 +175,16 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
) )
function checkEnv(env: string, aggregateEnvs: AggregateEnvironment[]) { function checkEnv(env: string, aggregateEnvs: AggregateEnvironment[]) {
const className = aggregateEnvs.find( let className = HOPP_ENV_HIGHLIGHT_NOT_FOUND
const envSource = aggregateEnvs.find(
(k: { key: string }) => k.key === env.slice(2, -2) (k: { key: string }) => k.key === env.slice(2, -2)
) )?.sourceEnv
? HOPP_ENV_HIGHLIGHT_FOUND
: HOPP_ENV_HIGHLIGHT_NOT_FOUND if (envSource === "RequestVariable")
className = HOPP_REQUEST_VARIABLE_HIGHLIGHT
else if (envSource === "Global") className = HOPP_GLOBAL_ENVIRONMENT_HIGHLIGHT
else if (envSource !== undefined) className = HOPP_ENVIRONMENT_HIGHLIGHT
return Decoration.mark({ return Decoration.mark({
class: `${HOPP_ENV_HIGHLIGHT} ${className}`, class: `${HOPP_ENV_HIGHLIGHT} ${className}`,