fix type errors

This commit is contained in:
Kalle (Sendou)
2020-11-18 13:57:41 +02:00
parent 7fd3dbaacb
commit e924cb3917
5 changed files with 15 additions and 16 deletions

View File

@@ -1,10 +1,6 @@
import { Box, Image, useColorModeValue } from "@chakra-ui/react";
import { useMyTheme } from "lib/useMyTheme";
import { useRouter } from "next/dist/client/router";
import footerOctoDark from "public/layout/b8ing_dark.png";
import footerOctoLight from "public/layout/b8ing_light.png";
import footerSquidDark from "public/layout/boing_dark.png";
import footerSquidLight from "public/layout/boing_light.png";
import FooterContent from "./FooterContent";
import FooterWaves from "./FooterWaves";
@@ -12,14 +8,14 @@ const Footer: React.FC = () => {
const species = useRouter().asPath.charCodeAt(1) % 2 === 0 ? "squid" : "octo";
const { themeColorHex: themeColor } = useMyTheme();
const footerImageSrc = useColorModeValue(
{ octo: footerOctoLight, squid: footerSquidLight },
{ octo: footerOctoDark, squid: footerSquidDark }
{ octo: "b8ing_light", squid: "boing_dark" },
{ octo: "b8ing_dark", squid: "boing_dark" }
)[species];
return (
<Box as="footer" mt="auto">
<Image
src={footerImageSrc}
src={`layout/${footerImageSrc}.png`}
bg={themeColor}
w="80px"
ml="auto"

View File

@@ -9,8 +9,11 @@ import {
import { t, Trans } from "@lingui/macro";
import { useLingui } from "@lingui/react";
import ModeImage from "components/common/ModeImage";
// @ts-ignore
import salmonRunHighTide from "lib/assets/SalmonRunHighTide.svg";
// @ts-ignore
import salmonRunLowTide from "lib/assets/SalmonRunLowTide.svg";
// @ts-ignore
import salmonRunMidTide from "lib/assets/SalmonRunMidTide.svg";
import { stages } from "lib/lists/stages";
import { PlannerMapBg } from ".";
@@ -34,14 +37,12 @@ const StageSelector: React.FC<StageSelectorProps> = ({
return (
<Box maxW="20rem" m="3rem auto">
<Select value={currentBackground.stage} onChange={handleChange}>
<option value="Spawning Grounds">{i18n._(t`Spawning Grounds`)}</option>
<option value="Marooner's Bay">{i18n._(t`Marooner's Bay`)}</option>
<option value="Lost Outpost">{i18n._(t`Lost Outpost`)}</option>
<option value="Salmonid Smokeyard">
{i18n._(t`Salmonid Smokeyard`)}
</option>
<option value="Spawning Grounds">{t`Spawning Grounds`}</option>
<option value="Marooner's Bay">{t`Marooner's Bay`}</option>
<option value="Lost Outpost">{t`Lost Outpost`}</option>
<option value="Salmonid Smokeyard">{t`Salmonid Smokeyard`}</option>
<option value="Ruins of Ark Polaris">
{i18n._(t`Ruins of Ark Polaris`)}
{t`Ruins of Ark Polaris`}
</option>
{stages.map((stage) => (
<option key={stage} value={stage}>

2
next-env.d.ts vendored
View File

@@ -1,2 +1,4 @@
/// <reference types="next" />
/// <reference types="next/types/global" />
declare module "@sendou/react-sketch";

View File

@@ -4,7 +4,7 @@
"private": true,
"scripts": {
"dev": "next dev",
"build": "lingui compile && next build",
"build": "npm run migrate:up && lingui compile && next build",
"start": "next start",
"migrate:save": "npx prisma migrate save --name init --experimental",
"migrate:up": "npx prisma migrate up --experimental",

View File

@@ -24,5 +24,5 @@
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
"exclude": ["node_modules", "old"]
}