Compare commits
No commits in common. "eac5118acae6bfd4e5786b22fc24108f0aba2993" and "ee88e832a6f0103784a56a09e6bbaa9aa405726f" have entirely different histories.
eac5118aca
...
ee88e832a6
@ -1,24 +0,0 @@
|
|||||||
import globals from "globals";
|
|
||||||
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,
|
|
||||||
...tseslint.configs.recommended,
|
|
||||||
pluginReactConfig,{
|
|
||||||
rules: {
|
|
||||||
'react/prop-types': 'off',
|
|
||||||
'@typescript-eslint/no-unused-vars': [
|
|
||||||
'warn',
|
|
||||||
{ argsIgnorePattern: '^_', caughtErrors: 'none' },
|
|
||||||
],
|
|
||||||
'@typescript-eslint/ban-types': 'off',
|
|
||||||
'@typescript-eslint/no-var-requires': 'off',
|
|
||||||
"@typescript-eslint/no-explicit-any": "off"
|
|
||||||
},
|
|
||||||
ignores: ["src/index.tsx"]
|
|
||||||
}
|
|
||||||
];
|
|
@ -19,6 +19,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
"r-and-m.api": "/api"
|
key: "value",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
2230
package-lock.json
generated
2230
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "r-and-m",
|
"name": "r-and-m",
|
||||||
"version": "1.1.0",
|
"version": "1.0.0",
|
||||||
"description": "Рик огурчик",
|
"description": "Рик огурчик",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"directories": {
|
"directories": {
|
||||||
@ -11,7 +11,6 @@
|
|||||||
"start": "ijl-cli server --port=8099 --with-open-browser",
|
"start": "ijl-cli server --port=8099 --with-open-browser",
|
||||||
"build": "npm run clean && ijl-cli build --dev",
|
"build": "npm run clean && ijl-cli build --dev",
|
||||||
"build:prod": "npm run clean && ijl-cli build",
|
"build:prod": "npm run clean && ijl-cli build",
|
||||||
"eslint": "exit 0",
|
|
||||||
"clean": "rimraf dist"
|
"clean": "rimraf dist"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
@ -28,12 +27,5 @@
|
|||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"react-router-dom": "^6.23.0",
|
"react-router-dom": "^6.23.0",
|
||||||
"typescript": "^5.4.4"
|
"typescript": "^5.4.4"
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@eslint/js": "^9.3.0",
|
|
||||||
"eslint": "^8.57.0",
|
|
||||||
"eslint-plugin-react": "^7.34.1",
|
|
||||||
"globals": "^15.2.0",
|
|
||||||
"typescript-eslint": "^7.9.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { getNavigationsValue, getConfigValue } from '@ijl/cli';
|
import { getNavigationsValue } from '@ijl/cli';
|
||||||
import { generatePath } from 'react-router-dom';
|
import { generatePath } from 'react-router-dom';
|
||||||
|
|
||||||
const baseUrl = getNavigationsValue('r-and-m.main');
|
const baseUrl = getNavigationsValue('r-and-m.main');
|
||||||
@ -13,7 +13,5 @@ export const URLs = {
|
|||||||
getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`, { charId })
|
getUrl: (charId: number) => generatePath(`${baseUrl}${getNavigationsValue('r-and-m.character.detail')}`, { charId })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
api: {
|
api: {},
|
||||||
main: getConfigValue('r-and-m.api')
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,4 @@ const App = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
App.displayName = "App-22";
|
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
@ -6,7 +6,7 @@ import { Link } from "../link";
|
|||||||
import { Nav, NavList } from "./nav-panel.style";
|
import { Nav, NavList } from "./nav-panel.style";
|
||||||
import { URLs } from "../../__data__/urls";
|
import { URLs } from "../../__data__/urls";
|
||||||
|
|
||||||
const _navList = [
|
const navList = [
|
||||||
{ title: "Home", href: "/r-and-m" },
|
{ title: "Home", href: "/r-and-m" },
|
||||||
{ title: "Персонажи", href: "/r-and-m/search" },
|
{ title: "Персонажи", href: "/r-and-m/search" },
|
||||||
{ title: "Локации", href: "#03" },
|
{ title: "Локации", href: "#03" },
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
// @es-lint-ignore-file
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom/client';
|
import ReactDOM from 'react-dom/client';
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ import { Link } from "../components/link";
|
|||||||
import { Card } from "../components/card";
|
import { Card } from "../components/card";
|
||||||
import { Header1 } from "../components/common";
|
import { Header1 } from "../components/common";
|
||||||
import { ErrorBoundary } from "../components/error-boundary";
|
import { ErrorBoundary } from "../components/error-boundary";
|
||||||
import { URLs } from "../__data__/urls";
|
import { Button } from "../components/button";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
BrandText,
|
BrandText,
|
||||||
@ -26,7 +26,7 @@ import {
|
|||||||
export const LandingPage = () => {
|
export const LandingPage = () => {
|
||||||
const [data, setData] = useState([])
|
const [data, setData] = useState([])
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetch(`${URLs.api.main}/landing-data`)
|
fetch('/api/landing-data')
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
setData(data.data)
|
setData(data.data)
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"error": "not found"
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user