diff --git a/app.py b/app.py index ef12693..f55fc40 100644 --- a/app.py +++ b/app.py @@ -367,10 +367,6 @@ def dashboard(): return render_template('dashboard.html', title='Dashboard', **dashboard_data) # Redirect old admin dashboard URL to new dashboard -@app.route('/admin/dashboard') -@admin_required -def admin_dashboard(): - return redirect(url_for('dashboard')) @app.route('/admin/users') @admin_required @@ -1844,4 +1840,4 @@ def download_team_hours_export(): return redirect(url_for('team_hours')) if __name__ == '__main__': - app.run(debug=True) \ No newline at end of file + app.run(debug=True, port=5050) \ No newline at end of file diff --git a/static/css/style.css b/static/css/style.css index c5b4675..ca5efbc 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -184,6 +184,11 @@ button { color: white; } +.btn-success { + background-color: #4CAF50; + color: white; +} + .btn:hover { background-color: #45a049; } @@ -490,6 +495,13 @@ input[type="time"]::-webkit-datetime-edit { margin-bottom: 2rem; } +.admin-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 2rem; +} + .admin-panel { display: flex; flex-wrap: wrap; diff --git a/templates/admin_dashboard.html b/templates/admin_dashboard.html deleted file mode 100644 index 645f5a3..0000000 --- a/templates/admin_dashboard.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} -
-

Admin Dashboard

- -
-
-

User Management

-

Manage user accounts, permissions, and roles.

- Manage Users -
- -
-

Team Management

-

Configure teams and their members.

- Configure -
- -
-

System Settings

-

Configure application-wide settings like registration and more.

- Configure -
-
-
-{% endblock %} \ No newline at end of file diff --git a/templates/admin_projects.html b/templates/admin_projects.html index b616396..6aa8c31 100644 --- a/templates/admin_projects.html +++ b/templates/admin_projects.html @@ -4,7 +4,7 @@

Project Management

- Create New Project + Create New Project
{% if projects %} @@ -45,11 +45,11 @@ {{ project.created_by.username }} {{ project.time_entries|length }} - Edit + Edit {% if g.user.role.name == 'ADMIN' and project.time_entries|length == 0 %}
- +
{% endif %} @@ -66,12 +66,6 @@