Merge branch 'main' into DWPF-704-update-dw-usage-of-feedback-package…

…-and-implement-custom-notifications
uktrade · Sep 4, 2023 · fc95bf4 · fc95bf4
2 parents 939dfcb + 7e328d0
commit fc95bf4
Show file tree

Hide file tree

Showing 50 changed files with 2,610 additions and 1,497 deletions.
diff --git a/assets/js/application.js b/assets/js/application.js
@@ -4,5 +4,11 @@ const images = require.context("../images", true);
 const imagePath = (name) => images(name, true);
 
 require.context("govuk-frontend/govuk/assets");
-import { initAll } from "govuk-frontend";
+require.context(
+    "@ministryofjustice/frontend/moj/assets"
+);
+import {initAll} from "govuk-frontend";
+import mojFrontend from "@ministryofjustice/frontend";
+
 initAll();
+mojFrontend.initAll();
diff --git a/assets/stylesheets/application.scss b/assets/stylesheets/application.scss
@@ -11,6 +11,9 @@ $govuk-image-url-function: frontend-image-url;
 
 @import "~govuk-frontend/govuk/all";
 
+$moj-assets-path: "/static/moj-frontend/";
+@import "~@ministryofjustice/frontend/moj/all";
+
 // Variables
 @import "vars/colors";
 

diff --git a/assets/stylesheets/components/_peoplefinder.scss b/assets/stylesheets/components/_peoplefinder.scss
@@ -421,3 +421,35 @@
     }
   }
 }
+
+.profile-photo {
+  --bubble-color: rgba(var(--color-1), var(--color-2), var(--color-3), 0.1);
+
+  padding: 0px;
+  display: grid;
+  background: radial-gradient(circle at 13% 47%, var(--bubble-color) 0%, var(--bubble-color) 25%,transparent 25%, transparent 100%), radial-gradient(circle at 28% 63%, var(--bubble-color) 0%, var(--bubble-color) 16%,transparent 16%, transparent 100%),radial-gradient(circle at 81% 56%, var(--bubble-color) 0%, var(--bubble-color) 12%,transparent 12%, transparent 100%),radial-gradient(circle at 26% 48%, var(--bubble-color) 0%, var(--bubble-color) 6%,transparent 6%, transparent 100%),radial-gradient(circle at 97% 17%, var(--bubble-color) 0%, var(--bubble-color) 56%,transparent 56%, transparent 100%),radial-gradient(circle at 50% 100%, var(--bubble-color) 0%, var(--bubble-color) 36%,transparent 36%, transparent 100%),radial-gradient(circle at 55% 52%, var(--bubble-color) 0%, var(--bubble-color) 6%,transparent 6%, transparent 100%),linear-gradient(90deg, rgb(255,255,255),rgb(255,255,255));
+  background-size: 400% 400%;
+  transition: padding 0.2s ease-in-out;
+
+  &:hover {
+    padding: 5px;
+    transition: padding 0.2s ease-in-out;
+  }
+}
+
+// Animate the profile photo background gradient
+.profile-photo {
+  animation: gradient 10s ease infinite;
+}
+
+@keyframes gradient {
+  0% {
+    background-position: 0% 50%;
+  }
+  50% {
+    background-position: 100% 50%;
+  }
+  100% {
+    background-position: 0% 50%;
+  }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,6 +17,11 @@ services:
       timeout: 5s
       retries: 5
 
+  redis:
+    image: redis:buster
+    ports:
+      - "6379:6379"
+
   opensearch:
     image: opensearchproject/opensearch:1.3.7
     ports:
@@ -37,6 +42,18 @@ services:
           "http://localhost:9200/_cat/health"
         ]
 
+  opensearch-dashboards:
+    image: opensearchproject/opensearch-dashboards:1.3.7
+    ports:
+      - 5601:5601
+    profiles:
+      - opensearch
+    environment:
+      - 'OPENSEARCH_HOSTS=["http://opensearch:9200"]'
+      - "DISABLE_SECURITY_DASHBOARDS_PLUGIN=true"
+    depends_on:
+      - opensearch
+
   wagtail:
     build:
       context: .
@@ -60,11 +77,6 @@ services:
     stdin_open: true
     tty: true
 
-  redis:
-    image: redis:buster
-    ports:
-      - "6379:6379"
-
   celery:
     image: digital_workspace/wagtail:latest
     command: poetry run celery -A config worker -l info
@@ -108,15 +120,3 @@ services:
       - DJANGO_SETTINGS_MODULE=config.settings.test
     links:
       - "wagtail:main"
-
-  opensearch-dashboards:
-    image: opensearchproject/opensearch-dashboards:1.3.7
-    ports:
-      - 5601:5601
-    profiles:
-      - opensearch
-    environment:
-      - 'OPENSEARCH_HOSTS=["http://opensearch:9200"]'
-      - "DISABLE_SECURITY_DASHBOARDS_PLUGIN=true"
-    depends_on:
-      - opensearch