eslint.config.mjs

@@ -3,6 +3,7 @@ import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
 import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";
 
+
 export default [
   {languageOptions: { globals: globals.browser }},
   pluginJs.configs.recommended,
@@ -19,8 +20,5 @@ export default [
         "@typescript-eslint/no-explicit-any": "off"
     },
     ignores: ["src/index.tsx"]
-  },
-  {
-    ignores: ['stubs/**/*']
   }
 ];

jest.config.js

@@ -1,202 +0,0 @@
-/**
- * For a detailed explanation regarding each configuration property, visit:
- * https://jestjs.io/docs/configuration
- */
-
-/** @type {import('jest').Config} */
-const config = {
-  // All imported modules in your tests should be mocked automatically
-  // automock: false,
-
-  // Stop running tests after `n` failures
-  // bail: 0,
-
-  // The directory where Jest should store its cached dependency information
-  // cacheDirectory: "C:\\Users\\alex\\AppData\\Local\\Temp\\jest",
-
-  // Automatically clear mock calls, instances, contexts and results before every test
-  clearMocks: true,
-
-  // Indicates whether the coverage information should be collected while executing the test
-  collectCoverage: true,
-
-  // An array of glob patterns indicating a set of files for which coverage information should be collected
-  collectCoverageFrom: [
-    '<rootDir>/src/**/*',
-    // '!<rootDir>/src/**/index.tsx',
-    // '!<rootDir>/src/**/global-styles.tsx',
-  ],
-
-  // The directory where Jest should output its coverage files
-  coverageDirectory: "coverage",
-
-  // An array of regexp pattern strings used to skip coverage collection
-  // coveragePathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // Indicates which provider should be used to instrument code for coverage
-  coverageProvider: "v8",
-
-  // A list of reporter names that Jest uses when writing coverage reports
-  // coverageReporters: [
-  //   "json",
-  //   "text",
-  //   "lcov",
-  //   "clover"
-  // ],
-
-  // An object that configures minimum threshold enforcement for coverage results
-  // coverageThreshold: undefined,
-
-  // A path to a custom dependency extractor
-  // dependencyExtractor: undefined,
-
-  // Make calling deprecated APIs throw helpful error messages
-  // errorOnDeprecated: false,
-
-  // The default configuration for fake timers
-  // fakeTimers: {
-  //   "enableGlobally": false
-  // },
-
-  // Force coverage collection from ignored files using an array of glob patterns
-  // forceCoverageMatch: [],
-
-  // A path to a module which exports an async function that is triggered once before all test suites
-  // globalSetup: undefined,
-
-  // A path to a module which exports an async function that is triggered once after all test suites
-  // globalTeardown: undefined,
-
-  // A set of global variables that need to be available in all test environments
-  // globals: {},
-
-  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
-  // maxWorkers: "50%",
-
-  // An array of directory names to be searched recursively up from the requiring module's location
-  // moduleDirectories: [
-  //   "node_modules"
-  // ],
-
-  // An array of file extensions your modules use
-  // moduleFileExtensions: [
-  //   "js",
-  //   "mjs",
-  //   "cjs",
-  //   "jsx",
-  //   "ts",
-  //   "tsx",
-  //   "json",
-  //   "node"
-  // ],
-
-  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-  moduleNameMapper: {},
-
-  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
-  // modulePathIgnorePatterns: [],
-
-  // Activates notifications for test results
-  // notify: false,
-
-  // An enum that specifies notification mode. Requires { notify: true }
-  // notifyMode: "failure-change",
-
-  // A preset that is used as a base for Jest's configuration
-  preset: 'ts-jest',
-
-  // Run tests from one or more projects
-  // projects: undefined,
-
-  // Use this configuration option to add custom reporters to Jest
-  // reporters: undefined,
-
-  // Automatically reset mock state before every test
-  // resetMocks: false,
-
-  // Reset the module registry before running each individual test
-  // resetModules: false,
-
-  // A path to a custom resolver
-  // resolver: undefined,
-
-  // Automatically restore mock state and implementation before every test
-  // restoreMocks: false,
-
-  // The root directory that Jest should scan for tests and modules within
-  // rootDir: undefined,
-
-  // A list of paths to directories that Jest should use to search for files in
-  // roots: [
-  //   "<rootDir>"
-  // ],
-
-  // Allows you to use a custom runner instead of Jest's default test runner
-  // runner: "jest-runner",
-
-  // The paths to modules that run some code to configure or set up the testing environment before each test
-  // setupFiles: [],
-
-  // A list of paths to modules that run some code to configure or set up the testing framework before each test
-  // setupFilesAfterEnv: [],
-
-  // The number of seconds after which a test is considered as slow and reported as such in the results.
-  // slowTestThreshold: 5,
-
-  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
-  // snapshotSerializers: [],
-
-  // The test environment that will be used for testing
-  testEnvironment: "jsdom",
-
-  // Options that will be passed to the testEnvironment
-  // testEnvironmentOptions: {},
-
-  // Adds a location field to test results
-  // testLocationInResults: false,
-
-  // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  // testPathIgnorePatterns: [
-  //   "\\\\node_modules\\\\"
-  // ],
-
-  // The regexp pattern or array of patterns that Jest uses to detect test files
-  // testRegex: [],
-
-  // This option allows the use of a custom results processor
-  // testResultsProcessor: undefined,
-
-  // This option allows use of a custom test runner
-  // testRunner: "jest-circus/runner",
-
-  // A map from regular expressions to paths to transformers
-  // transform: undefined,
-
-  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  // transformIgnorePatterns: [
-  //   "\\\\node_modules\\\\",
-  //   "\\.pnp\\.[^\\\\]+$"
-  // ],
-
-  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-  // unmockedModulePathPatterns: undefined,
-
-  // Indicates whether each individual test should be reported during the run
-  // verbose: undefined,
-
-  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-  // watchPathIgnorePatterns: [],
-
-  // Whether to use watchman for file crawling
-  // watchman: true,
-};
-
-module.exports = config;

package.json

@@ -1,16 +1,16 @@
 {
     "name": "r-and-m",
-    "version": "2.0.0",
+    "version": "1.1.0",
     "description": "Рик огурчик",
     "main": "./src/index.tsx",
     "directories": {
         "doc": "docs"
     },
     "scripts": {
-        "test": "jest",
+        "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "brojs server --port=8099 --with-open-browser",
+        "start": "ijl-cli server --port=8099 --with-open-browser",
-        "build": "npm run clean && brojs build --dev",
+        "build": "npm run clean && ijl-cli build --dev",
-        "build:prod": "npm run clean && brojs build",
+        "build:prod": "npm run clean && ijl-cli build",
         "eslint": "exit 0",
         "clean": "rimraf dist"
     },
@@ -18,13 +18,12 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@brojs/cli": "^1.6.3",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
+        "@ijl/cli": "^5.1.0",
         "@types/react": "^18.2.74",
         "@types/react-dom": "^18.2.24",
         "express": "^4.19.2",
-        "jest-environment-jsdom": "^29.7.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.23.0",
@@ -32,13 +31,9 @@
     },
     "devDependencies": {
         "@eslint/js": "^9.3.0",
-        "@jest/globals": "^29.7.0",
-        "@types/jest": "^29.5.12",
         "eslint": "^8.57.0",
         "eslint-plugin-react": "^7.34.1",
         "globals": "^15.2.0",
-        "jest": "^29.7.0",
-        "ts-jest": "^29.1.2",
         "typescript-eslint": "^7.9.0"
     }
 }

src/__data__/urls.ts

@@ -1,16 +1,16 @@
-import { getNavigationValue, getConfigValue } from '@brojs/cli';
+import { getNavigationsValue, getConfigValue } from '@ijl/cli';
 import { generatePath } from 'react-router-dom';
 
-const baseUrl = getNavigationValue('r-and-m.main');
+const baseUrl = getNavigationsValue('r-and-m.main');
 
 export const URLs = {
   baseUrl,
   ui: {
-    search: getNavigationValue('r-and-m.search') && `${baseUrl}${getNavigationValue('r-and-m.search')}`,
+    search: getNavigationsValue('r-and-m.search') && `${baseUrl}${getNavigationsValue('r-and-m.search')}`,
     charDetail: {
-      url: `${baseUrl}${getNavigationValue('r-and-m.character.detail')}`,
+      url: `${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`,
-      on: Boolean(getNavigationValue('r-and-m.character.detail')),
+      on: Boolean(getNavigationsValue('r-and-m.character.detail')),
-      getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationValue('r-and-m.character.detail')}`, { charId })
+      getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`, { charId })
     }
   },
   api: {

src/__tests__/sum.test.ts

@@ -1,14 +0,0 @@
-import { it, expect, describe } from '@jest/globals'
-
-import { sum } from '../utils/sum'
-
-describe('sum', () => {
-  it('works with numbers', () => {
-    expect(sum(1, 2)).toBe(3)
-    expect(sum(-1, 2)).toBe(1)
-  })
-
-  it('works with numbers and strings', () => {
-    expect(sum(1, '2')).toBe(3)
-  })
-})

src/components/button/button.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 import { ButtonStyled } from "./button.style";
 
-export const Button = (props: React.HtmlHTMLAttributes<HTMLButtonElement> & { type: "button" | "submit" | "reset" }) => {
+export const Button = (props: React.HtmlHTMLAttributes<HTMLButtonElement>) => {
   return <ButtonStyled {...props} />;
 };

src/pages/search-character.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from "react";
-import { Link as Connectedlink, useNavigate } from "react-router-dom";
+import { Link as Connectedlink } from "react-router-dom";
 
 import data from "../__stubs__/characters.json";
 import logo from "../assets/logo_1x.png";
@@ -27,7 +27,6 @@ export const SearchCharacterPage = () => {
   const [searchValue, setSearchValue] = useState("");
   const [searchValueError, setSearchValueError] = useState(false);
   const searchInputRef = useRef<any>();
-  const nav = useNavigate()
 
   useEffect(() => {
     searchInputRef.current.focus();
@@ -46,30 +45,6 @@ export const SearchCharacterPage = () => {
     setSearchValue(value);
   };
 
-  const handleSubmitSearchFrom = (event) => {
-    event.preventDefault();
-
-    fetch(`${URLs.api.main}/search`, {
-      method: 'POST',
-      body: JSON.stringify({
-        search: searchValue
-      }),
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-    .then((response) => response.json())
-    .then((data) => {
-      const isAlive = data.data[0].status === "alive";
-
-      if (isAlive) {
-        nav(URLs.baseUrl)
-      } else {
-        nav(URLs.ui.charDetail.getUrl(data.data[0].id))
-      }
-    })
-  }
-
   return (
     <>
       <PageHeader>
@@ -96,7 +71,7 @@ export const SearchCharacterPage = () => {
           <Header1>
             <BrandText>Поиск</BrandText> персонажей
           </Header1>
-          <SearchForm onSubmit={handleSubmitSearchFrom}>
+          <SearchForm>
             <InputField
               inputRef={searchInputRef}
               onChange={handleSearchChange}
@@ -105,7 +80,7 @@ export const SearchCharacterPage = () => {
               placeHolder="Напишите имя для поиска"
             />
             {searchValueError && <span style={{ color: 'red', display: 'flex'}}>Ай яй</span>}
-            <SearchButton type="submit">Поиск</SearchButton>
+            <SearchButton>Поиск</SearchButton>
           </SearchForm>
         </MainCardWrapper>
         <CharacterList>

src/utils/sum.ts

@@ -1,8 +0,0 @@
-
-export const sum = (a: any, b: number | string): number => {
-  if (typeof a === 'string') {
-    throw new Error('a must be a number');
-  }
-
-  return a + +b
-};

stubs/api/index.js

@@ -1,26 +1,7 @@
-const router = require("express").Router();
+const router = require('express').Router();
 
-router.get("/landing-data", (request, response) => {
+router.get('/landing-data', (request, response) => {
-  response.send(require("../json/landing-data/success.json"));
+  response.send(require('../json/landing-data/success.json'))
-});
-
-router.post("/login", (req, res) => {
-  const { username, password } = req.body;
-  if (username === "admin") {
-    response.send(require("../json/user/sitter.success.json"));
-  } else {
-    response.send(require("../json/landing-data/success.json"));
-  }
-});
-
-router.post('/search', (req, res) => {
-  const { search } = req.body;
-
-  if (search === "Morty") {
-    return res.send(require("../json/seach/alive.success.json"));
-  }
-
-  res.send(require("../json/seach/success.json"));
 })
 
 module.exports = router;

stubs/json/seach/alive.success.json

@@ -1,24 +0,0 @@
-{
-  "data": [
-    {
-      "id": 14,
-      "name": "Morty",
-      "status": "alive",
-      "species": "Alien",
-      "type": "",
-      "gender": "Male",
-      "origin": {
-        "name": "unknown",
-        "url": ""
-      },
-      "location": {
-        "name": "Citadel of Ricks",
-        "url": "https://rickandmortyapi.com/api/location/3"
-      },
-      "image": "https://rickandmortyapi.com/api/character/avatar/14.jpeg",
-      "episode": ["https://rickandmortyapi.com/api/episode/10"],
-      "url": "https://rickandmortyapi.com/api/character/14",
-      "created": "2017-11-04T20:51:31.373Z"
-    }
-  ]
-}

stubs/json/seach/success.json

@@ -1,24 +0,0 @@
-{
-  "data": [
-    {
-      "id": 14,
-      "name": "Alien Morty",
-      "status": "unknown",
-      "species": "Alien",
-      "type": "",
-      "gender": "Male",
-      "origin": {
-        "name": "unknown",
-        "url": ""
-      },
-      "location": {
-        "name": "Citadel of Ricks",
-        "url": "https://rickandmortyapi.com/api/location/3"
-      },
-      "image": "https://rickandmortyapi.com/api/character/avatar/14.jpeg",
-      "episode": ["https://rickandmortyapi.com/api/episode/10"],
-      "url": "https://rickandmortyapi.com/api/character/14",
-      "created": "2017-11-04T20:51:31.373Z"
-    }
-  ]
-}

stubs/json/user/sitter.success.json

@@ -1,6 +0,0 @@
-{
-  "data": {
-    "role": "sitter",
-    
-  }
-}