From aa1b73c3054761dd765735d8932a08e794a9c1a5 Mon Sep 17 00:00:00 2001 From: Caio Cabral Date: Tue, 12 Nov 2024 09:54:19 -0500 Subject: [PATCH] feat: finishing extracting color palette --- Client/src/Utils/Theme/constants.js | 132 +++++++++++++++++++++++---- Client/src/Utils/Theme/darkTheme.js | 76 ++++++++------- Client/src/Utils/Theme/lightTheme.js | 81 +++++++++------- 3 files changed, 207 insertions(+), 82 deletions(-) diff --git a/Client/src/Utils/Theme/constants.js b/Client/src/Utils/Theme/constants.js index ceb138fc3..a27e65921 100644 --- a/Client/src/Utils/Theme/constants.js +++ b/Client/src/Utils/Theme/constants.js @@ -8,7 +8,9 @@ const typographyLevels = { xl: `${(typographyBase + 10) / 16}rem`, }; -/* This should not be here. INcorporate into color structure */ +/* This should not be here. Incorporate into color structure. + +Is is being exported to globalStyle*/ const paletteLight = { text: { primary: "#1c2130", @@ -19,7 +21,6 @@ const paletteLight = { }; /* TODO Expand this */ - const paletteColors = { white: "#FFFFFF", gray50: "#FEFEFE", @@ -27,18 +28,42 @@ const paletteColors = { gray70: "#FDFDFD", gray80: "#FDFCFD", gray90: "#FCFCFD", + gray95: "#FAFAFA", + gray97: "#F9FAFB", gray100: "#F4F4F4", + gray125: "#F2F4F7", + gray150: "#EAECF0", + gray180: "#E6E6E6", gray200: "#E3E3E3", + gray225: "#D6D9DD", + gray250: "#D0D5DD", + gray300: "#A2A3A3", + gray350: "#A1A1AA", + gray450: "#8E8E8F", + gray500: "#838C99", + gray600: "#454546", + gray750: "#36363E", gray800: "#2D2D33", + gray815: "#27272A", gray830: "#262115", + gray835: "#18181a", + gray840: "#151518", gray850: "#131315", gray860: "#111113", gray870: "#0F0F11", gray880: "#0C0C0E", gray890: "#09090B", black: "#000000", + blueGray20: "#E8F0FE", + blueGray40: "#E2EAF7", + blueGray150: "#667085", + blueGray200: "#475467", + blueGray400: "#344054", + blueGray900: "#1c2130", blueBlueWave: "#1570EF", - blue700: "#475467", + blue700: "#4E5BA6", + purple300: "#664EFF", + purple400: "#3A1BFF", green20: "#ECFDF3", green50: "#D4F4E1", green150: "#45BB7A", @@ -54,7 +79,6 @@ const paletteColors = { red800: "#301A1F", orange50: "#FEF8EA", orange100: "#FFECBC", - orange200: "#FEC84B", orange300: "#FDB022", orange400: "#FF9F00", orange500: "#E88C30", @@ -81,7 +105,7 @@ const semanticColors = { //TODO we dont have secondary dark for dark mode }, constrastText: { - light: paletteColors.blue700, + light: paletteColors.blueGray200, //TODO we dont have secondary contrastText for dark mode }, }, @@ -114,7 +138,7 @@ const semanticColors = { contrastText: { //TODO contrasttext semantically should be something that contrasts with the main light: paletteColors.red200, - dark: paletteColors.red200, + dark: paletteColors.red50, }, light: { light: paletteColors.red100, @@ -130,24 +154,20 @@ const semanticColors = { light: paletteColors.orange300, dark: paletteColors.orange400, }, - text: { - light: paletteColors.orange600, - dark: paletteColors.orange500, - }, light: { light: paletteColors.orange100, dark: paletteColors.orange800, }, - bg: { + contrastText: { + light: paletteColors.orange600, + dark: paletteColors.orange500, + }, + dark: { light: paletteColors.orange50, dark: paletteColors.gray830, }, - border: { - light: paletteColors.orange200, - dark: paletteColors.orange500, - }, }, - + /* From this part on, try to create semantic structure, not feature based structure */ gradient: { color1: { light: paletteColors.gray90, @@ -170,5 +190,85 @@ const semanticColors = { dark: paletteColors.gray850, }, }, + background: { + main: { + light: paletteColors.white, + dark: paletteColors.gray840, + }, + alt: { + light: paletteColors.gray90, + dark: paletteColors.gray890, + }, + fill: { + light: paletteColors.gray100, + dark: paletteColors.gray800, + }, + accent: { + light: paletteColors.gray97, + dark: paletteColors.gray835, + }, + }, + text: { + primary: { + light: paletteColors.blueGray900, + dark: paletteColors.gray95, + }, + secondary: { + light: paletteColors.blueGray400, + dark: paletteColors.gray180, + }, + tertiary: { + light: paletteColors.blueGray200, + dark: paletteColors.gray350, + }, + accent: { + light: paletteColors.gray500, + dark: paletteColors.gray450, + }, + }, + border: { + light: { + light: paletteColors.gray150, + dark: paletteColors.gray815, + }, + dark: { + light: paletteColors.gray250, + dark: paletteColors.gray750, + }, + }, + percentage: { + /* uptimeFair: { + light: paletteColors. + } */ + }, + unresolved: { + main: { + light: paletteColors.blue700, + dark: paletteColors.purple300, + }, + light: { + light: paletteColors.blueGray40, + dark: paletteColors.purple400, + }, + bg: { + light: paletteColors.gray125, + dark: paletteColors.gray125, + }, + }, + other: { + icon: { + light: paletteColors.blueGray150, + }, + line: { + light: paletteColors.gray225, + }, + grid: { + light: paletteColors.gray300, + dark: paletteColors.gray600, + }, + autofill: { + light: paletteColors.blueGray20, + }, + }, }; export { typographyLevels, paletteLight, semanticColors as colors }; diff --git a/Client/src/Utils/Theme/darkTheme.js b/Client/src/Utils/Theme/darkTheme.js index 5b47b3963..f5948217d 100644 --- a/Client/src/Utils/Theme/darkTheme.js +++ b/Client/src/Utils/Theme/darkTheme.js @@ -2,21 +2,6 @@ import { createTheme } from "@mui/material"; import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; -const text = { - primary: "#fafafa", - secondary: "#e6e6e6", - tertiary: "#a1a1aa", - accent: "#8e8e8f", - disabled: "rgba(172, 172, 172, 0.3)", -}; -const background = { - main: "#151518", - alt: "#09090b", - fill: "#2D2D33", - accent: "#18181a", -}; -const border = { light: "#27272a", dark: "#36363e" }; - const { primary, secondary, @@ -30,6 +15,11 @@ const { color4: { dark: color4 }, color5: { dark: color5 }, }, + background, + text, + border, + unresolved, + other, } = colors; const darkTheme = createTheme({ @@ -55,20 +45,25 @@ const darkTheme = createTheme({ contrastText: warning.contrastText.dark, dark: warning.dark.dark, }, + /* From this part on, try to create semantic structure, not feature based structure */ percentage: { - uptimePoor: "#d32f2f", - uptimeFair: "#e88c30", - uptimeGood: "#ffd600", - uptimeExcellent: "#079455", + uptimePoor: error.main.dark, + uptimeFair: warning.contrastText.dark, + uptimeGood: warning.main.dark /* Change for a success color? ?*/, + uptimeExcellent: success.contrastText.light, }, - unresolved: { main: "#664eff", light: "#3a1bff", bg: "#f2f4f7" }, - divider: border.light, + unresolved: { + main: unresolved.main.dark, + light: unresolved.light.dark, + bg: unresolved.bg.dark, + }, + divider: border.light.dark, other: { - icon: "#e6e6e6", - line: "#27272a", - fill: "#18181a", - grid: "#454546", - autofill: "#2d2d33", + icon: text.secondary.dark, + line: border.light.dark, + fill: background.accent.dark, + grid: other.grid.dark, + autofill: secondary.main.dark, }, gradient: { color1, @@ -77,15 +72,28 @@ const darkTheme = createTheme({ color4, color5, }, - text: text, - background: background, - border: border, + text: { + primary: text.primary.dark, + secondary: text.secondary.dark, + tertiary: text.tertiary.dark, + accent: text.accent.dark, + }, + background: { + main: background.main.dark, + alt: background.alt.dark, + fill: background.fill.dark, + accent: background.accent.dark, + }, + border: { + light: border.light.dark, + dark: border.dark.dark, + }, info: { - text: text.primary, - main: text.secondary, - bg: background.main, - light: background.main, - border: border.light, + text: text.primary.dark, + main: text.secondary.dark, + bg: background.main.dark, + light: background.main.dark, + border: border.light.dark, }, }, }); diff --git a/Client/src/Utils/Theme/lightTheme.js b/Client/src/Utils/Theme/lightTheme.js index c8229ad1e..7687d6cf0 100644 --- a/Client/src/Utils/Theme/lightTheme.js +++ b/Client/src/Utils/Theme/lightTheme.js @@ -2,20 +2,14 @@ import { createTheme } from "@mui/material"; import { baseTheme } from "./globalTheme"; import { colors } from "./constants"; -const text = { - primary: "#1c2130", - secondary: "#344054", - tertiary: "#475467", - accent: "#838c99", -}; -const background = { - main: "#FFFFFF", - alt: "#FCFCFD", - fill: "#F4F4F4", - accent: "#f9fafb", -}; +/* +Take things from global theme -const border = { light: "#eaecf0", dark: "#d0d5dd" }; +Next step: check if all here are being used. + +Discuss colors with Gorkem and rest of the team + +*/ const { primary, @@ -30,6 +24,11 @@ const { color4: { light: color4 }, color5: { light: color5 }, }, + background, + text, + border, + unresolved, + other, } = colors; const lightTheme = createTheme({ @@ -59,20 +58,25 @@ const lightTheme = createTheme({ contrastText: warning.contrastText.light, dark: warning.dark.light, }, + /* From this part on, try to create semantic structure, not feature based structure */ percentage: { - uptimePoor: "#d32f2f", - uptimeFair: "#ec8013", - uptimeGood: "#ffb800", - uptimeExcellent: "#079455", + uptimePoor: error.main.light, + uptimeFair: warning.contrastText.light, + uptimeGood: warning.main.light /* Change for a success color? */, + uptimeExcellent: success.contrastText.light, }, - unresolved: { main: "#4e5ba6", light: "#e2eaf7", bg: "#f2f4f7" }, - divider: border.light, + unresolved: { + main: unresolved.main.light, + light: unresolved.light.light, + bg: unresolved.bg.light, + }, + divider: border.light.light, other: { - icon: "#667085", - line: "#d6d9dd", - fill: "#e3e3e3", - grid: "#a2a3a3", - autofill: "#e8f0fe", + icon: other.icon.light, + line: other.line.light, + fill: secondary.dark.light, + grid: other.grid.light, + autofill: other.autofill.light, }, gradient: { color1, @@ -81,15 +85,28 @@ const lightTheme = createTheme({ color4, color5, }, - text: text, - background: background, - border: border, + text: { + primary: text.primary.light, + secondary: text.secondary.light, + tertiary: text.tertiary.light, + accent: text.accent.light, + }, + background: { + main: background.main.light, + alt: background.alt.light, + fill: background.fill.light, + accent: background.accent.light, + }, + border: { + light: border.light.light, + dark: border.dark.light, + }, info: { - text: text.primary, - main: text.tertiary, - bg: background.main, - light: background.main, - border: border.dark, + text: text.primary.light, + main: text.tertiary.light, + bg: background.main.light, + light: background.main.light, + border: border.dark.light, }, }, });