Skip to content

Commit

Permalink
Merge branch 'release/v1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
appsol committed Jul 23, 2021
2 parents 1fe4de3 + 17a4aae commit 3f74a4f
Show file tree
Hide file tree
Showing 80 changed files with 484 additions and 310 deletions.
8 changes: 6 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<div id="app">
<vue-headful
title="One Hounslow Connect"
title="Hounslow Connect"
:head="headAttributes"
:html="htmlAttributes"
/>

<gov-skip-link href="#main-content">Skip to main content</gov-skip-link>

<gov-header service-name="One Hounslow Connect" :navigation="headerNav" />
<gov-header service-name="Hounslow Connect" :navigation="headerNav" />

<div class="govuk-width-container">
<main
Expand Down Expand Up @@ -77,6 +77,10 @@ export default {
text: "Update requests",
to: { name: "update-requests-index" },
hide: !Auth.isGlobalAdmin
},
{
text: "Help",
to: { name: "help-index" }
}
];
},
Expand Down
6 changes: 6 additions & 0 deletions src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ let router = new Router({
component: () => import("@/views/Dashboard"),
meta: { auth: true }
},
{
path: "/help",
name: "help-index",
component: () => import("@/views/help/Index"),
meta: { auth: true }
},
{
path: "/organisations",
name: "organisations-index",
Expand Down
19 changes: 9 additions & 10 deletions src/views/Dashboard.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Dashboard" />
<vue-headful title="Hounslow Connect - Dashboard" />

<gov-main-wrapper>
<gov-grid-row>
<gov-grid-column width="two-thirds">
<gov-heading size="xl">
Welcome to the One Hounslow Connect admin portal
Welcome to the Hounslow Connect admin portal
</gov-heading>

<gov-body size="l">
From here, you can add and edit your pages on One Hounslow Connect,
as well as manage referrals into your service. For any support,
contact
From here, you can add and edit your pages on Hounslow Connect, as
well as manage referrals into your service. For any support, contact
<gov-link href="mailto:[email protected]">
[email protected]
</gov-link>
or view our
<gov-link :to="{ name: 'help-index' }">help videos</gov-link>
</gov-body>
</gov-grid-column>
</gov-grid-row>
Expand All @@ -25,7 +26,7 @@
<gov-grid-row>
<gov-grid-column width="one-half">
<gov-heading size="l">Services</gov-heading>
<gov-body>Add or edit your pages on One Hounslow Connect.</gov-body>
<gov-body>Add or edit your pages on Hounslow Connect.</gov-body>
<gov-button start :to="{ name: 'services-index' }">
Go to services
</gov-button>
Expand All @@ -52,9 +53,7 @@

<gov-grid-column width="one-half" v-if="auth.isGlobalAdmin">
<gov-heading size="l">Organisations</gov-heading>
<gov-body
>Add or edit organisations on One Hounslow Connect.</gov-body
>
<gov-body>Add or edit organisations on Hounslow Connect.</gov-body>
<gov-button start :to="{ name: 'organisations-index' }">
Go to organisations
</gov-button>
Expand All @@ -73,7 +72,7 @@
<gov-grid-column width="one-half" v-if="auth.isGlobalAdmin">
<gov-heading size="l">Reports</gov-heading>
<gov-body>
Download reports of activity on One Hounslow Connect.
Download reports of activity on Hounslow Connect.
</gov-body>
<gov-button start :to="{ name: 'reports-index' }">
Go to reports
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/Index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Admin" />
<vue-headful title="Hounslow Connect - Admin" />

<gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>

Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/AuditLogs.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Audits" />
<vue-headful title="Hounslow Connect - Admin: Audits" />

<gov-heading size="l">Audit logs</gov-heading>

Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/Cms.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: CMS" />
<vue-headful title="Hounslow Connect - Admin: CMS" />

<gov-heading size="l">Frontend</gov-heading>

Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/Collections.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Collections" />
<vue-headful title="Hounslow Connect - Admin: Collections" />

<gov-tabs :tabs="tabs">
<router-view />
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/Feedback.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Page Feedback" />
<vue-headful title="Hounslow Connect - Admin: Page Feedback" />

<gov-heading size="l">Feedback</gov-heading>

Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/Notifications.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Notifications" />
<vue-headful title="Hounslow Connect - Admin: Notifications" />

<gov-heading size="l">Notifications</gov-heading>
<ck-loader v-if="loading" />
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/SearchEngine.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Search Engine" />
<vue-headful title="Hounslow Connect - Admin: Search Engine" />

<gov-tabs :tabs="tabs">
<router-view />
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/Taxonomies.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<vue-headful title="One Hounslow Connect - Admin: Taxonomies" />
<vue-headful title="Hounslow Connect - Admin: Taxonomies" />

<gov-tabs :tabs="tabs">
<router-view />
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/index/cms/Updated.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful :title="`One Hounslow Connect - Admin: CMS Updated`" />
<vue-headful :title="`Hounslow Connect - Admin: CMS Updated`" />

<gov-main-wrapper>
<gov-grid-row>
Expand Down
5 changes: 1 addition & 4 deletions src/views/audits/Show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
<gov-grid-row v-else>
<vue-headful
:title="
`One Hounslow Connect - Audit: ${audit.description.substr(
0,
10
)}...`
`Hounslow Connect - Audit: ${audit.description.substr(0, 10)}...`
"
/>

Expand Down
4 changes: 2 additions & 2 deletions src/views/auth/Login.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Login" />
<vue-headful title="Hounslow Connect - Login" />

<gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>
<gov-main-wrapper>
Expand All @@ -10,7 +10,7 @@

<template v-if="!validateRequest">
<gov-body size="l">
Click below to login to the One Hounslow Connect admin portal:
Click below to login to the Hounslow Connect admin portal:
</gov-body>

<gov-button :href="loginUrl">Login</gov-button>
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/Logout.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Logout" />
<vue-headful title="Hounslow Connect - Logout" />

<gov-main-wrapper>
<gov-grid-row>
Expand Down
2 changes: 1 addition & 1 deletion src/views/collections/categories/Create.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Add Collection Category" />
<vue-headful title="Hounslow Connect - Add Collection Category" />

<gov-back-link :to="{ name: 'admin-index-collections' }"
>Back to collection categories</gov-back-link
Expand Down
2 changes: 1 addition & 1 deletion src/views/collections/categories/Edit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template v-else>
<vue-headful
:title="
`One Hounslow Connect - Edit Collection Category: ${collection.name}`
`Hounslow Connect - Edit Collection Category: ${collection.name}`
"
/>

Expand Down
2 changes: 1 addition & 1 deletion src/views/collections/personas/Create.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Add Collection Persona" />
<vue-headful title="Hounslow Connect - Add Collection Persona" />

<gov-back-link :to="{ name: 'admin-index-collections-personas' }"
>Back to collection personas</gov-back-link
Expand Down
2 changes: 1 addition & 1 deletion src/views/collections/personas/Edit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template v-else>
<vue-headful
:title="
`One Hounslow Connect - Edit Collection Persona: ${collection.name}`
`Hounslow Connect - Edit Collection Persona: ${collection.name}`
"
/>

Expand Down
2 changes: 1 addition & 1 deletion src/views/errors/404.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<gov-width-container>
<vue-headful title="One Hounslow Connect - Page Not Found" />
<vue-headful title="Hounslow Connect - Page Not Found" />

<gov-main-wrapper>
<gov-grid-row>
Expand Down
97 changes: 97 additions & 0 deletions src/views/help/Index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<template>
<gov-width-container>
<vue-headful title="Hounslow Connect - Help" />

<gov-back-link :to="{ name: 'dashboard' }">Back to dashboard</gov-back-link>

<gov-main-wrapper>
<gov-grid-row>
<gov-grid-column width="full">
<gov-heading size="xl">Help</gov-heading>
<gov-body
>Welcome to the help section. Please follow the links below to our
series of "how to" guides on YouTube.</gov-body
>
<template v-for="(videoPair, i) in pairedVideos">
<gov-grid-row :key="`video-pair-${i}`">
<gov-grid-column
v-for="(video, j) in videoPair"
:key="`video-${j}`"
width="one-half"
>
<video-iframe
:height="video.height"
:width="video.width"
:src="video.src"
:title="video.title"
/>
<gov-heading size="m">{{ video.title }}</gov-heading>
</gov-grid-column>
</gov-grid-row>
</template>
</gov-grid-column>
</gov-grid-row>
</gov-main-wrapper>
</gov-width-container>
</template>

<script>
import VideoIframe from "./components/VideoIframe";
export default {
name: "Help",
components: {
VideoIframe
},
data() {
return {
videos: [
{
height: 315,
width: 560,
src: "https://www.youtube.com/embed/HALo2I-gdXs",
title: "Introduction the to video training series"
},
{
height: 315,
width: 560,
src: "https://www.youtube.com/embed/RoeMDBZLJQc",
title: "How to sign up to the platform"
},
{
height: 315,
width: 560,
src: "https://www.youtube.com/embed/p3-4mlY1pOQ",
title: "Your first login, managing your organisation and adding users"
},
{
height: 315,
width: 560,
src: "https://www.youtube.com/embed/Qf421buT6zs",
title: "Adding your service"
}
]
};
},
computed: {
pairedVideos() {
let pairedVideos = [];
this.videos.forEach((video, index) => {
if (index % 2 == 0) {
let videoPair = [video];
if (typeof this.videos[index + 1] !== "undefined") {
videoPair.push(this.videos[index + 1]);
}
pairedVideos.push(videoPair);
}
});
return pairedVideos;
}
}
};
</script>

<style lang="scss" scoped></style>
Loading

0 comments on commit 3f74a4f

Please sign in to comment.