removed useless icon files, fixed boolean repr (#100)

closes #78
latenighttales · Dec 10, 2019 · 673f7a6 · 673f7a6
1 parent 497be6b
commit 673f7a6
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/api/serializers.py b/api/serializers.py
@@ -66,6 +66,13 @@ class Meta:
         model = Minions
         fields = "__all__"
 
+    def to_representation(self, instance):
+        data = super(MinionsSerializer, self).to_representation(instance)
+        data["conformity"] = (
+            "Unknown" if data["conformity"] is None else str(data["conformity"])
+        )
+        return data
+
 
 class ConformitySerializer(serializers.ModelSerializer):
     class Meta:

diff --git a/api/views/alcali.py b/api/views/alcali.py
@@ -246,7 +246,9 @@ def render(self, request):
             default_conformity = {
                 "minion_id": minion.minion_id,
                 "last_highstate": last_highstate_date,
-                "conformity": minion.conformity(),
+                "conformity": "Unknown"
+                if minion.conformity() is None
+                else str(minion.conformity()),
                 "succeeded": succeeded,
                 "unchanged": unchanged,
                 "failed": failed,

diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=preload as=style><link href=/static/css/chunk-vendors.79d99540.css rel=preload as=style><link href=/static/js/app.2911b6e4.js rel=preload as=script><link href=/static/js/chunk-vendors.ff4d722f.js rel=preload as=script><link href=/static/css/chunk-vendors.79d99540.css rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.ff4d722f.js></script><script src=/static/js/app.2911b6e4.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=preload as=style><link href=/static/css/chunk-vendors.a6f43c83.css rel=preload as=style><link href=/static/js/app.43c2106a.js rel=preload as=script><link href=/static/js/chunk-vendors.90ddc1f0.js rel=preload as=script><link href=/static/css/chunk-vendors.a6f43c83.css rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.90ddc1f0.js></script><script src=/static/js/app.43c2106a.js></script></body></html>
diff --git a/dist/static/css/chunk-vendors.79d99540.css b/dist/static/css/chunk-vendors.79d99540.css
diff --git a/dist/static/css/chunk-vendors.a6f43c83.css b/dist/static/css/chunk-vendors.a6f43c83.css
diff --git a/dist/static/fonts/materialdesignicons-webfont.0aee1bb1.woff2 b/dist/static/fonts/materialdesignicons-webfont.0aee1bb1.woff2
diff --git a/dist/static/fonts/materialdesignicons-webfont.3c851d60.ttf b/dist/static/fonts/materialdesignicons-webfont.3c851d60.ttf
diff --git a/dist/static/fonts/materialdesignicons-webfont.8e4c7482.eot b/dist/static/fonts/materialdesignicons-webfont.8e4c7482.eot
diff --git a/dist/static/fonts/materialdesignicons-webfont.ce34aa6c.woff b/dist/static/fonts/materialdesignicons-webfont.ce34aa6c.woff
diff --git a/dist/static/js/app.2911b6e4.js b/dist/static/js/app.2911b6e4.js
diff --git a/dist/static/js/app.2911b6e4.js.map b/dist/static/js/app.2911b6e4.js.map
diff --git a/dist/static/js/app.43c2106a.js b/dist/static/js/app.43c2106a.js
diff --git a/dist/static/js/app.43c2106a.js.map b/dist/static/js/app.43c2106a.js.map
diff --git a/dist/static/js/chunk-vendors.ff4d722f.js → dist/static/js/chunk-vendors.90ddc1f0.js b/dist/static/js/chunk-vendors.ff4d722f.js → dist/static/js/chunk-vendors.90ddc1f0.js
diff --git a/dist/static/js/chunk-vendors.ff4d722f.js.map → dist/static/js/chunk-vendors.90ddc1f0.js.map b/dist/static/js/chunk-vendors.ff4d722f.js.map → dist/static/js/chunk-vendors.90ddc1f0.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "xterm-addon-fit": "^0.2.1"
   },
   "devDependencies": {
-    "@mdi/font": "^4.0.96",
     "@vue/cli-plugin-babel": "^3.12.1",
     "@vue/cli-plugin-eslint": "^3.12.1",
     "@vue/cli-service": "^3.12.1",

diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,6 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title>ALCALI</title>
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
     <link href="https://fonts.googleapis.com/css?family=Material+Icons" rel="stylesheet">
   </head>
   <body>

diff --git a/src/components/ConformityTable.vue b/src/components/ConformityTable.vue
@@ -28,7 +28,7 @@
           {{item.last_highstate === null ? "": new Date(item.last_highstate).toLocaleString("en-GB")}}
         </template>
         <template v-slot:item.conformity="{ item }">
-          <v-chip :color="boolRepr(item.conformity)" dark>{{ item.conformity == null ? "unknown": item.conformity.toString() }}
+          <v-chip :color="boolRepr(item.conformity)" dark>{{ item.conformity }}
           </v-chip>
         </template>
         <template v-slot:item.succeeded="{ item }">
@@ -121,9 +121,9 @@
         })
       },
       boolRepr(bool) {
-        if (bool === true) {
+        if (bool === "True") {
           return "green"
-        } else if (bool === false) {
+        } else if (bool === "False") {
           return "red"
         } else return "primary"
       },

diff --git a/src/components/MinionsTable.vue b/src/components/MinionsTable.vue
@@ -24,7 +24,7 @@
           <v-btn text small class="text-none" :to="'/minions/'+item.minion_id">{{ item.minion_id }}</v-btn>
         </template>
         <template v-slot:item.conformity="{ item }">
-          <v-chip :color="boolRepr(item.conformity)" dark>{{ item.conformity == null ? "unknown": item.conformity.toString() }}
+          <v-chip :color="boolRepr(item.conformity)" dark>{{ item.conformity }}
           </v-chip>
         </template>
         <template v-slot:item.last_job="{ item }">
@@ -157,9 +157,9 @@
         })
       },
       boolRepr(bool) {
-        if (bool === true) {
+        if (bool === "True") {
           return "green"
-        } else if (bool === false) {
+        } else if (bool === "False") {
           return "red"
         } else return "primary"
       },

diff --git a/src/components/NotFound.vue b/src/components/NotFound.vue
@@ -11,7 +11,7 @@
           </v-card-text>
           <v-card-actions>
             <v-btn text class="primary darken-3 white--text" to="/">
-              <v-icon left v-text="'mdi-arrow-left'"/>
+              <v-icon left>arrow_back</v-icon>
               Back
             </v-btn>
           </v-card-actions>

diff --git a/src/components/core/Layout.vue b/src/components/core/Layout.vue
@@ -111,7 +111,7 @@
         ></v-text-field>
       </v-expand-transition>
       <v-btn icon @click="expand_search = !expand_search" class="mr-2">
-        <v-icon>mdi-magnify</v-icon>
+        <v-icon>search</v-icon>
       </v-btn>
       <v-menu
           v-model="notif_menu"
@@ -162,7 +162,7 @@
       <v-menu bottom left offset-y offset-x close-on-click>
         <template v-slot:activator="{ on }">
           <v-btn v-on="on" icon>
-            <v-icon>mdi-dots-vertical</v-icon>
+            <v-icon>more_vert</v-icon>
           </v-btn>
         </template>
         <v-list>

diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
@@ -1,4 +1,3 @@
-import '@mdi/font/css/materialdesignicons.css';
 import Vue from 'vue';
 import Vuetify, {VSnackbar, VBtn, VIcon} from 'vuetify/lib'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=preload as=style><link href=/static/css/chunk-vendors.79d99540.css rel=preload as=style><link href=/static/js/app.2911b6e4.js rel=preload as=script><link href=/static/js/chunk-vendors.ff4d722f.js rel=preload as=script><link href=/static/css/chunk-vendors.79d99540.css rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.ff4d722f.js></script><script src=/static/js/app.2911b6e4.js></script></body></html>
		<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>ALCALI</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link href="https://fonts.googleapis.com/css?family=Material+Icons" rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=preload as=style><link href=/static/css/chunk-vendors.a6f43c83.css rel=preload as=style><link href=/static/js/app.43c2106a.js rel=preload as=script><link href=/static/js/chunk-vendors.90ddc1f0.js rel=preload as=script><link href=/static/css/chunk-vendors.a6f43c83.css rel=stylesheet><link href=/static/css/app.7dd676e0.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.90ddc1f0.js></script><script src=/static/js/app.43c2106a.js></script></body></html>