Compare commits

...

22 Commits
master ... main

Author SHA1 Message Date
8cea7dd0f9 a bit tests 2024-05-18 15:32:04 +03:00
2ce27bf8de post stubs example 2024-05-18 14:41:38 +03:00
0f3ddfb9f5 post /login stub example 2024-05-18 14:03:21 +03:00
eac5118aca 1.1.0 2024-05-18 13:29:08 +03:00
2c0e724539 api url from config 2024-05-18 13:26:01 +03:00
ee88e832a6 change description 2024-05-18 12:35:59 +03:00
d22ca1a6d4 uncomment componentss 2024-05-13 17:22:07 +03:00
d435ec06be fetch landing data 2024-05-11 14:39:59 +03:00
c70b0e7236 error boundary 2024-05-04 15:33:31 +03:00
bae7e17444 1.0.0 2024-05-04 14:59:54 +03:00
0daa177626 Merge branch 'main' of ssh://85.143.175.152:222/inno-js/rick-and-morty 2024-05-04 14:58:46 +03:00
1db1a2efce react-router-dom 2024-05-04 14:58:19 +03:00
bb49021fb8 search sscreen 2024-05-04 12:32:19 +03:00
1a8a38186d Merge pull request 'replace style.css by components' (#3) from feature/landing-main-blocks into main
Reviewed-on: https://git.inno-js.ru/inno-js/rick-and-morty/pulls/3
2024-05-02 22:59:08 +03:00
3652b99f4c replace style.css by components 2024-05-02 22:57:42 +03:00
9de669e3c1 Merge pull request '(#1) Landing on Card component' (#2) from feature/landing-main-blocks into main
Reviewed-on: https://git.inno-js.ru/inno-js/rick-and-morty/pulls/2
2024-04-20 22:34:55 +03:00
79bed2dae6 (#1) Добил вёрстку центральных блоков landing 2024-04-20 22:33:06 +03:00
68e94680e3 (#1) Landing on Card component 2024-04-20 15:14:49 +03:00
388aec2050 Подготовка компонента на лэндинг 2024-04-20 13:23:27 +03:00
d79676cbb4 13.04 components + maps 2024-04-13 19:26:25 +03:00
f2df14caa3 check jenkins script 2024-04-11 12:53:50 +03:00
9eafbace4c fix images 2024-04-09 23:52:33 +03:00
51 changed files with 6855 additions and 368 deletions

24
eslint.config.mjs Normal file
View File

@ -0,0 +1,24 @@
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"]
}
];

View File

@ -1,119 +0,0 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Рик и Морти</title>
<link rel="stylesheet" href="./style/main.css" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=PT+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap"
rel="stylesheet"
/>
<link
rel="apple-touch-icon"
sizes="180x180"
href="./assets/favicon/apple-touch-icon.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="./assets/favicon/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="./assets/favicon/favicon-16x16.png"
/>
<link rel="manifest" href="./assets/favicon/site.webmanifest" />
<style>
* {
margin: 0;
padding: 0;
list-style: none;
}
</style>
</head>
<body>
<header id="header">
<img
class="logo"
height="44p"
width="227"
src="./assets/logo_4x.png"
alt="Логотип. Надпись Рик и Морти"
srcset="
./assets/logo_1x.png 220w,
./assets/logo_2x.png 445w,
./assets/logo_4x.png 880w
"
sizes="
(max-width: 240px) 100px,
(min-width: 320px) 440px,
(min-width: 520px) 880px
"
/>
<nav class="nav">
<ul>
<li><a class="link" href="#01">Home</a></li>
<li><a class="link link__contrast" href="#02">Персонажи</a></li>
<li><a class="link link__contrast" href="#03">Локации</a></li>
<li><a class="link link__contrast" href="#04">Эризоды</a></li>
</ul>
</nav>
</header>
<main class="main">
<header class="card card-main">
<div class="card-text">
<h1 class="h1">
Персонажи из <br /><span class="brand-text"
>огурчиковой вселенной</span
>
</h1>
<p class="p card--text__p">
На этой странице представлены персонажи из сериала “<a
class="link"
href="#"
>Rick and Morty</a
>”. Этот популярный анимационный сериал, созданный Джастином
Ройландом и Дэном Хармоном, рассказывает о приключениях Рика
Санчеза, гениального и эксцентричного ученого, и его внука Морти
Смита.
</p>
</div>
<img class="card--img" src="./assets/cucumber.png" alt="" />
</header>
<article class="card card__toRight">
<div class="card-text">
<h1 class="h1">
Персонажи из <br /><span class="brand-text"
>огурчиковой вселенной</span
>
</h1>
<p class="p card--text__p">
На этой странице представлены персонажи из сериала “<a
class="link"
href="#"
>Rick and Morty</a
>”. Этот популярный анимационный сериал, созданный Джастином
Ройландом и Дэном Хармоном, рассказывает о приключениях Рика
Санчеза, гениального и эксцентричного ученого, и его внука Морти
Смита.
</p>
</div>
<img class="card--img" src="./assets/cucumber.png" alt="" />
</article>
</main>
<aside></aside>
<footer class="page-footer"></footer>
</body>
</html>

View File

@ -1,14 +0,0 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Рик и Морти</title>
<link rel="apple-touch-icon" sizes="180x180" href="./assets/favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="./assets/favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="./assets/favicon/favicon-16x16.png" />
<link rel="manifest" href="./assets/favicon/site.webmanifest" />
</head>
<body></body>
</html>

View File

@ -1,22 +1,24 @@
const pkg = require('./package') const pkg = require("./package");
module.exports = { module.exports = {
apiPath: 'stubs/api', apiPath: "stubs/api",
webpackConfig: { webpackConfig: {
output: { output: {
publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/` publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
} },
}, },
/* use https://kc.admin.inno-js.ru/ to create config, navigations and features */ /* use https://kc.admin.inno-js.ru/ to create config, navigations and features */
navigations: { navigations: {
'r-and-m.main': '/r-and-m' "r-and-m.main": "/r-and-m",
"r-and-m.search": "/search",
"r-and-m.character.detail": "/char/:charId"
}, },
features: { features: {
'r-and-m': { "r-and-m": {
// add your features here in the format [featureName]: { value: string } // add your features here in the format [featureName]: { value: string }
}, },
}, },
config: { config: {
key: 'value' "r-and-m.api": "/api"
} },
} };

9
index.d.ts vendored Normal file
View File

@ -0,0 +1,9 @@
declare module '*.png' {
const path: string;
export default path;
}
declare module '*.svg' {
const path: string;
export default path;
}

202
jest.config.js Normal file
View File

@ -0,0 +1,202 @@
/**
* 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;

5209
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +1,44 @@
{ {
"name": "r-and-m", "name": "r-and-m",
"version": "1.0.0", "version": "1.1.0",
"description": "![Рик огурчик!!!](./docs/cucumber.webp)", "description": "Рик огурчик",
"main": "./src/index.tsx", "main": "./src/index.tsx",
"directories": { "directories": {
"doc": "docs" "doc": "docs"
}, },
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "jest",
"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": [],
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@ijl/cli": "^5.1.0", "@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",
"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"
} }
} }

19
src/__data__/urls.ts Normal file
View File

@ -0,0 +1,19 @@
import { getNavigationsValue, getConfigValue } from '@ijl/cli';
import { generatePath } from 'react-router-dom';
const baseUrl = getNavigationsValue('r-and-m.main');
export const URLs = {
baseUrl,
ui: {
search: getNavigationsValue('r-and-m.search') && `${baseUrl}${getNavigationsValue('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 })
}
},
api: {
main: getConfigValue('r-and-m.api')
},
}

View File

@ -0,0 +1,473 @@
[
{
"id": 2,
"name": "Morty Smith",
"status": "Alive",
"species": "Human",
"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/2.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/1",
"https://rickandmortyapi.com/api/episode/2",
"https://rickandmortyapi.com/api/episode/3",
"https://rickandmortyapi.com/api/episode/4",
"https://rickandmortyapi.com/api/episode/5",
"https://rickandmortyapi.com/api/episode/6",
"https://rickandmortyapi.com/api/episode/7",
"https://rickandmortyapi.com/api/episode/8",
"https://rickandmortyapi.com/api/episode/9",
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/11",
"https://rickandmortyapi.com/api/episode/12",
"https://rickandmortyapi.com/api/episode/13",
"https://rickandmortyapi.com/api/episode/14",
"https://rickandmortyapi.com/api/episode/15",
"https://rickandmortyapi.com/api/episode/16",
"https://rickandmortyapi.com/api/episode/17",
"https://rickandmortyapi.com/api/episode/18",
"https://rickandmortyapi.com/api/episode/19",
"https://rickandmortyapi.com/api/episode/20",
"https://rickandmortyapi.com/api/episode/21",
"https://rickandmortyapi.com/api/episode/22",
"https://rickandmortyapi.com/api/episode/23",
"https://rickandmortyapi.com/api/episode/24",
"https://rickandmortyapi.com/api/episode/25",
"https://rickandmortyapi.com/api/episode/26",
"https://rickandmortyapi.com/api/episode/27",
"https://rickandmortyapi.com/api/episode/28",
"https://rickandmortyapi.com/api/episode/29",
"https://rickandmortyapi.com/api/episode/30",
"https://rickandmortyapi.com/api/episode/31",
"https://rickandmortyapi.com/api/episode/32",
"https://rickandmortyapi.com/api/episode/33",
"https://rickandmortyapi.com/api/episode/34",
"https://rickandmortyapi.com/api/episode/35",
"https://rickandmortyapi.com/api/episode/36",
"https://rickandmortyapi.com/api/episode/37",
"https://rickandmortyapi.com/api/episode/38",
"https://rickandmortyapi.com/api/episode/39",
"https://rickandmortyapi.com/api/episode/40",
"https://rickandmortyapi.com/api/episode/41",
"https://rickandmortyapi.com/api/episode/42",
"https://rickandmortyapi.com/api/episode/43",
"https://rickandmortyapi.com/api/episode/44",
"https://rickandmortyapi.com/api/episode/45",
"https://rickandmortyapi.com/api/episode/46",
"https://rickandmortyapi.com/api/episode/47",
"https://rickandmortyapi.com/api/episode/48",
"https://rickandmortyapi.com/api/episode/49",
"https://rickandmortyapi.com/api/episode/50",
"https://rickandmortyapi.com/api/episode/51"
],
"url": "https://rickandmortyapi.com/api/character/2",
"created": "2017-11-04T18:50:21.651Z"
},
{
"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"
},
{
"id": 18,
"name": "Antenna Morty",
"status": "Alive",
"species": "Human",
"type": "Human with antennae",
"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/18.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/28"
],
"url": "https://rickandmortyapi.com/api/character/18",
"created": "2017-11-04T22:25:29.008Z"
},
{
"id": 21,
"name": "Aqua Morty",
"status": "unknown",
"species": "Humanoid",
"type": "Fish-Person",
"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/21.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/22"
],
"url": "https://rickandmortyapi.com/api/character/21",
"created": "2017-11-04T22:39:48.055Z"
},
{
"id": 27,
"name": "Artist Morty",
"status": "Alive",
"species": "Human",
"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/27.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/28"
],
"url": "https://rickandmortyapi.com/api/character/27",
"created": "2017-11-05T08:59:07.457Z"
},
{
"id": 42,
"name": "Big Head Morty",
"status": "unknown",
"species": "Human",
"type": "Human with giant head",
"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/42.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/22"],
"url": "https://rickandmortyapi.com/api/character/42",
"created": "2017-11-05T10:15:53.349Z"
},
{
"id": 43,
"name": "Big Morty",
"status": "Dead",
"species": "Human",
"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/43.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/43",
"created": "2017-11-05T10:17:04.997Z"
},
{
"id": 44,
"name": "Body Guard Morty",
"status": "Dead",
"species": "Human",
"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/44.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/44",
"created": "2017-11-05T10:18:11.062Z"
},
{
"id": 53,
"name": "Blue Shirt Morty",
"status": "unknown",
"species": "Human",
"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/53.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/10"],
"url": "https://rickandmortyapi.com/api/character/53",
"created": "2017-11-05T11:28:38.627Z"
},
{
"id": 61,
"name": "Campaign Manager Morty",
"status": "Dead",
"species": "Human",
"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/61.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/61",
"created": "2017-11-05T11:53:44.737Z"
},
{
"id": 73,
"name": "Cop Morty",
"status": "Dead",
"species": "Human",
"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/73.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/73",
"created": "2017-11-30T11:43:04.217Z"
},
{
"id": 77,
"name": "Cowboy Morty",
"status": "Alive",
"species": "Human",
"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/77.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/10"],
"url": "https://rickandmortyapi.com/api/character/77",
"created": "2017-11-30T14:13:17.371Z"
},
{
"id": 83,
"name": "Cronenberg Morty",
"status": "unknown",
"species": "Cronenberg",
"type": "",
"gender": "Male",
"origin": {
"name": "Cronenberg Earth",
"url": "https://rickandmortyapi.com/api/location/12"
},
"location": {
"name": "Earth (C-137)",
"url": "https://rickandmortyapi.com/api/location/1"
},
"image": "https://rickandmortyapi.com/api/character/avatar/83.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/6",
"https://rickandmortyapi.com/api/episode/10"
],
"url": "https://rickandmortyapi.com/api/character/83",
"created": "2017-11-30T20:02:29.204Z"
},
{
"id": 84,
"name": "Cult Leader Morty",
"status": "Alive",
"species": "Human",
"type": "",
"gender": "Male",
"origin": {
"name": "unknown",
"url": ""
},
"location": {
"name": "Hideout Planet",
"url": "https://rickandmortyapi.com/api/location/27"
},
"image": "https://rickandmortyapi.com/api/character/avatar/84.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/10"],
"url": "https://rickandmortyapi.com/api/character/84",
"created": "2017-11-30T20:41:48.080Z"
},
{
"id": 85,
"name": "Cyclops Morty",
"status": "Alive",
"species": "Humanoid",
"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/85.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/28"
],
"url": "https://rickandmortyapi.com/api/character/85",
"created": "2017-11-30T20:49:52.133Z"
},
{
"id": 95,
"name": "Dipper and Mabel Mortys",
"status": "unknown",
"species": "Human",
"type": "",
"gender": "unknown",
"origin": {
"name": "unknown",
"url": ""
},
"location": {
"name": "Citadel of Ricks",
"url": "https://rickandmortyapi.com/api/location/3"
},
"image": "https://rickandmortyapi.com/api/character/avatar/95.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/22"],
"url": "https://rickandmortyapi.com/api/character/95",
"created": "2017-12-01T11:54:36.670Z"
},
{
"id": 113,
"name": "Eric Stoltz Mask Morty",
"status": "unknown",
"species": "Human",
"type": "",
"gender": "Male",
"origin": {
"name": "Eric Stoltz Mask Earth",
"url": "https://rickandmortyapi.com/api/location/33"
},
"location": {
"name": "Earth (Replacement Dimension)",
"url": "https://rickandmortyapi.com/api/location/20"
},
"image": "https://rickandmortyapi.com/api/character/avatar/113.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/10"],
"url": "https://rickandmortyapi.com/api/character/113",
"created": "2017-12-26T13:43:29.296Z"
},
{
"id": 118,
"name": "Evil Morty",
"status": "Alive",
"species": "Human",
"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/118.jpeg",
"episode": [
"https://rickandmortyapi.com/api/episode/10",
"https://rickandmortyapi.com/api/episode/28",
"https://rickandmortyapi.com/api/episode/51"
],
"url": "https://rickandmortyapi.com/api/character/118",
"created": "2017-12-26T16:13:41.103Z"
},
{
"id": 123,
"name": "Fat Morty",
"status": "Alive",
"species": "Human",
"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/123.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/123",
"created": "2017-12-26T17:22:40.315Z"
},
{
"id": 143,
"name": "Glasses Morty",
"status": "Alive",
"species": "Human",
"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/143.jpeg",
"episode": ["https://rickandmortyapi.com/api/episode/28"],
"url": "https://rickandmortyapi.com/api/character/143",
"created": "2017-12-27T20:37:26.134Z"
}
]

14
src/__tests__/sum.test.ts Normal file
View File

@ -0,0 +1,14 @@
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)
})
})

View File

@ -1,14 +1,19 @@
import React from 'react'; import React from "react";
import { Global } from "@emotion/react";
import { BrowserRouter } from "react-router-dom";
import { LandingPage } from './pages/landing' import { globalStyles } from "./global-styles";
import { PageRoutes } from "./routes";
import './style/main.css'
const App = () => { const App = () => {
return ( return (
<LandingPage /> <BrowserRouter>
<Global styles={globalStyles} />
<PageRoutes />
</BrowserRouter>
); );
}; };
export default App; App.displayName = "App-22";
export default App;

View File

@ -0,0 +1,5 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11" stroke="#2E81FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M15 3H21V9" stroke="#2E81FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M10 14L21 3" stroke="#2E81FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 644 B

View File

@ -0,0 +1 @@
export { default as externalIcon } from './external-link.svg';

View File

@ -0,0 +1 @@
export * as landing from './landing';

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

View File

@ -0,0 +1,4 @@
export { default as beth } from './beth.png';
export { default as jerry } from './jerry.png';
export { default as morty } from './morty.png';
export { default as rick } from './rick.png';

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

View File

@ -0,0 +1,11 @@
import styled from "@emotion/styled";
export const ButtonStyled = styled.button`
padding: 4px 7px;
border-color: var(--main-dark);
border-style: solid;
border-radius: 5px;
background-image: var(--gradient-cucumber);
color: white;
font-size: 26px;
`;

View File

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

View File

@ -0,0 +1 @@
export { Button } from "./button";

View File

@ -0,0 +1,56 @@
import { css } from "@emotion/react";
import styled from "@emotion/styled";
export const CardWrapper = styled.article`
display: flex;
flex-direction: column;
margin-top: 24px;
border-radius: 30px;
box-shadow: 0 0 26px 2px #0000001c;
background: rgba(255, 255, 255, 0.59);
padding: 24px;
`;
export const CardImage = styled.img<{ directionReverse: boolean }>`
width: 300px;
height: 300px;
margin-left: 0;
margin-right: auto;
${props => props.directionReverse && css`
margin-left: auto;
margin-right: 0;
`}
`;
export const CardHeader = styled.header`
display: flex;
justify-content: space-between;
font-size: 24px;
font-weight: 800;
align-items: center;
`;
export const SubHeader = styled.h2`
color: #659a26;
font-size: 24px;
`;
export const Content = styled.div<{ directionReverse: boolean }>`
display: flex;
flex-direction: row;
gap: 40px;
${props => {
if (props.directionReverse) {
return css`
flex-direction: row-reverse;
`;
}
}}
`;
export const CardText = styled.p`
font-size: 24px;
`;

View File

@ -0,0 +1,50 @@
import React from "react";
import { landing } from "../../assets/images";
import { Header1 } from "../common";
import { Link } from "../link";
import {
CardHeader,
CardWrapper,
SubHeader,
Content,
CardImage,
CardText,
} from "./card.style";
export const Card = ({
title,
subTitle,
children,
image,
link,
directionReverse,
}) => (
<CardWrapper>
<CardHeader>
{title && (
<Header1>
<Link inheritColor href={link}>
{title}
</Link>
</Header1>
)}
{subTitle && <SubHeader>{subTitle}</SubHeader>}
</CardHeader>
<Content directionReverse={directionReverse}>
{image && (
<CardImage directionReverse={directionReverse} src={landing[image]} />
)}
<CardText>{children}</CardText>
</Content>
</CardWrapper>
);
Card.defaultProps = {
title: void 0,
subTitle: void 0,
image: void 0,
link: void 0,
directionReverse: false,
};

View File

@ -0,0 +1,2 @@
export { Card } from './card'
export { CardWrapper } from './card.style'

11
src/components/common.ts Normal file
View File

@ -0,0 +1,11 @@
import styled from "@emotion/styled";
export const Header1 = styled.h1`
margin-top: 32px;
margin-bottom: 24px;
font-size: 47px;
`;
export const Paragraph = styled.p`
font-size: 24px;
`;

View File

@ -0,0 +1,21 @@
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
}
}

View File

@ -0,0 +1,21 @@
import styled from "@emotion/styled";
export const FieldWrapper = styled.div`
display: flex;
flex-direction: column;
`;
export const FieldLabel = styled.label`
padding: 12px 0;
font-size: 24px;
`;
export const FieldInput = styled.input`
min-height: 24px;
border-width: 2px;
border-radius: 6px;
border-color: #3d3d3d;
border-style: solid;
padding: 6px 4px;
font-size: 16px;
`;

View File

@ -0,0 +1,18 @@
import React from "react";
import { FieldInput, FieldLabel, FieldWrapper } from "./field.style";
export const InputField = ({ id, placeHolder, value, label, onChange, inputRef }) => {
return (
<FieldWrapper>
<FieldLabel htmlFor={id}>
{label}
</FieldLabel>
<FieldInput ref={inputRef} id={id} type="text" placeholder={placeHolder} value={value} onChange={onChange} />
</FieldWrapper>
);
};
InputField.defaultProps = {
id: `input-${(Math.random() * 10).toString()}`,
};

View File

View File

@ -0,0 +1 @@
export { Link } from './link'

View File

@ -0,0 +1,35 @@
import styled from "@emotion/styled";
import { css } from "@emotion/react";
import { Link as ConnectedLink } from 'react-router-dom';
export const StyledLink = styled(ConnectedLink)<{
contrast?: boolean;
inheritColor?: boolean;
}>`
font-weight: 400;
text-decoration: underline;
text-decoration-skip-ink: none;
color: ${(props: any) =>
props.contrast ? "var(--text-contrast)" : "var(--dark-link)"};
${(props) => {
if (props.contrast) {
return css`
&:hover {
color: var(--dark-link);
}
`;
}
}}
${(props) => {
if (props.inheritColor) {
return css`
font-weight: inherit;
color: inherit;
text-decoration: inherit;
`;
}
}}
`;

View File

@ -0,0 +1,35 @@
import React, { useMemo } from "react";
import { externalIcon } from '../../assets/icons'
import { StyledLink } from './link.styled'
interface LinkProps {
href: string;
children: React.ReactNode;
contrast?: boolean;
inheritColor?: boolean;
}
export const Link = (props: LinkProps) => {
const isExternal = useMemo(() => props.href?.startsWith('http'), [props.href]);
const linkProps: any = {}
if (isExternal) {
linkProps.target = '_blank'
linkProps.rel = 'noopener noreferrer'
}
return (
<StyledLink reloadDocument={isExternal} inheritColor={props.inheritColor} contrast={props.contrast} to={props.href} {...linkProps}>
{props.children}
{isExternal && <img src={externalIcon} alt="external link icon" />}
</StyledLink>
);
};
Link.defaultProps = {
contrast: false,
inheritColor: false,
}

View File

@ -0,0 +1 @@
export { NavPanel } from './nav-panel'

View File

@ -0,0 +1,14 @@
import styled from "@emotion/styled";
export const Nav = styled.nav`
background-color: var(--main-transparent);
padding: 16px 64px 16px 33px;
border-bottom-left-radius: 20px;
font-size: 16px;
`;
export const NavList = styled.ul`
display: flex;
gap: 12px;
list-style: none;
`;

View File

@ -0,0 +1,46 @@
import React from "react";
// import { Link as ConnectedLink } from 'react-router-dom'
import { Link } from "../link";
import { Nav, NavList } from "./nav-panel.style";
import { URLs } from "../../__data__/urls";
const _navList = [
{ title: "Home", href: "/r-and-m" },
{ title: "Персонажи", href: "/r-and-m/search" },
{ title: "Локации", href: "#03" },
{ title: "Эризоды", href: "#04" },
];
const nav = {
home: { title: "Home", href: URLs.baseUrl },
search: { title: "Персонажи", href: URLs.ui.search },
};
export function NavPanel({ currentNavElement }) {
return (
<Nav>
<NavList>
<li>
<Link
contrast={currentNavElement === nav.home.title}
href={nav.home.href}
>
{nav.home.title}
</Link>
</li>
{URLs.ui.search && (
<li>
<Link
contrast={currentNavElement === nav.search.title}
href={nav.search.href}
>
{nav.search.title}
</Link>
</li>
)}
</NavList>
</Nav>
);
}

37
src/global-styles.ts Normal file
View File

@ -0,0 +1,37 @@
import { css } from "@emotion/react";
export const globalStyles = css`
:root {
--dark-link: #2e81ff;
--main: #43888c;
--main-transparent: #44898d66;
--main-dark: #228947;
--brand: #4d7f1e;
--accent: #6a1072;
--bg-main: #cee6e9;
--text: #000000;
--text-contrast: #ffffff;
--gradient-cucumber: linear-gradient(90deg, #2E8A47, #67AB3D);
}
html {
height: 100%;
}
body.dark {
--bg-main: #0f5c66;
}
body {
font-family: "PT Sans", sans-serif;
background-color: var(--bg-main);
color: var(--text);
font-size: 24px;
height: 100%;
}
`;

View File

@ -1,3 +1,4 @@
// @es-lint-ignore-file
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';

View File

@ -1,98 +1,138 @@
import React from "react"; import React, { useEffect, useState } from "react";
import { NavPanel } from "../components/nav-panel";
import logo from "../assets/logo_1x.png";
import cucumber from "../assets/cucumber.png";
import logo2x from "../assets/logo_2x.png";
import logo4x from "../assets/logo_4x.png";
import { Link } from "../components/link";
import { Card } from "../components/card";
import { Header1 } from "../components/common";
import { ErrorBoundary } from "../components/error-boundary";
import { URLs } from "../__data__/urls";
import {
BrandText,
Logo,
Main,
MainCardImg,
MainCardText,
MainCardTextP,
MainCardWrapper,
PageFooter,
PageHeader,
} 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 (
<> <>
<header id="header"> <ErrorBoundary>
<img <PageHeader>
className="logo" <Logo
height="44p" height="44px"
width="227" width="227"
src="./assets/logo_4x.png" src={logo4x}
alt="Логотип. Надпись Рик и Морти" alt="Логотип. Надпись Рик и Морти"
srcSet=" srcSet={`
./assets/logo_1x.png 220w, ${logo} 220w,
./assets/logo_2x.png 445w, ${logo2x} 445w,
./assets/logo_4x.png 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"} />
<nav className="nav"> </PageHeader>
<ul> </ErrorBoundary>
<li> <Main>
<a className="link" href="#01"> <MainCardWrapper as="header">
Home <MainCardText>
</a> <Header1>
</li>
<li>
<a className="link link__contrast" href="#02">
Персонажи
</a>
</li>
<li>
<a className="link link__contrast" href="#03">
Локации
</a>
</li>
<li>
<a className="link link__contrast" href="#04">
Эризоды
</a>
</li>
</ul>
</nav>
</header>
<main className="main">
<header className="card card-main">
<div className="card-text">
<h1 className="h1">
Персонажи из <br /> Персонажи из <br />
<span className="brand-text">огурчиковой вселенной</span> <BrandText>огурчиковой вселенной</BrandText>
</h1> </Header1>
<p className="p card--text__p"> <MainCardTextP>
На этой странице представлены персонажи из сериала На этой странице представлены персонажи из сериала
<a className="link" href="#"> <Link href="#">Rick and Morty</Link>
Rick and Morty
</a>
. Этот популярный анимационный сериал, созданный Джастином . Этот популярный анимационный сериал, созданный Джастином
Ройландом и Дэном Хармоном, рассказывает о приключениях Рика Ройландом и Дэном Хармоном, рассказывает о приключениях Рика
Санчеза, гениального и эксцентричного ученого, и его внука Морти Санчеза, гениального и эксцентричного ученого, и его внука Морти
Смита. Смита.
</p> </MainCardTextP>
</div> </MainCardText>
<img className="card--img" src="./assets/cucumber.png" alt="" /> <MainCardImg src={cucumber} alt="" />
</header> </MainCardWrapper>
<article className="card card__toRight"> <ErrorBoundary>
<div className="card-text"> <Cards cards={data} />
<h1 className="h1"> </ErrorBoundary>
Персонажи из <br /> </Main>
<span className="brand-text">огурчиковой вселенной</span>
</h1>
<p className="p card--text__p"> <PageFooter></PageFooter>
На этой странице представлены персонажи из сериала
<a className="link" href="#">
Rick and Morty
</a>
. Этот популярный анимационный сериал, созданный Джастином
Ройландом и Дэном Хармоном, рассказывает о приключениях Рика
Санчеза, гениального и эксцентричного ученого, и его внука Морти
Смита.
</p>
</div>
<img className="card--img" src="./assets/cucumber.png" alt="" />
</article>
</main>
<aside></aside>
<footer className="page-footer"></footer>
</> </>
); );
}; };
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>
));
};

View File

@ -0,0 +1,124 @@
import React, { useEffect, useState, useRef } from "react";
import { Link as Connectedlink, useNavigate } from "react-router-dom";
import data from "../__stubs__/characters.json";
import logo from "../assets/logo_1x.png";
import logo2x from "../assets/logo_2x.png";
import logo4x from "../assets/logo_4x.png";
import { NavPanel } from "../components/nav-panel";
import { Header1 } from "../components/common";
import { InputField } from "../components/field/field";
import { URLs } from "../__data__/urls";
import {
BrandText,
CharName,
CharacterItem,
CharacterList,
Logo,
Main,
MainCardWrapper,
PageHeader,
SearchButton,
SearchForm,
} from "./style";
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 (
<>
<PageHeader>
<Logo
height="44px"
width="227"
src={logo4x}
alt="Логотип. Надпись Рик и Морти"
srcSet={`
${logo} 220w,
${logo2x} 445w,
${logo4x} 880w,
`}
sizes="
(max-width: 240px) 100px,
(min-width: 320px) 440px,
(min-width: 520px) 880px
"
/>
<NavPanel currentNavElement="Персонажи" />
</PageHeader>
<Main>
<MainCardWrapper style={{ flexDirection: "column" }}>
<Header1>
<BrandText>Поиск</BrandText> персонажей
</Header1>
<SearchForm onSubmit={handleSubmitSearchFrom}>
<InputField
inputRef={searchInputRef}
onChange={handleSearchChange}
value={searchValue}
label="Поиск"
placeHolder="Напишите имя для поиска"
/>
{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} />
<CharName>{char.name}</CharName>
</CharacterItem>
</Connectedlink>
))}
</CharacterList>
</Main>
</>
);
};

98
src/pages/style.ts Normal file
View File

@ -0,0 +1,98 @@
import styled from "@emotion/styled";
import { CardWrapper } from "../components/card";
import { Paragraph } from "../components/common";
import { Button } from "../components/button";
import { CardText } from "../components/card/card.style";
export const Main = styled.main`
width: 1024px;
max-width: calc(100% - 32px);
margin: 0 auto;
`;
export const MainCardWrapper = styled(CardWrapper)`
background-color: #ffffff;
flex-direction: row;
`;
export const MainCardText = styled(CardText)`
margin-top: 0;
`;
export const MainCardTextP = styled(Paragraph)`
max-width: 630px;
`;
export const MainCardImg = styled.img`
margin-left: auto;
`;
export const PageHeader = styled.header`
display: flex;
flex-wrap: wrap;
align-content: stretch;
flex-direction: row;
justify-content: space-between;
margin-bottom: 32px;
padding-left: 24px;
border-bottom: 1px solid var(--brand);
min-height: 62px;
align-items: flex-start;
`;
export const BrandText = styled.span`
color: var(--brand);
`;
export const Logo = styled.img`
margin: auto 0;
`;
export const PageFooter = styled.footer`
min-height: 100px;
background-color: var(--accent);
margin-top: 64px;
`;
export const SearchForm = styled.form`
display: flex;
align-items: flex-end;
width: 100%;
`;
export const SearchButton = styled(Button)`
height: 40px;
margin-left: 24px;
padding-left: 24px;
padding-right: 24px;
font-size: 16px;
`;
export const CharacterList = styled.ul`
margin-top: 24px;
list-style: none;
display: flex;
flex-wrap: wrap;
gap: 12px;
padding: 0;
align-items: center;
justify-content: center;
`;
export const CharacterItem = styled.li`
position: relative;
`;
export const CharName = styled.p`
position: absolute;
color: white;
bottom: 5px;
right: 0;
margin: 0;
/* text-shadow: 0 0 2px #000; */
color: black;
background-color: #fff;
padding: 2px;
`;

21
src/routes.tsx Normal file
View File

@ -0,0 +1,21 @@
import React from "react";
import { Routes, Route } from "react-router-dom";
import { URLs } from "./__data__/urls";
import { LandingPage } from "./pages/landing";
import { SearchCharacterPage } from "./pages/search-character";
import { ErrorBoundary } from "./components/error-boundary";
export const PageRoutes = () => (
<ErrorBoundary>
<Routes>
<Route path={URLs.ui.charDetail.url} element={<LandingPage />} />
<Route path={URLs.baseUrl} element={<LandingPage />} />
{URLs.ui.search && (
<Route path={URLs.ui.search} element={<SearchCharacterPage />} />
)}
<Route path="*" element={<h1>Page not found</h1>} />
</Routes>
</ErrorBoundary>
);

View File

@ -1,131 +0,0 @@
:root {
--dark-link: #2E81FF;
--main: #43888C;
--main-transparent: #44898d66;
--brand: #4D7F1E;
--accent: #6A1072;
--bg-main: #cee6e9;
--text: #000000;
--text-contrast: #ffffff;
}
html { height: 100%; }
body.dark {
--bg-main: #0f5c66;
}
body {
font-family: "PT Sans", sans-serif;
background-color: var(--bg-main);
color: var(--text);
font-size: 24px;
height: 100%;
}
.brand-text {
color: var(--brand);
}
.link {
font-weight: 400;
text-decoration: underline;
text-decoration-skip-ink: none;
color: var(--dark-link);
}
.link__contrast {
color: var(--text-contrast);
}
.p {
font-size: 24px;
}
#header {
display: flex;
flex-wrap: wrap;
align-content: stretch;
flex-direction: row;
justify-content: space-between;
margin-bottom: 32px;
padding-left: 24px;
border-bottom: 1px solid var(--brand);
min-height: 62px;
align-items: flex-start;
}
.logo {
margin: auto 0;
}
.main {
width: 1024px;
max-width: calc(100% - 32px);
margin: 0 auto;
}
.card {
margin-top: 24px;
border-radius: 30px;
box-shadow: 0 0 26px 2px #0000001c;
background: rgba(255, 255, 255, 0.59);
padding: 24px;
display: flex;
}
.card-main {
background-color: #ffffff;
}
.h1 {
margin-top: 32px;
margin-bottom: 24px;
font-size: 47px;
}
.card--text {
display: flex;
flex-direction: column;
margin-right: auto;
}
.card__toRight {
flex-direction: row-reverse;
}
.card__toRight .card--img {
margin-left: 0;
margin-right: auto;
}
.card--text__p {
max-width: 630px;
}
.card--img {
margin-left: auto;
}
.nav ul {
display: flex;
gap: 12px;
}
.nav {
background-color: var(--main-transparent);
padding: 16px 64px 16px 33px;
border-bottom-left-radius: 20px;
font-size: 16px;
}
.page-footer {
min-height: 100px;
background-color: var(--accent);
margin-top: 64px;
}

8
src/utils/sum.ts Normal file
View File

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

View File

@ -1,3 +1,26 @@
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;

View File

@ -0,0 +1,3 @@
{
"error": "not found"
}

View File

@ -0,0 +1,40 @@
{
"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\"!"
}
]
}

View File

@ -0,0 +1,24 @@
{
"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"
}
]
}

View File

@ -0,0 +1,24 @@
{
"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"
}
]
}

View File

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