Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update prototype to v13 of the GOV.UK prototype kit #798

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c1f1e44
Update .gitignore
simonwhatley Dec 12, 2024
bde75b2
Install govuk-prototype-kit dependency
simonwhatley Dec 12, 2024
93c2025
Remove packages
simonwhatley Dec 12, 2024
dae42cb
Delete start.js
simonwhatley Dec 12, 2024
a301995
Delete server.js
simonwhatley Dec 12, 2024
efc9553
Update filters.js
simonwhatley Dec 12, 2024
f291bae
Update routes.js
simonwhatley Dec 12, 2024
11ef5bc
Remove packages
simonwhatley Dec 12, 2024
3b37c24
Update package scripts
simonwhatley Dec 12, 2024
44bb3a8
Update routes
simonwhatley Dec 12, 2024
cdf290a
Update application.scss
simonwhatley Dec 12, 2024
3f8f420
Merge branch 'main' into update-kit-to-v13
simonwhatley Dec 13, 2024
8dc1805
Update styles
simonwhatley Dec 13, 2024
2ef52a7
Add flash messaging to routes
simonwhatley Dec 13, 2024
1752b28
Update prototype config to use JSON file
simonwhatley Dec 16, 2024
16c3cc5
Update page layouts
simonwhatley Dec 16, 2024
4b4a28a
Code style fixes
Dec 16, 2024
6cba6c1
Update functions
simonwhatley Dec 16, 2024
f4629df
Code style fixes
Dec 16, 2024
8b9fb64
Delete Procfile
simonwhatley Dec 16, 2024
89a95eb
Delete listen-on-port.js
simonwhatley Dec 16, 2024
53026d4
Delete lib folder and contents
simonwhatley Dec 16, 2024
3bbad22
Merge branch 'update-kit-to-v13' of https://github.com/DFE-Digital/re…
simonwhatley Dec 16, 2024
3200eeb
Update filter checkboxes
simonwhatley Dec 16, 2024
a421be4
Temporary fix to prevent lint errors
simonwhatley Dec 16, 2024
47fa310
Fix data error
simonwhatley Dec 16, 2024
c868fd9
Remove unnecessary MOJ component calls
simonwhatley Dec 16, 2024
cad846d
Fix sass lint errors
simonwhatley Dec 16, 2024
1cb1586
Delete gulp scripts
simonwhatley Dec 18, 2024
0bc7b86
Remove gulp packages
simonwhatley Dec 18, 2024
2c1a924
Merge service navigation
simonwhatley Dec 19, 2024
b665087
Update govuk-frontend
simonwhatley Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 145 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,150 @@
# ignore tracking usage data config - we want a different one for each user
usage-data-config.json
# ignore extension SCSS because it's dynamically generated
# Ignore prototype files
app/assets/data/search-index.json
lib/extensions/_extensions.scss
package-lock.json
public

# Prototype ignores - per-user
.tmp/
.env
.sass-cache
migrate.log
usage-data-config.json

# General ignores
.DS_Store
.start.pid
.idea
.port.tmp
public
node_modules/*
.sass-cache
.start.pid
.tmuxp.*
package-lock.json
app/assets/data/search-index.json
.idea

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp
.cache

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

12 changes: 5 additions & 7 deletions app/assets/sass/application.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
@use "sass:string";

// For guidance on how to add CSS and SCSS see:
// https://prototype-kit.service.gov.uk/docs/adding-css-javascript-and-images
$govuk-new-typography-scale: true;

// global styles for <a> and <p> tags
$govuk-global-styles: true;

// We can't mount GOV.UK Frontend's assets at root as it's done automatically by the extensions framework.
$app-assets-path: "/public/";
$govuk-assets-path: "/dist/govuk/assets/";

// Import GOV.UK Frontend and any extension styles if extensions have been configured
@import "lib/extensions/extensions";

@import "node_modules/@ministryofjustice/frontend/moj/all";
// $govuk-assets-path: "/dist/govuk/assets/";

// Patterns that aren't in Frontend
@import "patterns/related-items";
Expand Down Expand Up @@ -58,7 +57,6 @@ $govuk-assets-path: "/dist/govuk/assets/";
@import "overrides/govuk-tag";
@import "overrides/moj-button-menu";
@import "overrides/moj-filter";
@import "overrides/moj-primary-navigation";
@import "overrides/status-grid";
@import "overrides/tabs";

Expand Down
23 changes: 0 additions & 23 deletions app/assets/sass/overrides/_moj-primary-navigation.scss

This file was deleted.

15 changes: 0 additions & 15 deletions app/assets/sass/unbranded.scss

This file was deleted.

36 changes: 0 additions & 36 deletions app/config.js

This file was deleted.

4 changes: 4 additions & 0 deletions app/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"serviceName": "Register trainee teachers",
"useNjkExtensions": true
}
Loading