Skip to content

Commit

Permalink
fixed favicon and boolrepr (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattLLVW committed Dec 10, 2019
1 parent 673f7a6 commit f2cd0bc
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dist/index.html
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 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>
<!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=/static/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.6dcc5189.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.6dcc5189.js></script></body></html>
File renamed without changes.
2 changes: 0 additions & 2 deletions dist/static/js/app.43c2106a.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/static/js/app.43c2106a.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions dist/static/js/app.6dcc5189.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/static/js/app.6dcc5189.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="/static/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">
Expand Down
Binary file added public/static/favicon.ico
Binary file not shown.
Binary file removed src/assets/logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion src/assets/logo.svg

This file was deleted.

13 changes: 10 additions & 3 deletions src/components/ConformityCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<tr>
<td>Highstate</td>
<td class="text-right">
<v-chip :color="boolRepr(conformity)" dark>{{ valRepr(conformity) }}</v-chip>
<v-chip :color="boolRepr(conformity)" dark>{{ valRepr(conformity)|capitalize }}</v-chip>
</td>
</tr>
</tbody>
Expand All @@ -19,7 +19,8 @@
v-if="isBool(val)"
:color="boolRepr(conformity)"
dark
>{{ valRepr(conformity) }}</v-chip>
>{{ valRepr(conformity)|capitalize }}
</v-chip>
<span v-else>{{ valRepr(val) }}</span>
</td>
</tr>
Expand Down Expand Up @@ -47,12 +48,18 @@
}
},
isBool(val) {
return typeof val === 'boolean'
return typeof val === "boolean"
},
valRepr(val) {
return val === null ? "unknown" : val
},
},
filters: {
capitalize: function(value) {
value = value.toString()
return value.charAt(0).toUpperCase() + value.slice(1)
},
},
}
</script>

Expand Down
4 changes: 2 additions & 2 deletions src/components/InfosCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
props: ["minion"],
methods: {
boolRepr(bool) {
if (bool === true) {
if (bool === "True") {
return "green"
} else if (bool === false) {
} else if (bool === "False") {
return "red"
} else return "primary"
},
Expand Down

0 comments on commit f2cd0bc

Please sign in to comment.