Merge pull request #23 from alphagov/revert-15-add-needed-frontend-framework-changes

Revert "Setup UI environment for Fact Check Manager"

Author: hezzimo

Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "8.0.3"
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem "sprockets-rails"
 # Use sqlite3 as the database for Active Record
 # gem "sqlite3", ">= 1.4"
 # # Use the Puma web server [https://github.com/puma/puma]
@@ -11,14 +12,14 @@ gem "rails", "8.0.3"
 # gem "importmap-rails"
 
 gem "bootsnap", require: false
+gem "bootstrap-sass"
 gem "dartsass-rails"
 gem "erb_lint"
 gem "gds-api-adapters"
 gem "gds-sso"
 gem "govuk_app_config", "~> 9.22.3"
 gem "govuk_publishing_components"
 gem "govuk_sidekiq"
-gem "nokodiff"
 gem "pg"
 gem "plek"
 gem "sentry-sidekiq"

Gemfile.lock

@@ -75,6 +75,8 @@ GEM
     addressable (2.8.8)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
+    autoprefixer-rails (10.4.21.0)
+      execjs (~> 2)
     base64 (0.3.0)
     benchmark (0.5.0)
     better_html (2.2.0)
@@ -87,6 +89,9 @@ GEM
     bigdecimal (3.3.1)
     bootsnap (1.19.0)
       msgpack (~> 1.2)
+    bootstrap-sass (3.4.1)
+      autoprefixer-rails (>= 5.2.1)
+      sassc (>= 2.0.0)
     brakeman (7.1.1)
       racc
     builder (3.3.0)
@@ -181,16 +186,6 @@ GEM
       rake (>= 13)
     googleapis-common-protos-types (1.22.0)
       google-protobuf (~> 4.26)
-    govspeak (10.8.6)
-      actionview (>= 6, < 8.1.2)
-      addressable (>= 2.3.8, < 2.8.9)
-      govuk_publishing_components (>= 43)
-      htmlentities (~> 4)
-      i18n (>= 0.7, < 1.14.9)
-      kramdown (>= 2.3.1, < 2.5.3)
-      nokogiri (~> 1.12)
-      rinku (~> 2.0)
-      sanitize (>= 6, < 8)
     govuk_app_config (9.22.3)
       connection_pool (< 3)
       logstasher (~> 2.1)
@@ -228,7 +223,6 @@ GEM
       puma
       selenium-webdriver (>= 4.0)
     hashie (5.0.0)
-    htmlentities (4.4.2)
     http-accept (1.7.0)
     http-cookie (1.1.0)
       domain_name (~> 0.5)
@@ -287,13 +281,6 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokodiff (0.2.0)
-      actionview (>= 6, < 8.1.3)
-      diff-lcs
-      gds-api-adapters (>= 101.0, < 101.3)
-      govspeak (>= 10.6.3)
-      rails (>= 6, < 8.1.3)
-      view_component (~> 4)
     nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
     nokogiri (1.18.10-aarch64-linux-musl)
@@ -591,7 +578,6 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.4.4)
-    rinku (2.0.6)
     rouge (4.6.1)
     rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
@@ -648,9 +634,6 @@ GEM
       rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     rubyzip (3.2.2)
-    sanitize (7.0.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.16.8)
     sass-embedded (1.94.2-aarch64-linux-gnu)
       google-protobuf (~> 4.31)
     sass-embedded (1.94.2-aarch64-linux-musl)
@@ -667,6 +650,8 @@ GEM
       google-protobuf (~> 4.31)
     sass-embedded (1.94.2-x86_64-linux-musl)
       google-protobuf (~> 4.31)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     securerandom (0.4.1)
     selenium-webdriver (4.38.0)
       base64 (~> 0.2)
@@ -724,10 +709,6 @@ GEM
     uri (1.1.1)
     useragent (0.16.11)
     version_gem (1.1.9)
-    view_component (4.2.0)
-      actionview (>= 7.1.0)
-      activesupport (>= 7.1.0)
-      concurrent-ruby (~> 1)
     warden (1.2.9)
       rack (>= 2.0.9)
     warden-oauth2 (0.0.1)
@@ -758,6 +739,7 @@ PLATFORMS
 
 DEPENDENCIES
   bootsnap
+  bootstrap-sass
   byebug
   dartsass-rails
   erb_lint
@@ -769,7 +751,6 @@ DEPENDENCIES
   govuk_sidekiq
   govuk_test
   listen
-  nokodiff
   pg
   plek
   rails (= 8.0.3)
@@ -779,6 +760,7 @@ DEPENDENCIES
   sidekiq
   simplecov (~> 0.22)
   simplecov-html (~> 0.12)
+  sprockets-rails
   terser
   uglifier
 

app/assets/config/manifest.js

@@ -1,3 +1,2 @@
 //= link_tree ../images
-//= link application.js
-//= link_tree ../builds
+//= link_directory ../stylesheets .css

app/assets/javascripts/application.js

@@ -1,12 +1,12 @@
-// require_directory ./modules
+//= require_directory ./modules
 
 //= require govuk_publishing_components/dependencies
 //= require govuk_publishing_components/lib
 
 // Analytics modules
-// require analytics_modules/ga4-form-setup
-// require analytics_modules/ga4-form-change-tracker
-// require analytics_modules/ga4-index-section-setup
+//= require analytics_modules/ga4-form-setup
+//= require analytics_modules/ga4-form-change-tracker
+//= require analytics_modules/ga4-index-section-setup
 
 window.GOVUK.approveAllCookieTypes()
 window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })

app/assets/stylesheets/application.scss

@@ -1,46 +1,3 @@
 $govuk-page-width: 1140px;
 
-// GOVUK Design System
-@import 'govuk_publishing_components/govuk_frontend_support';
-@import 'govuk_publishing_components/component_support';
-@import 'govuk_publishing_components/components/accordion';
-@import 'govuk_publishing_components/components/add-another';
-@import 'govuk_publishing_components/components/back-link';
-@import 'govuk_publishing_components/components/button';
-@import 'govuk_publishing_components/components/checkboxes';
-@import 'govuk_publishing_components/components/date-input';
-@import 'govuk_publishing_components/components/details';
-@import 'govuk_publishing_components/components/document-list';
-@import 'govuk_publishing_components/components/emergency-banner';
-@import 'govuk_publishing_components/components/error-alert';
-@import 'govuk_publishing_components/components/error-message';
-@import 'govuk_publishing_components/components/error-summary';
-@import 'govuk_publishing_components/components/fieldset';
-@import 'govuk_publishing_components/components/govspeak';
-@import 'govuk_publishing_components/components/heading';
-@import 'govuk_publishing_components/components/hint';
-@import 'govuk_publishing_components/components/input';
-@import 'govuk_publishing_components/components/inset-text';
-@import 'govuk_publishing_components/components/label';
-@import 'govuk_publishing_components/components/layout-footer';
-@import 'govuk_publishing_components/components/layout-for-admin';
-@import 'govuk_publishing_components/components/layout-header';
-@import 'govuk_publishing_components/components/lead-paragraph';
-@import 'govuk_publishing_components/components/notice';
-@import 'govuk_publishing_components/components/radio';
-@import 'govuk_publishing_components/components/reorderable-list';
-@import 'govuk_publishing_components/components/search';
-@import 'govuk_publishing_components/components/secondary-navigation';
-@import 'govuk_publishing_components/components/select';
-@import 'govuk_publishing_components/components/select-with-search';
-@import 'govuk_publishing_components/components/service-navigation';
-@import 'govuk_publishing_components/components/skip-link';
-@import 'govuk_publishing_components/components/success-alert';
-@import 'govuk_publishing_components/components/summary-card';
-@import 'govuk_publishing_components/components/summary-list';
-@import 'govuk_publishing_components/components/table';
-@import 'govuk_publishing_components/components/tabs';
-@import 'govuk_publishing_components/components/tag';
-@import 'govuk_publishing_components/components/textarea';
-@import 'govuk_publishing_components/components/warning-text';
-
+@import 'govuk_publishing_components/govuk_frontend_support';

app/controllers/application_controller.rb

@@ -1,10 +1,11 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
-  layout "design_system"
+  layout "application"
 
   include GDS::SSO::ControllerMethods
 
   before_action :authenticate_user!
+
   def hello_world
     render "hello_world"
   end

app/views/layouts/design_system.html.erb

@@ -13,7 +13,6 @@
 require "action_view/railtie"
 # require "action_cable/engine"
 require "rails/test_unit/railtie"
-require "sprockets/railtie"
 
 require "open-uri"
 require "builder"