From 694a49cb90c834204ea24e75b7f7502bcb6c6245 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Tue, 7 Oct 2025 16:28:48 +0800 Subject: [PATCH] Updated main page --- src/pages/MainPage/Main.sass | 103 +---------------------------------- src/pages/MainPage/Main.tsx | 10 +++- 2 files changed, 9 insertions(+), 104 deletions(-) diff --git a/src/pages/MainPage/Main.sass b/src/pages/MainPage/Main.sass index 06e6db8..17dae12 100644 --- a/src/pages/MainPage/Main.sass +++ b/src/pages/MainPage/Main.sass @@ -1,4 +1,5 @@ @use '/src/styles/variables.sass' as vars +@use '/src/styles/classes.sass' @use 'sass:color' .padding @@ -15,107 +16,7 @@ h1 .name font-size: 1.25rem -.tabs - width: 100% - &[data-orientation="vertical"] - display: flex - - &__list - position: relative - display: flex - gap: 5rem - - &__list[data-orientation="horizontal"] - align-items: center - - &__list[data-orientation="vertical"] - flex-direction: column - align-items: stretch - - &__indicator - position: absolute - background-color: color.adjust(vars.$background, $lightness: 20%) - transition: all 250ms - - &__indicator[data-orientation="horizontal"] - bottom: -1px - height: 3px - - &__indicator[data-orientation="vertical"] - right: -1px - width: 2px - - &__trigger - // display: inline-block - // padding: 8px 16px - // outline: none - // cursor: pointer - background-color: vars.$background - border: none - border-radius: 6px 6px 0 0 - color: vars.$textColor - padding: 0.75rem 1.75rem - width: 10rem - text-align: center - text-decoration: none - display: inline-block - font-size: 1rem - font-weight: 500 - cursor: pointer - // transition: all 0.2s ease-out - - &__trigger:hover - background-color: color.adjust(vars.$background, $lightness: 20%) - // color: hsl(240 5% 34%) - - &__trigger:focus-visible - // background-color: hsl(240 5% 96%) - -.tabs__trigger[data-disabled], -.tabs__trigger[data-disabled]:hover - opacity: 0.5 - background-color: transparent - -.tabs__content - padding: 16px - -.table - width: 90% - border-collapse: collapse - margin: 2rem - box-shadow: inset 0 1px 2px #16212C, 0 2px 4px #2a3f5332, 0 4px 8px #344c654e - - th, td - // border: 1px solid vars.$tableBorderColor - padding: 0.75rem - text-align: left - font-size: 1rem - - th - background-color: vars.$tableHeaderBackground - color: vars.$textColor - padding: 1rem - - th:nth-child(1) - text-align: center - border-radius: 1rem 0 0 0 - - th:nth-child(3) - border-radius: 0 1rem 0 0 - - td - background-color: rgba(color.adjust(vars.$background, $blackness: 5%), 0.8) - - td:nth-child(1) - width: 10rem - text-align: center - - td:nth-child(3) - width: 8.75rem - - tbody tr:nth-child(even) - background-color: rgba(color.adjust(vars.$background, $lightness: 10%), 0.8) .modal font-weight: 500 @@ -167,4 +68,4 @@ h1 .approval font-size: 1.75rem font-weight: 700 - padding: 0.5rem 1rem \ No newline at end of file + padding: 0.5rem 1rem diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx index a5b9cc8..00739c1 100644 --- a/src/pages/MainPage/Main.tsx +++ b/src/pages/MainPage/Main.tsx @@ -7,6 +7,7 @@ import { onMount, createSignal } from 'solid-js' import dayjs from 'dayjs' import { checkConnection, createPdf } from '../../utils/functions' import { FaSolidThumbsUp } from 'solid-icons/fa' +import { _employeeName } from '../../stores/employee' // @ts-ignore // import * as openssl from 'openssl-nodejs' @@ -184,9 +185,12 @@ export default () => { - Login Name + {_employeeName.get()} - + + + Logout + @@ -245,7 +249,7 @@ export default () => { -

List of Ready to Approve and Sign Electrical Order of Payments

+

List of Ready to Approve and Sign in Electrical Order of Payments