Skip to content

Commit fe99dc7

Browse files
Merge pull request #1186 from MetRonnie/depr
Remove deprecated Vue & Vuetify syntax
2 parents ae56a48 + cc68f90 commit fe99dc7

File tree

14 files changed

+139
-222
lines changed

14 files changed

+139
-222
lines changed

src/components/cylc/Drawer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3131
<v-list
3232
class="pa-0 ma-0 flex-grow-0 d-flex flex-column"
3333
>
34-
<c-header class="pb-5" :user="user.username" />
34+
<c-header :user="user.username" />
3535
<v-list-item
3636
v-if="responsive"
3737
>

src/components/cylc/Header.vue

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
-->
1717

1818
<template>
19-
<v-list-item-action-text class="pt-3 pb-3 c-header">
20-
<v-layout align-center justify-center row wrap fill-height>
21-
<div class="mb-2 px-8">
22-
<svg version="1.1" preserveAspectRatio="xMinYMin meet" width="100%" height="100%" viewBox="0 0 655 260" xmlns="http://www.w3.org/2000/svg">
23-
<g transform="translate(292.53,-49.505)">
19+
<div class="c-header d-flex flex-column align-center pt-3 pb-5">
20+
<div class="mb-2 px-6">
21+
<svg version="1.1" preserveAspectRatio="xMinYMin meet" width="100%" height="100%" viewBox="0 0 655 260" xmlns="http://www.w3.org/2000/svg">
22+
<g transform="translate(292.53,-49.505)">
23+
<g>
2424
<g>
2525
<g>
26-
<g>
27-
<circle r="27.743086" cy="248.39331" cx="-135.70163" transform="scale(-1,1)" style="fill:#ff5966;fill-opacity:1;stroke:none;stroke-width:1.29467726;stroke-opacity:1"/>
28-
<circle r="72.85714" cy="216.6479" cx="201.04846" style="fill:#0dc66e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"/>
29-
<circle r="37.37936" cy="136.32114" cx="167.3486" style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:1.18934333;stroke-opacity:1"/>
30-
<circle r="49.79998" cy="121.63028" cx="292.31558" style="fill:#00b4fd;fill-opacity:1;stroke:none;stroke-width:0.91736811;stroke-opacity:1"/>
31-
<path d="m -239.15268,150.44225 q 5.28,0 17.92,1.92 l 3.84,0.48 -0.48,9.76 q -12.8,-1.44 -18.88,-1.44 -13.6,0 -18.56,6.56 -4.8,6.4 -4.8,24 0,17.44 4.48,24.32 4.64,6.88 19.04,6.88 l 18.88,-1.44 0.48,9.92 q -14.88,2.24 -22.24,2.24 -18.72,0 -25.92,-9.6 -7.04,-9.6 -7.04,-32.32 0,-22.88 7.68,-32 7.68,-9.28 25.6,-9.28 z" style="fill:#ff5966;fill-opacity:1;stroke:none"/>
32-
<path d="m -175.59268,152.04225 h 12 l 20,69.6 h 5.28 l 20.16,-69.6 h 12 l -33.28,115.52 h -12 l 10.4,-35.52 h -11.84 z" style="fill:#ffcc00;fill-opacity:1;stroke:none"/>
33-
<path d="m -58.612682,232.04225 v -114.88 h 12 v 114.88 z" style="fill:#0dc66e;fill-opacity:1;stroke:none"/>
34-
<path d="m 34.534818,150.44225 q 5.28,0 17.92,1.92 l 3.84,0.48 -0.48,9.76 q -12.8,-1.44 -18.88,-1.44 -13.6,0 -18.56,6.56 -4.8,6.4 -4.8,24 0,17.44 4.48,24.32 4.64,6.88 19.04,6.88 l 18.88,-1.44 0.48,9.92 q -14.88,2.24 -22.24,2.24 -18.72,0 -25.9199999,-9.6 -7.04,-9.6 -7.04,-32.32 0,-22.88 7.68,-32 7.6799999,-9.28 25.5999999,-9.28 z" style="fill:#00b4fd;fill-opacity:1;stroke:none"/>
35-
</g>
26+
<circle r="27.743086" cy="248.39331" cx="-135.70163" transform="scale(-1,1)" style="fill:#ff5966;fill-opacity:1;stroke:none;stroke-width:1.29467726;stroke-opacity:1"/>
27+
<circle r="72.85714" cy="216.6479" cx="201.04846" style="fill:#0dc66e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"/>
28+
<circle r="37.37936" cy="136.32114" cx="167.3486" style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:1.18934333;stroke-opacity:1"/>
29+
<circle r="49.79998" cy="121.63028" cx="292.31558" style="fill:#00b4fd;fill-opacity:1;stroke:none;stroke-width:0.91736811;stroke-opacity:1"/>
30+
<path d="m -239.15268,150.44225 q 5.28,0 17.92,1.92 l 3.84,0.48 -0.48,9.76 q -12.8,-1.44 -18.88,-1.44 -13.6,0 -18.56,6.56 -4.8,6.4 -4.8,24 0,17.44 4.48,24.32 4.64,6.88 19.04,6.88 l 18.88,-1.44 0.48,9.92 q -14.88,2.24 -22.24,2.24 -18.72,0 -25.92,-9.6 -7.04,-9.6 -7.04,-32.32 0,-22.88 7.68,-32 7.68,-9.28 25.6,-9.28 z" style="fill:#ff5966;fill-opacity:1;stroke:none"/>
31+
<path d="m -175.59268,152.04225 h 12 l 20,69.6 h 5.28 l 20.16,-69.6 h 12 l -33.28,115.52 h -12 l 10.4,-35.52 h -11.84 z" style="fill:#ffcc00;fill-opacity:1;stroke:none"/>
32+
<path d="m -58.612682,232.04225 v -114.88 h 12 v 114.88 z" style="fill:#0dc66e;fill-opacity:1;stroke:none"/>
33+
<path d="m 34.534818,150.44225 q 5.28,0 17.92,1.92 l 3.84,0.48 -0.48,9.76 q -12.8,-1.44 -18.88,-1.44 -13.6,0 -18.56,6.56 -4.8,6.4 -4.8,24 0,17.44 4.48,24.32 4.64,6.88 19.04,6.88 l 18.88,-1.44 0.48,9.92 q -14.88,2.24 -22.24,2.24 -18.72,0 -25.9199999,-9.6 -7.04,-9.6 -7.04,-32.32 0,-22.88 7.68,-32 7.6799999,-9.28 25.5999999,-9.28 z" style="fill:#00b4fd;fill-opacity:1;stroke:none"/>
3634
</g>
3735
</g>
3836
</g>
39-
</svg>
40-
</div>
41-
<div class="c-environment-info">
42-
<v-chip id="username" class="text--secondary" outlined>{{ user }}</v-chip>
43-
<span class="at">@</span>
44-
<v-chip id="host" class="text--secondary" outlined>{{ environment }}</v-chip>
45-
</div>
46-
</v-layout>
47-
</v-list-item-action-text>
37+
</g>
38+
</svg>
39+
</div>
40+
<div class="c-environment-info">
41+
<v-chip id="username" class="text--secondary" outlined>{{ user }}</v-chip>
42+
<span class="at">@</span>
43+
<v-chip id="host" class="text--secondary" outlined>{{ environment }}</v-chip>
44+
</div>
45+
</div>
4846
</template>
4947

5048
<script>

src/components/cylc/gscan/GScan.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
127127
:to="workflowLink(scope.node)"
128128
>
129129
<v-list-item-title>
130-
<v-layout align-center align-content-center d-flex flex-nowrap>
131-
<v-flex
130+
<v-row class="align-center align-content-center flex-nowrap">
131+
<v-col
132132
v-if="scope.node.type === 'workflow-part'"
133133
class="c-gscan-workflow-name"
134134
>
135135
<span>{{ scope.node.name || scope.node.id }}</span>
136-
</v-flex>
137-
<v-flex
136+
</v-col>
137+
<v-col
138138
v-else-if="scope.node.type === 'workflow'"
139139
class="c-gscan-workflow-name"
140140
>
@@ -144,11 +144,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
144144
</template>
145145
<span>{{ scope.node.id }}</span>
146146
</v-tooltip>
147-
</v-flex>
147+
</v-col>
148148
<!-- We check the latestStateTasks below as offline workflows won't have a latestStateTasks property -->
149-
<v-flex
149+
<v-col
150150
v-if="scope.node.type === 'workflow' && scope.node.node.latestStateTasks"
151-
class="text-right c-gscan-workflow-states"
151+
class="text-right c-gscan-workflow-states flex-grow-0"
152152
>
153153
<!-- task summary tooltips -->
154154
<span
@@ -183,8 +183,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
183183
</span>
184184
</v-tooltip>
185185
</span>
186-
</v-flex>
187-
</v-layout>
186+
</v-col>
187+
</v-row>
188188
</v-list-item-title>
189189
</v-list-item>
190190
</template>

src/components/cylc/tree/TreeItem.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
<template>
1919
<div class="treeitem" v-show="filtered">
20-
<v-flex
20+
<div
2121
class="node d-flex align-center"
2222
:class="nodeClass"
2323
:style="nodeStyle"
@@ -187,7 +187,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
187187
</div>
188188
</slot>
189189
<slot></slot>
190-
</v-flex>
190+
</div>
191191
<span
192192
v-show="isExpanded"
193193
v-if="!stopOn.includes(node.type)"

src/mixins/subscriptionView.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,5 @@ export default {
3636
next(vm => {
3737
vm.$workflowService.startSubscriptions()
3838
})
39-
},
40-
beforeRouteUpdate (to, from, next) {
41-
next(vm => {
42-
vm.$workflowService.startSubscriptions()
43-
})
4439
}
4540
}

src/styles/cylc/_dashboard.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
width: auto;
2727
height: auto;
2828
}
29-
.v-list__tile__action, .v-list__tile__avatar {
30-
min-width: auto;
31-
margin-left: -10px;
32-
}
3329

3430
/* otherwise avatar does not left align with component above,
3531
!important as the attributes are set in the tag element */
@@ -43,11 +39,6 @@
4339
padding: 0 0;
4440
}
4541

46-
/* to left align items in the dashboard */
47-
.v-list__tile {
48-
padding: 10px 0;
49-
}
50-
5142
table {
5243
tbody {
5344
tr {

src/styles/cylc/_drawer.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@
2525

2626
@include theme-dependent(background-color, $grey, 4);
2727

28-
.v-list__tile {
29-
border-radius: 4px;
30-
margin-top: 5px;
31-
}
32-
33-
.v-image__image--contain {
34-
top: 30px;
35-
bottom: 30px;
36-
height: 60%;
37-
}
38-
3928
.search-input {
4029
margin-bottom: 30px !important;
4130
padding-left: 15px;

src/styles/cylc/_header.scss

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@
2323

2424
@include theme-dependent(background-color, $grey, 3);
2525

26-
.layout {
27-
.c-environment-info {
28-
font-size: 1rem;
29-
font-weight: map-get($font-weights, 'regular');
26+
.c-environment-info {
27+
font-size: 1rem;
28+
font-weight: map-get($font-weights, 'regular');
3029

31-
.v-chip {
32-
font-size: 1rem;
33-
@include theme-dependent(background-color, $grey, 5, !important);
34-
@include theme-dependent(border-color, $grey, 1, !important);
35-
}
30+
.v-chip {
31+
font-size: 1rem;
32+
@include theme-dependent(background-color, $grey, 5, !important);
33+
@include theme-dependent(border-color, $grey, 1, !important);
3634
}
3735
}
3836
}

src/views/Dashboard.vue

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2121
grid-list
2222
class="c-dashboard mt-4"
2323
>
24-
<v-layout wrap>
25-
<v-flex xs12 md6 lg6>
24+
<v-row wrap>
25+
<v-col md="6" lg="6">
2626
<p class="display-1">Workflows</p>
2727
<v-data-table
2828
:headers="workflowsHeader"
@@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3232
hide-default-header
3333
id="dashboard-workflows"
3434
>
35-
<v-progress-linear slot="progress" color="grey" indeterminate></v-progress-linear>
3635
<template v-slot:item.count="{ item }">
3736
<v-skeleton-loader
3837
:loading="isLoading"
@@ -47,8 +46,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4746
<span class="title font-weight-light">{{ item.text }}</span>
4847
</template>
4948
</v-data-table>
50-
</v-flex>
51-
<v-flex xs12 md6 lg6>
49+
</v-col>
50+
<v-col md="6" lg="6">
5251
<p class="display-1">Events</p>
5352
<v-data-table
5453
:headers="eventsHeader"
@@ -66,11 +65,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
6665
<td class="title">No events</td>
6766
</template>
6867
</v-data-table>
69-
</v-flex>
70-
</v-layout>
68+
</v-col>
69+
</v-row>
7170
<v-divider />
72-
<v-layout wrap>
73-
<v-flex xs12 md6 lg6>
71+
<v-row wrap>
72+
<v-col md="6" lg="6">
7473
<v-list three-line>
7574
<v-list-item to="/workflow-table" data-cy="workflow-table-link">
7675
<v-list-item-avatar size="60" style="font-size: 2em;">
@@ -117,8 +116,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
117116
<span>You are not running Cylc UI via Cylc Hub.</span>
118117
</v-tooltip>
119118
</v-list>
120-
</v-flex>
121-
<v-flex xs12 md6 lg6>
119+
</v-col>
120+
<v-col md="6" lg="6">
122121
<v-list three-line>
123122
<v-list-item to="/guide" data-cy="quickstart-link">
124123
<v-list-item-avatar size="60" style="font-size: 2em;">
@@ -160,8 +159,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
160159
</v-list-item-content>
161160
</v-list-item>
162161
</v-list>
163-
</v-flex>
164-
</v-layout>
162+
</v-col>
163+
</v-row>
165164
</v-container>
166165
</template>
167166

src/views/Guide.vue

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3030

3131
<div class="card-grid">
3232

33-
<v-flex
34-
md5
35-
xs12
36-
>
33+
<v-col>
3734
<v-card outlined>
3835
<v-card-title primary-title>
3936
<p class="display-1 text--primary">Tasks &amp; Jobs</p>
@@ -89,12 +86,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
8986
</p>
9087
</v-card-text>
9188
</v-card>
92-
</v-flex>
89+
</v-col>
9390

94-
<v-flex
95-
md5
96-
xs12
97-
>
91+
<v-col>
9892
<v-card outlined>
9993
<v-card-title primary-title>
10094
<p class="display-1 text--primary">Why Are We Waiting?</p>
@@ -187,7 +181,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
187181
</p>
188182
</v-card-text>
189183
</v-card>
190-
</v-flex>
184+
</v-col>
191185
</div>
192186

193187
</v-container>

0 commit comments

Comments
 (0)