From e7f1f0728ad2e46198a7d58b49ac907d17d19931 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Sirois Date: Mon, 12 Aug 2019 23:18:24 -0400 Subject: [PATCH] style: fix lint issues --- scripts/buildHelpers.js | 4 ++-- scripts/fetchUsers.js | 6 +++++- src/SidebarProvider.tsx | 8 ++++---- src/components/Footer/index.tsx | 2 +- src/components/Header/index.tsx | 2 +- src/components/Layout/index.tsx | 8 ++++---- src/components/Markdown/index.tsx | 8 ++++---- src/components/ResourceBreadcrumb/index.tsx | 6 +++--- src/components/ResourceBreadcrumb/styles.tsx | 2 +- src/components/ResourceHeader/index.tsx | 4 ++-- src/components/ResourceHeader/styles.tsx | 2 +- src/components/ResourcesLayout/index.tsx | 2 +- src/components/ResourcesSidebar/index.tsx | 10 +++++----- src/components/ResourcesSidebar/styles.tsx | 2 +- src/components/ResourcesSidebar/useBuildTree.tsx | 10 +++++----- src/components/ResourcesSidebarSection/index.tsx | 4 ++-- src/components/SEO/index.tsx | 6 +++--- src/components/StackedAvatars/index.tsx | 4 ++-- src/pages/about.tsx | 4 ++-- src/pages/index.tsx | 2 +- src/pages/rules.tsx | 4 ++-- src/templates/languagePost.tsx | 4 ++-- src/utils/index.ts | 2 +- 23 files changed, 55 insertions(+), 51 deletions(-) diff --git a/scripts/buildHelpers.js b/scripts/buildHelpers.js index 411709de..529090af 100644 --- a/scripts/buildHelpers.js +++ b/scripts/buildHelpers.js @@ -33,9 +33,9 @@ module.exports = { const avatar = target ? target.avatar : this.getDefaultAvatar(hash) return { - name, - hash, avatar, + hash, + name, } }, resolveAuthors(users, authors) { diff --git a/scripts/fetchUsers.js b/scripts/fetchUsers.js index dd725a33..5ab141f5 100644 --- a/scripts/fetchUsers.js +++ b/scripts/fetchUsers.js @@ -22,6 +22,7 @@ const writeS = (content, dest) => { } client.once("ready", async () => { + // tslint:disable-next-line no-console console.log("Bot ready, fetching user list...") const tph = client.guilds.get(TPH) if (!tph) { @@ -29,16 +30,19 @@ client.once("ready", async () => { } const guild = await tph.fetchMembers() const memberInfo = guild.members.map(member => ({ - identifier: `${member.user.username}#${member.user.discriminator}`, avatar: member.user.displayAvatarURL, + identifier: `${member.user.username}#${member.user.discriminator}`, })) const wrs = fs.createWriteStream(DESTINATION) + // tslint:disable-next-line no-console console.log(`Fetched ${memberInfo.length} users, writing to ${DESTINATION}`) writeS(memberInfo, wrs).on("finish", () => { + // tslint:disable-next-line no-console console.log("Finished writing list") process.exit(0) }) }) +// tslint:disable-next-line no-console console.log("Attempting to log in...") client.login(process.env.BOT_TOKEN) diff --git a/src/SidebarProvider.tsx b/src/SidebarProvider.tsx index c30a2dd0..cc44827b 100644 --- a/src/SidebarProvider.tsx +++ b/src/SidebarProvider.tsx @@ -1,21 +1,21 @@ import React, { useState } from "react" -interface SidebarProviderProps { +interface ISidebarProviderProps { children: React.ReactNode } -export interface SidebarContextInterface { +export interface ISidebarContextInterface { current: number setCurrent: (index: number) => void } -export const SidebarContext = React.createContext( +export const SidebarContext = React.createContext( null ) export function SidebarProvider({ children, -}: SidebarProviderProps): JSX.Element { +}: ISidebarProviderProps): JSX.Element { const [current, setCurrent] = useState(0) function selectFirstLevel(index: number) { diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 82585cdc..1c7d38b2 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -1,6 +1,6 @@ import React from "react" -import * as SC from "./styles" import { Container } from "../Container" +import * as SC from "./styles" export function Footer() { return ( diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index 84edf449..e682f4eb 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -1,7 +1,7 @@ import { Link } from "gatsby" import React, { PropsWithChildren } from "react" -import { Container } from "../Container" import logo from "../../images/tph-logo.png" +import { Container } from "../Container" import * as SC from "./styles" function MenuItem({ children, to }: PropsWithChildren<{ to: string }>) { diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index 7b384e00..69784854 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -5,16 +5,16 @@ * See: https://www.gatsbyjs.org/docs/use-static-query/ */ +import { graphql, useStaticQuery } from "gatsby" import React, { PropsWithChildren } from "react" -import { useStaticQuery, graphql } from "gatsby" +import Scrollbar from "react-perfect-scrollbar" +import "react-perfect-scrollbar/dist/css/styles.css" +import { GlobalStyles } from "../../globalStyles" import { Container } from "../Container" import { Footer } from "../Footer" import { Header } from "../Header" -import { GlobalStyles } from "../../globalStyles" import * as SC from "./styles" -import Scrollbar from "react-perfect-scrollbar" -import "react-perfect-scrollbar/dist/css/styles.css" export function Layout({ children }: PropsWithChildren<{}>) { const data = useStaticQuery(graphql` diff --git a/src/components/Markdown/index.tsx b/src/components/Markdown/index.tsx index 00298f8b..b5e166cc 100644 --- a/src/components/Markdown/index.tsx +++ b/src/components/Markdown/index.tsx @@ -1,12 +1,12 @@ -import React from "react" -import * as SC from "./styles" import Prism from "prismjs" -import "prismjs/components/prism-python" import "prismjs/components/prism-markup-templating" import "prismjs/components/prism-php" +import "prismjs/components/prism-python" import "prismjs/plugins/line-numbers/prism-line-numbers.css" +import React from "react" +import * as SC from "./styles" -interface MarkdownProps { +interface IMarkdownProps { content: string } diff --git a/src/components/ResourceBreadcrumb/index.tsx b/src/components/ResourceBreadcrumb/index.tsx index fa8749ac..83dbc358 100644 --- a/src/components/ResourceBreadcrumb/index.tsx +++ b/src/components/ResourceBreadcrumb/index.tsx @@ -1,11 +1,11 @@ import React from "react" -import { IFileOrFolder } from "../ResourcesSidebar/index" import ChevronUp from "../../icons/chevron-up.svg" import { traversePaths } from "../../utils" +import { IFileOrFolder } from "../ResourcesSidebar/index" import * as SC from "./styles" -interface ResourceBreadcrumbProps { +interface IResourceBreadcrumbProps { relativePath: any } @@ -24,7 +24,7 @@ function flatten([ return flatten([...currNode.children, ...previousNodes, currNode]) } -export function ResourceBreadcrumb({ relativePath }: ResourceBreadcrumbProps) { +export function ResourceBreadcrumb({ relativePath }: IResourceBreadcrumbProps) { const paths = relativePath.split("/") const breadcrumbItems = flatten([traversePaths(paths)]) diff --git a/src/components/ResourceBreadcrumb/styles.tsx b/src/components/ResourceBreadcrumb/styles.tsx index 3c7f8e52..458b2957 100644 --- a/src/components/ResourceBreadcrumb/styles.tsx +++ b/src/components/ResourceBreadcrumb/styles.tsx @@ -1,5 +1,5 @@ -import styled from "styled-components" import { Link } from "gatsby" +import styled from "styled-components" export const ResourceBreadcrumbWrapper = styled.div` display: flex; diff --git a/src/components/ResourceHeader/index.tsx b/src/components/ResourceHeader/index.tsx index 8faf2760..e388b7c6 100644 --- a/src/components/ResourceHeader/index.tsx +++ b/src/components/ResourceHeader/index.tsx @@ -1,11 +1,11 @@ import React, { Fragment } from "react" -import { StackedAvatars } from "../StackedAvatars" import ChevronUp from "../../icons/chevron-up.svg" import { ResourceBreadcrumb } from "../ResourceBreadcrumb" +import { StackedAvatars } from "../StackedAvatars" import * as SC from "./styles" -interface ResourceHeaderProps { +interface IResourceHeaderProps { relativePath: any title: any authors: any diff --git a/src/components/ResourceHeader/styles.tsx b/src/components/ResourceHeader/styles.tsx index 30293b8d..bc9e42b6 100644 --- a/src/components/ResourceHeader/styles.tsx +++ b/src/components/ResourceHeader/styles.tsx @@ -1,5 +1,5 @@ -import styled, { css } from "styled-components" import { Link } from "gatsby" +import styled, { css } from "styled-components" import { fontFamily, modularScale } from "../../design/typography" export const ResourceHeaderWrapper = styled.div` diff --git a/src/components/ResourcesLayout/index.tsx b/src/components/ResourcesLayout/index.tsx index 0ffc0207..46b302f3 100644 --- a/src/components/ResourcesLayout/index.tsx +++ b/src/components/ResourcesLayout/index.tsx @@ -8,9 +8,9 @@ import React, { PropsWithChildren } from "react" import { GlobalStyles } from "../../globalStyles" +import { SidebarProvider } from "../../SidebarProvider" import { ResourcesSidebar } from "../ResourcesSidebar" import * as SC from "./styles" -import { SidebarProvider } from "../../SidebarProvider" export function ResourcesLayout({ children }: PropsWithChildren<{}>) { return ( diff --git a/src/components/ResourcesSidebar/index.tsx b/src/components/ResourcesSidebar/index.tsx index 4d8df2e7..93720096 100644 --- a/src/components/ResourcesSidebar/index.tsx +++ b/src/components/ResourcesSidebar/index.tsx @@ -1,10 +1,10 @@ -import React, { useState, PropsWithChildren } from "react" -import { useStaticQuery, graphql, Link } from "gatsby" -import useBuildTree from "./useBuildTree" -import useSidebar from "./../../hooks/useSidebar" -import Banner from "../../images/tph-banner.svg" +import { graphql, Link, useStaticQuery } from "gatsby" +import React, { PropsWithChildren, useState } from "react" import TriangleDown from "../../icons/triangle-down.svg" +import Banner from "../../images/tph-banner.svg" +import useSidebar from "./../../hooks/useSidebar" import * as SC from "./styles" +import useBuildTree from "./useBuildTree" export interface IFile { title: string diff --git a/src/components/ResourcesSidebar/styles.tsx b/src/components/ResourcesSidebar/styles.tsx index b9c6b650..834d481a 100644 --- a/src/components/ResourcesSidebar/styles.tsx +++ b/src/components/ResourcesSidebar/styles.tsx @@ -1,5 +1,5 @@ -import styled from "styled-components" import { Link } from "gatsby" +import styled from "styled-components" import ChevronUp from "../../icons/chevron-up.svg" export const ResourcesSidebarWrapper = styled.div` diff --git a/src/components/ResourcesSidebar/useBuildTree.tsx b/src/components/ResourcesSidebar/useBuildTree.tsx index 201ff4f4..1240c93e 100644 --- a/src/components/ResourcesSidebar/useBuildTree.tsx +++ b/src/components/ResourcesSidebar/useBuildTree.tsx @@ -1,13 +1,13 @@ -import partition from "ramda/es/partition" import chain from "ramda/es/chain" +import partition from "ramda/es/partition" import { traversePaths } from "../../utils" import { - IFileOrFolder, - IFile, - IFolder, IAllResourcesQuery, + IFile, + IFileOrFolder, IFileQuery, + IFolder, } from "./index" function generateFolder({ @@ -44,7 +44,7 @@ function generateFile({ } function join([head, ...tail]: IFileOrFolder[]): IFileOrFolder[] { - if (!head) return [] + if (!head) { return [] } const [similarFs, remaining] = partition( obj => obj.title === head.title && obj.type === head.type, diff --git a/src/components/ResourcesSidebarSection/index.tsx b/src/components/ResourcesSidebarSection/index.tsx index e9298a37..ef76ccc4 100644 --- a/src/components/ResourcesSidebarSection/index.tsx +++ b/src/components/ResourcesSidebarSection/index.tsx @@ -1,14 +1,14 @@ import React, { PropsWithChildren } from "react" import * as SC from "./styles" -export interface ResourcesSidebarSectionProps { +export interface IResourcesSidebarSectionProps { readonly title: string } export function ResourcesSidebarSection({ title, children, -}: PropsWithChildren) { +}: PropsWithChildren) { return (
{title} diff --git a/src/components/SEO/index.tsx b/src/components/SEO/index.tsx index 6597c855..a4c274d6 100644 --- a/src/components/SEO/index.tsx +++ b/src/components/SEO/index.tsx @@ -1,8 +1,8 @@ +import { graphql, useStaticQuery } from "gatsby" import React from "react" import Helmet from "react-helmet" -import { useStaticQuery, graphql } from "gatsby" -interface SEOProps { +interface ISEOProps { readonly description?: string readonly lang?: string readonly meta?: any[] @@ -16,7 +16,7 @@ export function SEO({ meta = [], keywords = [], title, -}: SEOProps) { +}: ISEOProps) { const { site } = useStaticQuery( graphql` query { diff --git a/src/components/StackedAvatars/index.tsx b/src/components/StackedAvatars/index.tsx index 59c9de5b..57e2f88c 100644 --- a/src/components/StackedAvatars/index.tsx +++ b/src/components/StackedAvatars/index.tsx @@ -2,11 +2,11 @@ import React from "react" import * as SC from "./styles" -interface StackedAvatarsProps { +interface IStackedAvatarsProps { authors: any } -export function StackedAvatars({ authors }: StackedAvatarsProps) { +export function StackedAvatars({ authors }: IStackedAvatarsProps) { return ( {authors.map((author, index) => ( diff --git a/src/pages/about.tsx b/src/pages/about.tsx index 52e22a17..81c3e62e 100644 --- a/src/pages/about.tsx +++ b/src/pages/about.tsx @@ -1,7 +1,7 @@ -import React, { Fragment } from "react" import { graphql } from "gatsby" -import { Markdown } from "../components/Markdown" +import React, { Fragment } from "react" import { MarkdownRemark, Query } from "../../generated/graphql" +import { Markdown } from "../components/Markdown" import { SEO } from "../components/SEO" function AboutPage({ data }: ComponentQuery<{ md: MarkdownRemark }>) { diff --git a/src/pages/index.tsx b/src/pages/index.tsx index d7935053..306307af 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,5 +1,5 @@ -import React, { Fragment } from "react" import { Link } from "gatsby" +import React, { Fragment } from "react" import { SEO } from "../components/SEO" diff --git a/src/pages/rules.tsx b/src/pages/rules.tsx index d5c7e293..695cc068 100644 --- a/src/pages/rules.tsx +++ b/src/pages/rules.tsx @@ -1,7 +1,7 @@ -import React, { Fragment } from "react" import { graphql } from "gatsby" -import { Markdown } from "../components/Markdown" +import React, { Fragment } from "react" import { MarkdownRemark, Query } from "../../generated/graphql" +import { Markdown } from "../components/Markdown" import { SEO } from "../components/SEO" function RulesPage({ data }: ComponentQuery<{ md: MarkdownRemark }>) { diff --git a/src/templates/languagePost.tsx b/src/templates/languagePost.tsx index ca907b28..06e326ab 100644 --- a/src/templates/languagePost.tsx +++ b/src/templates/languagePost.tsx @@ -1,8 +1,8 @@ -import React, { Fragment } from "react" import { graphql } from "gatsby" +import React, { Fragment } from "react" import { Markdown } from "../components/Markdown" -import { SEO } from "../components/SEO" import { ResourceHeader } from "../components/ResourceHeader" +import { SEO } from "../components/SEO" // @todo maybe find alternative type for data function LanguagePost({ data }: any) { diff --git a/src/utils/index.ts b/src/utils/index.ts index 6aede7ed..a7a3fd28 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -2,7 +2,7 @@ import { IFileOrFolder } from "../components/ResourcesSidebar/index" export function traversePaths( [head, ...tail]: string[], - basePath = "/resources" + basePath: string = "/resources" ): IFileOrFolder { const path = basePath + "/" + head const isFile = !tail.length