Adding sass and extra stats

This commit is contained in:
2024-11-24 19:32:04 +01:00
parent 96f74a6b24
commit 2b2e66af0c
3 changed files with 67 additions and 34 deletions

View File

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json; using Newtonsoft.Json;
using pointMaster.Data; using pointMaster.Data;
using pointMaster.Models;
namespace pointMaster.Controllers namespace pointMaster.Controllers
{ {
@@ -76,6 +75,8 @@ namespace pointMaster.Controllers
var vm = new List<StatModel>(); var vm = new List<StatModel>();
var pointData = await dataContext.Points.ToListAsync(); var pointData = await dataContext.Points.ToListAsync();
var patruljeData = await dataContext.Patruljer.ToListAsync();
var postData = await dataContext.Poster.ToListAsync();
vm.Add(new StatModel vm.Add(new StatModel
{ {
@@ -83,6 +84,18 @@ namespace pointMaster.Controllers
Value = pointData.Sum(x => x.Points + x.Turnout).ToString() Value = pointData.Sum(x => x.Points + x.Turnout).ToString()
}); });
vm.Add(new StatModel
{
Title = "Antal patruljer",
Value = patruljeData.Count().ToString()
});
vm.Add(new StatModel
{
Title = "Antal poster",
Value = postData.Count().ToString()
});
return Ok(JsonConvert.SerializeObject(vm)); return Ok(JsonConvert.SerializeObject(vm));
} }

View File

@@ -14,6 +14,8 @@
"@vue/cli-plugin-typescript": "^5.0.8", "@vue/cli-plugin-typescript": "^5.0.8",
"apexcharts": "^4.0.0", "apexcharts": "^4.0.0",
"axios": "^1.7.7", "axios": "^1.7.7",
"sass": "^1.81.0",
"sass-loader": "^16.0.3",
"vue": "^3.5.13" "vue": "^3.5.13"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -1,15 +1,19 @@
<template> <template>
<div class="stat-dashboard"> <div class="stat-dashboard">
<div> <div class="stat-panel">
<h1>Stats</h1> <h1>Stats</h1>
<div class="stats"> <div class="stats">
<div class="stat" v-for="(data, index) in StatData" :key="index"> <div
class="stat"
v-for="(data, index) in StatData"
:key="index"
>
<p class="stat-title">{{ data.Title }}</p> <p class="stat-title">{{ data.Title }}</p>
<p class="stat-value">{{ data.Value }}</p> <p class="stat-value">{{ data.Value }}</p>
</div> </div>
</div> </div>
</div> </div>
<div> <div class="stat-chart">
<p class="stat-title">Point over tid</p> <p class="stat-title">Point over tid</p>
<div id="chart"></div> <div id="chart"></div>
</div> </div>
@@ -17,10 +21,9 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import ApexCharts, { ApexOptions } from 'apexcharts'; import ApexCharts, { ApexOptions } from "apexcharts";
import axios from 'axios'; import axios from "axios";
import { defineComponent, onMounted, ref } from 'vue'; import { defineComponent, onMounted, ref } from "vue";
export default defineComponent({ export default defineComponent({
name: "Stats", name: "Stats",
@@ -28,7 +31,7 @@ export default defineComponent({
const StatData = ref<Stat[]>([]); const StatData = ref<Stat[]>([]);
const GetStats = async () => { const GetStats = async () => {
const data = (await axios.get("/api/getstats")).data as Stat[] const data = (await axios.get("/api/getstats")).data as Stat[];
StatData.value = data; StatData.value = data;
}; };
@@ -42,18 +45,21 @@ export default defineComponent({
}, },
}, },
xaxis: { xaxis: {
type: "datetime" type: "datetime",
}, },
series: [] series: [],
}; };
const chart = new ApexCharts(document.querySelector("#chart"), options); const chart = new ApexCharts(
document.querySelector("#chart"),
options
);
chart.render(); chart.render();
const data = (await axios.get("/api/GetPointsOverTime")).data; const data = (await axios.get("/api/GetPointsOverTime")).data;
chart.updateOptions({ chart.updateOptions({
series: data series: data,
} as ApexOptions); } as ApexOptions);
}; };
@@ -63,40 +69,52 @@ export default defineComponent({
}); });
return { return {
StatData StatData,
} };
} },
}) });
</script> </script>
<style lang="css"> <style lang="scss">
.stat-dashboard { .stat-dashboard {
display: flex; display: flex;
height: 60vh;
justify-content: space-between; justify-content: space-between;
flex-direction: row;
@media (max-width: 768px) {
flex-direction: column;
}
} }
#chart { .stat-panel {
height: 300px; @media (max-width: 768px) {
width: 500px; margin-bottom: 2rem;
}
}
.stat-chart {
flex-grow: 1;
} }
.stats { .stats {
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
gap: 2rem; gap: 2rem;
max-width: 50vw;
}
.stat { @media (max-width: 1000px) {
background-color: rgba(0, 0, 0, 0.1); grid-template-columns: repeat(2, 1fr);
padding: 10px; }
height: 7rem;
width: 10rem; .stat {
border-radius: 5px; background-color: rgba(0, 0, 0, 0.1);
text-align: center; padding: 10px;
box-shadow: 0px 0px 5px rgba(0,0,0,0.1); height: 7rem;
width: 10rem;
border-radius: 5px;
text-align: center;
box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.1);
margin: auto;
}
} }
.stat-title { .stat-title {