Skip to content

Commit

Permalink
Merge pull request #362 from dvsa/feature-bl-17951-update-crown-in-mt…
Browse files Browse the repository at this point in the history
…s-footer

feature: BL-17951 Update crown in MTS footer
  • Loading branch information
aaronlong authored Oct 28, 2024
2 parents 9474d6f + 532c5ca commit e6ea4b8
Show file tree
Hide file tree
Showing 23 changed files with 19,727 additions and 14,439 deletions.
42 changes: 25 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# Front-end
**Assets for [MTS](https://gitlab.mot.dvsacloud.uk/mot/mot).**

**Note:** Previously also used by [CVR](https://gitlab.mot.dvsacloud.uk/vehicle-recalls/recalls-app) / [MOTH](https://github.com/dvsa/mot-history) / [MOTR](https://github.com/dvsa/motr)

## Localdev setup

1. Run npm install in the root directory of front-end
2. Make changes to your code
3. Build assets using
``` docker-compose run app npm run build-production```
4. Refresh the page
**Requirements: Node.js "^12.16"**

1. Run `npm install` in the root directory of front-end
2. Make changes to your code. Update version tag in `package.json` and `composer.json`.
3. **LOCAL:** Build assets using `npm run build-production`. Changes will be reflected in `/dist` folder with new tag versions.
4. **DOCKER:** Build assets using
```docker compose run app npm run build-production```
5. Refresh the page
NOTE:
If you want to update the assets for MTS, the easiest way is to take the Styles.css file

Expand All @@ -30,24 +38,24 @@ For the old stylesheets:
4. Commit your changes
5. Run ```git tag -a 1.5.x -m "Updated assets" ``` to tag your latest commit
6. Run ```git push origin 1.5.x``` to push the new asset version
7. Under web-frontend/CVR/MOTH/MOTR update the composer dependancy to point to the new version.
7. Under web-frontend ~~/CVR/MOTH/MOTR~~ update the composer dependancy to point to the new version.
8. Run the Jenkins build.

Further details and guidance for using this kit for prototypes and releases for MTS can be found internally in Confluence by searching for front-end.

## Demo

You can view the MOT component library and prototypes here:
~~You can view the MOT component library and prototypes here:~~

[Heroku Demo](https://dvsa-front-end.herokuapp.com/)
~~[Heroku Demo](https://dvsa-front-end.herokuapp.com/)~~

## Login credentials

If you'd like to access the [Prototypes pages](https://dvsa-front-end.herokuapp.com/prototypes), log in as below.
The prototype system is password protected to prevent users accidentally accessing what may look like a real Government Service.
~~If you'd like to access the [Prototypes pages](https://dvsa-front-end.herokuapp.com/prototypes), log in as below.
The prototype system is password protected to prevent users accidentally accessing what may look like a real Government Service.~~

User: admin
Password: dvsa
~~User: admin~~
~~Password: dvsa~~


## OLD Local Setup
Expand All @@ -58,15 +66,15 @@ Password: dvsa

2. Install dependencies using NPM

```javascript
```shell
docker-compose run app npm install
```

### Development

To run development mode run the following command inside the directory.

```javascript
```shell
docker-compose up
```

Expand All @@ -89,7 +97,7 @@ Build production command will generate production ready assets and node js serve

The productions assets are located in the **dist/assets** folder and the server code is located in the **dist/server** folder.

```javascript
```shell
docker-compose run app npm run build-production
```

Expand All @@ -103,7 +111,7 @@ docker-compose run app npm run build-production

For faster development you can use docker by running the following command:

```
```shell
docker-compose up
```

Expand All @@ -117,6 +125,6 @@ http://localhost:3002

Run the following command

```
```shell
docker-compose run --rm app npm run build-production
```
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dvsa/front-end",
"description": "DVSA front-end assets used within all applications",
"version": "1.8.0",
"version": "1.8.2",
"homepage": "https://github.com/dvsa/front-end",
"license": "MIT"
}
1 change: 1 addition & 0 deletions dist/assets/images/govuk-crest.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions dist/assets/javascripts/development.bundle.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/assets/javascripts/dvsa-manuals.bundle.js

Large diffs are not rendered by default.

37 changes: 25 additions & 12 deletions dist/assets/javascripts/dvsa-mts-legacy.bundle.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/assets/javascripts/dvsa-mts.bundle.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/assets/javascripts/dvsa.bundle.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/assets/javascripts/vendor.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/assets/misc/manifest-motr.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"platform": "web"
}
]
}
}
2 changes: 1 addition & 1 deletion dist/assets/misc/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"platform": "web"
}
]
}
}
6 changes: 3 additions & 3 deletions dist/assets/stylesheets/development.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/assets/stylesheets/styles.css

Large diffs are not rendered by default.

Loading

0 comments on commit e6ea4b8

Please sign in to comment.