summaryrefslogtreecommitdiff
path: root/src/views/Overview
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2020-01-29 05:18:40 +0300
committerGunnar Mills <gmills@us.ibm.com>2020-01-29 05:19:24 +0300
commitc4844b457cb7eeb8cab0ee8dca179be684a38b17 (patch)
tree0856ee85b0d0fd9cfc0e647cab40d02fb2bedf13 /src/views/Overview
parentff4ab407dac4b5652bf8b7a096894ba461a6cf6a (diff)
downloadwebui-vue-c4844b457cb7eeb8cab0ee8dca179be684a38b17.tar.xz
Revert "Change eslint rules to use vue recommended"
Merged accidentally. Although this one did have the proper +1s/+2s. The 2 underneath did not. The author will resubmit. This reverts commit 5e7ac49058e5dc37fd43ecf3c0d06f5dda14af5b. Change-Id: Iceb1de3a170cc0b592b183545c792aa3eb87bfee Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'src/views/Overview')
-rw-r--r--src/views/Overview/Overview.vue30
-rw-r--r--src/views/Overview/OverviewEvents.vue10
-rw-r--r--src/views/Overview/OverviewQuickLinks.vue20
3 files changed, 30 insertions, 30 deletions
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 1c4ba55f..4412d19d 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -1,12 +1,12 @@
<template>
<b-container fluid>
- <page-title />
+ <PageTitle />
<div class="quicklinks-section">
- <overview-quick-links />
+ <OverviewQuickLinks />
</div>
<b-row>
<b-col>
- <page-section section-title="Server Information">
+ <PageSection sectionTitle="Server Information">
<b-row>
<b-col sm="6">
<dl>
@@ -33,8 +33,8 @@
</dl>
</b-col>
</b-row>
- </page-section>
- <page-section section-title="BMC information">
+ </PageSection>
+ <PageSection sectionTitle="BMC information">
<b-row>
<b-col sm="6">
<dl>
@@ -51,7 +51,7 @@
<b-col sm="6">
<dl>
<dt>IP address</dt>
- <dd v-for="ip in ipAddress" :key="ip.id">{{ ip }}</dd>
+ <dd v-for="ip in ipAddress" v-bind:key="ip.id">{{ ip }}</dd>
</dl>
</b-col>
<b-col sm="6">
@@ -61,8 +61,8 @@
</dl>
</b-col>
</b-row>
- </page-section>
- <page-section section-title="Power consumption">
+ </PageSection>
+ <PageSection sectionTitle="Power consumption">
<b-row>
<b-col sm="6">
<dl>
@@ -77,12 +77,12 @@
</dl>
</b-col>
</b-row>
- </page-section>
+ </PageSection>
</b-col>
</b-row>
- <page-section section-title="High priority events">
- <overview-events />
- </page-section>
+ <PageSection sectionTitle="High priority events">
+ <OverviewEvents />
+ </PageSection>
</b-container>
</template>
@@ -100,6 +100,9 @@ export default {
PageTitle,
PageSection
},
+ created() {
+ this.getOverviewInfo();
+ },
computed: mapState({
serverModel: state => state.overview.serverModel,
serverManufacturer: state => state.overview.serverManufacturer,
@@ -112,9 +115,6 @@ export default {
ipAddress: state => state.networkSettings.ipAddress,
macAddress: state => state.networkSettings.macAddress
}),
- created() {
- this.getOverviewInfo();
- },
methods: {
getOverviewInfo() {
this.$store.dispatch('overview/getServerInfo');
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index 5820e612..07aab1d5 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -8,7 +8,7 @@
<small>{{
logData.Timestamp | date('MMM DD YYYY HH:MM:SS A ZZ')
}}</small>
- <chevron-right16 />
+ <ChevronRight16 />
</div>
<p class="mb-1">{{ logData.eventID }}: {{ logData.description }}</p>
</b-list-group-item>
@@ -22,18 +22,18 @@
<script>
import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
export default {
- name: 'Events',
+ name: 'events',
components: {
ChevronRight16
},
+ created() {
+ this.getEventLogData();
+ },
computed: {
eventLogData() {
return this.$store.getters['eventLog/eventLogData'];
}
},
- created() {
- this.getEventLogData();
- },
methods: {
getEventLogData() {
this.$store.dispatch('eventLog/getEventLogData');
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index f36c264f..e8ed4dda 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -31,7 +31,7 @@
class="d-flex justify-content-between align-items-center"
>
<span>Edit network settings</span>
- <icon-arrow-right />
+ <IconArrowRight />
</b-button>
</div>
<div>
@@ -42,7 +42,7 @@
class="d-flex justify-content-between align-items-center"
>
<span>Serial over LAN console</span>
- <icon-arrow-right />
+ <IconArrowRight />
</b-button>
</div>
</div>
@@ -52,27 +52,27 @@
import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
export default {
- name: 'QuickLinks',
+ name: 'quickLinks',
components: {
IconArrowRight: ArrowRight16
},
- data() {
- return {
- serverLEDChecked: false
- };
+ created() {
+ this.getBmcTime();
},
computed: {
bmcTime() {
return this.$store.getters['global/bmcTime'];
}
},
- created() {
- this.getBmcTime();
- },
methods: {
getBmcTime() {
this.$store.dispatch('global/getBmcTime');
}
+ },
+ data() {
+ return {
+ serverLedChecked: false
+ };
}
};
</script>