From 40b7f2bc5d264a6d62831321f5cc6400b802c25b Mon Sep 17 00:00:00 2001 From: lora322 <39804183+lora322@users.noreply.github.com> Date: Tue, 23 Sep 2025 19:46:16 -0400 Subject: [PATCH 1/3] Change red color value in tailwind config --- frontend/tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index fdfd973..db55ca7 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -54,7 +54,7 @@ module.exports = { blue: '#244E5E', green: '#00B448', orange: '#FFAA00', - red: '#F20041', + red: '#BD021E', 900: '#141F2A', 800: '#4b5b66', 700: '#5e7785', From 6e3f048d97862b11242acdeef93edfe148a65464 Mon Sep 17 00:00:00 2001 From: lora322 <39804183+lora322@users.noreply.github.com> Date: Tue, 23 Sep 2025 20:32:53 -0400 Subject: [PATCH 2/3] Display welcome message for current user Add a welcome message displaying the user's first name. --- frontend/src/pages/dashboard.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx index 11915f0..b1abefa 100644 --- a/frontend/src/pages/dashboard.tsx +++ b/frontend/src/pages/dashboard.tsx @@ -137,6 +137,13 @@ const Dashboard = () => { > {''} + {/* Welcome message under page title */} + {currentUser?.first_name && ( +

+ Welcome to VRES, {currentUser.first_name}! +

+)} + {hasPermission(currentUser, 'CREATE_ROLES') && ( Date: Tue, 23 Sep 2025 20:54:39 -0400 Subject: [PATCH 3/3] Add TableOrders component to dashboard --- frontend/src/pages/dashboard.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx index b1abefa..4598a8a 100644 --- a/frontend/src/pages/dashboard.tsx +++ b/frontend/src/pages/dashboard.tsx @@ -10,6 +10,7 @@ import BaseIcon from '../components/BaseIcon'; import { getPageTitle } from '../config'; import Link from 'next/link'; import { useTranslation } from 'next-i18next'; +import TableOrders from '../components/TableOrders'; import { hasPermission } from '../helpers/userPermissions'; import { fetchWidgets } from '../stores/roles/rolesSlice'; @@ -619,6 +620,7 @@ const Dashboard = () => { )} + ); };