Skip to content

Commit

Permalink
uk graph update fin #10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArtemisDicoTiar
ArtemisDicoTiar committed Oct 19, 2020
1 parent 719d0a5 commit 76b9817
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 50 deletions.
4 changes: 2 additions & 2 deletions covid_tmp/src/assets/customTheme.scss
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "~vue-material/dist/theme/engine"; // Import the theme engine

@include md-register-theme("default", (
primary: md-get-palette-color(lime, A700), // The primary color of your application
accent: md-get-palette-color(deeporange, A200), // The accent or secondary color
primary: #558b2f, // The primary color of your application
accent: #d84315, // The accent or secondary color
theme: dark // This can be dark or light
));

Expand Down
43 changes: 35 additions & 8 deletions covid_tmp/src/components/covidStatusGraph/covidGlobal/covidGraphbyRegionCumul.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<md-icon>menu</md-icon>
</md-button>

<span class="md-title">COVID - 19 Global Cumulative Data</span>
<span class="md-headline">COVID - 19 Global Cumulative Data</span>
</div>
</md-app-toolbar>

Expand All @@ -22,19 +22,46 @@
All data are provided by CSSE-github (John's Hopkins University).<br/>
<br/>
</span>

<span class="md-subheading">
<b>Confirmed</b>: number of people being confirmed.<br/>
<b>Active</b>: number of people being hospitalised due to COVID-19.<br/>
<b>Deaths</b>: number of people died.<br/>
<b>Recovered</b>: number of people recovered.<br/>
<b>Removed</b>: number of people recovered + died.<br/>
<md-toolbar class="md-accent">
<span class="md-title">Description of Graph</span>
</md-toolbar>

<md-table>
<md-table-row>
<md-table-head>Graph Legends</md-table-head>
<md-table-head>Meaning</md-table-head>
</md-table-row>
<md-table-row>
<md-table-cell>Confirmed</md-table-cell>
<md-table-cell>number of people being confirmed</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Active</md-table-cell>
<md-table-cell>number of people being hospitalised due to COVID-19</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Deaths</md-table-cell>
<md-table-cell>number of people died</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Recovered</md-table-cell>
<md-table-cell>number of people recovered</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Removed</md-table-cell>
<md-table-cell>number of people recovered + died</md-table-cell>
</md-table-row>
</md-table>

</span>
</div>

<div id="selection">
<md-toolbar class="md-accent" style="margin-bottom: 30px">
<span class="md-title">Search Section</span>
</md-toolbar>
<div class="md-layout md-gutter">

<div class="md-layout-item">
<md-autocomplete v-model="continent" :md-options="continents" :md-open-on-focus="true" :md-dense="true">
<label>Continents</label>
Expand Down
33 changes: 25 additions & 8 deletions covid_tmp/src/components/covidStatusGraph/covidGlobal/covidGraphbyRegionNews.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<md-icon>menu</md-icon>
</md-button>

<span class="md-title">COVID - 19 Global New Cases</span>
<span class="md-headline">COVID - 19 Global New Cases</span>

</div>
</md-app-toolbar>
Expand All @@ -23,17 +23,34 @@
All data are provided by CSSE-github (John's Hopkins University).<br/>
<br/>
</span>

<span class="md-subheading">
<b>Confirmed</b>: number of people daily confirmed.<br/>
<b>Deaths</b>: number of people daily died.<br/>
<b>Recovered</b>: number of people daily recovered.<br/>
</span>
<md-toolbar class="md-accent">
<span class="md-title">Description of Graph</span>
</md-toolbar>
<md-table>
<md-table-row>
<md-table-head>Graph Legends</md-table-head>
<md-table-head>Meaning</md-table-head>
</md-table-row>
<md-table-row>
<md-table-cell>Confirmed</md-table-cell>
<md-table-cell>number of people being confirmed</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Deaths</md-table-cell>
<md-table-cell>number of people died</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Recovered</md-table-cell>
<md-table-cell>number of people recovered</md-table-cell>
</md-table-row>
</md-table>
</div>

<div id="selection">
<md-toolbar class="md-accent" style="margin-bottom: 30px">
<span class="md-title">Search Section</span>
</md-toolbar>
<div class="md-layout md-gutter">

<div class="md-layout-item">
<md-autocomplete v-model="continent" :md-options="continents" :md-open-on-focus="true" :md-dense="true">
<label>Continents</label>
Expand Down
16 changes: 4 additions & 12 deletions ...covidStatusGraph/covidGraphGlobalHome.vue → ...nents/covidStatusGraph/covidGraphHome.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<md-icon>menu</md-icon>
</md-button>

<span class="md-title">COVID - 19 Global Home</span>
<span class="md-headline">COVID - 19 Global Home</span>
</div>
</md-app-toolbar>

Expand All @@ -17,28 +17,20 @@

<md-app-content>
<span class="md-title">
Global Home page.<br/>
On Construction. <br/>
COVID DATA Analysis Home page.<br/>
</span>
<span class="md-subheading">
Pleas have a look on <b><u>left-side drawer</u></b>. <br/>
You can open it my clicking <b><u>left top</u></b>, three lines icon.<br/>
</span>
<span class="md-">
<b>UK pages are preparing datasets.</b>
</span>

<h2>Pages connecting to ...</h2>

<md-tabs md-sync-route>
<md-tabs md-sync-route class="md-accent">
<md-tab id="tab-home" md-label="Global New" to="/global/new"></md-tab>
<md-tab id="tab-pages" md-label="Global Cumulative" to="/global/cumulative"></md-tab>
<md-tab id="tab-posts" md-label="UK Data" to="/uk"></md-tab>
</md-tabs>
<md-tabs md-sync-route>
<md-tab id="tab-posts" md-label="UK New" to="/uk/new" md-disabled></md-tab>
<md-tab id="tab-favorites" md-label="UK Cumulative" to="/uk/cumulative" md-disabled></md-tab>
</md-tabs>

</md-app-content>
</md-app>
</div>
Expand Down
36 changes: 29 additions & 7 deletions covid_tmp/src/components/covidStatusGraph/covidUK/covidGraphbyUKAll.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<md-icon>menu</md-icon>
</md-button>

<span class="md-title">COVID - 19 UK All type of Data</span>
<span class="md-headline">COVID - 19 UK All type of Data</span>

</div>
</md-app-toolbar>
Expand All @@ -19,54 +19,76 @@
<md-app-content>
<div id="description" style="margin-bottom: 30px">
<span class="md-headline">
This page is for temporary demo. (*On Construction.)<br/>
This page will be renewed with detailed information.<br/>
This page provides all kind of COVID data from UK.<br/>
All data are provided by UK Government.<br/>
<br/>
</span>

<span class="md-subheading">
<span class="md-title">Description of Graph</span>
<md-toolbar class="md-accent">
<span class="md-title">Description of Graph</span>
</md-toolbar>
<md-toolbar md-elevation="10">
<span class="md-heading">* [Caution]: -10 from graph represents data missing.</span>
</md-toolbar>

<md-table>
<md-table-row>
<md-table-head>Graph Index</md-table-head>
<md-table-head>Graph Legends</md-table-head>
<md-table-head>Meaning</md-table-head>
<md-table-head>Detailed Meaning (by UK GOV)</md-table-head>
</md-table-row>

<md-table-row>
<md-table-cell>Conf Dly</md-table-cell>
<md-table-cell>Confirmed Daily</md-table-cell>
<md-table-cell>New cases by publish date</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>Conf Cuml</md-table-cell>
<md-table-cell>Confirmed Cumulative</md-table-cell>
<md-table-cell>Cumulative cases by publish date</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>CumlD/DD</md-table-cell>
<md-table-cell>Cumulative Deaths by Death Date (in 28days)</md-table-cell>
<md-table-cell>Cumulative deaths within 28 days of positive test</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>CumlD/DR</md-table-cell>
<md-table-cell>Rate of Cumulative Deaths by Death Date (in 28days)</md-table-cell>
<md-table-cell>Rate of cumulative deaths within 28 days of positive test per 100k resident population</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>CumlD/PD</md-table-cell>
<md-table-cell>Cumulative Deaths by Publish Date (in 28days)</md-table-cell>
<md-table-cell>Cumulative deaths within 28 days of positive test by death date</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>CumlD/PR</md-table-cell>
<md-table-cell>Rate of Cumulative Deaths by Publish Date (in 28days)</md-table-cell>
<md-table-cell>Rate of cumulative deaths within 28 days of positive test by death date per 100k resident population</md-table-cell>
</md-table-row>
<md-table-row>
<md-table-cell>NewD/PD</md-table-cell>
<md-table-cell>New Deaths by Publish Date (in 28days)</md-table-cell>
<md-table-cell>Deaths within 28 days of positive test</md-table-cell>
</md-table-row>
</md-table>

</span>
</div>

<div id="selection">
<span class="md-title">Search Section</span>
<md-toolbar class="md-accent">
<span class="md-title">Search Section</span>
</md-toolbar>
<md-toolbar style="margin-bottom: 30px">
<span class="md-subheading">
If your city is well known UTLA will fit to you.<br/>
If your city is small and unknown LTLA may fit to you.
</span>
</md-toolbar>
<div class="md-layout md-gutter">

<div class="md-layout-item">
Expand Down Expand Up @@ -121,7 +143,7 @@
:data="plotData"
:layout="plotLayout"
:display-mode-bar="false"

:isAsync="true"
/>
</div>

Expand Down
2 changes: 1 addition & 1 deletion covid_tmp/src/router/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from "vue";
import VueRouter from "vue-router";

import Home from "@/components/covidStatusGraph/covidGraphGlobalHome";
import Home from "@/components/covidStatusGraph/covidGraphHome";

import covidGraphbyRegion from "@/components/covidStatusGraph/covidGlobal/covidGraphbyRegionCumul";
import covidGraphbyRegionNews from "@/components/covidStatusGraph/covidGlobal/covidGraphbyRegionNews";
Expand Down
Loading

0 comments on commit 76b9817

Please sign in to comment.