From fac720d2827de7c522790322b93b5854a182f927 Mon Sep 17 00:00:00 2001 From: d10s <79284025+D10S0VSkY-OSS@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:50:13 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7refactor:=20sld=20home=20and=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- play-with-sld/docker/docker-compose.dev.yml | 2 - play-with-sld/docker/docker-compose.yml | 2 - .../app/base/static/assets/css/volt.css | 15 ++-- .../app/base/static/assets/img/brand/dark.svg | 2 +- .../base/static/assets/img/brand/light.svg | 70 ++++--------------- .../app/base/templates/includes/sidebar.html | 8 ++- .../app/home/templates/activity-logs.html | 2 +- .../app/home/templates/aws-edit.html | 2 +- .../app/home/templates/aws-list.html | 2 +- sld-dashboard/app/home/templates/aws-new.html | 2 +- .../app/home/templates/azure-edit.html | 2 +- .../app/home/templates/azure-list.html | 2 +- .../app/home/templates/azure-new.html | 2 +- .../home/templates/custom-provider-list.html | 2 +- .../home/templates/custom-provider-new.html | 2 +- .../app/home/templates/dashboard.html | 4 +- .../app/home/templates/deploy-stream.html | 2 +- .../app/home/templates/gcp-edit.html | 2 +- .../app/home/templates/gcp-list.html | 2 +- sld-dashboard/app/home/templates/gcp-new.html | 2 +- sld-dashboard/app/home/templates/index.html | 18 +++-- .../app/home/templates/stack-details.html | 4 ++ .../app/home/templates/stacks-cards.html | 2 +- .../app/home/templates/stacks-list.html | 2 +- .../app/home/templates/stacks-new.html | 2 +- .../app/home/templates/tasks-logs.html | 5 +- .../app/home/templates/tasks-output.html | 2 +- .../app/home/templates/users-list.html | 2 +- .../app/home/templates/users-new.html | 2 +- 29 files changed, 65 insertions(+), 103 deletions(-) diff --git a/play-with-sld/docker/docker-compose.dev.yml b/play-with-sld/docker/docker-compose.dev.yml index 95143b0f..f79cae1e 100644 --- a/play-with-sld/docker/docker-compose.dev.yml +++ b/play-with-sld/docker/docker-compose.dev.yml @@ -9,7 +9,6 @@ services: - SYS_NICE volumes: - sld-db_dev:/var/lib/mysql - restart: always ports: - 3306:3306 # command: --init-file init.sql @@ -103,7 +102,6 @@ services: #image: d10s0vsky/sld-dashboard:latest hostname: sld-dashboard entrypoint: gunicorn --config gunicorn-cfg.py run:app - restart: always env_file: ../../sld-dashboard/.env ports: - "5000:5000" diff --git a/play-with-sld/docker/docker-compose.yml b/play-with-sld/docker/docker-compose.yml index 289867b2..d9f23eaa 100644 --- a/play-with-sld/docker/docker-compose.yml +++ b/play-with-sld/docker/docker-compose.yml @@ -8,7 +8,6 @@ services: - SYS_NICE volumes: - sld-db:/var/lib/mysql - restart: always ports: - 3306:3306 environment: @@ -86,7 +85,6 @@ services: environment: PATH: "/home/sld/.asdf/shims:/home/sld/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" entrypoint: python -m gunicorn --config gunicorn-cfg.py run:app - restart: always env_file: ../../sld-dashboard/.env ports: - "5000:5000" diff --git a/sld-dashboard/app/base/static/assets/css/volt.css b/sld-dashboard/app/base/static/assets/css/volt.css index b77dfec9..c46a0216 100644 --- a/sld-dashboard/app/base/static/assets/css/volt.css +++ b/sld-dashboard/app/base/static/assets/css/volt.css @@ -3766,10 +3766,8 @@ progress { } .btn-secondary { - color: #f12e58; - background-color: #f12e58; - border-color: #f12e58; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(46, 54, 80, 0.075); + background-image: linear-gradient(to right, #a8b3df, #6d5d9f) } .btn-secondary:hover { @@ -13751,7 +13749,7 @@ progress { } .bg-primary { - background-color: #262B40 !important; + background: linear-gradient(to top left, #262b40, #262b40) } .bg-secondary { @@ -28696,7 +28694,6 @@ label { } .navbar-theme-primary:not(.headroom) { - background-color: #262B40; } .navbar-theme-primary.navbar-light:not(.headroom) .navbar-nav .dropdown-item.active, .navbar-theme-primary.navbar-light:not(.headroom) .navbar-nav .dropdown-item:hover, @@ -32891,7 +32888,7 @@ label { .sidebar .nav-item.active > .nav-link { color: #eaedf2; - background-color: #2e3650; + background-color: #361f6b; } .sidebar .nav-item .nav-link { @@ -32900,7 +32897,7 @@ label { .sidebar .nav-item .nav-link:hover { color: #eaedf2; - background-color: #2e3650; + background-color: #361f6b; } .sidebar .nav-link + .multi-level { @@ -40350,7 +40347,7 @@ label { } .table .thead-dark th { - background-color: #262B40; + background-color: #0e1133; color: #ffffff; } @@ -41859,7 +41856,7 @@ pre { } #particles-js{ - background-color: #262B40; + background: linear-gradient(to bottom left, #09223d, #080308, #282629, #7132a9, #0b0716); position: static; width: 100%; height: 100%; diff --git a/sld-dashboard/app/base/static/assets/img/brand/dark.svg b/sld-dashboard/app/base/static/assets/img/brand/dark.svg index 47b9c220..bea4310c 100644 --- a/sld-dashboard/app/base/static/assets/img/brand/dark.svg +++ b/sld-dashboard/app/base/static/assets/img/brand/dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sld-dashboard/app/base/static/assets/img/brand/light.svg b/sld-dashboard/app/base/static/assets/img/brand/light.svg index 666cb767..8564daa9 100644 --- a/sld-dashboard/app/base/static/assets/img/brand/light.svg +++ b/sld-dashboard/app/base/static/assets/img/brand/light.svg @@ -1,59 +1,13 @@ - -

diff --git a/sld-dashboard/app/home/templates/activity-logs.html b/sld-dashboard/app/home/templates/activity-logs.html index 94d23100..7381f7f1 100644 --- a/sld-dashboard/app/home/templates/activity-logs.html +++ b/sld-dashboard/app/home/templates/activity-logs.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="SLD logo">
diff --git a/sld-dashboard/app/home/templates/aws-edit.html b/sld-dashboard/app/home/templates/aws-edit.html index ac7a8a2a..4d0a7633 100644 --- a/sld-dashboard/app/home/templates/aws-edit.html +++ b/sld-dashboard/app/home/templates/aws-edit.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/aws-list.html b/sld-dashboard/app/home/templates/aws-list.html index e506933a..2e56e493 100644 --- a/sld-dashboard/app/home/templates/aws-list.html +++ b/sld-dashboard/app/home/templates/aws-list.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/aws-new.html b/sld-dashboard/app/home/templates/aws-new.html index f2328ece..30d8400f 100644 --- a/sld-dashboard/app/home/templates/aws-new.html +++ b/sld-dashboard/app/home/templates/aws-new.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/azure-edit.html b/sld-dashboard/app/home/templates/azure-edit.html index b73e4433..43f21a91 100644 --- a/sld-dashboard/app/home/templates/azure-edit.html +++ b/sld-dashboard/app/home/templates/azure-edit.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/azure-list.html b/sld-dashboard/app/home/templates/azure-list.html index 78494650..ad030257 100644 --- a/sld-dashboard/app/home/templates/azure-list.html +++ b/sld-dashboard/app/home/templates/azure-list.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/azure-new.html b/sld-dashboard/app/home/templates/azure-new.html index e860f5a5..7016e5a9 100644 --- a/sld-dashboard/app/home/templates/azure-new.html +++ b/sld-dashboard/app/home/templates/azure-new.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/custom-provider-list.html b/sld-dashboard/app/home/templates/custom-provider-list.html index 0c727c76..948ac21b 100644 --- a/sld-dashboard/app/home/templates/custom-provider-list.html +++ b/sld-dashboard/app/home/templates/custom-provider-list.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/custom-provider-new.html b/sld-dashboard/app/home/templates/custom-provider-new.html index 69dfb4d8..01c3206a 100644 --- a/sld-dashboard/app/home/templates/custom-provider-new.html +++ b/sld-dashboard/app/home/templates/custom-provider-new.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/dashboard.html b/sld-dashboard/app/home/templates/dashboard.html index 03768f19..5759503e 100644 --- a/sld-dashboard/app/home/templates/dashboard.html +++ b/sld-dashboard/app/home/templates/dashboard.html @@ -46,7 +46,7 @@
+ class="fas fa-layer-group">
@@ -70,7 +70,7 @@

{{ stacks|length }}

+ class="fas fa-box-open">
diff --git a/sld-dashboard/app/home/templates/deploy-stream.html b/sld-dashboard/app/home/templates/deploy-stream.html index 75183836..cb9b9bfb 100644 --- a/sld-dashboard/app/home/templates/deploy-stream.html +++ b/sld-dashboard/app/home/templates/deploy-stream.html @@ -59,7 +59,7 @@

This is a beta version of the feature. Feedback is welcome!

- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/gcp-edit.html b/sld-dashboard/app/home/templates/gcp-edit.html index fcb07944..15b75baa 100644 --- a/sld-dashboard/app/home/templates/gcp-edit.html +++ b/sld-dashboard/app/home/templates/gcp-edit.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/gcp-list.html b/sld-dashboard/app/home/templates/gcp-list.html index 3e9d8787..f59cec5a 100644 --- a/sld-dashboard/app/home/templates/gcp-list.html +++ b/sld-dashboard/app/home/templates/gcp-list.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
Volt logo + height="90" alt="Volt logo">
diff --git a/sld-dashboard/app/home/templates/gcp-new.html b/sld-dashboard/app/home/templates/gcp-new.html index 053c227c..1144c2a5 100644 --- a/sld-dashboard/app/home/templates/gcp-new.html +++ b/sld-dashboard/app/home/templates/gcp-new.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/index.html b/sld-dashboard/app/home/templates/index.html index 67da23e4..445f52fd 100644 --- a/sld-dashboard/app/home/templates/index.html +++ b/sld-dashboard/app/home/templates/index.html @@ -52,13 +52,19 @@
@@ -87,8 +93,10 @@
- Logo light + + + +

Stack Lifecycle Deployment

Defines and manages the complete lifecycle of resources used diff --git a/sld-dashboard/app/home/templates/stack-details.html b/sld-dashboard/app/home/templates/stack-details.html index 14bc1ad7..5854ae7a 100644 --- a/sld-dashboard/app/home/templates/stack-details.html +++ b/sld-dashboard/app/home/templates/stack-details.html @@ -61,6 +61,10 @@

Details

IaC Version {{ stack.tf_version }} + + Git Repository + {{ stack.git_repo }} + diff --git a/sld-dashboard/app/home/templates/stacks-cards.html b/sld-dashboard/app/home/templates/stacks-cards.html index 412b89cb..4c6c216f 100644 --- a/sld-dashboard/app/home/templates/stacks-cards.html +++ b/sld-dashboard/app/home/templates/stacks-cards.html @@ -14,7 +14,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/stacks-list.html b/sld-dashboard/app/home/templates/stacks-list.html index 2e5b52c8..ac8c7ac5 100644 --- a/sld-dashboard/app/home/templates/stacks-list.html +++ b/sld-dashboard/app/home/templates/stacks-list.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/stacks-new.html b/sld-dashboard/app/home/templates/stacks-new.html index 40867283..2e1a841f 100644 --- a/sld-dashboard/app/home/templates/stacks-new.html +++ b/sld-dashboard/app/home/templates/stacks-new.html @@ -10,7 +10,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/tasks-logs.html b/sld-dashboard/app/home/templates/tasks-logs.html index 3d62617d..c15d2e01 100644 --- a/sld-dashboard/app/home/templates/tasks-logs.html +++ b/sld-dashboard/app/home/templates/tasks-logs.html @@ -3,7 +3,8 @@ {% block title %} Tasks {% endblock %} -{% block stylesheets %}{% endblock stylesheets %} +{% block stylesheets %} +{% endblock stylesheets %} {% block content %} @@ -11,7 +12,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + SLD logo
diff --git a/sld-dashboard/app/home/templates/tasks-output.html b/sld-dashboard/app/home/templates/tasks-output.html index 4743abeb..ed4d5a6c 100644 --- a/sld-dashboard/app/home/templates/tasks-output.html +++ b/sld-dashboard/app/home/templates/tasks-output.html @@ -12,7 +12,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/users-list.html b/sld-dashboard/app/home/templates/users-list.html index d8bcff29..8595d8ae 100644 --- a/sld-dashboard/app/home/templates/users-list.html +++ b/sld-dashboard/app/home/templates/users-list.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo
diff --git a/sld-dashboard/app/home/templates/users-new.html b/sld-dashboard/app/home/templates/users-new.html index 1b644006..6ceae576 100644 --- a/sld-dashboard/app/home/templates/users-new.html +++ b/sld-dashboard/app/home/templates/users-new.html @@ -11,7 +11,7 @@ {% include 'includes/navigation.html' %}
- Volt logo + Volt logo