From 7572136cc8a2cbdba107d8f526a4213889e85c46 Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Tue, 8 Oct 2024 08:46:35 +0200 Subject: [PATCH] feat: sign-up and sign-in pages are styled and ready to be merged --- app/(prowler)/profile/page.tsx | 2 +- app/(prowler)/providers/page.tsx | 2 +- auth.config.ts | 12 ++++----- components/auth/oss/auth-form.tsx | 30 ++++++---------------- components/filters/data-filters.ts | 5 ---- tailwind.config.js | 40 ++++++++++++++---------------- 6 files changed, 35 insertions(+), 56 deletions(-) diff --git a/app/(prowler)/profile/page.tsx b/app/(prowler)/profile/page.tsx index 91fa4907f0..0cfb4f8ab2 100644 --- a/app/(prowler)/profile/page.tsx +++ b/app/(prowler)/profile/page.tsx @@ -15,7 +15,7 @@ export default async function Profile() { } // const user = await getUserByMe(); - // console.log("user", user); + return ( <>
diff --git a/app/(prowler)/providers/page.tsx b/app/(prowler)/providers/page.tsx index a5cb092664..b999671859 100644 --- a/app/(prowler)/providers/page.tsx +++ b/app/(prowler)/providers/page.tsx @@ -24,7 +24,7 @@ export default async function Providers({
- + diff --git a/auth.config.ts b/auth.config.ts index 556c7d40c0..4639f8bf37 100644 --- a/auth.config.ts +++ b/auth.config.ts @@ -124,7 +124,7 @@ export const authConfig = { token.accessToken as string, ) as CustomJwtPayload; // eslint-disable-next-line no-console - console.log("decodedToken", decodedToken); + // console.log("decodedToken", decodedToken); token.accessTokenExpires = (decodedToken.exp as number) * 1000; token.user_id = decodedToken.user_id; token.tenant_id = decodedToken.tenant_id; @@ -150,11 +150,11 @@ export const authConfig = { } // eslint-disable-next-line no-console - console.log( - "Access token expires", - token.accessTokenExpires, - new Date(Number(token.accessTokenExpires)), - ); + // console.log( + // "Access token expires", + // token.accessTokenExpires, + // new Date(Number(token.accessTokenExpires)), + // ); // If the access token is not expired, return the token if ( diff --git a/components/auth/oss/auth-form.tsx b/components/auth/oss/auth-form.tsx index 3b70a5a040..451e043c0b 100644 --- a/components/auth/oss/auth-form.tsx +++ b/components/auth/oss/auth-form.tsx @@ -112,13 +112,15 @@ export const AuthForm = ({ type }: { type: string }) => { return (
{/* Auth Form */} -
- {/* Prowler Logo */} -
- -
+
+ {/* Background Pattern */} +
-
+
+ {/* Prowler Logo */} +
+ +

{type === "sign-in" ? "Sign In" : "Sign Up"} @@ -287,22 +289,6 @@ export const AuthForm = ({ type }: { type: string }) => { )}

- -
-
-

- Open Cloud Security Platform -

-
-
); }; diff --git a/components/filters/data-filters.ts b/components/filters/data-filters.ts index 9aea8e9dd3..df1e01cea0 100644 --- a/components/filters/data-filters.ts +++ b/components/filters/data-filters.ts @@ -1,9 +1,4 @@ export const filtersProviders = [ - { - key: "provider__in", - labelCheckboxGroup: "Select a Provider", - values: ["aws", "gcp", "azure", "kubernetes"], - }, { key: "connected", labelCheckboxGroup: "Connection", diff --git a/tailwind.config.js b/tailwind.config.js index 608551bb96..31bdbfd39e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -20,36 +20,34 @@ module.exports = { extend: { colors: { prowler: { - blue: { + theme: { midnight: "#030921", pale: "#f3fcff", - smoky: "#7b8390", - }, - grey: { - medium: "#353a4d", - light: "#868994", - }, - green: { - DEFAULT: "#9FD655", - medium: "#09BF3D", - }, - theme: { green: "#6af400", purple: "#5001d0", coral: "#ff5356", orange: "#f69000", yellow: "#ffdf16", }, - dark: { - DEFAULT: "#0E1117", - 700: "#151B23", - 400: "#262C36", - title: "#E2E8F0", - text: "#94a3b8" /* primary default for dark mode */, + blue: { + 800: "#1e293bff", }, - light: { - title: "#1e293bff", - text: "#64748b" /* primary default for light mode */, + grey: { + medium: "#353a4d", + light: "#868994", + 600: "#64748b", + }, + green: { + DEFAULT: "#9FD655", + medium: "#09BF3D", + }, + black: { + DEFAULT: "#000", + 900: "#18181A", + }, + white: { + DEFAULT: "#FFF", + 900: "#18181A", }, }, system: {