diff --git a/index.html b/index.html index f2e16b22..748027e9 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,6 @@ - + @@ -30,6 +25,7 @@ + diff --git a/public/assets/css/core-extend.css b/public/assets/css/core-extend.css new file mode 100644 index 00000000..c017c963 --- /dev/null +++ b/public/assets/css/core-extend.css @@ -0,0 +1,12 @@ +:root, +[data-bs-theme="light"] { + --bs-nav-link-font-size: 0.7375rem; +} + +.nav { + --bs-nav-link-font-size: 0.7375rem; +} + +.card-header { + padding: 0.5rem var(--bs-card-cap-padding-x); +} diff --git a/public/assets/css/default.css b/public/assets/css/default.css index 7da3c592..2abd37ee 100644 --- a/public/assets/css/default.css +++ b/public/assets/css/default.css @@ -1,7 +1,3 @@ -/* -* demo.css -* File include item demo only specific css only -******************************************************************************/ #root { width: 100%; @@ -20,21 +16,28 @@ padding: 0 !important; } -.menu .app-brand.demo { +.menu .app-brand { height: 64px; margin-top: 12px; } -.app-brand-logo.demo svg { +.app-brand-logo svg { width: 22px; height: 38px; } .app-brand-logo-sidebar { - width: 70px; + width: 45px; } -.app-brand-text.demo { +.app-brand-logo-login { + width: 100px; +} + +.app-brand-logo-border { + border: 1px solid #d5d5d5; +} +.app-brand-text { font-size: 1.75rem; letter-spacing: -0.5px; /* text-transform: lowercase; */ @@ -61,39 +64,6 @@ * Content ******************************************************************************/ -.demo-blocks > * { - display: block !important; -} - -.demo-inline-spacing > * { - margin: 1rem 0.375rem 0 0 !important; -} - -/* ? .demo-vertical-spacing class is used to have vertical margins between elements. To remove margin-top from the first-child, use .demo-only-element class with .demo-vertical-spacing class. For example, we have used this class in forms-input-groups.html file. */ -.demo-vertical-spacing > * { - margin-top: 1rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing.demo-only-element > :first-child { - margin-top: 0 !important; -} - -.demo-vertical-spacing-lg > * { - margin-top: 1.875rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing-lg.demo-only-element > :first-child { - margin-top: 0 !important; -} - -.demo-vertical-spacing-xl > * { - margin-top: 5rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing-xl.demo-only-element > :first-child { - margin-top: 0 !important; -} - .rtl-only { display: none !important; text-align: left !important; @@ -104,30 +74,6 @@ display: block !important; } -/* -* Layout demo -******************************************************************************/ - -.layout-demo-wrapper { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - margin-top: 1rem; -} -.layout-demo-placeholder img { - width: 900px; -} -.layout-demo-info { - text-align: center; - margin-top: 1rem; -} .infra-activity-table-header { border-top: 0; text-transform: capitalize !important; diff --git a/public/img/brand/marco.png b/public/img/brand/marco.png index 40490583..ca14f303 100644 Binary files a/public/img/brand/marco.png and b/public/img/brand/marco.png differ diff --git a/public/img/brand/marco1.png b/public/img/brand/marco1.png new file mode 100644 index 00000000..40490583 Binary files /dev/null and b/public/img/brand/marco1.png differ diff --git a/src/assets/css/default.css b/src/assets/css/default.css index 7420d4b2..8ed523e0 100644 --- a/src/assets/css/default.css +++ b/src/assets/css/default.css @@ -1,23 +1,3 @@ -/* -* demo.css -* File include item demo only specific css only -******************************************************************************/ - -.menu .app-brand.demo { - height: 64px; - margin-top: 12px; -} - -.app-brand-logo.demo svg { - width: 22px; - height: 38px; -} - -.app-brand-text.demo { - font-size: 1.75rem; - letter-spacing: -0.5px; -} - /* ! For .layout-navbar-fixed added fix padding top to .layout-page */ /* Detached navbar */ .layout-navbar-fixed @@ -43,43 +23,6 @@ z-index: auto; } -/* -* Content -******************************************************************************/ - -.demo-blocks > * { - display: block !important; -} - -.demo-inline-spacing > * { - margin: 1rem 0.375rem 0 0 !important; -} - -/* ? .demo-vertical-spacing class is used to have vertical margins between elements. To remove margin-top from the first-child, use .demo-only-element class with .demo-vertical-spacing class. For example, we have used this class in forms-input-groups.html file. */ -.demo-vertical-spacing > * { - margin-top: 1rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing.demo-only-element > :first-child { - margin-top: 0 !important; -} - -.demo-vertical-spacing-lg > * { - margin-top: 1.875rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing-lg.demo-only-element > :first-child { - margin-top: 0 !important; -} - -.demo-vertical-spacing-xl > * { - margin-top: 5rem !important; - margin-bottom: 0 !important; -} -.demo-vertical-spacing-xl.demo-only-element > :first-child { - margin-top: 0 !important; -} - .rtl-only { display: none !important; text-align: left !important; @@ -89,41 +32,3 @@ [dir="rtl"] .rtl-only { display: block !important; } - -/* Dropdown buttons going out of small screens */ -@media (max-width: 576px) { - #dropdown-variation-demo .btn-group .text-truncate { - width: 231px; - position: relative; - } - #dropdown-variation-demo .btn-group .text-truncate::after { - position: absolute; - top: 45%; - right: 0.65rem; - } -} - -/* -* Layout demo -******************************************************************************/ - -.layout-demo-wrapper { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - margin-top: 1rem; -} -.layout-demo-placeholder img { - width: 900px; -} -.layout-demo-info { - text-align: center; - margin-top: 1rem; -} diff --git a/src/components/Dashboard/ProjectProgressChart.jsx b/src/components/Dashboard/ProjectProgressChart.jsx index 6159dbc9..20e0191a 100644 --- a/src/components/Dashboard/ProjectProgressChart.jsx +++ b/src/components/Dashboard/ProjectProgressChart.jsx @@ -4,12 +4,15 @@ import { useProjects } from "../../hooks/useProjects"; import { useDashboard_Data } from "../../hooks/useDashboard_Data"; import { useSelector } from "react-redux"; -const ProjectProgressChart = () => { +const ProjectProgressChart = ({ + ShowAllProject = true, + DefaultRange = "15D", +}) => { const selectedProject = useSelector( (store) => store.localVariables.projectId ); const { projects } = useProjects(); - const [range, setRange] = useState("15D"); + const [range, setRange] = useState(DefaultRange); const [showAllEmployees, setShowAllEmployees] = useState(false); const getDaysFromRange = (range) => { @@ -69,7 +72,7 @@ const ProjectProgressChart = () => { ); const lineChartCategoriesDates = sortedDashboardData.map((d) => new Date(d.date).toLocaleDateString("en-US", { - weekday:"short", + weekday: "short", month: "short", day: "numeric", year: "numeric", @@ -82,7 +85,7 @@ const ProjectProgressChart = () => { : selectedProjectData?.name; return ( -
+
{/* Left: Title */} @@ -93,22 +96,24 @@ const ProjectProgressChart = () => { {/* Right: Checkbox and Project Name */}
-
- setShowAllEmployees(e.target.checked)} - /> - -
+ {ShowAllProject == true && ( +
+ setShowAllEmployees(e.target.checked)} + /> + +
+ )} {!showAllEmployees && selectedProjectName && (

{selectedProjectName} diff --git a/src/components/Directory/NoteCardDirectory.jsx b/src/components/Directory/NoteCardDirectory.jsx index 30848855..fde21d4b 100644 --- a/src/components/Directory/NoteCardDirectory.jsx +++ b/src/components/Directory/NoteCardDirectory.jsx @@ -19,6 +19,10 @@ const NoteCardDirectory = ({ const [isLoading, setIsLoading] = useState(false); const [isDeleting, setIsDeleting] = useState(false); const [isActivProcess, setActiveProcessing] = useState(false); + + // State to manage hover status + const [isHovered, setIsHovered] = useState(false); + const handleUpdateNote = async () => { try { setIsLoading(true); @@ -127,6 +131,8 @@ const NoteCardDirectory = ({ background: `${noteItem.isActive ? "" : "#f8f6f6"}`, }} key={noteItem.id} + onMouseEnter={() => setIsHovered(true)} // Set hover state to true on mouse enter + onMouseLeave={() => setIsHovered(false)} // Set hover state to false on mouse leave >

@@ -149,11 +155,15 @@ const NoteCardDirectory = ({
-
+
{noteItem.isActive ? ( <> setEditing(true)} > diff --git a/src/components/Directory/NoteCardDirectoryEditable.jsx b/src/components/Directory/NoteCardDirectoryEditable.jsx index 7759e62a..de91ad69 100644 --- a/src/components/Directory/NoteCardDirectoryEditable.jsx +++ b/src/components/Directory/NoteCardDirectoryEditable.jsx @@ -184,7 +184,7 @@ const NoteCardDirectoryEditable = ({ ) : ( diff --git a/src/components/Layout/LayoutMenu.tsx b/src/components/Layout/LayoutMenu.tsx index 48d38c05..a658d88b 100644 --- a/src/components/Layout/LayoutMenu.tsx +++ b/src/components/Layout/LayoutMenu.tsx @@ -1,9 +1,9 @@ const LayoutMenu = () => { return (