From db72aea5e4a51e668a6f7155aabd1ff8515dc06b Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Thu, 15 Feb 2024 13:40:25 +0000
Subject: [PATCH] feat: added theming scss and removed unneeded configmaps
---
.../assets/config/config.theming.default.scss | 149 ++++++++++++++++++
.../templates/portalweb-config-nginx.yaml | 36 -----
.../helm/openslice/templates/portalweb.yaml | 6 -
.../templates/tmfweb-config-nginx.yaml | 36 -----
.../openslice/templates/tmfweb-config.yaml | 4 +-
.../helm/openslice/templates/tmfweb.yaml | 6 -
6 files changed, 152 insertions(+), 85 deletions(-)
create mode 100644 kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.theming.default.scss
delete mode 100644 kubernetes/helm/openslice/templates/portalweb-config-nginx.yaml
delete mode 100644 kubernetes/helm/openslice/templates/tmfweb-config-nginx.yaml
diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.theming.default.scss b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.theming.default.scss
new file mode 100644
index 0000000..54839f3
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.theming.default.scss
@@ -0,0 +1,149 @@
+/* You can add global styles to this file, and also import other style files */
+
+// @import "@angular/material/prebuilt-themes/indigo-pink.css";
+
+@import "~@danielmoncada/angular-datetime-picker/assets/style/picker.min.css";
+
+/* override bootstrap's 4 blue color */
+$primary: #428bca;
+$secondary: #6c6c6c;
+
+@import "src/assets/config/theming.scss";
+
+@import "~bootstrap/scss/bootstrap";
+
+// .mat-chip-list-wrapper {
+// flex-wrap: nowrap !important;
+// }
+
+.mat-chip {
+ overflow: unset !important;
+ white-space: nowrap !important;
+}
+
+* {
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 300;
+}
+
+h1, h2, h3, h4, h5, .h1, .h2, .h3, .h4, .h5 {
+ font-weight: 300 !important;
+}
+
+.btn {
+ font-weight: 300 !important;
+}
+
+.shadowed {
+ text-shadow: 4px 4px 6px #aaa;
+}
+
+.shadowed-dark{
+ text-shadow: 4px 4px 6px #513838;
+}
+
+.universal-tooltip {
+ font-size: .9rem;
+ // width: 450px;
+}
+
+mat-form-field.white-background .mat-form-field-wrapper .mat-form-field-flex .mat-form-field-outline {
+ background-color: #fff;
+ border-radius: 5px
+}
+
+mat-form-field {
+ width: 100%;
+}
+
+.jumbotron.jumbotron-small.jumbotron-list-container {
+ min-height: 345px;
+}
+
+
+.card.card-paper {
+ border-radius: 12px;
+ box-shadow: 0 6px 10px -4px rgba(0,0,0,.15);
+ background-color: #fff;
+ color: #252422;
+ margin-bottom: 20px;
+ position: relative;
+ border: 0;
+ transition: box-shadow .2s ease,-webkit-transform .3s cubic-bezier(.34,2,.6,1);
+ transition: transform .3s cubic-bezier(.34,2,.6,1),box-shadow .2s ease;
+ transition: transform .3s cubic-bezier(.34,2,.6,1),box-shadow .2s ease,-webkit-transform .3s cubic-bezier(.34,2,.6,1);
+}
+
+.card.card-paper .card-header {
+ // padding: 15px 15px 0;
+ padding: 15px;
+ // border: 0;
+}
+
+.card.card-paper .card-body {
+ padding: 15px 15px 0px;
+}
+
+.card.card-paper .card-footer {
+ padding: 0px 15px 15px;
+ border: 0;
+ background: transparent;
+}
+
+.card-stats {
+ font-size: .9rem;
+}
+
+.card-stats i {
+ font-size: .8em;
+}
+
+.filter-container mat-form-field.mat-form-field-appearance-outline .mat-form-field-wrapper {
+ padding: 0;
+}
+
+.table.table-generic {
+ margin-bottom: 0;
+ // border: 1px solid #ddd;
+ // font-family:inherit;
+}
+
+.table.table-generic th {
+ padding: .5rem;
+ font-weight: 600;
+ font-size: 0.9rem;
+}
+
+.table.table-generic td {
+ vertical-align: middle;
+ padding: .5rem
+}
+
+.mat-paginator {
+ font-weight: 600;
+}
+
+mat-panel-title {
+ font-weight: bold;
+}
+
+.nav-link.active mat-checkbox .mat-checkbox-layout .mat-checkbox-inner-container .mat-checkbox-frame {
+ border-color:#fff
+}
+
+.nav-link mat-checkbox label {
+ margin-bottom: 0 ;
+}
+
+.minh-30vh {
+ min-height: 30vh;
+}
+
+html, body { height: 100%; }
+body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+
+@media screen and (min-width: 576px) {
+ .jumbotron.jumbotron-small {
+ padding: 2rem;
+ }
+ }
\ No newline at end of file
diff --git a/kubernetes/helm/openslice/templates/portalweb-config-nginx.yaml b/kubernetes/helm/openslice/templates/portalweb-config-nginx.yaml
deleted file mode 100644
index 5616103..0000000
--- a/kubernetes/helm/openslice/templates/portalweb-config-nginx.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
- name: {{ include "openslice.fullname" . }}-portalweb-config-nginx
- namespace: {{ .Release.Namespace }}
- labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: portalweb
- chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- {{- include "openslice.labels" . | nindent 4 }}
-data:
- default.conf: |+
- # Expires map
- map $sent_http_content_type $expires {
- default off;
- text/html epoch;
- text/css max;
- application/json max;
- application/javascript max;
- ~image/ max;
- }
-
- server {
- listen 80;
- include /etc/nginx/mime.types;
-
- server_name {{ .Values.rooturl }};
- location / {
- root /usr/share/nginx/html/;
- index index.html index.htm;
- try_files $uri $uri/ /index.html =404;
- }
-
- expires $expires;
- gzip on;
- }
diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml
index b97736c..62b5d90 100644
--- a/kubernetes/helm/openslice/templates/portalweb.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb.yaml
@@ -36,17 +36,11 @@ spec:
- name: portalweb-configuration
mountPath: /usr/share/nginx/html/nfvportal/js/config.js
subPath: config.js
- - name: portalweb-configuration-nginx
- readOnly: true
- mountPath: "/etc/nginx/conf.d"
volumes:
- name: portalweb-configuration
configMap:
name: {{ include "openslice.fullname" . }}-portalweb-config
defaultMode: 420
- - name: portalweb-configuration-nginx
- configMap:
- name: {{ include "openslice.fullname" . }}-portalweb-config-nginx
restartPolicy: Always
---
apiVersion: v1
diff --git a/kubernetes/helm/openslice/templates/tmfweb-config-nginx.yaml b/kubernetes/helm/openslice/templates/tmfweb-config-nginx.yaml
deleted file mode 100644
index 501df79..0000000
--- a/kubernetes/helm/openslice/templates/tmfweb-config-nginx.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: {{ .Release.Namespace }}
- labels:
- app: {{ include "openslice.fullname" . }}
- org.etsi.osl.service: tmfweb
- chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- {{- include "openslice.labels" . | nindent 4 }}
- name: {{ include "openslice.fullname" . }}-tmfweb-config-nginx
-data:
- default.conf: |+
- # Expires map
- map $sent_http_content_type $expires {
- default off;
- text/html epoch;
- text/css max;
- application/json max;
- application/javascript max;
- ~image/ max;
- }
-
- server {
- listen 80;
- include /etc/nginx/mime.types;
-
- server_name {{ .Values.rooturl }};
- location / {
- root /usr/share/nginx/html/services;
- index index.html index.htm;
- try_files $uri $uri/ /index.html =404;
- }
-
- expires $expires;
- gzip on;
- }
diff --git a/kubernetes/helm/openslice/templates/tmfweb-config.yaml b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
index de2067b..89a7727 100644
--- a/kubernetes/helm/openslice/templates/tmfweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
@@ -8,8 +8,10 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
name: {{ include "openslice.fullname" . }}-tmfweb-config
- data:
+data:
config.prod.json: |
{{- .Files.Get "files/org.etsi.osl.tmf.web/src/assets/config/config.prod.json" | nindent 4 }}
config.theming.json: |
{{- .Files.Get "files/org.etsi.osl.tmf.web/src/assets/config/config.theming.json" | nindent 4 }}
+ config.theming.scss: |
+ {{- .Files.Get "files/org.etsi.osl.tmf.web/src/assets/config/config.theming.scss" | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml
index 81bff65..5ee8974 100644
--- a/kubernetes/helm/openslice/templates/tmfweb.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb.yaml
@@ -36,16 +36,10 @@ spec:
- name: "tmfweb-configuration"
readOnly: true
mountPath: "/usr/share/nginx/html/services/assets/config"
- - name: "tmfweb-configuration-nginx"
- readOnly: true
- mountPath: "/etc/nginx/conf.d"
volumes:
- name: "tmfweb-configuration"
configMap:
name: {{ include "openslice.fullname" . }}-tmfweb-config
- - name: "tmfweb-configuration-nginx"
- configMap:
- name: {{ include "openslice.fullname" . }}-tmfweb-config-nginx
restartPolicy: Always
---
apiVersion: v1
--
GitLab