Compare commits
4 Commits
8cea7dd0f9
...
feature/av
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b6a9ae10c | |||
| 624c7d9766 | |||
|
|
a5f2047cda | ||
|
|
30e5281b4a |
@@ -3,7 +3,6 @@ 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,
|
||||
@@ -20,5 +19,8 @@ export default [
|
||||
"@typescript-eslint/no-explicit-any": "off"
|
||||
},
|
||||
ignores: ["src/index.tsx"]
|
||||
},
|
||||
{
|
||||
ignores: ['stubs/**/*']
|
||||
}
|
||||
];
|
||||
5349
package-lock.json
generated
5349
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",
|
||||
"version": "1.1.0",
|
||||
"version": "2.0.0",
|
||||
"description": "Рик огурчик",
|
||||
"main": "./src/index.tsx",
|
||||
"directories": {
|
||||
@@ -8,9 +8,9 @@
|
||||
},
|
||||
"scripts": {
|
||||
"test": "jest",
|
||||
"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",
|
||||
"start": "brojs server --port=8099 --with-open-browser",
|
||||
"build": "npm run clean && brojs build --dev",
|
||||
"build:prod": "npm run clean && brojs 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",
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import { getNavigationsValue, getConfigValue } from '@ijl/cli';
|
||||
import { getNavigationValue, getConfigValue } from '@brojs/cli';
|
||||
import { generatePath } from 'react-router-dom';
|
||||
|
||||
const baseUrl = getNavigationsValue('r-and-m.main');
|
||||
const baseUrl = getNavigationValue('r-and-m.main');
|
||||
|
||||
export const URLs = {
|
||||
baseUrl,
|
||||
ui: {
|
||||
search: getNavigationsValue('r-and-m.search') && `${baseUrl}${getNavigationsValue('r-and-m.search')}`,
|
||||
search: getNavigationValue('r-and-m.search') && `${baseUrl}${getNavigationValue('r-and-m.search')}`,
|
||||
charDetail: {
|
||||
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 })
|
||||
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 })
|
||||
}
|
||||
},
|
||||
api: {
|
||||
|
||||
@@ -55,7 +55,7 @@ export const SearchCharacterPage = () => {
|
||||
search: searchValue
|
||||
}),
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
'Content-Type': 'shmapplication/json'
|
||||
}
|
||||
})
|
||||
.then((response) => response.json())
|
||||
@@ -104,15 +104,19 @@ export const SearchCharacterPage = () => {
|
||||
label="Поиск"
|
||||
placeHolder="Напишите имя для поиска"
|
||||
/>
|
||||
{searchValueError && <span style={{ color: 'red', display: 'flex'}}>Ай яй</span>}
|
||||
|
||||
{searchValueError && (
|
||||
<span style={{ color: 'red', display: 'flex'}}>Ай яй</span>
|
||||
}
|
||||
|
||||
<SearchButton type="submit">Поиск</SearchButton>
|
||||
</SearchForm>
|
||||
</MainCardWrapper>
|
||||
<CharacterList>
|
||||
{data?.map((char) => (
|
||||
<Connectedlink to={URLs.ui.charDetail.getUrl(char.id)}>
|
||||
<CharacterItem key={char.id}>
|
||||
<img src={char.image} />
|
||||
<CharacterItem>
|
||||
<img src={char.image} key={char.id} />
|
||||
<CharName>{char.name}</CharName>
|
||||
</CharacterItem>
|
||||
</Connectedlink>
|
||||
|
||||
@@ -4,7 +4,7 @@ router.get("/landing-data", (request, response) => {
|
||||
response.send(require("../json/landing-data/success.json"));
|
||||
});
|
||||
|
||||
router.post("/login", (req, res) => {
|
||||
router.smost("/login", (req, res) => {
|
||||
const { username, password } = req.body;
|
||||
if (username === "admin") {
|
||||
response.send(require("../json/user/sitter.success.json"));
|
||||
|
||||
Reference in New Issue
Block a user