From 771e2f371708ec19abe6b4066e006766da224326 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Thu, 16 Dec 2021 04:53:33 +0000 Subject: [PATCH] :zap: Moves common functionality into reusable mixin --- src/components/Widgets/CryptoPriceChart.vue | 8 -------- src/components/Widgets/CryptoWatchList.vue | 8 -------- src/components/Widgets/ExchangeRates.vue | 8 -------- src/components/Widgets/Flights.vue | 8 -------- src/components/Widgets/Jokes.vue | 8 -------- src/components/Widgets/NdCpuHistory.vue | 3 --- src/components/Widgets/NdLoadHistory.vue | 3 --- src/components/Widgets/NdRamHistory.vue | 3 --- src/components/Widgets/RssFeed.vue | 8 -------- src/components/Widgets/StockPriceChart.vue | 8 -------- src/components/Widgets/SystemInfo.vue | 5 ----- src/components/Widgets/TflStatus.vue | 9 --------- src/components/Widgets/XkcdComic.vue | 8 -------- 13 files changed, 87 deletions(-) diff --git a/src/components/Widgets/CryptoPriceChart.vue b/src/components/Widgets/CryptoPriceChart.vue index b646a9c4..ab719740 100644 --- a/src/components/Widgets/CryptoPriceChart.vue +++ b/src/components/Widgets/CryptoPriceChart.vue @@ -18,9 +18,6 @@ export default { chartDom: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* The crypto asset to fetch price data for */ asset() { @@ -61,11 +58,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Create new chart, using the crypto data */ generateChart() { return new Chart(`#${this.chartId}`, { diff --git a/src/components/Widgets/CryptoWatchList.vue b/src/components/Widgets/CryptoWatchList.vue index da603b35..5e7cb6f6 100644 --- a/src/components/Widgets/CryptoWatchList.vue +++ b/src/components/Widgets/CryptoWatchList.vue @@ -32,9 +32,6 @@ export default { cryptoData: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* The crypto assets to fetch price data for */ assets() { @@ -82,11 +79,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to CoinGecko API endpoint */ fetchData() { axios.get(this.endpoint) diff --git a/src/components/Widgets/ExchangeRates.vue b/src/components/Widgets/ExchangeRates.vue index d89cdbf9..19d6cd35 100644 --- a/src/components/Widgets/ExchangeRates.vue +++ b/src/components/Widgets/ExchangeRates.vue @@ -24,9 +24,6 @@ export default { exchangeRates: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* The users API key for exchangerate-api.com */ apiKey() { @@ -51,11 +48,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to CoinGecko API endpoint */ fetchData() { axios.get(this.endpoint) diff --git a/src/components/Widgets/Flights.vue b/src/components/Widgets/Flights.vue index dd9924b9..c9b0039b 100644 --- a/src/components/Widgets/Flights.vue +++ b/src/components/Widgets/Flights.vue @@ -43,9 +43,6 @@ export default { arrivals: [], }; }, - mounted() { - this.fetchData(); - }, filters: { formatDate(date) { const d = new Date(date); @@ -105,11 +102,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to CoinGecko API endpoint */ fetchData() { const requestConfig = { diff --git a/src/components/Widgets/Jokes.vue b/src/components/Widgets/Jokes.vue index ed3adb41..b6d50802 100644 --- a/src/components/Widgets/Jokes.vue +++ b/src/components/Widgets/Jokes.vue @@ -20,9 +20,6 @@ export default { jokeLine2: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* Language code to fetch jokes for */ language() { @@ -53,11 +50,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to Jokes API endpoint */ fetchData() { axios.get(this.endpoint) diff --git a/src/components/Widgets/NdCpuHistory.vue b/src/components/Widgets/NdCpuHistory.vue index e989f5ce..66bc7f03 100644 --- a/src/components/Widgets/NdCpuHistory.vue +++ b/src/components/Widgets/NdCpuHistory.vue @@ -17,9 +17,6 @@ export default { chartDom: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* URL where NetData is hosted */ netDataHost() { diff --git a/src/components/Widgets/NdLoadHistory.vue b/src/components/Widgets/NdLoadHistory.vue index 86d9505c..243c1ac4 100644 --- a/src/components/Widgets/NdLoadHistory.vue +++ b/src/components/Widgets/NdLoadHistory.vue @@ -17,9 +17,6 @@ export default { chartDom: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* URL where NetData is hosted */ netDataHost() { diff --git a/src/components/Widgets/NdRamHistory.vue b/src/components/Widgets/NdRamHistory.vue index bc97b90c..70fbd61d 100644 --- a/src/components/Widgets/NdRamHistory.vue +++ b/src/components/Widgets/NdRamHistory.vue @@ -13,9 +13,6 @@ import ChartingMixin from '@/mixins/ChartingMixin'; export default { mixins: [WidgetMixin, ChartingMixin], components: {}, - mounted() { - this.fetchData(); - }, computed: { /* URL where NetData is hosted */ netDataHost() { diff --git a/src/components/Widgets/RssFeed.vue b/src/components/Widgets/RssFeed.vue index 71739ec7..e737ab84 100644 --- a/src/components/Widgets/RssFeed.vue +++ b/src/components/Widgets/RssFeed.vue @@ -42,9 +42,6 @@ export default { posts: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* The URL to users atom-format RSS feed */ rssUrl() { @@ -91,11 +88,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to Rss2Json */ fetchData() { axios.get(this.endpoint) diff --git a/src/components/Widgets/StockPriceChart.vue b/src/components/Widgets/StockPriceChart.vue index 04b35954..655d5d52 100644 --- a/src/components/Widgets/StockPriceChart.vue +++ b/src/components/Widgets/StockPriceChart.vue @@ -18,9 +18,6 @@ export default { chartDom: null, }; }, - mounted() { - this.fetchData(); - }, computed: { /* The stock or share asset symbol to fetch data for */ stock() { @@ -66,11 +63,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Create new chart, using the crypto data */ generateChart() { return new Chart(`#${this.chartId}`, { diff --git a/src/components/Widgets/SystemInfo.vue b/src/components/Widgets/SystemInfo.vue index 78853d77..035abde8 100644 --- a/src/components/Widgets/SystemInfo.vue +++ b/src/components/Widgets/SystemInfo.vue @@ -52,11 +52,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to CoinGecko API endpoint */ fetchData() { axios.get(this.endpoint) diff --git a/src/components/Widgets/TflStatus.vue b/src/components/Widgets/TflStatus.vue index 948fa4d7..99660a79 100644 --- a/src/components/Widgets/TflStatus.vue +++ b/src/components/Widgets/TflStatus.vue @@ -49,11 +49,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Makes GET request to the TFL API */ fetchData() { axios.get(widgetApiEndpoints.tflStatus) @@ -114,10 +109,6 @@ export default { this.showAll = !this.showAll; }, }, - created() { - if (this.options.showAll) this.showAll = true; - this.fetchData(); - }, }; diff --git a/src/components/Widgets/XkcdComic.vue b/src/components/Widgets/XkcdComic.vue index 9674f4ee..ba565f76 100644 --- a/src/components/Widgets/XkcdComic.vue +++ b/src/components/Widgets/XkcdComic.vue @@ -23,9 +23,6 @@ export default { comicNum: '', }; }, - mounted() { - this.fetchData(); - }, computed: { /* Let user select which comic to display: random, latest or a specific number */ comicNumber() { @@ -44,11 +41,6 @@ export default { }, }, methods: { - /* Extends mixin, and updates data. Called by parent component */ - update() { - this.startLoading(); - this.fetchData(); - }, /* Make GET request to CoinGecko API endpoint */ fetchData() { axios.get(this.endpoint)