Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-9423f4c335

Signed-off-by: Sebastian N. Kaupe <[email protected]>
SovereignCloudStack · Dec 4, 2024 · 73102b4 · 73102b4
2 parents 5e2af99 + 5e620f9
commit 73102b4
Show file tree

Hide file tree

Showing 137 changed files with 2,872 additions and 775 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,10 +22,6 @@ yarn-error.log
 
 # Visual Studio Code
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 .history/*
 
 # Miscellaneous

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Devcontainerfile b/Devcontainerfile
@@ -1,7 +1,7 @@
 FROM fedora:40
 
 RUN dnf upgrade -y --refresh && \
-    dnf install -y nodejs nodejs-npm ripgrep eza fd-find jq rubygem-mustache python3 python3-dateutil && \
+    dnf install -y nodejs nodejs-npm ripgrep eza fd-find jq rubygem-mustache python3 python3-dateutil docker && \
     dnf clean all && \
     npm install -g @angular/cli
 
diff --git a/angular.json b/angular.json
@@ -25,7 +25,8 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "node_modules/ngx-toastr/toastr.css"
             ],
             "scripts": [],
             "allowedCommonJsDependencies": [

diff --git a/html-prototype/templates/incident-log.mustache b/html-prototype/templates/incident-log.mustache
@@ -5,7 +5,7 @@
     <article>
         <h3>17.11.2023</h3>
         <article class="incident">
-            <h4><!--<span class="incident-status status-broken">ongoing</span>--><a class="text-broken" href="./incident.html">API 3 - Service unreachable</a></h4>
+            <h4><a class="text-broken" href="./incident.html">API 3 - Service unreachable</a></h4>
             <p class="incident-start-date">since 16.11.2023</p>
             <section class="incident-update">
                 <h5>Identified</h5>

diff --git a/html-prototype/templates/incident.mustache b/html-prototype/templates/incident.mustache
@@ -1,5 +1,5 @@
 <article id="incident-{{ id }}" class="incident">
-    <h4><!--<span class="incident-api status-{{ severity }}">{{ api }}</span>--><a class="text-{{ severity }}" href="./incident.html">{{ api }} - {{ title }}</a></h4>
+    <h4><a class="text-{{ severity }}" href="./incident.html">{{ api }} - {{ title }}</a></h4>
     {{# updates }}
         <div class="incident-update">
             <h5>{{ title }}</h5>