Compare commits

..

No commits in common. "a5f2047cda4b7e1f3fd7ca939d7c1fb1e668ec41" and "8cea7dd0f984317bffa7a289547bd777214cc608" have entirely different histories.

5 changed files with 3128 additions and 2267 deletions

View File

@ -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/**/*']
}
];

5369
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "r-and-m",
"version": "2.0.0",
"version": "1.1.0",
"description": "Рик огурчик",
"main": "./src/index.tsx",
"directories": {
@ -8,9 +8,9 @@
},
"scripts": {
"test": "jest",
"start": "brojs server --port=8099 --with-open-browser",
"build": "npm run clean && brojs build --dev",
"build:prod": "npm run clean && brojs build",
"start": "ijl-cli server --port=8099 --with-open-browser",
"build": "npm run clean && ijl-cli build --dev",
"build:prod": "npm run clean && ijl-cli build",
"eslint": "exit 0",
"clean": "rimraf dist"
},
@ -18,9 +18,9 @@
"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",

View File

@ -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')}`,
on: Boolean(getNavigationValue('r-and-m.character.detail')),
getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationValue('r-and-m.character.detail')}`, { charId })
url: `${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`,
on: Boolean(getNavigationsValue('r-and-m.character.detail')),
getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`, { charId })
}
},
api: {