1
0
Fork 0

Various Fix attempts

This commit is contained in:
Neshura 2023-06-02 01:41:58 +02:00
parent 7f90fd1a80
commit 7c3ba29316
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
6 changed files with 25 additions and 5 deletions

View file

@ -20,6 +20,7 @@ export async function GET() {
if (rows?.length) { if (rows?.length) {
let empireCount: number = rows[0][1]; let empireCount: number = rows[0][1];
console.log("New Google Data loaded " + Intl.DateTimeFormat('en-UK', {hour: 'numeric', minute: 'numeric', hour12: false}).format(Date.now()));
return NextResponse.json({ empireCount }); return NextResponse.json({ empireCount });
} }
else { else {

View file

@ -78,6 +78,7 @@ export async function GET() {
} }
} }
console.log("New Google Data loaded " + Intl.DateTimeFormat('en-UK', {hour: 'numeric', minute: 'numeric', hour12: false}).format(Date.now()));
return NextResponse.json({ speciesArray }); return NextResponse.json({ speciesArray });
} }
} }

View file

@ -1,9 +1,8 @@
'use client'; 'use client';
import useSWR from "swr"; import useSWR from "swr";
import { Chart as ChartJS, registerables } from 'chart.js'; import { Chart as ChartJS, registerables } from 'chart.js';
import { Pie } from "react-chartjs-2"; import { Pie } from "react-chartjs-2";
import ChartDataLabels, { Context } from 'chartjs-plugin-datalabels'; import ChartDataLabels, {Context} from 'chartjs-plugin-datalabels';
import { Species } from '../../types/stellaris'; import { Species } from '../../types/stellaris';
const fetcher = async (url:any) => await fetch(url).then((res) => res.json()); const fetcher = async (url:any) => await fetch(url).then((res) => res.json());
@ -71,7 +70,7 @@ export const PopChart = () => {
} }
}, },
legend: { legend: {
display: true display: false
}, },
datalabels: { datalabels: {
formatter: (value: any, context: Context) => { formatter: (value: any, context: Context) => {
@ -82,7 +81,6 @@ export const PopChart = () => {
return ""; return "";
} }
}, },
color: 'black' color: 'black'
}, },
}, },

View file

@ -126,7 +126,7 @@ export const RadarChart = (props: { weighted: boolean }) => {
ChartJS.register( ...registerables ) ChartJS.register( ...registerables )
return ( return (
<div className="chart-container min-h-screen aspect-square p-2"> <div className="chart-container h-full aspect-square p-2">
<Radar {...config} /> <Radar {...config} />
</div> </div>
); );

View file

@ -16,6 +16,7 @@
"autoprefixer": "10.4.14", "autoprefixer": "10.4.14",
"chart.js": "^4.3.0", "chart.js": "^4.3.0",
"chartjs-plugin-datalabels": "^2.2.0", "chartjs-plugin-datalabels": "^2.2.0",
"encoding": "^0.1.13",
"eslint": "8.41.0", "eslint": "8.41.0",
"eslint-config-next": "13.4.4", "eslint-config-next": "13.4.4",
"googleapis": "^118.0.0", "googleapis": "^118.0.0",

View file

@ -1555,6 +1555,13 @@ emoji-regex@^9.2.2:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
encoding@^0.1.13:
version "0.1.13"
resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
dependencies:
iconv-lite "^0.6.2"
enhanced-resolve@^5.12.0: enhanced-resolve@^5.12.0:
version "5.14.1" version "5.14.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3"
@ -2270,6 +2277,13 @@ human-signals@^4.3.0:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"
integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==
iconv-lite@^0.6.2:
version "0.6.3"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
dependencies:
safer-buffer ">= 2.1.2 < 3.0.0"
ignore@^5.2.0: ignore@^5.2.0:
version "5.2.4" version "5.2.4"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
@ -3182,6 +3196,11 @@ safe-regex-test@^1.0.0:
get-intrinsic "^1.1.3" get-intrinsic "^1.1.3"
is-regex "^1.1.4" is-regex "^1.1.4"
"safer-buffer@>= 2.1.2 < 3.0.0":
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
scheduler@^0.23.0: scheduler@^0.23.0:
version "0.23.0" version "0.23.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"