From b3062a04f97ee8af85e1e0997f2e02890b4d12ab Mon Sep 17 00:00:00 2001
From: Ash Keel
Date: Thu, 28 Oct 2021 11:00:01 +0200
Subject: [PATCH] Fix type imports in frontend
---
frontend/src/lib/react-utils.ts | 3 +--
frontend/src/overrides.css | 1 -
frontend/src/ui/components/Modal.tsx | 4 ++--
frontend/src/ui/pages/loyalty/Goals.tsx | 5 +++--
frontend/src/ui/pages/loyalty/Queue.tsx | 4 ++--
frontend/src/ui/pages/loyalty/Rewards.tsx | 6 +++---
frontend/src/ui/pages/loyalty/UserList.tsx | 4 ++--
frontend/src/ui/pages/stulbe/Webhook.tsx | 1 +
frontend/src/ui/pages/twitch/Commands.tsx | 7 ++++---
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/frontend/src/lib/react-utils.ts b/frontend/src/lib/react-utils.ts
index e2f6be4..6a16890 100644
--- a/frontend/src/lib/react-utils.ts
+++ b/frontend/src/lib/react-utils.ts
@@ -7,10 +7,9 @@ import {
} from '@strimertul/kilovolt-client';
import { RootState } from '../store';
import apiReducer, {
- APIState,
getUserPoints,
- LoyaltyStorage,
} from '../store/api/reducer';
+import {APIState, LoyaltyStorage} from "../store/api/types";
export function useModule({
key,
diff --git a/frontend/src/overrides.css b/frontend/src/overrides.css
index bf3879d..b1e0e6c 100644
--- a/frontend/src/overrides.css
+++ b/frontend/src/overrides.css
@@ -144,7 +144,6 @@ label {
}
.tabs.is-boxed li a.is-active {
border-color: #5e6d6f;
- border-bottom-color: rgb(94, 109, 111);
border-bottom-color: transparent !important;
}
.tabs li a.is-active {
diff --git a/frontend/src/ui/components/Modal.tsx b/frontend/src/ui/components/Modal.tsx
index dd7ab94..d6f7152 100644
--- a/frontend/src/ui/components/Modal.tsx
+++ b/frontend/src/ui/components/Modal.tsx
@@ -35,7 +35,7 @@ function Modal({
onClose() : null}
- >
+ />
{title}
@@ -44,7 +44,7 @@ function Modal({
className="delete"
aria-label="close"
onClick={() => onClose()}
- >
+ />
) : null}
diff --git a/frontend/src/ui/pages/loyalty/Goals.tsx b/frontend/src/ui/pages/loyalty/Goals.tsx
index cad7e99..718de5f 100644
--- a/frontend/src/ui/pages/loyalty/Goals.tsx
+++ b/frontend/src/ui/pages/loyalty/Goals.tsx
@@ -4,8 +4,9 @@ import { useTranslation } from 'react-i18next';
import { useSelector, useDispatch } from 'react-redux';
import { useModule } from '../../../lib/react-utils';
import { RootState } from '../../../store';
-import { LoyaltyGoal, modules } from '../../../store/api/reducer';
+import { modules } from '../../../store/api/reducer';
import Modal from '../../components/Modal';
+import {LoyaltyGoal} from "../../../store/api/types";
interface GoalItemProps {
item: LoyaltyGoal;
@@ -252,7 +253,7 @@ function GoalModal({
placeholder={t('loyalty.goals.description-placeholder')}
onChange={(ev) => setDescription(ev.target.value)}
value={description}
- >
+ />
diff --git a/frontend/src/ui/pages/loyalty/Queue.tsx b/frontend/src/ui/pages/loyalty/Queue.tsx
index cd6eab7..eacd9bf 100644
--- a/frontend/src/ui/pages/loyalty/Queue.tsx
+++ b/frontend/src/ui/pages/loyalty/Queue.tsx
@@ -4,12 +4,12 @@ import { RouteComponentProps } from '@reach/router';
import { useTranslation } from 'react-i18next';
import { useModule, useUserPoints } from '../../../lib/react-utils';
import {
- LoyaltyRedeem,
modules,
removeRedeem,
setUserPoints,
} from '../../../store/api/reducer';
import PageList from '../../components/PageList';
+import {LoyaltyRedeem} from "../../../store/api/types";
interface SortingOrder {
key: 'user' | 'when';
@@ -154,7 +154,7 @@ export default function LoyaltyRedeemQueuePage(
{t('loyalty.queue.reward-name')} |
{t('loyalty.queue.request')} |
- |
+ |
diff --git a/frontend/src/ui/pages/loyalty/Rewards.tsx b/frontend/src/ui/pages/loyalty/Rewards.tsx
index 785f1fa..e9fc5c9 100644
--- a/frontend/src/ui/pages/loyalty/Rewards.tsx
+++ b/frontend/src/ui/pages/loyalty/Rewards.tsx
@@ -7,11 +7,11 @@ import { useModule } from '../../../lib/react-utils';
import { RootState } from '../../../store';
import {
createRedeem,
- LoyaltyReward,
modules,
} from '../../../store/api/reducer';
import Modal from '../../components/Modal';
import { getInterval } from '../../../lib/time-utils';
+import {LoyaltyReward} from "../../../store/api/types";
interface RewardItemProps {
item: LoyaltyReward;
@@ -262,7 +262,7 @@ function RewardModal({
placeholder={t('loyalty.rewards.description-placeholder')}
onChange={(ev) => setDescription(ev.target.value)}
value={description}
- >
+ />
@@ -289,7 +289,7 @@ function RewardModal({
-
+
diff --git a/frontend/src/ui/pages/twitch/Commands.tsx b/frontend/src/ui/pages/twitch/Commands.tsx
index 3c9387c..7601ba8 100644
--- a/frontend/src/ui/pages/twitch/Commands.tsx
+++ b/frontend/src/ui/pages/twitch/Commands.tsx
@@ -3,8 +3,9 @@ import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux';
import { useModule } from '../../../lib/react-utils';
-import { modules, TwitchBotCustomCommand } from '../../../store/api/reducer';
+import { modules } from '../../../store/api/reducer';
import Modal from '../../components/Modal';
+import {TwitchBotCustomCommand} from "../../../store/api/types";
interface CommandItemProps {
name: string;
@@ -151,7 +152,7 @@ function CommandModal({
rows={1}
onChange={(ev) => setDescription(ev.target.value)}
value={description}
- >
+ />
@@ -168,7 +169,7 @@ function CommandModal({
placeholder={t('twitch.commands.response-help')}
onChange={(ev) => setResponse(ev.target.value)}
value={response}
- >
+ />