Compare commits
No commits in common. "main" and "feature/landing-main-blocks" have entirely different histories.
main
...
feature/la
@ -1,26 +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"]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ignores: ['stubs/**/*']
|
|
||||||
}
|
|
||||||
];
|
|
@ -19,6 +19,6 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
"r-and-m.api": "/api"
|
key: "value",
|
||||||
},
|
},
|
||||||
};
|
};
|
202
jest.config.js
202
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;
|
|
9717
package-lock.json
generated
9717
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
27
package.json
27
package.json
@ -1,44 +1,31 @@
|
|||||||
{
|
{
|
||||||
"name": "r-and-m",
|
"name": "r-and-m",
|
||||||
"version": "2.0.0",
|
"version": "0.0.0",
|
||||||
"description": "Рик огурчик",
|
"description": "![Рик огурчик!!!](./docs/cucumber.webp)",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"directories": {
|
"directories": {
|
||||||
"doc": "docs"
|
"doc": "docs"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"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"
|
"clean": "rimraf dist"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brojs/cli": "^1.6.3",
|
|
||||||
"@emotion/react": "^11.11.4",
|
"@emotion/react": "^11.11.4",
|
||||||
"@emotion/styled": "^11.11.5",
|
"@emotion/styled": "^11.11.5",
|
||||||
|
"@ijl/cli": "^5.1.0",
|
||||||
"@types/react": "^18.2.74",
|
"@types/react": "^18.2.74",
|
||||||
"@types/react-dom": "^18.2.24",
|
"@types/react-dom": "^18.2.24",
|
||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"jest-environment-jsdom": "^29.7.0",
|
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"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",
|
|
||||||
"@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"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,19 +1,17 @@
|
|||||||
import { getNavigationValue, getConfigValue } from '@brojs/cli';
|
import { getNavigationsValue } from '@ijl/cli';
|
||||||
import { generatePath } from 'react-router-dom';
|
import { generatePath } from 'react-router-dom';
|
||||||
|
|
||||||
const baseUrl = getNavigationValue('r-and-m.main');
|
const baseUrl = getNavigationsValue('r-and-m.main');
|
||||||
|
|
||||||
export const URLs = {
|
export const URLs = {
|
||||||
baseUrl,
|
baseUrl,
|
||||||
ui: {
|
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: {
|
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: {
|
api: {},
|
||||||
main: getConfigValue('r-and-m.api')
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
38
src/__stubs__/landing-data.json
Normal file
38
src/__stubs__/landing-data.json
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"id": "0.9212559272707432",
|
||||||
|
"title": "Рик Санчез",
|
||||||
|
"subTitle": "Главный герой",
|
||||||
|
"body": "Он ученый-изобретатель, который путешествует по разным мирам и измерениям, используя свою уникальную машину для путешествий. Рик обладает острым умом и нестандартным мышлением, что позволяет ему решать самые сложные проблемы. Он также известен своим цинизмом и сарказмом, что делает его персонажем с ярким характером.",
|
||||||
|
"image": "rick",
|
||||||
|
"link": "https://en.wikipedia.org/wiki/Rick_Sanchez"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0.44732992281434125",
|
||||||
|
"title": "Морти Смит",
|
||||||
|
"subTitle": "Внук Рика",
|
||||||
|
"body": "Обычный подросток, который часто оказывается втянутым в приключения своего дедушки. Морти часто испытывает трудности с принятием решений и не всегда понимает, что происходит вокруг него. Однако, несмотря на свою неопытность, Морти часто оказывается ключевым элементом в решении сложных ситуаций.",
|
||||||
|
"image": "morty",
|
||||||
|
"link": "https://en.wikipedia.org/wiki/morty"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0.9858955616085823",
|
||||||
|
"title": "Бет Смит",
|
||||||
|
"subTitle": "Мать Морти",
|
||||||
|
"body": "Бет Смит также является мамой Морти. Она врач и мать-одиночка, которая старается поддерживать свою семью. Бет часто оказывается в конфликте с Риком из-за его безответственного поведения и постоянных приключений. Однако, несмотря на все трудности, Бет всегда готова прийти на помощь своей семье.",
|
||||||
|
"image": "beth",
|
||||||
|
"link": "https://en.wikipedia.org/wiki/beth"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0.1590784370756242",
|
||||||
|
"title": "Джерри Смит",
|
||||||
|
"subTitle": "Отец Морти",
|
||||||
|
"body": "Джерри Смит - муж Бет. Он обычный человек, который старается справиться с жизнью в семье, полной необычных персонажей. Джерри часто оказывается в тени Рика и Морти, но он всегда готов поддержать свою семью в трудные моменты.",
|
||||||
|
"image": "jerry",
|
||||||
|
"link": "https://en.wikipedia.org/wiki/beth"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "0.29021795027285324",
|
||||||
|
"body": "Семья Смитов - это только часть персонажей, представленных в сериале \"Rick and Morty\". В сериале также присутствуют множество других интересных и запоминающихся персонажей, каждый из которых имеет свою уникальную историю и характер. На этой странице вы сможете узнать больше о каждом персонаже, его истории и роли в сериале. Мы также предлагаем вам возможность ознакомиться с интересными фактами о создании сериала и его персонажах. Присоединяйтесь к нам и погрузитесь в увлекательный мир \"Rick and Morty\"!"
|
||||||
|
}
|
||||||
|
]
|
@ -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)
|
|
||||||
})
|
|
||||||
})
|
|
@ -14,6 +14,4 @@ const App = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
App.displayName = "App-22";
|
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
@ -7,5 +7,5 @@ export const ButtonStyled = styled.button`
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
background-image: var(--gradient-cucumber);
|
background-image: var(--gradient-cucumber);
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 26px;
|
font-size: 12px;
|
||||||
`;
|
`;
|
||||||
|
@ -2,6 +2,6 @@ import React from "react";
|
|||||||
|
|
||||||
import { ButtonStyled } from "./button.style";
|
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} />;
|
return <ButtonStyled {...props} />;
|
||||||
};
|
};
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
import React from 'react'
|
|
||||||
|
|
||||||
export class ErrorBoundary extends React.Component {
|
|
||||||
state = {
|
|
||||||
error: false
|
|
||||||
}
|
|
||||||
|
|
||||||
static getDerivedStateFromError() {
|
|
||||||
return {
|
|
||||||
error: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
if (this.state.error) {
|
|
||||||
return <h1>Something went wrong.</h1>
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.props.children
|
|
||||||
}
|
|
||||||
}
|
|
@ -2,13 +2,13 @@ import React from "react";
|
|||||||
|
|
||||||
import { FieldInput, FieldLabel, FieldWrapper } from "./field.style";
|
import { FieldInput, FieldLabel, FieldWrapper } from "./field.style";
|
||||||
|
|
||||||
export const InputField = ({ id, placeHolder, value, label, onChange, inputRef }) => {
|
export const InputField = ({ id, placeHolder, value, label }) => {
|
||||||
return (
|
return (
|
||||||
<FieldWrapper>
|
<FieldWrapper>
|
||||||
<FieldLabel htmlFor={id}>
|
<FieldLabel htmlFor={id}>
|
||||||
{label}
|
{label}
|
||||||
</FieldLabel>
|
</FieldLabel>
|
||||||
<FieldInput ref={inputRef} id={id} type="text" placeholder={placeHolder} value={value} onChange={onChange} />
|
<FieldInput id={id} type="text" placeholder={placeHolder} value={value} />
|
||||||
</FieldWrapper>
|
</FieldWrapper>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -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';
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React from "react";
|
||||||
|
|
||||||
|
import data from '../__stubs__/landing-data.json'
|
||||||
import { NavPanel } from "../components/nav-panel";
|
import { NavPanel } from "../components/nav-panel";
|
||||||
import logo from "../assets/logo_1x.png";
|
import logo from "../assets/logo_1x.png";
|
||||||
import cucumber from "../assets/cucumber.png";
|
import cucumber from "../assets/cucumber.png";
|
||||||
@ -8,8 +9,6 @@ import logo4x from "../assets/logo_4x.png";
|
|||||||
import { Link } from "../components/link";
|
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 { URLs } from "../__data__/urls";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
BrandText,
|
BrandText,
|
||||||
@ -24,38 +23,28 @@ import {
|
|||||||
} from "./style";
|
} from "./style";
|
||||||
|
|
||||||
export const LandingPage = () => {
|
export const LandingPage = () => {
|
||||||
const [data, setData] = useState([])
|
|
||||||
useEffect(() => {
|
|
||||||
fetch(`${URLs.api.main}/landing-data`)
|
|
||||||
.then(response => response.json())
|
|
||||||
.then(data => {
|
|
||||||
setData(data.data)
|
|
||||||
})
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<ErrorBoundary>
|
<PageHeader>
|
||||||
<PageHeader>
|
<Logo
|
||||||
<Logo
|
height="44px"
|
||||||
height="44px"
|
width="227"
|
||||||
width="227"
|
src={logo4x}
|
||||||
src={logo4x}
|
alt="Логотип. Надпись Рик и Морти"
|
||||||
alt="Логотип. Надпись Рик и Морти"
|
srcSet={`
|
||||||
srcSet={`
|
|
||||||
${logo} 220w,
|
${logo} 220w,
|
||||||
${logo2x} 445w,
|
${logo2x} 445w,
|
||||||
${logo4x} 880w,
|
${logo4x} 880w,
|
||||||
`}
|
`}
|
||||||
sizes="
|
sizes="
|
||||||
(max-width: 240px) 100px,
|
(max-width: 240px) 100px,
|
||||||
(min-width: 320px) 440px,
|
(min-width: 320px) 440px,
|
||||||
(min-width: 520px) 880px
|
(min-width: 520px) 880px
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
<NavPanel currentNavElement={"Home"} />
|
<NavPanel currentNavElement={'Home'} />
|
||||||
</PageHeader>
|
</PageHeader>
|
||||||
</ErrorBoundary>
|
|
||||||
<Main>
|
<Main>
|
||||||
<MainCardWrapper as="header">
|
<MainCardWrapper as="header">
|
||||||
<MainCardText>
|
<MainCardText>
|
||||||
@ -75,64 +64,21 @@ export const LandingPage = () => {
|
|||||||
</MainCardText>
|
</MainCardText>
|
||||||
<MainCardImg src={cucumber} alt="" />
|
<MainCardImg src={cucumber} alt="" />
|
||||||
</MainCardWrapper>
|
</MainCardWrapper>
|
||||||
<ErrorBoundary>
|
{data.map((item, index) => (
|
||||||
<Cards cards={data} />
|
<Card
|
||||||
</ErrorBoundary>
|
directionReverse={index % 2 === 0}
|
||||||
|
key={item.id}
|
||||||
|
title={item.title}
|
||||||
|
image={item.image}
|
||||||
|
link={item.link}
|
||||||
|
subTitle={item.subTitle}
|
||||||
|
>
|
||||||
|
{item.body}
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
</Main>
|
</Main>
|
||||||
|
|
||||||
<PageFooter></PageFooter>
|
<PageFooter></PageFooter>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const Cards = ({ cards }) => {
|
|
||||||
// const [value, setValue] = useState(0);
|
|
||||||
// const card = cards[value];
|
|
||||||
|
|
||||||
// const handleNextClick = () => {
|
|
||||||
// setValue(prevValue => (prevValue + 1) % cards.length);
|
|
||||||
// };
|
|
||||||
|
|
||||||
// const handleBackClick = () => {
|
|
||||||
// setValue((value) => (value - 1 + cards.length) % cards.length);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// return (
|
|
||||||
// <>
|
|
||||||
// <div
|
|
||||||
// style={{
|
|
||||||
// marginTop: 24,
|
|
||||||
// display: "flex",
|
|
||||||
// justifyContent: "space-between",
|
|
||||||
// fontSize: "26px",
|
|
||||||
// padding: 10,
|
|
||||||
// }}
|
|
||||||
// >
|
|
||||||
// <Button style={{ visibility: value === 0 ? 'hidden' : 'visible' }} onClick={handleBackClick}>Назад</Button>
|
|
||||||
// {value !== cards.length - 1 && <Button onClick={handleNextClick}>Вперёд</Button>}
|
|
||||||
// </div>
|
|
||||||
// <Card
|
|
||||||
// directionReverse={value % 2 === 0}
|
|
||||||
// key={card.id}
|
|
||||||
// title={card.title}
|
|
||||||
// image={card.image}
|
|
||||||
// link={card.link}
|
|
||||||
// subTitle={card.subTitle}
|
|
||||||
// >
|
|
||||||
// {card.body}
|
|
||||||
// </Card>
|
|
||||||
// </>
|
|
||||||
// );
|
|
||||||
return cards.map((card, index) => (
|
|
||||||
<Card
|
|
||||||
directionReverse={index % 2 === 0}
|
|
||||||
key={card.id}
|
|
||||||
title={card.title}
|
|
||||||
image={card.image}
|
|
||||||
link={card.link}
|
|
||||||
subTitle={card.subTitle}
|
|
||||||
>
|
|
||||||
{card.body}
|
|
||||||
</Card>
|
|
||||||
));
|
|
||||||
};
|
|
||||||
|
@ -1,14 +1,11 @@
|
|||||||
import React, { useEffect, useState, useRef } from "react";
|
import React 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 data from "../__stubs__/characters.json";
|
||||||
import logo from "../assets/logo_1x.png";
|
import logo from "../assets/logo_1x.png";
|
||||||
import logo2x from "../assets/logo_2x.png";
|
import logo2x from "../assets/logo_2x.png";
|
||||||
import logo4x from "../assets/logo_4x.png";
|
import logo4x from "../assets/logo_4x.png";
|
||||||
import { NavPanel } from "../components/nav-panel";
|
import { NavPanel } from "../components/nav-panel";
|
||||||
import { Header1 } from "../components/common";
|
|
||||||
import { InputField } from "../components/field/field";
|
|
||||||
import { URLs } from "../__data__/urls";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
BrandText,
|
BrandText,
|
||||||
@ -22,54 +19,11 @@ import {
|
|||||||
SearchButton,
|
SearchButton,
|
||||||
SearchForm,
|
SearchForm,
|
||||||
} from "./style";
|
} from "./style";
|
||||||
|
import { Header1 } from "../components/common";
|
||||||
|
import { InputField } from "../components/field/field";
|
||||||
|
import { URLs } from "../__data__/urls";
|
||||||
|
|
||||||
export const SearchCharacterPage = () => {
|
export const SearchCharacterPage = () => {
|
||||||
const [searchValue, setSearchValue] = useState("");
|
|
||||||
const [searchValueError, setSearchValueError] = useState(false);
|
|
||||||
const searchInputRef = useRef<any>();
|
|
||||||
const nav = useNavigate()
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
searchInputRef.current.focus();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (/\d/.test(searchValue)) {
|
|
||||||
setSearchValueError(true)
|
|
||||||
} else {
|
|
||||||
setSearchValueError(false)
|
|
||||||
}
|
|
||||||
}, [searchValue])
|
|
||||||
|
|
||||||
const handleSearchChange = (e) => {
|
|
||||||
const value = e.currentTarget.value;
|
|
||||||
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 (
|
return (
|
||||||
<>
|
<>
|
||||||
<PageHeader>
|
<PageHeader>
|
||||||
@ -96,16 +50,9 @@ export const SearchCharacterPage = () => {
|
|||||||
<Header1>
|
<Header1>
|
||||||
<BrandText>Поиск</BrandText> персонажей
|
<BrandText>Поиск</BrandText> персонажей
|
||||||
</Header1>
|
</Header1>
|
||||||
<SearchForm onSubmit={handleSubmitSearchFrom}>
|
<SearchForm>
|
||||||
<InputField
|
<InputField label="Поиск" placeHolder="Напишите имя для поиска" />
|
||||||
inputRef={searchInputRef}
|
<SearchButton>Поиск</SearchButton>
|
||||||
onChange={handleSearchChange}
|
|
||||||
value={searchValue}
|
|
||||||
label="Поиск"
|
|
||||||
placeHolder="Напишите имя для поиска"
|
|
||||||
/>
|
|
||||||
{searchValueError && <span style={{ color: 'red', display: 'flex'}}>Ай яй</span>}
|
|
||||||
<SearchButton type="submit">Поиск</SearchButton>
|
|
||||||
</SearchForm>
|
</SearchForm>
|
||||||
</MainCardWrapper>
|
</MainCardWrapper>
|
||||||
<CharacterList>
|
<CharacterList>
|
||||||
|
@ -1,21 +1,16 @@
|
|||||||
import React from "react";
|
import React from 'react';
|
||||||
import { Routes, Route } from "react-router-dom";
|
import { Routes, Route } from'react-router-dom';
|
||||||
|
|
||||||
import { URLs } from "./__data__/urls";
|
import { URLs } from './__data__/urls';
|
||||||
import { LandingPage } from "./pages/landing";
|
import { LandingPage } from './pages/landing';
|
||||||
import { SearchCharacterPage } from "./pages/search-character";
|
import { SearchCharacterPage } from './pages/search-character';
|
||||||
import { ErrorBoundary } from "./components/error-boundary";
|
|
||||||
|
|
||||||
export const PageRoutes = () => (
|
export const PageRoutes = () => (
|
||||||
<ErrorBoundary>
|
<Routes>
|
||||||
<Routes>
|
<Route path={URLs.ui.charDetail.url} element={<LandingPage />} />
|
||||||
<Route path={URLs.ui.charDetail.url} element={<LandingPage />} />
|
<Route path={URLs.baseUrl} element={<LandingPage />} />
|
||||||
<Route path={URLs.baseUrl} element={<LandingPage />} />
|
{URLs.ui.search && <Route path={URLs.ui.search} element={<SearchCharacterPage />} />}
|
||||||
{URLs.ui.search && (
|
|
||||||
<Route path={URLs.ui.search} element={<SearchCharacterPage />} />
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Route path="*" element={<h1>Page not found</h1>} />
|
<Route path="*" element={<h1>Page not found</h1>} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</ErrorBoundary>
|
)
|
||||||
);
|
|
||||||
|
@ -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
|
|
||||||
};
|
|
@ -1,26 +1,3 @@
|
|||||||
const router = require("express").Router();
|
const router = require('express').Router();
|
||||||
|
|
||||||
router.get("/landing-data", (request, response) => {
|
|
||||||
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;
|
module.exports = router;
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"error": "not found"
|
|
||||||
}
|
|
@ -1,40 +0,0 @@
|
|||||||
{
|
|
||||||
"data": [
|
|
||||||
{
|
|
||||||
"id": "0.9212559272707432",
|
|
||||||
"title": "Рик Санчез",
|
|
||||||
"subTitle": "Главный герой",
|
|
||||||
"body": "Он ученый-изобретатель, который путешествует по разным мирам и измерениям, используя свою уникальную машину для путешествий. Рик обладает острым умом и нестандартным мышлением, что позволяет ему решать самые сложные проблемы. Он также известен своим цинизмом и сарказмом, что делает его персонажем с ярким характером.",
|
|
||||||
"image": "rick",
|
|
||||||
"link": "https://en.wikipedia.org/wiki/Rick_Sanchez"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "0.44732992281434125",
|
|
||||||
"title": "Морти Смит",
|
|
||||||
"subTitle": "Внук Рика",
|
|
||||||
"body": "Обычный подросток, который часто оказывается втянутым в приключения своего дедушки. Морти часто испытывает трудности с принятием решений и не всегда понимает, что происходит вокруг него. Однако, несмотря на свою неопытность, Морти часто оказывается ключевым элементом в решении сложных ситуаций.",
|
|
||||||
"image": "morty",
|
|
||||||
"link": "https://en.wikipedia.org/wiki/morty"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "0.9858955616085823",
|
|
||||||
"title": "Бет Смит",
|
|
||||||
"subTitle": "Мать Морти",
|
|
||||||
"body": "Бет Смит также является мамой Морти. Она врач и мать-одиночка, которая старается поддерживать свою семью. Бет часто оказывается в конфликте с Риком из-за его безответственного поведения и постоянных приключений. Однако, несмотря на все трудности, Бет всегда готова прийти на помощь своей семье.",
|
|
||||||
"image": "beth",
|
|
||||||
"link": "https://en.wikipedia.org/wiki/beth"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "0.1590784370756242",
|
|
||||||
"title": "Джерри Смит",
|
|
||||||
"subTitle": "Отец Морти",
|
|
||||||
"body": "Джерри Смит - муж Бет. Он обычный человек, который старается справиться с жизнью в семье, полной необычных персонажей. Джерри часто оказывается в тени Рика и Морти, но он всегда готов поддержать свою семью в трудные моменты.",
|
|
||||||
"image": "jerry",
|
|
||||||
"link": "https://en.wikipedia.org/wiki/beth"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "0.29021795027285324",
|
|
||||||
"body": "Семья Смитов - это только часть персонажей, представленных в сериале \"Rick and Morty\". В сериале также присутствуют множество других интересных и запоминающихся персонажей, каждый из которых имеет свою уникальную историю и характер. На этой странице вы сможете узнать больше о каждом персонаже, его истории и роли в сериале. Мы также предлагаем вам возможность ознакомиться с интересными фактами о создании сериала и его персонажах. Присоединяйтесь к нам и погрузитесь в увлекательный мир \"Rick and Morty\"!"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"data": {
|
|
||||||
"role": "sitter",
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user