Skip to content

Commit

Permalink
Test merge (#1493)
Browse files Browse the repository at this point in the history
* #945 Improve analysis of qualifying test questions (#1317)

* - Changed the TAB title from "Logs" to "Connection Logs"
- Created the "HISTORY" tab
- Added Analytics information and the amount of time user spent on the question

* [945] resolve conflict

* [945] fix build

* Revert changes to package-lock

* Revert changes to package.json

Co-authored-by: Warren Searle <warren@precise-minds.co.uk>

* #1440 QT fixes (#1468)

* Reports. Handle report not having data / existing

* Tidy sass imports to speed up build

* Fix console error when logged out and
ensure menu only shows when logged in

* Fix paging list of dry run responses

* Remove duration estimate now we have history log

* #1274 Fix: QT Connection logs not showing

* Show when question was last updated

* Fix sorting list of responses for dry run

* Bump version number to 0.73.0

* Update readme

* Bump version number to 0.74.0

* #1472 Fix: name blind sift link not showing up (#1473)

* #1472 Fix: name blind sift link not showing up

* Look at shortlisting methods as well as dates

* Tidy

* Tidy

* #1356 Display client details of QT participant (#1479)

* Bump version number to 0.75.0

* Input custom ASC word limits (#1478)

* input custom ASC word limits

* fix

* Feature/1327 enable request of character check form completion (#1357)

* WIP

* WIP

* WIP

* WIP

* WIP

* Revert wrong commit

* Removing wrong changes

* WIP

* WIP

* #1327 WIP

* #1327 A change to store file to show consent form completed app records in a tab

* #1327 Remove redundant code

* #1327 Changes to update appRecord

* #1327 Added a button to enable character checks

* #1327 Added characterChecksEnabled flag to exercise

* #1327 Changed button type

* #1327 Added Other Professional Bodies section

* #1327 Changed Consent checks tab to reflect consent form changes

* #1327 Display professional details date correctly

* Bump version number to 0.76.0

* #639 Added the approved email, removed a no-longer-in-use email (#1483)

* #589 Implement firebase app check (#1453)

* Upgrade firebase to V8 & add App Check

* Env / workflow changes to include recaptcha token

* Update on-release.yml

* #1314/additonal legal experience (#1331)

* admin ui

* connect to variables

* allow for applications without judicialFunctions object

* handle no answer provided

* handle no answer provided

* handle no answer provided

* handle no answer provided

* handle no answer provided

* admin ui

* connect to variables

* allow for applications without judicialFunctions object

* handle no answer provided

* handle no answer provided

* handle no answer provided

* handle no answer provided

* handle no answer provided

* working again added, workign basis inc

* UI sorted

* add judicial functions to review

* conditionally show total days engaged

* #1484 Placed data into correct columns (#1487)

* Revert "#589 Implement firebase app check (#1453)" (#1490)

This reverts commit b6cdd3b.

Co-authored-by: Lisias (Lee) Loback <lloback@users.noreply.github.com>
Co-authored-by: Warren Searle <warren@precise-minds.co.uk>
Co-authored-by: warrensearle <warren.searle@judicialappointments.digital>
Co-authored-by: Maria Brookes <40855898+mbrookeswebdev@users.noreply.github.com>
Co-authored-by: HalcyonJAC <79906532+HalcyonJAC@users.noreply.github.com>
  • Loading branch information
6 people authored Sep 22, 2021
1 parent 1112b38 commit 5f3bc84
Show file tree
Hide file tree
Showing 39 changed files with 1,724 additions and 217 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ cd admin
npm install
```


## Add environment variables to root project

create .env.develop.local file in root directory + credentials
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin",
"version": "0.72.0",
"version": "0.76.0",
"private": true,
"scripts": {
"preinstall": "npx npm-force-resolutions",
Expand Down
9 changes: 6 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
</a>
<span class="govuk-body-xs govuk-!-padding-left-2">{{ $store.getters.appVersion }}</span>

<nav class="float-right">
<nav
v-if="isSignedIn"
class="float-right"
>
<ul class="govuk-header__navigation user-menu">
<li class="govuk-header__navigation-item">
<RouterLink
Expand Down Expand Up @@ -154,9 +157,9 @@ export default {
async created() {
if (this.isSignedIn) {
this.$store.dispatch('services/bind');
const email = firebase.auth().currentUser.email;
this.authorisedToPerformAction = await authorisedToPerformAction(email);
}
const email = firebase.auth().currentUser.email;
this.authorisedToPerformAction = await authorisedToPerformAction(email);
},
destroyed() {
if (this.isSignedIn) {
Expand Down
Loading

0 comments on commit 5f3bc84

Please sign in to comment.