Merge branch 'develop' into main

.env.example

@@ -9,5 +9,12 @@
 ROLLBAR_ACCESS_TOKEN=ROLLBAR_ACCESS_TOKEN
 ROLLBAR_ENV=development
 
-# TODO: Replace `rails-template` with the name of the app.
-DATABASE_URL=postgres://postgres@localhost:5432/rails-template-development
+DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-development
+
+# Contentful
+CONTENTFUL_URL=cdn.contentful.com
+CONTENTFUL_SPACE=
+CONTENTFUL_ENVIRONMENT=master
+CONTENTFUL_ACCESS_TOKEN=
+CONTENTFUL_PLANNING_START_ENTRY_ID=
+CONTENTFUL_PREVIEW_APP=false

.env.test

@@ -5,5 +5,12 @@
 #
 # Reference: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
 
-# TODO: Replace `rails-template` with the name of the app.
-DATABASE_URL=postgres://postgres@localhost:5432/rails-template-test
+DATABASE_URL=postgres://postgres@localhost:5432/buy-for-your-school-test
+
+# Contentful
+CONTENTFUL_URL=cdn.contentful.com
+CONTENTFUL_SPACE=test
+CONTENTFUL_ENVIRONMENT=master
+CONTENTFUL_ACCESS_TOKEN=123
+CONTENTFUL_PLANNING_START_ENTRY_ID=1UjQurSOi5MWkcRuGxdXZS
+CONTENTFUL_PREVIEW_APP=false

.github/workflows/continuous-integration.yml

@@ -1,8 +1,11 @@
-# TODO: Enable GitHub Actions on the repository to test all pull requests
-# https://github.com/<org>/<repo>/actions
 name: CI
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
 
 jobs:
   test:

.gitignore

@@ -53,6 +53,7 @@ db/*.sqlite3
 rerun.txt
 pickle-email-*.html
 .zeus.sock
+/node_modules
 
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:

.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.6

CHANGELOG.md

@@ -6,5 +6,22 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
-[unreleased]: TODO
+## [release-001] - 2020-11-12
+
+- address rails-template TODO
+- any user can see a start page for the planning journey
+- use GOV.UK Frontend framework
+- users can see a basic form to start the planning journey sourced by a
+Contentful fixture
+- planning form is styled as a GOV.UK form
+- validate that an answer is provided to a question
+- the first planning question comes directly from Contentful
+- handle the exceptional case when a Contentful entry is missing
+- multiple radio questions can be answered in sequence
+- users can be asked to answer a short text question
+- Contentful can redirect users to preview endpoints
+
+[unreleased]: https://github.com/DfE/DFE-Digital/buy-for-your-school/compare/release-001...HEAD
+[release-001]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-000...release-001
+
 [keep a changelog 1.0.0]: https://keepachangelog.com/en/1.0.0/

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.3 as release
+FROM ruby:2.6.6 as release
 MAINTAINER dxw <[email protected]>
 RUN apt-get update && apt-get install -qq -y \
   build-essential \
@@ -17,6 +17,11 @@ ARG RAILS_ENV
 ENV RAILS_ENV=${RAILS_ENV:-production}
 ENV RACK_ENV=${RAILS_ENV:-production}
 
+COPY package.json $INSTALL_PATH/package.json
+COPY package-lock.json $INSTALL_PATH/package-lock.json
+
+RUN npm install
+
 COPY Gemfile $INSTALL_PATH/Gemfile
 COPY Gemfile.lock $INSTALL_PATH/Gemfile.lock
 

Gemfile

@@ -2,11 +2,13 @@
 
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby "2.6.3"
+ruby "2.6.6"
 
 gem "bootsnap", ">= 1.1.0", require: false
-gem "bootstrap", ">= 4.3.1"
+gem "climate_control"
 gem "coffee-rails", "~> 5.0"
+gem "contentful", "~> 2.15"
+gem "govuk_design_system_formbuilder", "~> 2.1"
 gem "high_voltage"
 gem "jbuilder", "~> 2.5"
 gem "jquery-rails"
@@ -21,7 +23,7 @@ gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 gem "uglifier", ">= 1.3.0"
 
 group :development do
-  gem "listen", ">= 3.0.5", "< 3.3"
+  gem "listen", ">= 3.0.5", "< 3.4"
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   gem "web-console", ">= 3.3.0"
@@ -30,6 +32,7 @@ end
 group :test do
   gem "capybara", ">= 2.15"
   gem "selenium-webdriver"
+  gem "shoulda-matchers"
   gem "simplecov"
 end
 

Gemfile.lock

@@ -59,19 +59,13 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
-    autoprefixer-rails (9.8.6.1)
-      execjs
-    better_errors (2.8.3)
+    better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindex (0.8.1)
-    bootsnap (1.4.8)
+    bootsnap (1.5.1)
       msgpack (~> 1.0)
-    bootstrap (4.5.2)
-      autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
-      sassc-rails (>= 2.0.0)
     brakeman (4.10.0)
     builder (3.2.4)
     bullet (6.1.0)
@@ -87,6 +81,7 @@ GEM
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
     childprocess (3.0.0)
+    climate_control (0.2.0)
     coderay (1.1.3)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
@@ -96,10 +91,15 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.7)
+    contentful (2.15.4)
+      http (> 0.8, < 5.0)
+      multi_json (~> 1)
     crass (1.0.6)
     database_cleaner (1.8.5)
     diff-lcs (1.4.4)
     docile (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
@@ -114,9 +114,26 @@ GEM
     faker (2.14.0)
       i18n (>= 1.6, < 2)
     ffi (1.13.1)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    govuk_design_system_formbuilder (2.1.4)
+      actionview (>= 5.2)
+      activemodel (>= 5.2)
+      activesupport (>= 5.2)
     high_voltage (3.1.2)
+    http (4.4.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jbuilder (2.10.1)
@@ -128,7 +145,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (8.4.255.0)
-    listen (3.2.1)
+    listen (3.3.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.7.0)
@@ -146,19 +163,19 @@ GEM
       libv8 (~> 8.4.255)
     minitest (5.14.2)
     msgpack (1.3.3)
+    multi_json (1.15.0)
     nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
+    parallel (1.20.0)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
-    popper_js (1.16.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.0.2)
+    puma (5.0.4)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -192,12 +209,12 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (1.8.2)
     rexml (3.2.4)
-    rollbar (3.0.1)
+    rollbar (3.1.0)
     rspec-core (3.9.2)
       rspec-support (~> 3.9.3)
     rspec-expectations (3.9.2)
@@ -215,16 +232,16 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (1.0.0)
+    rubocop (1.2.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.0.0)
+    rubocop-ast (1.1.1)
       parser (>= 2.7.1.5)
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
@@ -244,7 +261,9 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    simplecov (0.19.0)
+    shoulda-matchers (4.4.1)
+      activesupport (>= 4.2.0)
+    simplecov (0.19.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
@@ -261,22 +280,25 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    standard (0.8)
-      rubocop (= 1.0.0)
+    standard (0.9.0)
+      rubocop (= 1.2.0)
       rubocop-performance (= 1.8.1)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     uniform_notifier (1.13.0)
-    web-console (4.0.4)
+    web-console (4.1.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -286,29 +308,31 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   better_errors
   bootsnap (>= 1.1.0)
-  bootstrap (>= 4.3.1)
   brakeman
   bullet
   byebug
   capybara (>= 2.15)
+  climate_control
   coffee-rails (~> 5.0)
+  contentful (~> 2.15)
   database_cleaner
   dotenv-rails
   factory_bot_rails
   faker
+  govuk_design_system_formbuilder (~> 2.1)
   high_voltage
   jbuilder (~> 2.5)
   jquery-rails
   launchy
-  listen (>= 3.0.5, < 3.3)
+  listen (>= 3.0.5, < 3.4)
   mini_racer
   pg
   pry
@@ -319,6 +343,7 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 6.0)
   selenium-webdriver
+  shoulda-matchers
   simplecov
   spring
   spring-commands-rspec
@@ -330,7 +355,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 2.6.6p146
 
 BUNDLED WITH
    2.1.4

Procfile

@@ -0,0 +1,2 @@
+web: bundle exec puma -C config/puma.rb
+release: rake db:migrate