Merge branch 'master' of github.com:Lissy93/dashy into REFACTOR/2.1.2_unified-config

src/components/Widgets/GluetunStatus.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="vpn-ip-addr-wrapper">
+  <div class="ip-row public-ip" v-if="public_ip">
+    <span class="lbl">VPN IP</span>
+    <span class="val">{{ public_ip }}</span>
+  </div>
+  <div class="ip-row" v-if="country">
+    <span class="lbl">Country</span>
+    <span class="val">{{ country }}</span>
+  </div>
+  <div class="ip-row" v-if="region">
+    <span class="lbl">Region</span>
+    <span class="val">{{ region }}</span>
+  </div>
+  <div class="ip-row" v-if="city">
+    <span class="lbl">City</span>
+    <span class="val">{{ city }}</span>
+  </div>
+  <div class="ip-row" v-if="postal_code">
+    <span class="lbl">Post Code</span>
+    <span class="val">{{ postal_code }}</span>
+  </div>
+  <div class="ip-row" v-if="location">
+    <span class="lbl">Location</span>
+    <span class="val">{{ location }}</span>
+  </div>
+  <div class="ip-row" v-if="timezone">
+    <span class="lbl">Timezone</span>
+    <span class="val">{{ timezone }}</span>
+  </div>
+  <div class="ip-row" v-if="organization">
+    <span class="lbl">Organization</span>
+    <span class="val">{{ organization }}</span>
+  </div>
+</div>
+</template>
+
+<script>
+import WidgetMixin from '@/mixins/WidgetMixin';
+
+export default {
+  mixins: [WidgetMixin],
+  data() {
+    return {
+      public_ip: null,
+      country: null,
+      region: null,
+      city: null,
+      location: null,
+      organization: null,
+      postal_code: null,
+      timezone: null,
+    };
+  },
+  methods: {
+    /* Make GET request to Gluetun publicip API endpoint */
+    fetchData() {
+      this.makeRequest(this.options.hostname + "/v1/publicip/ip").then(this.processData);
+    },
+    /* Assign data variables to the returned data */
+    processData(ipInfo) {
+      var fields = this.options.visibleFields.split(",");
+      this.public_ip = fields.includes("public_ip") ? ipInfo.public_ip : null;
+      this.country = fields.includes("country") ?  ipInfo.country : null;
+      this.region = fields.includes("region") ? ipInfo.region : null;
+      this.city = fields.includes("city") ?  ipInfo.city : null;
+      this.location = fields.includes("location") ?  ipInfo.location : null;
+      this.organization = fields.includes("organization") ?  ipInfo.organization : null;
+      this.postal_code = fields.includes("postal_code") ?  ipInfo.postal_code : null;
+      this.timezone = fields.includes("timezone") ?  ipInfo.timezone : null;
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.vpn-ip-addr-wrapper {
+  .ip-row {
+    display: flex;
+    padding: 0.1rem 0.1rem 0.5rem 0.1rem;
+    align-items: center;
+    justify-content: space-between;
+    color: var(--widget-text-color);
+    max-width: 400px;
+    margin: 0.5rem auto;
+    span.lbl {
+      font-weight: bold;
+    }
+    span.val {
+      font-family: var(--font-monospace);
+    }
+    &:not(.public-ip) {
+      opacity: var(--dimming-factor);
+    }
+    &:not(:last-child) {
+      border-bottom: 1px dashed var(--widget-text-color);
+    }
+  }
+}
+</style>

src/components/Widgets/WidgetBase.vue

@@ -77,6 +77,7 @@ const COMPAT = {
   'gl-system-load': 'GlSystemLoad',
   'gl-cpu-temp': 'GlCpuTemp',
   'health-checks': 'HealthChecks',
+  'gluetun-status': 'GluetunStatus',
   iframe: 'IframeWidget',
   image: 'ImageWidget',
   joke: 'Jokes',