UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Platform One
P
Party Bus
Launchboard
launchboard-fe
Commits
01f35f76
Commit
01f35f76
authored
Aug 18, 2021
by
luke.glasscock
Browse files
Merge branch 'BULL-1175' into 'master'
Bull 1175 See merge request
!133
parents
1da8d9a0
c7845cf9
Changes
15
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
222 additions
and
185 deletions
+222
-185
package-lock.json
package-lock.json
+176
-176
src/InitialLoadingApp.vue
src/InitialLoadingApp.vue
+1
-0
src/components/APIErrorCard.vue
src/components/APIErrorCard.vue
+2
-0
src/components/CurriculumSchedule.vue
src/components/CurriculumSchedule.vue
+2
-0
src/components/ExternalLink.vue
src/components/ExternalLink.vue
+8
-1
src/components/HelpDeskSummary.vue
src/components/HelpDeskSummary.vue
+7
-1
src/components/LaunchboardSettings.vue
src/components/LaunchboardSettings.vue
+3
-1
src/components/ProjectsSummary.vue
src/components/ProjectsSummary.vue
+9
-0
src/components/ToolsSummary.vue
src/components/ToolsSummary.vue
+1
-0
src/components/Training/TrainingAttendance.vue
src/components/Training/TrainingAttendance.vue
+1
-0
src/views/Resources.vue
src/views/Resources.vue
+1
-0
src/views/Team.vue
src/views/Team.vue
+4
-1
src/views/super-admin/Teams.vue
src/views/super-admin/Teams.vue
+2
-2
src/views/super-admin/Training.vue
src/views/super-admin/Training.vue
+4
-2
tests/unit/main.spec.js
tests/unit/main.spec.js
+1
-1
No files found.
package-lock.json
View file @
01f35f76
This diff is collapsed.
Click to expand it.
src/InitialLoadingApp.vue
View file @
01f35f76
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
color=
"primary"
color=
"primary"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
send ticket
send ticket
</v-btn>
</v-btn>
...
...
src/components/APIErrorCard.vue
View file @
01f35f76
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
<v-btn
<v-btn
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
id=
"help_desk"
id=
"help_desk"
class=
"primary mb-5"
class=
"primary mb-5"
>
Submit Ticket
>
Submit Ticket
...
@@ -40,6 +41,7 @@
...
@@ -40,6 +41,7 @@
<v-btn
<v-btn
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1/create/137"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
id=
"help_desk"
id=
"help_desk"
class=
"primary"
class=
"primary"
>
Submit Ticket
>
Submit Ticket
...
...
src/components/CurriculumSchedule.vue
View file @
01f35f76
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
color=
"secondary"
color=
"secondary"
@
click=
"getCertificate(item.course)"
@
click=
"getCertificate(item.course)"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
v-bind=
"attrs"
v-bind=
"attrs"
v-on=
"on"
v-on=
"on"
>
>
...
@@ -53,6 +54,7 @@
...
@@ -53,6 +54,7 @@
color=
"secondary"
color=
"secondary"
href=
"https://www.galvanize.com/"
href=
"https://www.galvanize.com/"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"no-link"
class=
"no-link"
>
>
Go to Learn
Go to Learn
...
...
src/components/ExternalLink.vue
View file @
01f35f76
<
template
>
<
template
>
<a
text
class=
"link"
:href=
"href"
:class=
"
{ inline }" target="_blank">
<a
text
class=
"link"
:href=
"href"
:class=
"
{ inline }"
target="_blank"
rel="noopener noreferer"
>
<div
class=
"d-flex flex-nowrap"
>
<div
class=
"d-flex flex-nowrap"
>
<slot></slot>
<slot></slot>
<v-icon
class=
"mt-n1 ml-1"
aria-hidden=
"true"
>
mdi-launch
</v-icon>
<v-icon
class=
"mt-n1 ml-1"
aria-hidden=
"true"
>
mdi-launch
</v-icon>
...
...
src/components/HelpDeskSummary.vue
View file @
01f35f76
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
color=
"primary"
color=
"primary"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"mx-auto no-link"
class=
"mx-auto no-link"
>
>
Submit Ticket
Submit Ticket
...
@@ -24,7 +25,11 @@
...
@@ -24,7 +25,11 @@
Can't find a support form that meets your needs?
Can't find a support form that meets your needs?
<br
/>
<br
/>
Email us at
Email us at
<a
href=
"mailto:help@dso.mil"
target=
"_blank"
class=
"email"
<a
href=
"mailto:help@dso.mil"
class=
"email"
target=
"_blank"
rel=
"noopener noreferer"
>
help@dso.mil
</a
>
help@dso.mil
</a
>
>
</div>
</div>
...
@@ -34,6 +39,7 @@
...
@@ -34,6 +39,7 @@
color=
"tertiary"
color=
"tertiary"
href=
"mailto:help@dso.mil"
href=
"mailto:help@dso.mil"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"mx-auto"
class=
"mx-auto"
>
>
Email
Email
...
...
src/components/LaunchboardSettings.vue
View file @
01f35f76
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
v-on=
"on"
v-on=
"on"
href=
"https://login.dso.mil/auth/realms/baby-yoda/account/"
href=
"https://login.dso.mil/auth/realms/baby-yoda/account/"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-icon>
mdi-pencil
</v-icon>
<v-icon>
mdi-pencil
</v-icon>
</v-btn>
</v-btn>
...
@@ -83,7 +84,8 @@ export default {
...
@@ -83,7 +84,8 @@ export default {
mounted
()
{
mounted
()
{
this
.
user
=
this
.
$store
.
state
.
user
.
user
;
this
.
user
=
this
.
$store
.
state
.
user
.
user
;
this
.
darkMode
=
this
.
$store
.
state
.
userPreferences
.
userPreference
.
darkMode
;
this
.
darkMode
=
this
.
$store
.
state
.
userPreferences
.
userPreference
.
darkMode
;
this
.
welcomeMenu
=
this
.
$store
.
state
.
userPreferences
.
userPreference
.
welcomeMessage
;
this
.
welcomeMenu
=
this
.
$store
.
state
.
userPreferences
.
userPreference
.
welcomeMessage
;
this
.
changeLoadingColor
();
this
.
changeLoadingColor
();
},
},
methods
:
{
methods
:
{
...
...
src/components/ProjectsSummary.vue
View file @
01f35f76
...
@@ -71,6 +71,7 @@
...
@@ -71,6 +71,7 @@
v-if=
"project.links.repo"
v-if=
"project.links.repo"
:href=
"project.links.repo"
:href=
"project.links.repo"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-list-item-icon>
<v-list-item-icon>
<v-icon
small
class=
"ml-1"
>
$vuetify.icons.gitlab
</v-icon>
<v-icon
small
class=
"ml-1"
>
$vuetify.icons.gitlab
</v-icon>
...
@@ -83,6 +84,7 @@
...
@@ -83,6 +84,7 @@
v-if=
"project.links.latestPipeline"
v-if=
"project.links.latestPipeline"
:href=
"project.links.latestPipeline"
:href=
"project.links.latestPipeline"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-list-item-icon>
<v-list-item-icon>
<GitLabIcon
class=
"icon small ml-1"
icon=
"rocket"
/>
<GitLabIcon
class=
"icon small ml-1"
icon=
"rocket"
/>
...
@@ -95,6 +97,7 @@
...
@@ -95,6 +97,7 @@
v-if=
"project.links.jira"
v-if=
"project.links.jira"
:href=
"project.links.jira"
:href=
"project.links.jira"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-list-item-icon>
<v-list-item-icon>
<v-icon
small
class=
"ml-1"
>
$vuetify.icons.jira
</v-icon>
<v-icon
small
class=
"ml-1"
>
$vuetify.icons.jira
</v-icon>
...
@@ -107,6 +110,7 @@
...
@@ -107,6 +110,7 @@
v-if=
"project.links.confluence"
v-if=
"project.links.confluence"
:href=
"project.links.confluence"
:href=
"project.links.confluence"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-list-item-icon>
<v-list-item-icon>
<v-icon
small
class=
"ml-1"
>
<v-icon
small
class=
"ml-1"
>
...
@@ -127,6 +131,7 @@
...
@@ -127,6 +131,7 @@
icon
icon
:href=
"project.links.repo"
:href=
"project.links.repo"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
v-bind=
"attrs"
v-bind=
"attrs"
v-on=
"on"
v-on=
"on"
@
click.native.stop
@
click.native.stop
...
@@ -144,6 +149,7 @@
...
@@ -144,6 +149,7 @@
icon
icon
:href=
"project.links.latestPipeline"
:href=
"project.links.latestPipeline"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
v-bind=
"attrs"
v-bind=
"attrs"
v-on=
"on"
v-on=
"on"
@
click.native.stop
@
click.native.stop
...
@@ -161,6 +167,7 @@
...
@@ -161,6 +167,7 @@
icon
icon
:href=
"project.links.jira"
:href=
"project.links.jira"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
v-bind=
"attrs"
v-bind=
"attrs"
v-on=
"on"
v-on=
"on"
@
click.native.stop
@
click.native.stop
...
@@ -178,6 +185,7 @@
...
@@ -178,6 +185,7 @@
icon
icon
:href=
"project.links.confluence"
:href=
"project.links.confluence"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
v-bind=
"attrs"
v-bind=
"attrs"
v-on=
"on"
v-on=
"on"
@
click.native.stop
@
click.native.stop
...
@@ -201,6 +209,7 @@
...
@@ -201,6 +209,7 @@
:key=
"jIndex"
:key=
"jIndex"
:href=
"job.link"
:href=
"job.link"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
<v-list-item-icon>
<v-list-item-icon>
<GitLabIcon
class=
"status-icon"
:status=
"job.status"
/>
<GitLabIcon
class=
"status-icon"
:status=
"job.status"
/>
...
...
src/components/ToolsSummary.vue
View file @
01f35f76
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
color=
"secondary"
color=
"secondary"
:href=
"tool.link.href"
:href=
"tool.link.href"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"mx-auto no-link"
class=
"mx-auto no-link"
>
>
{{
tool
.
link
.
text
}}
{{
tool
.
link
.
text
}}
...
...
src/components/Training/TrainingAttendance.vue
View file @
01f35f76
...
@@ -126,6 +126,7 @@
...
@@ -126,6 +126,7 @@
<a
<a
:href=
"'mailto:' + item.user.email"
:href=
"'mailto:' + item.user.email"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"d-flex flex-wrap mx-0 pl-9 ml-9 mb-4 text-left"
class=
"d-flex flex-wrap mx-0 pl-9 ml-9 mb-4 text-left"
v-if=
"item.user.email"
v-if=
"item.user.email"
>
>
...
...
src/views/Resources.vue
View file @
01f35f76
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
color=
"secondary"
color=
"secondary"
href=
"https://confluence.il2.dso.mil/display/GROGU/7.3+A+Stylized+Exportable+PDF"
href=
"https://confluence.il2.dso.mil/display/GROGU/7.3+A+Stylized+Exportable+PDF"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"mx-auto no-link my-4"
class=
"mx-auto no-link my-4"
>
DOWNLOAD GUIDE
>
DOWNLOAD GUIDE
</v-btn>
</v-btn>
...
...
src/views/Team.vue
View file @
01f35f76
...
@@ -71,6 +71,7 @@
...
@@ -71,6 +71,7 @@
min-width=
"200"
min-width=
"200"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
>
>
Customer Success Team
Customer Success Team
</v-btn>
</v-btn>
...
@@ -90,6 +91,7 @@
...
@@ -90,6 +91,7 @@
color=
"tertiary"
color=
"tertiary"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
href=
"https://jira.il2.dso.mil/servicedesk/customer/portal/1"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
class=
"mx-auto no-link"
class=
"mx-auto no-link"
>
>
Submit Ticket
Submit Ticket
...
@@ -200,7 +202,7 @@
...
@@ -200,7 +202,7 @@
<
template
v-slot:
[`
item.username
`
]=
"{ item }"
>
<
template
v-slot:
[`
item.username
`
]=
"{ item }"
>
<a
<a
target=
"_blank"
target=
"_blank"
rel=
"noopener"
rel=
"noopener
noreferer
"
:href=
"`https://chat.il2.dso.mil/platform-one/messages/@$
{item.username}`"
:href=
"`https://chat.il2.dso.mil/platform-one/messages/@$
{item.username}`"
>
>
@
{{
item
.
username
}}
@
{{
item
.
username
}}
...
@@ -229,6 +231,7 @@
...
@@ -229,6 +231,7 @@
class=
"mr-3"
class=
"mr-3"
color=
"accent"
color=
"accent"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferer"
@
click=
"emailSelected"
@
click=
"emailSelected"
:disabled=
"selectedMembers.length === 0"
:disabled=
"selectedMembers.length === 0"
>
>
...
...
src/views/super-admin/Teams.vue
View file @
01f35f76
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
<a
<a
:href=
"`mailto:$
{lead.email}`"
:href=
"`mailto:$
{lead.email}`"
target="_blank"
target="_blank"
rel="noopener"
rel="noopener
noreferer
"
class="lead-name"
class="lead-name"
>
{{
lead
.
name
}}
</a
>
{{
lead
.
name
}}
</a
>
>
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
<a
<a
:href=
"`mailto:$
{lead.email}`"
:href=
"`mailto:$
{lead.email}`"
target="_blank"
target="_blank"
rel="noopener"
rel="noopener
noreferer
"
class="lead-name"
class="lead-name"
>
{{
lead
.
email
}}
</a
>
{{
lead
.
email
}}
</a
>
>
...
...
src/views/super-admin/Training.vue
View file @
01f35f76
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
v-if=
"!onMobile"
v-if=
"!onMobile"
:href=
"`mailto:$
{instructor.email}`"
:href=
"`mailto:$
{instructor.email}`"
target="_blank"
target="_blank"
rel="noopener"
rel="noopener
noreferer
"
class="white-space-nowrap"
class="white-space-nowrap"
>
>
{{
instructor
.
name
}}
</a
{{
instructor
.
name
}}
</a
...
@@ -193,6 +193,7 @@
...
@@ -193,6 +193,7 @@
v-on=
"on"
v-on=
"on"
:href=
"`mailto:$
{item.instructors[0].email},${item.instructors[1].email}`"
:href=
"`mailto:$
{item.instructors[0].email},${item.instructors[1].email}`"
target="_blank"
target="_blank"
rel="noopener noreferer"
>
>
<v-icon>
mdi-email
</v-icon>
<v-icon>
mdi-email
</v-icon>
</v-btn>
</v-btn>
...
@@ -235,7 +236,7 @@
...
@@ -235,7 +236,7 @@
<a
<a
:href=
"`mailto:$
{instructor.email}`"
:href=
"`mailto:$
{instructor.email}`"
target="_blank"
target="_blank"
rel="noopener"
rel="noopener
noreferer
"
class="white-space-nowrap"
class="white-space-nowrap"
>
>
{{
instructor
.
name
}}
{{
instructor
.
name
}}
...
@@ -256,6 +257,7 @@
...
@@ -256,6 +257,7 @@
v-on=
"on"
v-on=
"on"
:href=
"`mailto:$
{item.instructors[0].email},${item.instructors[1].email}`"
:href=
"`mailto:$
{item.instructors[0].email},${item.instructors[1].email}`"
target="_blank"
target="_blank"
rel="noopener noreferer"
>
>
<v-icon>
mdi-email
</v-icon>
<v-icon>
mdi-email
</v-icon>
</v-btn>
</v-btn>
...
...
tests/unit/main.spec.js
View file @
01f35f76
...
@@ -12,7 +12,7 @@ const fakeWait = (ms, val) => {
...
@@ -12,7 +12,7 @@ const fakeWait = (ms, val) => {
describe
(
"
main
"
,
()
=>
{
describe
(
"
main
"
,
()
=>
{
const
mockUser
=
{
name
:
"
mockUser
"
,
roles
:
[]
};
const
mockUser
=
{
name
:
"
mockUser
"
,
roles
:
[]
};
const
mockUserPreference
=
{
const
mockUserPreference
=
{
keycloakId
:
"
12345678901234567890
"
,
keycloakId
:
"
mock-keycloak-id
"
,
darkMode
:
true
,
darkMode
:
true
,
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment