diff --git a/Makefile b/Makefile index cb6a350f..718cc2aa 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ PREV_IMAGE_TAG=$$(git rev-parse HEAD~1) IMAGE_TAG=$$(git rev-parse HEAD) tf_build_args=-var "image_tag=$(IMAGE_TAG)" -DOCKER_SERVICES=$$(docker compose config --services | grep -Ev 'worker|sveltekit-app') +DOCKER_SERVICES=$$(docker compose config --services | grep -Ev 'worker') AUTO_APPLY_RESOURCES = module.django-app.aws_ecs_task_definition.aws-ecs-task \ module.django-app.aws_ecs_service.aws-ecs-service \ diff --git a/django_app/redbox_app/jinja2.py b/django_app/redbox_app/jinja2.py index 9e7d4b2f..bfd6b280 100644 --- a/django_app/redbox_app/jinja2.py +++ b/django_app/redbox_app/jinja2.py @@ -86,7 +86,6 @@ def environment(**options): "to_user_timezone": to_user_timezone, "environment": settings.ENVIRONMENT.value, "security": settings.MAX_SECURITY_CLASSIFICATION.value, - "waffle_flag": waffle.flag_is_active, } ) env.globals.update( @@ -98,7 +97,6 @@ def environment(**options): "to_user_timezone": to_user_timezone, "environment": settings.ENVIRONMENT.value, "security": settings.MAX_SECURITY_CLASSIFICATION.value, - "waffle_flag": waffle.flag_is_active, "google_analytics_tag": settings.GOOGLE_ANALYTICS_TAG, "google_analytics_link": settings.GOOGLE_ANALYTICS_LINK, "google_analytics_iframe_src": settings.GOOGLE_ANALYTICS_IFRAME_SRC, diff --git a/django_app/redbox_app/redbox_core/views/info_views.py b/django_app/redbox_app/redbox_core/views/info_views.py index df474147..93f149ac 100644 --- a/django_app/redbox_app/redbox_core/views/info_views.py +++ b/django_app/redbox_app/redbox_core/views/info_views.py @@ -13,10 +13,7 @@ def privacy_notice_view(request): return render( request, - "privacy-notice.html", - { - "waffle_flag": waffle.flag_is_active, - }, + "privacy-notice.html" ) @@ -34,6 +31,5 @@ def accessibility_statement_view(request): "accessibility-statement.html", { "contact_email": settings.CONTACT_EMAIL, - "waffle_flag": waffle.flag_is_active, }, ) diff --git a/django_app/redbox_app/templates/accessibility-statement.html b/django_app/redbox_app/templates/accessibility-statement.html index 8e749aa7..dccc87db 100644 --- a/django_app/redbox_app/templates/accessibility-statement.html +++ b/django_app/redbox_app/templates/accessibility-statement.html @@ -2,18 +2,11 @@ {% set pageTitle = "Accessibility statement" %} -{% if waffle_flag(request, "uktrade") %} - {% set departmental_owner = "Department for Business and Trade" %} - {% set zoom_level = "300%" %} - {% set review_date_last = "21st June 2024" %} - {% set compliance_status = 'This website is fully compliant with the Web Content Accessibility Guidelines version 2.2 AA standard.' %} - -{% else %} - {% set departmental_owner = "Cabinet Office" %} - {% set zoom_level = "400%" %} - {% set review_date_last = "12th August 2024" %} - {% set compliance_status = 'The website has been tested against the Web Content Accessibility Guidelines (WCAG) 2.2 AA standard. This website is fully compliant with the Web Content Accessibility Guidelines version 2.2 AA standard.' %} -{% endif %} +{% set departmental_owner = "Department for Business and Trade" %} +{% set zoom_level = "300%" %} +{% set review_date_last = "21st June 2024" %} +{% set compliance_status = 'This website is fully compliant with the Web Content Accessibility Guidelines version 2.2 AA standard.' %} + {% block content %} diff --git a/django_app/redbox_app/templates/base.html b/django_app/redbox_app/templates/base.html index 68da6aba..1dcdb574 100644 --- a/django_app/redbox_app/templates/base.html +++ b/django_app/redbox_app/templates/base.html @@ -19,7 +19,7 @@ - {% if environment | lower == "prod" and waffle_flag(request, 'uktrade') %} + {% if environment | lower == "prod" %} - - diff --git a/sveltekit_app/src/lib/components/button.svelte b/sveltekit_app/src/lib/components/button.svelte deleted file mode 100644 index 5669e225..00000000 --- a/sveltekit_app/src/lib/components/button.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - {text} - diff --git a/sveltekit_app/src/lib/components/footer.svelte b/sveltekit_app/src/lib/components/footer.svelte deleted file mode 100644 index 08780916..00000000 --- a/sveltekit_app/src/lib/components/footer.svelte +++ /dev/null @@ -1,102 +0,0 @@ - - - diff --git a/sveltekit_app/src/lib/components/top-nav.svelte b/sveltekit_app/src/lib/components/top-nav.svelte deleted file mode 100644 index 5a5ecc72..00000000 --- a/sveltekit_app/src/lib/components/top-nav.svelte +++ /dev/null @@ -1,125 +0,0 @@ - - -
-
-
-
- -
- {productName} -
- {#if phase} -
{phase}
- {/if} -
- -
- - - -
- - - -
diff --git a/sveltekit_app/src/routes/+layout.server.js b/sveltekit_app/src/routes/+layout.server.js deleted file mode 100644 index fbf029ab..00000000 --- a/sveltekit_app/src/routes/+layout.server.js +++ /dev/null @@ -1,38 +0,0 @@ -//import { redirect } from "@sveltejs/kit"; -import { config } from 'dotenv'; -config(); - -export async function load({ request, cookies }) { - - const API_URL = `${process.env.DJANGO_API_HOST}/api/v0?format=json`; - - let userData = {}; - - try { - const userRequest = await fetch(API_URL, { - headers: { - cookie: `sessionid=${cookies.get("sessionid")}`, - }, - }); - userData = userRequest.ok ? await userRequest.json() : {}; - } catch (err) { - console.log("Error connecting to Django", err); - } - - - const publicRoutes = [ - "/", - "/sign-in", - "/privacy", - "/accessibility", - "support", - "sitemap", - ]; - // TO DO: Add a redirect here if user is not authenticated, unless one of the publicRoutes - - return { - userIsAuthenticated: userData.email ? true : false, - user: userData, - }; - -} diff --git a/sveltekit_app/src/routes/+layout.svelte b/sveltekit_app/src/routes/+layout.svelte deleted file mode 100644 index 31fc9bf0..00000000 --- a/sveltekit_app/src/routes/+layout.svelte +++ /dev/null @@ -1,14 +0,0 @@ - - -
- -
- -
- -