Merge branch 'sidebar-navigation'

requirements.txt

@@ -9,6 +9,7 @@ SQLAlchemy==1.4.23
 python-dotenv==0.19.0
 pyotp==2.6.0
 qrcode[pil]==7.3.1
+numpy==1.26.4
 pandas==1.5.3
 xlsxwriter==3.1.2
 Flask-Mail==0.9.1

static/css/style.css

@@ -8,90 +8,258 @@ body {
     font-family: Arial, sans-serif;
     line-height: 1.6;
     color: #333;
+    margin: 0;
+    padding: 0;
 }
 
-header {
+/* Mobile Header Styles */
+.mobile-header {
+    display: none;
     background-color: #4CAF50;
     padding: 1rem;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 1001;
+    justify-content: space-between;
+    align-items: center;
 }
 
-nav ul {
+.mobile-nav-brand a {
+    color: white;
+    text-decoration: none;
+    font-size: 1.5rem;
+    font-weight: bold;
+}
+
+.mobile-nav-toggle {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    width: 30px;
+    height: 24px;
     display: flex;
-    justify-content: flex-start;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.mobile-nav-toggle span {
+    display: block;
+    height: 3px;
+    width: 100%;
+    background-color: white;
+    border-radius: 1px;
+    transition: all 0.3s ease;
+}
+
+.mobile-nav-toggle.active span:nth-child(1) {
+    transform: rotate(45deg) translate(6px, 6px);
+}
+
+.mobile-nav-toggle.active span:nth-child(2) {
+    opacity: 0;
+}
+
+.mobile-nav-toggle.active span:nth-child(3) {
+    transform: rotate(-45deg) translate(6px, -6px);
+}
+
+/* Sidebar Styles */
+.sidebar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 280px;
+    height: 100vh;
+    background-color: #3d9c17;
+    color: white;
+    overflow-y: auto;
+    transition: transform 0.3s ease;
+    z-index: 1000;
+    box-shadow: 2px 0 10px rgba(0,0,0,0.1);
+}
+
+.sidebar.collapsed {
+    width: 60px;
+}
+
+.sidebar-header {
+    padding: 1.5rem;
+    background-color: #34495e;
+    display: flex;
+    justify-content: space-between;
     align-items: center;
+    border-bottom: 1px solid #3a5269;
+}
+
+.sidebar-header h2 {
+    margin: 0;
+    color: white;
+    font-size: 1.5rem;
+    font-weight: bold;
+}
+
+.sidebar-header h2 a {
+    color: white;
+    text-decoration: none;
+}
+
+.sidebar-toggle {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    width: 24px;
+    height: 18px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.sidebar-toggle span {
+    display: block;
+    height: 2px;
+    width: 100%;
+    background-color: white;
+    border-radius: 1px;
+    transition: all 0.3s ease;
+}
+
+.sidebar-nav {
+    padding: 0;
+    font-weight: bold;
+}
+
+.sidebar-nav ul {
     list-style: none;
     padding: 0;
     margin: 0;
 }
 
-nav ul li {
+.sidebar-nav li {
-    margin: 0 1rem;
+    margin: 0;
 }
 
-nav ul li a {
+.sidebar-nav li a {
-    color: white;
+    display: flex;
+    align-items: center;
+    padding: 1rem 1.5rem;
+    color: #ecf0f1;
     text-decoration: none;
+    transition: all 0.3s ease;
+    border-left: 3px solid transparent;
 }
 
-/* Dropdown menu styles */
+.sidebar-nav li a:hover {
-nav ul li.dropdown {
+    background-color: #34495e;
+    border-left-color: #4CAF50;
+    color: white;
+}
+
+.sidebar-nav li a.active {
+    background-color: #4CAF50;
+    border-left-color: #45a049;
+    color: white;
+}
+
+.nav-icon {
+    margin-right: 1rem;
+    font-size: 1.2rem;
+    min-width: 24px;
+    text-align: center;
+}
+
+.nav-divider {
+    padding: 0.75rem 1.5rem 0.25rem;
+    font-size: 0.85rem;
+    color: #d9ffd1;
+    text-transform: uppercase;
+    font-weight: 600;
+    letter-spacing: 0.5px;
+    border-top: 1px solid #3a5269;
+    margin-top: 0.5rem;
+}
+
+.nav-divider:first-child {
+    border-top: none;
+    margin-top: 0;
+}
+
+/* Collapsed sidebar styles */
+.sidebar.collapsed .sidebar-header {
+    padding: 1rem 0.5rem;
+}
+
+.sidebar.collapsed .sidebar-header h2 {
+    display: none;
+}
+
+.sidebar.collapsed .nav-divider {
+    display: none;
+}
+
+.sidebar.collapsed .sidebar-nav li a {
+    padding: 1rem 0.5rem;
+    justify-content: center;
     position: relative;
 }
 
-nav ul li.admin-dropdown {
+.sidebar.collapsed .nav-icon {
-    margin-left: auto; /* Push to the right */
+    margin-right: 0;
+    font-size: 1.1rem;
 }
 
-nav ul li.dropdown .dropdown-toggle {
+/* Hide text in collapsed state */
-    cursor: pointer;
+.sidebar.collapsed .sidebar-nav li a .nav-text {
-    padding: 10px 15px;
-    display: block;
-    color: #fff;
-    text-decoration: none;
-}
-
-nav ul li.dropdown .dropdown-menu {
     display: none;
+}
+
+/* Tooltip for collapsed sidebar */
+.sidebar.collapsed .sidebar-nav li a:hover::after {
+    content: attr(data-tooltip);
     position: absolute;
-    right: 0; /* Align to the right for admin dropdown */
+    left: 100%;
-    background-color: #333;
+    top: 50%;
-    min-width: 180px;
+    transform: translateY(-50%);
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    background-color: #2c3e50;
-    z-index: 1000;
+    color: white;
-    padding: 10px 0;
+    padding: 0.5rem 1rem;
     border-radius: 4px;
-    margin-top: 5px;
+    white-space: nowrap;
+    z-index: 1001;
+    margin-left: 0.5rem;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.2);
 }
 
-/* Show dropdown on hover and keep it visible when hovering over the menu */
+/* Mobile overlay */
-nav ul li.dropdown:hover .dropdown-menu,
+.mobile-overlay {
-nav ul li.dropdown .dropdown-menu:hover {
+    display: none;
-    display: block;
+    position: fixed;
-}
+    top: 0;
-
+    left: 0;
-nav ul li.dropdown .dropdown-menu li {
-    display: block;
-    padding: 0;
     width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.5);
+    z-index: 999;
 }
 
-nav ul li.dropdown .dropdown-menu li a {
+.main-content {
-    padding: 10px 20px;
+    margin-left: 280px;
-    display: block;
+    padding: 2rem;
-    text-align: left;
+    min-height: 100vh;
-    color: #fff;
+    transition: margin-left 0.3s ease;
-    text-decoration: none;
-    transition: background-color 0.2s ease;
 }
 
-nav ul li.dropdown .dropdown-menu li a:hover {
+/* Main content adjustments for collapsed sidebar */
-    background-color: #444;
+body:has(.sidebar.collapsed) .main-content {
+    margin-left: 60px;
 }
 
-main {
+/* Fallback for browsers that don't support :has() */
-    max-width: 1200px;
+.sidebar.collapsed ~ .main-content {
-    margin: 2rem auto;
+    margin-left: 60px;
-    padding: 0 1rem;
 }
 
 .hero {
@@ -206,6 +374,18 @@ footer {
     padding: 1rem;
     background-color: #f4f4f4;
     margin-top: 2rem;
+    margin-left: 280px;
+    transition: margin-left 0.3s ease;
+}
+
+/* Footer adjustments for collapsed sidebar */
+body:has(.sidebar.collapsed) footer {
+    margin-left: 60px;
+}
+
+/* Fallback for browsers that don't support :has() */
+.sidebar.collapsed ~ footer {
+    margin-left: 60px;
 }
 
 /* Time tracking specific styles */
@@ -863,3 +1043,88 @@ input[type="time"]::-webkit-datetime-edit {
     transform: translateY(-1px);
     box-shadow: 0 3px 10px rgba(76, 175, 80, 0.3);
 }
+/* Responsive Design for Sidebar Navigation */
+@media (max-width: 1024px) {
+    .sidebar {
+        transform: translateX(-100%);
+    }
+
+    .sidebar.mobile-open {
+        transform: translateX(0);
+    }
+
+    .mobile-header {
+        display: flex;
+    }
+
+    .main-content {
+        margin-left: 0;
+        padding-top: 5rem;
+    }
+
+    footer {
+        margin-left: 0;
+    }
+
+    .mobile-overlay.active {
+        display: block;
+    }
+
+    .sidebar-toggle {
+        display: none;
+    }
+}
+
+@media (max-width: 768px) {
+    .main-content {
+        padding: 1rem;
+        padding-top: 5rem;
+    }
+
+    .sidebar {
+        width: 100%;
+        max-width: 300px;
+    }
+
+    .timetrack-container {
+        padding: 0;
+    }
+
+    .admin-panel {
+        flex-direction: column;
+    }
+
+    .admin-card {
+        width: 100%;
+    }
+
+    .features {
+        grid-template-columns: 1fr;
+    }
+
+    .export-options {
+        grid-template-columns: 1fr;
+    }
+
+    .quick-export-buttons {
+        grid-template-columns: 1fr;
+    }
+
+    #export-buttons .quick-export-buttons {
+        flex-direction: column;
+    }
+}
+
+@media (min-width: 1025px) {
+    .mobile-header {
+        display: none;
+    }
+
+    .sidebar {
+        transform: translateX(0);
+    }
+
+    .mobile-overlay {
+        display: none !important;
+    }
+}

static/js/sidebar.js

@@ -0,0 +1,67 @@
+// Sidebar functionality
+document.addEventListener('DOMContentLoaded', function() {
+    const sidebar = document.getElementById('sidebar');
+    const sidebarToggle = document.getElementById('sidebar-toggle');
+    const mobileNavToggle = document.getElementById('mobile-nav-toggle');
+    const mobileOverlay = document.getElementById('mobile-overlay');
+    
+    // Desktop sidebar toggle
+    if (sidebarToggle) {
+        sidebarToggle.addEventListener('click', function() {
+            sidebar.classList.toggle('collapsed');
+            
+            // Update main content and footer margins for browsers that don't support :has()
+            const mainContent = document.querySelector('.main-content');
+            const footer = document.querySelector('footer');
+            
+            if (sidebar.classList.contains('collapsed')) {
+                if (mainContent) mainContent.style.marginLeft = '60px';
+                if (footer) footer.style.marginLeft = '60px';
+            } else {
+                if (mainContent) mainContent.style.marginLeft = '280px';
+                if (footer) footer.style.marginLeft = '280px';
+            }
+        });
+    }
+    
+    // Mobile navigation toggle
+    if (mobileNavToggle) {
+        mobileNavToggle.addEventListener('click', function() {
+            sidebar.classList.toggle('mobile-open');
+            mobileOverlay.classList.toggle('active');
+            mobileNavToggle.classList.toggle('active');
+        });
+    }
+    
+    // Close mobile sidebar when clicking overlay
+    if (mobileOverlay) {
+        mobileOverlay.addEventListener('click', function() {
+            sidebar.classList.remove('mobile-open');
+            mobileOverlay.classList.remove('active');
+            if (mobileNavToggle) mobileNavToggle.classList.remove('active');
+        });
+    }
+    
+    // Close mobile sidebar when clicking on navigation links
+    if (sidebar) {
+        const navLinks = sidebar.querySelectorAll('a');
+        navLinks.forEach(link => {
+            link.addEventListener('click', function() {
+                if (window.innerWidth <= 1024) {
+                    sidebar.classList.remove('mobile-open');
+                    mobileOverlay.classList.remove('active');
+                    if (mobileNavToggle) mobileNavToggle.classList.remove('active');
+                }
+            });
+        });
+    }
+    
+    // Handle window resize
+    window.addEventListener('resize', function() {
+        if (window.innerWidth > 1024) {
+            if (sidebar) sidebar.classList.remove('mobile-open');
+            if (mobileOverlay) mobileOverlay.classList.remove('active');
+            if (mobileNavToggle) mobileNavToggle.classList.remove('active');
+        }
+    });
+});

templates/layout.html

@@ -7,69 +7,79 @@
     <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
 </head>
 <body>
-    <header>
+    <!-- Mobile header -->
-        <nav>
+    <header class="mobile-header">
+        <div class="mobile-nav-brand">
+            <a href="{{ url_for('home') }}">TimeTrack</a>
+        </div>
+        <button class="mobile-nav-toggle" id="mobile-nav-toggle">
+            <span></span>
+            <span></span>
+            <span></span>
+        </button>
+    </header>
+
+    <!-- Sidebar navigation -->
+    <aside class="sidebar" id="sidebar">
+        <div class="sidebar-header">
+            <h2><a href="{{ url_for('home') }}">TimeTrack</a></h2>
+            <button class="sidebar-toggle" id="sidebar-toggle">
+                <span></span>
+                <span></span>
+                <span></span>
+            </button>
+        </div>
+        <nav class="sidebar-nav">
             <ul>
-                <li><a href="{{ url_for('home') }}">Home</a></li>
+                <li><a href="{{ url_for('home') }}" data-tooltip="Home"><i class="nav-icon">🏠</i><span class="nav-text">Home</span></a></li>
                 {% if g.user %}
-                    <li><a href="{{ url_for('history') }}">History</a></li>
+                    <li><a href="{{ url_for('history') }}" data-tooltip="History"><i class="nav-icon">📊</i><span class="nav-text">History</span></a></li>
-                    <li><a href="{{ url_for('about') }}">About</a></li>
+                    <li><a href="{{ url_for('about') }}" data-tooltip="About"><i class="nav-icon">ℹ️</i><span class="nav-text">About</span></a></li>
                     
-                    <!-- Role-based dropdown menu -->
+                    <!-- Role-based menu items -->
                     {% if g.user.is_admin %}
-                    <li class="dropdown admin-dropdown">
+                    <li class="nav-divider">Admin</li>
-                        <a href="#" class="dropdown-toggle">Admin</a>
+                    <li><a href="{{ url_for('profile') }}" data-tooltip="Profile"><i class="nav-icon">👤</i><span class="nav-text">Profile</span></a></li>
-                        <ul class="dropdown-menu">
+                    <li><a href="{{ url_for('config') }}" data-tooltip="Config"><i class="nav-icon">⚙️</i><span class="nav-text">Config</span></a></li>
-                            <li><a href="{{ url_for('profile') }}">Profile</a></li>
+                    <li><a href="{{ url_for('dashboard') }}" data-tooltip="Dashboard"><i class="nav-icon">📈</i><span class="nav-text">Dashboard</span></a></li>
-                            <li><a href="{{ url_for('config') }}">Config</a></li>
+                    <li><a href="{{ url_for('admin_users') }}" data-tooltip="Manage Users"><i class="nav-icon">👥</i><span class="nav-text">Manage Users</span></a></li>
-                            <li><a href="{{ url_for('dashboard') }}">Dashboard</a></li>
+                    <li><a href="{{ url_for('admin_teams') }}" data-tooltip="Manage Teams"><i class="nav-icon">🏢</i><span class="nav-text">Manage Teams</span></a></li>
-                            <li><a href="{{ url_for('admin_users') }}">Manage Users</a></li>
+                    <li><a href="{{ url_for('admin_projects') }}" data-tooltip="Manage Projects"><i class="nav-icon">📝</i><span class="nav-text">Manage Projects</span></a></li>
-                            <li><a href="{{ url_for('admin_teams') }}">Manage Teams</a></li>
+                    <li><a href="{{ url_for('admin_settings') }}" data-tooltip="System Settings"><i class="nav-icon">🔧</i><span class="nav-text">System Settings</span></a></li>
-                            <li><a href="{{ url_for('admin_projects') }}">Manage Projects</a></li>
+                    {% if g.user.team_id %}
-                            <li><a href="{{ url_for('admin_settings') }}">System Settings</a></li>
+                    <li><a href="{{ url_for('team_hours') }}" data-tooltip="Team Hours"><i class="nav-icon">⏰</i><span class="nav-text">Team Hours</span></a></li>
-                            {% if g.user.team_id %}
-                            <li><a href="{{ url_for('team_hours') }}">Team Hours</a></li>
-                            {% endif %}
-                            <li><a href="{{ url_for('logout') }}">Logout</a></li>
-                        </ul>
-                    </li>
-                    {% elif g.user.role in [Role.TEAM_LEADER, Role.SUPERVISOR] %}
-                    <!-- Team Leader/Supervisor dropdown menu -->
-                    <li class="dropdown admin-dropdown">
-                        <a href="#" class="dropdown-toggle">{{ g.user.username }}</a>
-                        <ul class="dropdown-menu">
-                            <li><a href="{{ url_for('profile') }}">Profile</a></li>
-                            <li><a href="{{ url_for('config') }}">Config</a></li>
-                            <li><a href="{{ url_for('dashboard') }}">Dashboard</a></li>
-                            {% if g.user.role == Role.SUPERVISOR %}
-                            <li><a href="{{ url_for('admin_projects') }}">Manage Projects</a></li>
-                            {% endif %}
-                            {% if g.user.team_id %}
-                            <li><a href="{{ url_for('team_hours') }}">Team Hours</a></li>
-                            {% endif %}
-                            <li><a href="{{ url_for('logout') }}">Logout</a></li>
-                        </ul>
-                    </li>
-                    {% else %}
-                    <!-- Regular user dropdown menu -->
-                    <li class="dropdown admin-dropdown">
-                        <a href="#" class="dropdown-toggle">{{ g.user.username }}</a>
-                        <ul class="dropdown-menu">
-                            <li><a href="{{ url_for('profile') }}">Profile</a></li>
-                            <li><a href="{{ url_for('config') }}">Config</a></li>
-                            <li><a href="{{ url_for('logout') }}">Logout</a></li>
-                        </ul>
-                    </li>
                     {% endif %}
+                    {% elif g.user.role in [Role.TEAM_LEADER, Role.SUPERVISOR] %}
+                    <li class="nav-divider">{{ g.user.username }}</li>
+                    <li><a href="{{ url_for('profile') }}" data-tooltip="Profile"><i class="nav-icon">👤</i><span class="nav-text">Profile</span></a></li>
+                    <li><a href="{{ url_for('config') }}" data-tooltip="Config"><i class="nav-icon">⚙️</i><span class="nav-text">Config</span></a></li>
+                    <li><a href="{{ url_for('dashboard') }}" data-tooltip="Dashboard"><i class="nav-icon">📈</i><span class="nav-text">Dashboard</span></a></li>
+                    {% if g.user.role == Role.SUPERVISOR %}
+                    <li><a href="{{ url_for('admin_projects') }}" data-tooltip="Manage Projects"><i class="nav-icon">📝</i><span class="nav-text">Manage Projects</span></a></li>
+                    {% endif %}
+                    {% if g.user.team_id %}
+                    <li><a href="{{ url_for('team_hours') }}" data-tooltip="Team Hours"><i class="nav-icon">⏰</i><span class="nav-text">Team Hours</span></a></li>
+                    {% endif %}
+                    {% else %}
+                    <li class="nav-divider">{{ g.user.username }}</li>
+                    <li><a href="{{ url_for('profile') }}" data-tooltip="Profile"><i class="nav-icon">👤</i><span class="nav-text">Profile</span></a></li>
+                    <li><a href="{{ url_for('config') }}" data-tooltip="Config"><i class="nav-icon">⚙️</i><span class="nav-text">Config</span></a></li>
+                    {% endif %}
+                    
+                    <li class="nav-divider"></li>
+                    <li><a href="{{ url_for('logout') }}" data-tooltip="Logout"><i class="nav-icon">🚪</i><span class="nav-text">Logout</span></a></li>
                 {% else %}
-                    <li><a href="{{ url_for('login') }}">Login</a></li>
+                    <li><a href="{{ url_for('login') }}" data-tooltip="Login"><i class="nav-icon">🔑</i><span class="nav-text">Login</span></a></li>
-                    <li><a href="{{ url_for('register') }}">Register</a></li>
+                    <li><a href="{{ url_for('register') }}" data-tooltip="Register"><i class="nav-icon">📝</i><span class="nav-text">Register</span></a></li>
                 {% endif %}
             </ul>
         </nav>
-    </header>
+    </aside>
 
-    <main>
+    <!-- Mobile overlay -->
+    <div class="mobile-overlay" id="mobile-overlay"></div>
+
+    <main class="main-content">
         {% with messages = get_flashed_messages(with_categories=true) %}
             {% if messages %}
                 <div class="flash-messages">
@@ -88,5 +98,6 @@
     </footer>
 
     <script src="{{ url_for('static', filename='js/script.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/sidebar.js') }}"></script>
 </body>
 </html>