diff --git a/app/assets/images/.keep b/app/assets/images/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index d05ea0f51..000000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb deleted file mode 100644 index 65749b384..000000000 --- a/app/controllers/about_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class AboutController < ApplicationController - def index; end -end diff --git a/app/controllers/start_controller.rb b/app/controllers/start_controller.rb new file mode 100644 index 000000000..259b9039d --- /dev/null +++ b/app/controllers/start_controller.rb @@ -0,0 +1,3 @@ +class StartController < ApplicationController + def index; end +end diff --git a/app/controllers/test_controller.rb b/app/controllers/test_controller.rb deleted file mode 100644 index cef2efef0..000000000 --- a/app/controllers/test_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TestController < ApplicationController - def index; end -end diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb deleted file mode 100644 index 8de21683c..000000000 --- a/app/views/about/index.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% content_for :title, "About" %> - -

- <%= content_for(:title) %> -

diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb new file mode 100644 index 000000000..d3de2d344 --- /dev/null +++ b/app/views/start/index.html.erb @@ -0,0 +1,47 @@ +

+ <%= t("service_name") %> +

+ +
+
+

Use this service to submit social housing lettings and sales data to the Department for Levelling Up, Housing and Communities (DLUHC).

+

We’ll ask you questions about a sale or letting, like details about the household or property. Your answers will create a log that you can submit directly to us.

+

Your organisation can also:

+ +

The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.

+

This service is only for social housing in England.

+ + <%= govuk_start_button( + text: 'Start now', + href: user_session_path + ) %> + +

Before you start

+

Use your account details to sign in.

+

If you need to set up a new account, speak to your organisation’s CORE data coordinator. If you don’t know who that is, <%= govuk_link_to("contact the helpdesk", "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21") %>.

+

You can <%= govuk_link_to("request an account", "https://digital.dclg.gov.uk/jira/servicedesk/customer/portal/4/group/21") %> if your organisation doesn’t have one.

+ <%# TODO: Add link to data sharing agreement %> +

<%= govuk_link_to("Read our data sharing agreement", "#") %>.

+
+ +
+
+ +
+
+
diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb deleted file mode 100644 index a60d8f44a..000000000 --- a/app/views/test/index.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -<%= render GovukComponent::AccordionComponent.new(id: 'abc123') do |component| - component.section( - heading_text: 'Home electronics', - summary_text: 'Entertainment, communication and recreation', - expanded: true) do - tag.p(class: 'govuk-body') do - "Lorem ipsum dolor sit amet, consectetur adipiscing elit." - end - end - - component.section(heading_text: 'Appliances', summary_text: 'Laundry, cookers and vacuum cleaners') do - tag.p(class: 'govuk-body') do - "Ut et elementum tortor. Donec a tellus sed sem euismod congue" - end - end - - component.section(heading_text: 'Toys') do - safe_join([ - tag.p(class: 'govuk-body') do - "In et nunc vitae tortor sollicitudin ultrices. Vivamus a purus justo." - end, - - tag.p(class: 'govuk-body') do - "Duis a turpis non nunc pulvinar venenatis quis congue mauris" - end - ]) - end -end %> - -<%= govuk_link_to('About', about_path) %> diff --git a/app/webpacker/styles/_related-navigation.scss b/app/webpacker/styles/_related-navigation.scss new file mode 100644 index 000000000..2812dfdc8 --- /dev/null +++ b/app/webpacker/styles/_related-navigation.scss @@ -0,0 +1,59 @@ +.app-related-navigation { + @include govuk-text-colour; + border-top: 2px solid govuk-colour("blue"); +} + +.app-related-navigation__main-heading { + @include govuk-font(19, $weight: bold); + margin-top: govuk-spacing(3); + margin-bottom: govuk-spacing(2); +} + +.app-related-navigation__sub-heading { + @include govuk-font(16); + border-top: 1px solid govuk-colour("mid-grey", $legacy: "grey-2"); + margin: 0; + padding-top: govuk-spacing(3); +} + +.app-related-navigation__sub-heading--footer { + @include govuk-font(19, $weight: bold); + border-top: 0; + padding-top: 0; + margin-top: govuk-spacing(3); + margin-bottom: govuk-spacing(2); +} + +.app-related-navigation__main-heading + .app-related-navigation__sub-heading { + border-top: 0; + padding-top: 0; +} + +.app-related-navigation__nav-section { + margin-bottom: govuk-spacing(6); +} + +.app-related-navigation__link-list { + padding: 0; + margin: 0; + list-style: none; + margin-bottom: 1.25em; +} + +.app-related-navigation__link { + @include govuk-font($size: 16, $weight: regular, $line-height: 1.45); + list-style-type: none; + margin-top: govuk-spacing(3); + + @include govuk-media-query($from: tablet) { + line-height: 1.28; + } +} + +.app-related-navigation__section-link { + font-weight: bold; +} + +.app-related-navigation__section-link--other { + font-weight: normal; +} diff --git a/app/webpacker/styles/application.scss b/app/webpacker/styles/application.scss index 28f46740f..78b925154 100644 --- a/app/webpacker/styles/application.scss +++ b/app/webpacker/styles/application.scss @@ -11,8 +11,9 @@ $govuk-image-url-function: frontend-image-url; @import "~govuk-frontend/govuk/all"; -@import '_task-list'; -@import '_tab-navigation'; +@import 'related-navigation'; +@import 'task-list'; +@import 'tab-navigation'; $govuk-global-styles: true; diff --git a/config/routes.rb b/config/routes.rb index 9da87682c..a565762a6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,8 +11,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html ActiveAdmin.routes(self) - root to: "test#index" - get "about", to: "about#index" + + root to: "start#index" resources :users do member do diff --git a/spec/controllers/test_controller_spec.rb b/spec/controllers/start_controller_spec.rb similarity index 85% rename from spec/controllers/test_controller_spec.rb rename to spec/controllers/start_controller_spec.rb index 881bbd00a..0422225aa 100644 --- a/spec/controllers/test_controller_spec.rb +++ b/spec/controllers/start_controller_spec.rb @@ -1,7 +1,7 @@ require "rails_helper" # Test Controller intital test -RSpec.describe TestController, type: :controller do +RSpec.describe StartController, type: :controller do let(:valid_session) { {} } describe "GET #index" do diff --git a/spec/features/test_spec.rb b/spec/features/test_spec.rb index 2a922d647..13e42dee1 100644 --- a/spec/features/test_spec.rb +++ b/spec/features/test_spec.rb @@ -4,11 +4,4 @@ RSpec.describe "Test Features" do visit("/") expect(page).to have_content("Submit social housing lettings and sales data (CORE)") end - - it "Links to the About page" do - visit("/") - click_link("About") - expect(current_path).to eql("/about") - expect(page).to have_content("About") - end end