From e89a65c8dcefb17a0096ca1ff869e0fc9632dff8 Mon Sep 17 00:00:00 2001 From: Manuel <30572287+manuel-rw@users.noreply.github.com> Date: Tue, 31 Jan 2023 22:10:27 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20build=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tabs/NetworkTab/NetworkTab.tsx | 2 +- .../Dashboard/Tiles/Apps/AppTile.tsx | 3 +- src/pages/404.tsx | 11 +++-- src/pages/index.tsx | 4 +- src/tools/acceptableStatusCodes.ts | 42 ++++++++++--------- src/types/app.ts | 1 + yarn.lock | 8 ++-- 7 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx b/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx index 4d735a19f..6b3cc6a81 100644 --- a/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx +++ b/src/components/Dashboard/Modals/EditAppModal/Tabs/NetworkTab/NetworkTab.tsx @@ -27,7 +27,7 @@ export const NetworkTab = ({ form }: NetworkTabProps) => { data={StatusCodes} clearable searchable - defaultValue={form.values.network.statusCodes} + defaultValue={form.values.network.okStatus.map((x) => `${x}`)} variant="default" {...form.getInputProps('network.statusCodes')} /> diff --git a/src/components/Dashboard/Tiles/Apps/AppTile.tsx b/src/components/Dashboard/Tiles/Apps/AppTile.tsx index fff6d200c..b11604187 100644 --- a/src/components/Dashboard/Tiles/Apps/AppTile.tsx +++ b/src/components/Dashboard/Tiles/Apps/AppTile.tsx @@ -1,5 +1,4 @@ -import { Anchor, Box, Stack, Title, UnstyledButton } from '@mantine/core'; -import { NextLink } from '@mantine/next'; +import { Box, Stack, Title, UnstyledButton } from '@mantine/core'; import { createStyles } from '@mantine/styles'; import { motion } from 'framer-motion'; import Link from 'next/link'; diff --git a/src/pages/404.tsx b/src/pages/404.tsx index ea1ea65ec..aadf66175 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,14 +1,13 @@ -import React from 'react'; import { - createStyles, - Container, - Title, - Text, Button, + Container, + createStyles, Group, + Text, + Title, useMantineTheme, } from '@mantine/core'; -import { NextLink } from '@mantine/next'; +import React from 'react'; import { serverSideTranslations } from 'next-i18next/serverSideTranslations'; import Link from 'next/link'; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index c20dd8456..9ccf16c8d 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -2,6 +2,7 @@ import { getCookie, setCookie } from 'cookies-next'; import { GetServerSidePropsContext } from 'next'; import fs from 'fs'; +import { LoadConfigComponent } from '../components/Config/LoadConfig'; import { Dashboard } from '../components/Dashboard/Dashboard'; import Layout from '../components/layout/Layout'; import { useInitConfig } from '../config/init'; @@ -9,9 +10,6 @@ import { getFrontendConfig } from '../tools/config/getFrontendConfig'; import { getServerSideTranslations } from '../tools/getServerSideTranslations'; import { dashboardNamespaces } from '../tools/translation-namespaces'; import { DashboardServerSideProps } from '../types/dashboardPageType'; -import { LoadConfigComponent } from '../components/Config/LoadConfig'; -import dayjs from 'dayjs'; -import { useTranslation } from 'next-i18next'; export async function getServerSideProps({ req, diff --git a/src/tools/acceptableStatusCodes.ts b/src/tools/acceptableStatusCodes.ts index 3d942fd8d..12707ad65 100644 --- a/src/tools/acceptableStatusCodes.ts +++ b/src/tools/acceptableStatusCodes.ts @@ -1,21 +1,23 @@ -export const StatusCodes = [ - { value: 200, label: '200 - OK', group: 'Sucessful responses' }, - { value: 204, label: '204 - No Content', group: 'Sucessful responses' }, - { value: 301, label: '301 - Moved Permanently', group: 'Redirection responses' }, - { value: 302, label: '302 - Found / Moved Temporarily', group: 'Redirection responses' }, - { value: 304, label: '304 - Not Modified', group: 'Redirection responses' }, - { value: 307, label: '307 - Temporary Redirect', group: 'Redirection responses' }, - { value: 308, label: '308 - Permanent Redirect', group: 'Redirection responses' }, - { value: 400, label: '400 - Bad Request', group: 'Client error responses' }, - { value: 401, label: '401 - Unauthorized', group: 'Client error responses' }, - { value: 403, label: '403 - Forbidden', group: 'Client error responses' }, - { value: 404, label: '404 - Not Found', group: 'Client error responses' }, - { value: 405, label: '405 - Method Not Allowed', group: 'Client error responses' }, - { value: 408, label: '408 - Request Timeout', group: 'Client error responses' }, - { value: 410, label: '410 - Gone', group: 'Client error responses' }, - { value: 429, label: '429 - Too Many Requests', group: 'Client error responses' }, - { value: 500, label: '500 - Internal Server Error', group: 'Server error responses' }, - { value: 502, label: '502 - Bad Gateway', group: 'Server error responses' }, - { value: 503, label: '503 - Service Unavailable', group: 'Server error responses' }, - { value: 504, label: '504 - Gateway Timeout Error', group: 'Server error responses' }, +import { SelectItem } from '@mantine/core'; + +export const StatusCodes: SelectItem[] = [ + { value: '200', label: '200 - OK', group: 'Sucessful responses' }, + { value: '204', label: '204 - No Content', group: 'Sucessful responses' }, + { value: '301', label: '301 - Moved Permanently', group: 'Redirection responses' }, + { value: '302', label: '302 - Found / Moved Temporarily', group: 'Redirection responses' }, + { value: '304', label: '304 - Not Modified', group: 'Redirection responses' }, + { value: '307', label: '307 - Temporary Redirect', group: 'Redirection responses' }, + { value: '308', label: '308 - Permanent Redirect', group: 'Redirection responses' }, + { value: '400', label: '400 - Bad Request', group: 'Client error responses' }, + { value: '401', label: '401 - Unauthorized', group: 'Client error responses' }, + { value: '403', label: '403 - Forbidden', group: 'Client error responses' }, + { value: '404', label: '404 - Not Found', group: 'Client error responses' }, + { value: '405', label: '405 - Method Not Allowed', group: 'Client error responses' }, + { value: '408', label: '408 - Request Timeout', group: 'Client error responses' }, + { value: '410', label: '410 - Gone', group: 'Client error responses' }, + { value: '429', label: '429 - Too Many Requests', group: 'Client error responses' }, + { value: '500', label: '500 - Internal Server Error', group: 'Server error responses' }, + { value: '502', label: '502 - Bad Gateway', group: 'Server error responses' }, + { value: '503', label: '503 - Service Unavailable', group: 'Server error responses' }, + { value: '504', label: '504 - Gateway Timeout Error', group: 'Server error responses' }, ]; diff --git a/src/types/app.ts b/src/types/app.ts index 7edeadee9..0f6284628 100644 --- a/src/types/app.ts +++ b/src/types/app.ts @@ -1,4 +1,5 @@ import { IconKey, IconPassword, IconUser, TablerIcon } from '@tabler/icons'; + import { TileBaseType } from './tile'; export interface AppType extends TileBaseType { diff --git a/yarn.lock b/yarn.lock index 629a864cf..398c6e544 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4568,7 +4568,7 @@ __metadata: "fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7" + resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" dependencies: node-gyp: latest conditions: os=darwin @@ -7519,7 +7519,7 @@ __metadata: "resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin": version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" + resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 @@ -7532,7 +7532,7 @@ __metadata: "resolve@patch:resolve@^2.0.0-next.3#~builtin": version: 2.0.0-next.4 - resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin::version=2.0.0-next.4&hash=07638b" + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin::version=2.0.0-next.4&hash=c3c19d" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 @@ -8370,7 +8370,7 @@ __metadata: "typescript@patch:typescript@^4.7.4#~builtin": version: 4.9.4 - resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin::version=4.9.4&hash=7ad353" + resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin::version=4.9.4&hash=d73830" bin: tsc: bin/tsc tsserver: bin/tsserver