Commit b76408bd authored by Grant's avatar Grant
Browse files

Merge branch 'fix-eslint-client' into 'main' 

Fix eslint on client

See merge request sc07/canvas!70
parents b5295c4b b093dcb2

.gitlab-ci.yml

+14 −2
Original line number Diff line number Diff line 
stages:

  - test

  - lint

  - build

  - test

  - deploy



eslint client:

  stage: lint

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

        - packages/client/src/**/*

  image: node:23-alpine

  script:

    - npm i --include=dev

    - npm -w packages/client run lint



eslint server:

  stage: test

  stage: lint

  rules:

    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

      changes:

packages/client/.eslintrc.json

0 → 100644
+25 −0
Original line number Diff line number Diff line 
{

  "extends": ["react-app"],

  "rules": {

    "no-unused-vars": "off",

    "@typescript-eslint/no-namespace": "off",

    "@typescript-eslint/no-explicit-any": "off",

    "@typescript-eslint/no-unused-vars": [

      "error",

      {

        "argsIgnorePattern": "^_",

        "caughtErrors": "all",

        "caughtErrorsIgnorePattern": "^_",

        "destructuredArrayIgnorePattern": "^_",

        "varsIgnorePattern": "^_",

        "ignoreRestSiblings": true

      }

    ]

  },

  "overrides": [

    {

      "files": ["**/*.ts?(x)"],

      "rules": {}

    }

  ]

}

packages/client/package.json

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
  "keywords": [],

  "author": "",

  "license": "ISC",

  "eslintConfig": {

    "extends": "react-app"

  },

  "dependencies": {

    "@fortawesome/free-solid-svg-icons": "^6.7.2",

    "@icons-pack/react-simple-icons": "^10.2.0",

packages/client/src/components/App.tsx

+6 −7
Original line number Diff line number Diff line
@@ -5,11 +5,10 @@ import { TemplateContext } from "../contexts/TemplateContext"; 
import { SettingsSidebar } from "./Settings/SettingsSidebar";

import { DebugModal } from "./Debug/DebugModal";

import { ToolbarWrapper } from "./Toolbar/ToolbarWrapper";

import React, { lazy, useEffect } from "react";

import { useEffect } from "react";

import { ChatContext } from "../contexts/ChatContext";



import "react-toastify/dist/ReactToastify.css";

import { ToastContainer } from "react-toastify";

import { AuthErrors } from "./AuthErrors";

import "../lib/keybinds";

import { PixelWhoisSidebar } from "./PixelWhoisSidebar";
@@ -21,15 +20,15 @@ import { ModModal } from "./Moderation/ModModal"; 
import { DynamicModals } from "./DynamicModals";

import { ToastWrapper } from "./ToastWrapper";



const Chat = lazy(() => import("./Chat/Chat"));

// const Chat = lazy(() => import("./Chat/Chat"));



console.log("Client init with version " + __COMMIT_HASH__);



const DynamicallyLoadChat = () => {

  const { loadChat } = useAppContext();

// const DynamicallyLoadChat = () => {

//   const { loadChat } = useAppContext();



  return <React.Suspense>{loadChat && <Chat />}</React.Suspense>;

};

//   return <React.Suspense>{loadChat && <Chat />}</React.Suspense>;

// };



// get access to context data

const AppInner = () => {

packages/client/src/components/AuthErrors.tsx

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ const BannedError = ({ 
  return (

    <Modal isOpen={isOpen} onClose={onClose} isDismissable={false}>

      <ModalContent>

        {(onClose) => (

        {(_onClose) => (

          <>

            <ModalHeader>Login Error</ModalHeader>

            <ModalBody>
@@ -96,7 +96,7 @@ const OPError = ({ 
  params: URLSearchParams;

}) => {

  const canRetry = params.has(Params.CAN_RETRY);

  const [error, setError] = useState(params.get(Params.ERROR));

  const [error, _setError] = useState(params.get(Params.ERROR));

  const [errorDesc, setErrorDesc] = useState(params.get(Params.ERROR_DESC));



  useEffect(() => {
@@ -110,7 +110,7 @@ const OPError = ({ 
  return (

    <Modal isOpen={isOpen} onClose={onClose} isDismissable={false}>

      <ModalContent>

        {(onClose) => (

        {(_onClose) => (

          <>

            <ModalHeader>Login Error</ModalHeader>

            <ModalBody>