UNCLASSIFIED

Commit bcadea05 authored by Baban Faraj's avatar Baban Faraj Committed by graham.smith
Browse files

Made the column count for large screen size configurable based on where the...

Made the column count for large screen size configurable based on where the project summary is placed.
parent b9bd74c6
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
<v-row class="justify-content-center" v-else-if="this.cardView === true"> <v-row class="justify-content-center" v-else-if="this.cardView === true">
<v-col <v-col
v-for="(project, index) in filteredProjects" v-for="(project, index) in filteredProjects"
lg="4" :lg="projectCardColumnLgCount"
:key="index" :key="index"
:project="project" :project="project"
:cols="12" :cols="12"
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
<v-btn <v-btn
icon icon
:href="project.links.repo" :href="project.links.repo"
rel="noopener noreferer"
target="_blank" target="_blank"
v-bind="attrs" v-bind="attrs"
v-on="on" v-on="on"
...@@ -283,8 +284,8 @@ ...@@ -283,8 +284,8 @@
<v-card-actions> <v-card-actions>
<v-layout row justify-center class="project-card-detail"> <v-layout row justify-center class="project-card-detail">
<v-card-text v-if="project.latestPipeline"> <v-card-text v-if="project.latestPipeline">
<div class="project-card-pipeline-name"> <div class="project-card-text">
Pipeline: {{ project.latestPipeline.name }} Pipeline: {{ project.latestPipeline.message }}
</div> </div>
</v-card-text> </v-card-text>
<v-tooltip bottom> <v-tooltip bottom>
...@@ -317,7 +318,13 @@ ...@@ -317,7 +318,13 @@
:key="jIndex" :key="jIndex"
:to="job.link" :to="job.link"
> >
<a :href="job.link" target="_blank">{{ job.name }}; </a> <a
class="project-card-text"
:href="job.link"
rel="noopener noreferer"
target="_blank"
>{{ job.name }};
</a>
</router-link> </router-link>
</v-layout> </v-layout>
</v-card-actions> </v-card-actions>
...@@ -341,6 +348,10 @@ export default { ...@@ -341,6 +348,10 @@ export default {
ErrorMessage, ErrorMessage,
}, },
props: { props: {
projectCardColumnLgCount: {
type: Number,
default: 4,
},
detailed: { detailed: {
type: Boolean, type: Boolean,
default: true, default: true,
...@@ -376,6 +387,7 @@ export default { ...@@ -376,6 +387,7 @@ export default {
async refreshProjects() { async refreshProjects() {
if (this.setProjectLoading) { if (this.setProjectLoading) {
this.setProjectLoading(true); this.setProjectLoading(true);
this.loading = true;
} }
this.error = false; this.error = false;
this.emptyString = false; this.emptyString = false;
...@@ -395,6 +407,7 @@ export default { ...@@ -395,6 +407,7 @@ export default {
} }
if (this.setProjectLoading) { if (this.setProjectLoading) {
this.setProjectLoading(false); this.setProjectLoading(false);
this.loading = false;
} }
}, },
setCardView() { setCardView() {
...@@ -457,10 +470,13 @@ export default { ...@@ -457,10 +470,13 @@ export default {
padding-bottom: 20px; padding-bottom: 20px;
} }
.project-card-detail { .project-card-detail {
padding-top:30px; padding-top: 30px;
padding-bottom: 45px; padding-bottom: 45px;
padding-left:45px; padding-left: 45px;
padding-right:45px; padding-right: 45px;
}
.project-card-text {
font-size: medium;
} }
.card { .card {
min-height: 100%; min-height: 100%;
......
...@@ -12,13 +12,14 @@ ...@@ -12,13 +12,14 @@
:refreshClick="refreshProjectData" :refreshClick="refreshProjectData"
> >
<div <div
class="align-items-center d-flex"
slot="header-bar-icons" slot="header-bar-icons"
:cardViewProjects="cardViewProjects" :cardViewProjects="cardViewProjects"
:panelViewProjects="panelViewProjects" :panelViewProjects="panelViewProjects"
> >
<v-tooltip top > <v-tooltip top>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn <v-btn
icon icon
v-bind="attrs" v-bind="attrs"
v-on="on" v-on="on"
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</template> </template>
<span>Card View</span> <span>Card View</span>
</v-tooltip> </v-tooltip>
<v-tooltip top > <v-tooltip top>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn <v-btn
icon icon
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
slot="content" slot="content"
ref="projectSummary" ref="projectSummary"
:setProjectLoading="setProjectLoading" :setProjectLoading="setProjectLoading"
:projectCardColumnLgCount="4"
detailed detailed
/> />
</Section> </Section>
......
...@@ -60,37 +60,27 @@ ...@@ -60,37 +60,27 @@
headerTitle="My Project Summary" headerTitle="My Project Summary"
> >
<div <div
class="align-items-center d-flex " class="align-items-center d-flex"
slot="header-bar-icons" slot="header-bar-icons"
:cardViewProjects="cardViewProjects" :cardViewProjects="cardViewProjects"
:panelViewProjects="panelViewProjects" :panelViewProjects="panelViewProjects"
> >
<v-tooltip top> <v-tooltip top>
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-btn <v-btn icon v-bind="attrs" v-on="on" @click="cardViewProjects">
icon <v-icon>mdi-view-grid</v-icon>
v-bind="attrs" </v-btn>
v-on="on" </template>
@click="cardViewProjects" <span>Card View</span>
> </v-tooltip>
<v-icon>mdi-view-grid</v-icon> <v-tooltip top>
</v-btn> <template v-slot:activator="{ on, attrs }">
</template> <v-btn icon v-bind="attrs" v-on="on" @click="panelViewProjects">
<span>Card View</span> <v-icon>mdi-reorder-horizontal</v-icon>
</v-tooltip> </v-btn>
<v-tooltip top> </template>
<template v-slot:activator="{ on, attrs }"> <span>Panel View</span>
<v-btn </v-tooltip>
icon
v-bind="attrs"
v-on="on"
@click="panelViewProjects"
>
<v-icon>mdi-reorder-horizontal</v-icon>
</v-btn>
</template>
<span>Panel View</span>
</v-tooltip>
</div> </div>
<span slot="userinfo"> <span slot="userinfo">
<TutorialTooltip tooltipName="projects"> <TutorialTooltip tooltipName="projects">
...@@ -101,6 +91,7 @@ ...@@ -101,6 +91,7 @@
slot="content" slot="content"
ref="projectSummary" ref="projectSummary"
:setProjectLoading="setProjectLoading" :setProjectLoading="setProjectLoading"
:projectCardColumnLgCount="6"
/> />
</Section> </Section>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment