From 243405db0c908abe04af818a3b6d0b2f21ad0876 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Wed, 28 Feb 2024 12:44:28 +0200 Subject: [PATCH] layout optimisation and adjustments --- .gitignore | 1 + .vscode/settings.json | 3 + components/layout.tsx | 4 +- components/sidebar.tsx | 18 +-- pages/api/schedule.ts | 2 +- public/content/output/shifts 2024.1.json | 2 +- server.js | 4 - src/templates/schedule.hbs | 136 +++++++++++++++++++++++ src/templates/word.html | 5 +- 9 files changed, 156 insertions(+), 19 deletions(-) create mode 100644 src/templates/schedule.hbs diff --git a/.gitignore b/.gitignore index 670be0a..1798e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ next-cart-app.zip certificates content/output/* baseUrl.txt +public/content/output/* diff --git a/.vscode/settings.json b/.vscode/settings.json index 7c49be6..34a1155 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -119,5 +119,8 @@ }, "[javascriptreact]": { "editor.defaultFormatter": "vscode.typescript-language-features" + }, + "[handlebars]": { + "editor.defaultFormatter": "vscode.html-language-features" } } \ No newline at end of file diff --git a/components/layout.tsx b/components/layout.tsx index 8ee9046..26d877b 100644 --- a/components/layout.tsx +++ b/components/layout.tsx @@ -51,12 +51,12 @@ export default function Layout({ children }: { children: ReactNode }) {
-
+
{children}
{/*
-
+
*/} diff --git a/components/sidebar.tsx b/components/sidebar.tsx index 3247bfc..5e39200 100644 --- a/components/sidebar.tsx +++ b/components/sidebar.tsx @@ -17,7 +17,7 @@ function SidebarMenuItem({ item, session, isSubmenu }) { //const [isOpen, setIsOpen] = useState(false && collapsable); // Initialize isOpen to true for non-collapsible items, ensuring they are always "open" // xOR - const baseClass = `sidemenu-item flex items-center ${isSubmenu ? "px-4 py-1" : ""} mt-1 transition-colors duration-3000 transform rounded-md`; + const baseClass = `sidemenu-item flex items-center ${isSubmenu ? "px-3 py-1" : ""} mt-1 pr-0 transition-colors duration-3000 transform rounded-md`; const activeClass = isActive ? "sidemenu-item-active text-blue-600 bg-gray-100 dark:text-blue-400 dark:bg-blue-900" : "text-gray-700 dark:text-gray-300"; const hoverClasses = "hover:bg-gray-100 dark:hover:bg-gray-800 dark:hover:text-gray-200 hover:text-gray-700"; @@ -64,7 +64,7 @@ function SidebarMenuItem({ item, session, isSubmenu }) { {item.svgData && } - {item.text} + {item.text} {item.children && } {isOpen && item.children && ( @@ -89,7 +89,7 @@ function DropDownIcon({ isOpen }) { export default function Sidebar({ isSidebarOpen, toggleSidebar }) { const { data: session, status } = useSession(); - const sidebarWidth = 256; // Simplify by using a constant + const sidebarWidth = 226; // Simplify by using a constant const sidebarRef = useRef(null); //const [locations, setLocations] = useState([]); @@ -126,7 +126,7 @@ export default function Sidebar({ isSidebarOpen, toggleSidebar }) { return ( <>