From d4d4fb5d0aba33986b8e657705ac9d75acba17d3 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 11 Feb 2021 10:35:52 +0200 Subject: [PATCH] Fix lint errors --- src/components/Accordion/Accordion.tsx | 4 ++-- src/components/AddLink.tsx | 2 +- src/components/AdminHeader.tsx | 2 +- src/components/AdminSidebar.tsx | 2 +- src/components/CommitteeContainer.tsx | 2 +- src/components/Header.tsx | 4 ++-- src/components/Hero/HeroPrimaryButtons.tsx | 2 +- src/components/NavbarDropdownLink.tsx | 2 +- src/components/Widgets/Checkbox/Checkbox.tsx | 6 +++--- src/components/Widgets/Checkbox/Checkboxes.tsx | 6 ++---- src/components/Widgets/RadioButton/RadioButton.tsx | 6 +++--- src/components/Widgets/RadioButton/RadioButtonWidget.tsx | 6 ++---- src/pages/admin/jobads/index.tsx | 4 ++-- src/pages/admin/signups/[id].tsx | 4 ++-- src/pages/events/[id].tsx | 1 + src/pages/signup/[...params].tsx | 4 ++-- src/pages/yritysyhteistyo.tsx | 1 + src/views/ActualPage/EventCalendar.tsx | 2 +- src/views/ActualPage/News.tsx | 2 +- src/views/CorporatePage/CorporatePageView.tsx | 2 +- src/views/FreshmenPage/FreshmenPageView.tsx | 2 +- src/views/FrontPage/FrontPageView.tsx | 2 +- src/views/GuildPage/GuildPageView.tsx | 2 +- src/views/SignUpPage/SignUpPageView.tsx | 2 +- src/views/admin/AdminCreateCommon.tsx | 2 +- src/views/common/AdminPageWrapper.tsx | 2 +- 26 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx index dc0e766..45142ee 100644 --- a/src/components/Accordion/Accordion.tsx +++ b/src/components/Accordion/Accordion.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import styled from "styled-components"; -import AccordionIcon from "./AccordionIcon"; import { colors } from "@theme/colors"; +import AccordionIcon from "./AccordionIcon"; const Container = styled.div` margin: 0.2em; @@ -38,7 +38,7 @@ const Container = styled.div` } `; -const Panel = styled.div<{visible?: boolean}>` +const Panel = styled.div<{ visible?: boolean }>` margin-top: ${(p) => (p.visible ? "0" : "-100%")}; display: flex; diff --git a/src/components/AddLink.tsx b/src/components/AddLink.tsx index be9ceb0..bac3b8d 100644 --- a/src/components/AddLink.tsx +++ b/src/components/AddLink.tsx @@ -22,7 +22,7 @@ const StyledLink = styled(Link)` type AddLinkProps = ComponentProps & { text: string; -} +}; const AddLink: React.FC = ({ text, ...props }) => ( diff --git a/src/components/AdminHeader.tsx b/src/components/AdminHeader.tsx index 4886924..7280b49 100644 --- a/src/components/AdminHeader.tsx +++ b/src/components/AdminHeader.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import HeaderLogo from "./HeaderLogo"; import { colors } from "@theme/colors"; +import HeaderLogo from "./HeaderLogo"; const Header = styled.header` background-color: ${colors.darkBlue}; diff --git a/src/components/AdminSidebar.tsx b/src/components/AdminSidebar.tsx index ab8bc14..1b34939 100644 --- a/src/components/AdminSidebar.tsx +++ b/src/components/AdminSidebar.tsx @@ -20,7 +20,7 @@ const SideBar = styled.nav` } `; -const StyledLink = styled(Link)<{$path: string}>` +const StyledLink = styled(Link)<{ $path: string }>` padding: 1rem 3rem 1rem 1rem; letter-spacing: 3px; text-transform: uppercase; diff --git a/src/components/CommitteeContainer.tsx b/src/components/CommitteeContainer.tsx index 1c74722..638e71f 100644 --- a/src/components/CommitteeContainer.tsx +++ b/src/components/CommitteeContainer.tsx @@ -1,8 +1,8 @@ import React from "react"; import styled from "styled-components"; -import ContactCard from "./ContactCard"; import { Committee } from "@views/ContactsPage/ContactsPageView"; import { colors } from "@theme/colors"; +import ContactCard from "./ContactCard"; const blank_profile = "/img/blank_profile.png"; diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 45ad2a2..730fa40 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -1,9 +1,9 @@ import React, { useState, useEffect, useRef } from "react"; -import Navigation from "./Navigation"; import throttle from "lodash/throttle"; import styled from "styled-components"; import colors from "@theme/colors"; import breakpoints from "@theme/breakpoints"; +import Navigation from "./Navigation"; import NavigationMobile from "./NavigationMobile"; import HeaderLogo from "./HeaderLogo"; @@ -15,7 +15,7 @@ const StyledHeader = styled.header` } `; -const Sticky = styled.div<{$isHidden?: boolean}>` +const Sticky = styled.div<{ $isHidden?: boolean }>` position: sticky; top: 0; z-index: 10; diff --git a/src/components/Hero/HeroPrimaryButtons.tsx b/src/components/Hero/HeroPrimaryButtons.tsx index 8d87078..c81f279 100644 --- a/src/components/Hero/HeroPrimaryButtons.tsx +++ b/src/components/Hero/HeroPrimaryButtons.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import { colors } from "@theme/colors"; -const Buttons = styled.div<{row?: boolean}>` +const Buttons = styled.div<{ row?: boolean }>` min-width: 20%; max-width: fit-content; margin: auto; diff --git a/src/components/NavbarDropdownLink.tsx b/src/components/NavbarDropdownLink.tsx index c213ea0..1990cd0 100644 --- a/src/components/NavbarDropdownLink.tsx +++ b/src/components/NavbarDropdownLink.tsx @@ -1,9 +1,9 @@ import React, { useState } from "react"; import styled from "styled-components"; -import DropDownBox from "./DropDownBox"; import { Link } from "@components/index"; import colors from "@theme/colors"; import breakpoints from "@theme/breakpoints"; +import DropDownBox from "./DropDownBox"; const Container = styled.div` position: relative; diff --git a/src/components/Widgets/Checkbox/Checkbox.tsx b/src/components/Widgets/Checkbox/Checkbox.tsx index c91d209..bc4deba 100644 --- a/src/components/Widgets/Checkbox/Checkbox.tsx +++ b/src/components/Widgets/Checkbox/Checkbox.tsx @@ -25,7 +25,7 @@ const HiddenDefaultElement = styled.input` `; /* Create a custom checkbox */ -const CustomCBoxElement = styled.span<{checked?: boolean}>` +const CustomCBoxElement = styled.span<{ checked?: boolean }>` border-radius: 4px; position: absolute; top: 0; @@ -60,8 +60,8 @@ const Checkmark = styled.div` `; type CheckboxProps = Omit< - React.InputHTMLAttributes, - "type" +React.InputHTMLAttributes, +"type" >; const Checkbox: React.FC = ({ children, checked, ...props }) => ( diff --git a/src/components/Widgets/Checkbox/Checkboxes.tsx b/src/components/Widgets/Checkbox/Checkboxes.tsx index eadb3ba..9e9d913 100644 --- a/src/components/Widgets/Checkbox/Checkboxes.tsx +++ b/src/components/Widgets/Checkbox/Checkboxes.tsx @@ -33,10 +33,8 @@ const Checkboxes: React.FC = ({
{enumOptions.map((option, index) => { const checked = value.indexOf(option.value) !== -1; - const itemDisabled = - enumDisabled && enumDisabled.indexOf(option.value) !== -1; - const disabledCls = - disabled || itemDisabled || readonly ? "disabled" : ""; + const itemDisabled = enumDisabled && enumDisabled.indexOf(option.value) !== -1; + const disabledCls = disabled || itemDisabled || readonly ? "disabled" : ""; const checkbox = ( ` +const CustomRadioElement = styled.span<{ checked?: boolean }>` position: absolute; top: 0; left: 0; @@ -43,8 +43,8 @@ const Indicator = styled.div` `; type RadioButtonProps = Omit< - React.InputHTMLAttributes, - "type" +React.InputHTMLAttributes, +"type" >; const RadioButton: React.FC = ({ diff --git a/src/components/Widgets/RadioButton/RadioButtonWidget.tsx b/src/components/Widgets/RadioButton/RadioButtonWidget.tsx index b9e7a95..f49b4ee 100644 --- a/src/components/Widgets/RadioButton/RadioButtonWidget.tsx +++ b/src/components/Widgets/RadioButton/RadioButtonWidget.tsx @@ -33,10 +33,8 @@ const RadioButtonWidget: React.FC = (props) => {
{enumOptions.map((option, i) => { const checked = option.value === value; - const itemDisabled = - enumDisabled && enumDisabled.indexOf(option.value) !== -1; - const disabledCls = - disabled || itemDisabled || readonly ? "disabled" : ""; + const itemDisabled = enumDisabled && enumDisabled.indexOf(option.value) !== -1; + const disabledCls = disabled || itemDisabled || readonly ? "disabled" : ""; const radio = ( { {ad.title_fi} {ad.description_fi} - {ad.autohide_enabled ? - formatRelative(new Date(ad.autohide_at), new Date()) + {ad.autohide_enabled + ? formatRelative(new Date(ad.autohide_at), new Date()) : "Disabled"} diff --git a/src/pages/admin/signups/[id].tsx b/src/pages/admin/signups/[id].tsx index 507375a..f3e6dfa 100644 --- a/src/pages/admin/signups/[id].tsx +++ b/src/pages/admin/signups/[id].tsx @@ -11,10 +11,10 @@ import SignupQuestionsWidget from "@components/Widgets/SignupQuestionsWidget/Sig import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; import { buildValidationSchema } from "@views/SignUpPage/FormUtils"; -const DEFAULT_EMAIL = -`Moikka, +const DEFAULT_EMAIL = `Moikka, Ilmottautuminen saapui perille.`; + const widgets = { datetime: DatetimeWidget, signup: SignupQuestionsWidget, diff --git a/src/pages/events/[id].tsx b/src/pages/events/[id].tsx index 9490c6f..0b810ac 100644 --- a/src/pages/events/[id].tsx +++ b/src/pages/events/[id].tsx @@ -16,6 +16,7 @@ interface InitialProps { const EventPage: NextPage = ({ initialEvent }) => { const router = useRouter(); const { id } = router.query; + // eslint-disable-next-line @typescript-eslint/no-unused-vars const { data, error } = useFetchEvents({ initialData: initialEvent, id: id as string }); if (!data) return ; diff --git a/src/pages/signup/[...params].tsx b/src/pages/signup/[...params].tsx index 71b0d66..e760818 100644 --- a/src/pages/signup/[...params].tsx +++ b/src/pages/signup/[...params].tsx @@ -67,11 +67,11 @@ const SignUpPage: NextPage = () => { try { if (uuid) { - const resp = await updateSignup(payload, uuid); + await updateSignup(payload, uuid); // TODO: Update signup list, so user sees possible changes in the list setStatus("Sign-up submission updated successfully"); } else { - const resp = await createSignup(payload); + await createSignup(payload); // TODO: Fetch/update signup list, so user sees the signup in the list setStatus("Sign-up submitted successfully"); } diff --git a/src/pages/yritysyhteistyo.tsx b/src/pages/yritysyhteistyo.tsx index 094e52b..0d4ae57 100644 --- a/src/pages/yritysyhteistyo.tsx +++ b/src/pages/yritysyhteistyo.tsx @@ -12,6 +12,7 @@ interface InitialProps { } const CorporatePage: NextPage = ({ initialJobAds }) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars const { data, error } = useFetchJobAds({ initialData: initialJobAds }); return ( <> diff --git a/src/views/ActualPage/EventCalendar.tsx b/src/views/ActualPage/EventCalendar.tsx index 6572047..49139ed 100644 --- a/src/views/ActualPage/EventCalendar.tsx +++ b/src/views/ActualPage/EventCalendar.tsx @@ -2,9 +2,9 @@ import React, { useState } from "react"; import { Event } from "@models/Event"; import Button from "@components/Button"; -import FilterContainer from "./FilterContainer"; import { CardSection, Card, FullWidthSection } from "@components/index"; import noop from "@utils/noop"; +import FilterContainer from "./FilterContainer"; interface EventCalendarProps { events: Event[]; diff --git a/src/views/ActualPage/News.tsx b/src/views/ActualPage/News.tsx index 71af861..cb1e005 100644 --- a/src/views/ActualPage/News.tsx +++ b/src/views/ActualPage/News.tsx @@ -2,9 +2,9 @@ import React, { useState } from "react"; import { Post } from "@models/Feed"; import Button from "@components/Button"; -import FilterContainer from "./FilterContainer"; import { CardSection, Card, FullWidthSection } from "@components/index"; import noop from "@utils/noop"; +import FilterContainer from "./FilterContainer"; interface NewsProps { feed: Post[]; diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 3709c12..5b55058 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -1,9 +1,9 @@ import React from "react"; -import CorporatePageHero from "./CorporatePageHero"; import { CTASection, TextSection, PageLink, Link, } from "@components/index"; import { JobAd } from "@models/JobAd"; +import CorporatePageHero from "./CorporatePageHero"; import JobAdList from "./JobAdList"; const EXCURSION_RULES = "https://static.sahkoinsinoorikilta.fi/saannot/excursiosaannot.pdf"; diff --git a/src/views/FreshmenPage/FreshmenPageView.tsx b/src/views/FreshmenPage/FreshmenPageView.tsx index 75b0a7d..1159d4a 100644 --- a/src/views/FreshmenPage/FreshmenPageView.tsx +++ b/src/views/FreshmenPage/FreshmenPageView.tsx @@ -1,10 +1,10 @@ import React from "react"; import Image from "next/image"; import styled from "styled-components"; -import FreshmenPageHero from "./FreshmenPageHero"; import { CTASection, TextSection, InfoBox, PageLink, Link, } from "@components/index"; +import FreshmenPageHero from "./FreshmenPageHero"; const FOPAS_LINK = ""; const FUKSI_POINTS_LINK = ""; diff --git a/src/views/FrontPage/FrontPageView.tsx b/src/views/FrontPage/FrontPageView.tsx index f312849..134cfa4 100644 --- a/src/views/FrontPage/FrontPageView.tsx +++ b/src/views/FrontPage/FrontPageView.tsx @@ -9,13 +9,13 @@ import { CTASection, Link, } from "@components/index"; -import FrontPageHero from "./FrontPageHero"; import { Event } from "@models/Event"; import { Post } from "@models/Feed"; import { colors } from "@theme/colors"; import FullWidthSection from "@components/Sections/FullWidthSection"; import noop from "@utils/noop"; +import FrontPageHero from "./FrontPageHero"; // Corporate logos import const ABB = "/img/corporate_logos/abb.png"; diff --git a/src/views/GuildPage/GuildPageView.tsx b/src/views/GuildPage/GuildPageView.tsx index da614ac..2e27b6c 100644 --- a/src/views/GuildPage/GuildPageView.tsx +++ b/src/views/GuildPage/GuildPageView.tsx @@ -3,10 +3,10 @@ import styled from "styled-components"; import { CTASection, TextSection, PageLink, Link, } from "@components/index"; -import GuildPageHero from "./GuildPageHero"; import FullWidthSection from "@components/Sections/FullWidthSection"; import colors from "@theme/colors"; import breakpoints from "@theme/breakpoints"; +import GuildPageHero from "./GuildPageHero"; const Column = styled.div` display: flex; diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx index edbed0c..4797a5f 100644 --- a/src/views/SignUpPage/SignUpPageView.tsx +++ b/src/views/SignUpPage/SignUpPageView.tsx @@ -2,13 +2,13 @@ import React from "react"; import styled from "styled-components"; import { IChangeEvent, ISubmitEvent, ErrorSchema } from "react-jsonschema-form"; import { SignupForm } from "@models/SignupForm"; -import { buildFormSchema, buildUISchema } from "./FormUtils"; import Checkboxes from "@components/Widgets/Checkbox/Checkboxes"; import RadioButtonWidget from "@components/Widgets/RadioButton/RadioButtonWidget"; import { TextSection } from "@components/index"; import { colors } from "@theme/colors"; import FormWrapper from "@views/common/FormWrapper"; import Loader from "@components/Loader"; +import { buildFormSchema, buildUISchema } from "./FormUtils"; const customWidgets = { radio: RadioButtonWidget, diff --git a/src/views/admin/AdminCreateCommon.tsx b/src/views/admin/AdminCreateCommon.tsx index 770d51b..63737f2 100644 --- a/src/views/admin/AdminCreateCommon.tsx +++ b/src/views/admin/AdminCreateCommon.tsx @@ -51,7 +51,7 @@ type AdminCreateCommonProps = { widgets: { [name: string]: any; }; -} +}; const AdminCreateCommon: React.FC = ({ title, diff --git a/src/views/common/AdminPageWrapper.tsx b/src/views/common/AdminPageWrapper.tsx index 702c545..f926ebb 100644 --- a/src/views/common/AdminPageWrapper.tsx +++ b/src/views/common/AdminPageWrapper.tsx @@ -58,7 +58,7 @@ const useShouldRedirect = (enabled = true) => { type PageProps = { requiresAuthentication: boolean; -} +}; const AdminPageWrapper: React.FC = ({ requiresAuthentication, children }) => { const router = useRouter();