Compare commits
No commits in common. "0daa177626a7765a1c55f5b510f2a7345c0b1cf5" and "1a8a38186dc6c164ef74c407411f46fd37881b81" have entirely different histories.
0daa177626
...
1a8a38186d
@ -1,24 +1,22 @@
|
|||||||
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",
|
key: 'value'
|
||||||
},
|
}
|
||||||
};
|
}
|
||||||
|
|||||||
43
package-lock.json
generated
43
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "r-and-m",
|
"name": "r-and-m",
|
||||||
"version": "0.0.0",
|
"version": "1.0.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "r-and-m",
|
"name": "r-and-m",
|
||||||
"version": "0.0.0",
|
"version": "1.0.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@emotion/react": "^11.11.4",
|
"@emotion/react": "^11.11.4",
|
||||||
@ -17,7 +17,6 @@
|
|||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -2223,14 +2222,6 @@
|
|||||||
"node": ">= 8"
|
"node": ">= 8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@remix-run/router": {
|
|
||||||
"version": "1.16.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.0.tgz",
|
|
||||||
"integrity": "sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@socket.io/component-emitter": {
|
"node_modules/@socket.io/component-emitter": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
|
||||||
@ -6558,36 +6549,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
|
||||||
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
|
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
|
||||||
},
|
},
|
||||||
"node_modules/react-router": {
|
|
||||||
"version": "6.23.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.0.tgz",
|
|
||||||
"integrity": "sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==",
|
|
||||||
"dependencies": {
|
|
||||||
"@remix-run/router": "1.16.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": ">=16.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/react-router-dom": {
|
|
||||||
"version": "6.23.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.0.tgz",
|
|
||||||
"integrity": "sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"@remix-run/router": "1.16.0",
|
|
||||||
"react-router": "6.23.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"react": ">=16.8",
|
|
||||||
"react-dom": ">=16.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rechoir": {
|
"node_modules/rechoir": {
|
||||||
"version": "0.8.0",
|
"version": "0.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
|
||||||
|
|||||||
@ -25,7 +25,6 @@
|
|||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,17 +0,0 @@
|
|||||||
import { getNavigationsValue } 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: {},
|
|
||||||
}
|
|
||||||
@ -1,473 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"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,16 +1,15 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Global } from "@emotion/react";
|
import { Global } from "@emotion/react";
|
||||||
import { BrowserRouter } from "react-router-dom";
|
|
||||||
|
|
||||||
|
import { LandingPage } from "./pages/landing";
|
||||||
import { globalStyles } from "./global-styles";
|
import { globalStyles } from "./global-styles";
|
||||||
import { PageRoutes } from "./routes";
|
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<>
|
||||||
<Global styles={globalStyles} />
|
<Global styles={globalStyles} />
|
||||||
<PageRoutes />
|
<LandingPage />
|
||||||
</BrowserRouter>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
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: 12px;
|
|
||||||
`;
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
import { ButtonStyled } from "./button.style";
|
|
||||||
|
|
||||||
export const Button = (props: React.HtmlHTMLAttributes<HTMLButtonElement>) => {
|
|
||||||
return <ButtonStyled {...props} />;
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { Button } from "./button";
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
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;
|
|
||||||
`;
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
import { FieldInput, FieldLabel, FieldWrapper } from "./field.style";
|
|
||||||
|
|
||||||
export const InputField = ({ id, placeHolder, value, label }) => {
|
|
||||||
return (
|
|
||||||
<FieldWrapper>
|
|
||||||
<FieldLabel htmlFor={id}>
|
|
||||||
{label}
|
|
||||||
</FieldLabel>
|
|
||||||
<FieldInput id={id} type="text" placeholder={placeHolder} value={value} />
|
|
||||||
</FieldWrapper>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
InputField.defaultProps = {
|
|
||||||
id: `input-${(Math.random() * 10).toString()}`,
|
|
||||||
};
|
|
||||||
@ -1,9 +1,7 @@
|
|||||||
import styled from "@emotion/styled";
|
import styled from "@emotion/styled";
|
||||||
import { css } from "@emotion/react";
|
import { css } from "@emotion/react";
|
||||||
import { Link as ConnectedLink } from 'react-router-dom';
|
|
||||||
|
|
||||||
|
export const StyledLink = styled.a<{
|
||||||
export const StyledLink = styled(ConnectedLink)<{
|
|
||||||
contrast?: boolean;
|
contrast?: boolean;
|
||||||
inheritColor?: boolean;
|
inheritColor?: boolean;
|
||||||
}>`
|
}>`
|
||||||
|
|||||||
@ -22,7 +22,7 @@ export const Link = (props: LinkProps) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledLink reloadDocument={isExternal} inheritColor={props.inheritColor} contrast={props.contrast} to={props.href} {...linkProps}>
|
<StyledLink inheritColor={props.inheritColor} contrast={props.contrast} href={props.href} {...linkProps}>
|
||||||
{props.children}
|
{props.children}
|
||||||
{isExternal && <img src={externalIcon} alt="external link icon" />}
|
{isExternal && <img src={externalIcon} alt="external link icon" />}
|
||||||
</StyledLink>
|
</StyledLink>
|
||||||
|
|||||||
@ -1,45 +1,27 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
// import { Link as ConnectedLink } from 'react-router-dom'
|
|
||||||
|
|
||||||
import { Link } from "../link";
|
import { Link } from "../link";
|
||||||
|
|
||||||
import { Nav, NavList } from "./nav-panel.style";
|
import { Nav, NavList } from "./nav-panel.style";
|
||||||
import { URLs } from "../../__data__/urls";
|
|
||||||
|
|
||||||
const navList = [
|
const navList = [
|
||||||
{ title: "Home", href: "/r-and-m" },
|
{ title: "Home", href: "#01" },
|
||||||
{ title: "Персонажи", href: "/r-and-m/search" },
|
{ title: "Персонажи", href: "#02" },
|
||||||
{ title: "Локации", href: "#03" },
|
{ title: "Локации", href: "#03" },
|
||||||
{ title: "Эризоды", href: "#04" },
|
{ title: "Эризоды", href: "#04" },
|
||||||
];
|
];
|
||||||
|
|
||||||
const nav = {
|
export function NavPanel() {
|
||||||
home: { title: "Home", href: URLs.baseUrl },
|
|
||||||
search: { title: "Персонажи", href: URLs.ui.search },
|
|
||||||
};
|
|
||||||
|
|
||||||
export function NavPanel({ currentNavElement }) {
|
|
||||||
return (
|
return (
|
||||||
<Nav>
|
<Nav className="nav">
|
||||||
<NavList>
|
<NavList>
|
||||||
<li>
|
{navList.map((element, index) => (
|
||||||
<Link
|
<li key={element.href}>
|
||||||
contrast={currentNavElement === nav.home.title}
|
<Link contrast={Boolean(index)} href={element.href}>
|
||||||
href={nav.home.href}
|
{element.title}
|
||||||
>
|
|
||||||
{nav.home.title}
|
|
||||||
</Link>
|
|
||||||
</li>
|
|
||||||
{URLs.ui.search && (
|
|
||||||
<li>
|
|
||||||
<Link
|
|
||||||
contrast={currentNavElement === nav.search.title}
|
|
||||||
href={nav.search.href}
|
|
||||||
>
|
|
||||||
{nav.search.title}
|
|
||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
)}
|
))}
|
||||||
</NavList>
|
</NavList>
|
||||||
</Nav>
|
</Nav>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -3,10 +3,8 @@ import { css } from "@emotion/react";
|
|||||||
export const globalStyles = css`
|
export const globalStyles = css`
|
||||||
:root {
|
:root {
|
||||||
--dark-link: #2e81ff;
|
--dark-link: #2e81ff;
|
||||||
|
|
||||||
--main: #43888c;
|
--main: #43888c;
|
||||||
--main-transparent: #44898d66;
|
--main-transparent: #44898d66;
|
||||||
--main-dark: #228947;
|
|
||||||
|
|
||||||
--brand: #4d7f1e;
|
--brand: #4d7f1e;
|
||||||
|
|
||||||
@ -15,8 +13,6 @@ export const globalStyles = css`
|
|||||||
--bg-main: #cee6e9;
|
--bg-main: #cee6e9;
|
||||||
--text: #000000;
|
--text: #000000;
|
||||||
--text-contrast: #ffffff;
|
--text-contrast: #ffffff;
|
||||||
|
|
||||||
--gradient-cucumber: linear-gradient(90deg, #2E8A47, #67AB3D);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
import React 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";
|
||||||
@ -9,7 +8,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 {
|
import {
|
||||||
BrandText,
|
BrandText,
|
||||||
Logo,
|
Logo,
|
||||||
@ -22,6 +20,45 @@ import {
|
|||||||
PageHeader,
|
PageHeader,
|
||||||
} from "./style";
|
} from "./style";
|
||||||
|
|
||||||
|
const data = [
|
||||||
|
{
|
||||||
|
id: Math.random().toString(),
|
||||||
|
title: "Рик Санчез",
|
||||||
|
subTitle: "Главный герой",
|
||||||
|
body: "Он ученый-изобретатель, который путешествует по разным мирам и измерениям, используя свою уникальную машину для путешествий. Рик обладает острым умом и нестандартным мышлением, что позволяет ему решать самые сложные проблемы. Он также известен своим цинизмом и сарказмом, что делает его персонажем с ярким характером.",
|
||||||
|
image: "rick",
|
||||||
|
link: "https://en.wikipedia.org/wiki/Rick_Sanchez",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: Math.random().toString(),
|
||||||
|
title: "Морти Смит",
|
||||||
|
subTitle: "Внук Рика",
|
||||||
|
body: "Обычный подросток, который часто оказывается втянутым в приключения своего дедушки. Морти часто испытывает трудности с принятием решений и не всегда понимает, что происходит вокруг него. Однако, несмотря на свою неопытность, Морти часто оказывается ключевым элементом в решении сложных ситуаций.",
|
||||||
|
image: "morty",
|
||||||
|
link: "https://en.wikipedia.org/wiki/morty",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: Math.random().toString(),
|
||||||
|
title: "Бет Смит",
|
||||||
|
subTitle: "Мать Морти",
|
||||||
|
body: "Бет Смит также является мамой Морти. Она врач и мать-одиночка, которая старается поддерживать свою семью. Бет часто оказывается в конфликте с Риком из-за его безответственного поведения и постоянных приключений. Однако, несмотря на все трудности, Бет всегда готова прийти на помощь своей семье.",
|
||||||
|
image: "beth",
|
||||||
|
link: "https://en.wikipedia.org/wiki/beth",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: Math.random().toString(),
|
||||||
|
title: "Джерри Смит",
|
||||||
|
subTitle: "Отец Морти",
|
||||||
|
body: "Джерри Смит - муж Бет. Он обычный человек, который старается справиться с жизнью в семье, полной необычных персонажей. Джерри часто оказывается в тени Рика и Морти, но он всегда готов поддержать свою семью в трудные моменты.",
|
||||||
|
image: "jerry",
|
||||||
|
link: "https://en.wikipedia.org/wiki/beth",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: Math.random().toString(),
|
||||||
|
body: 'Семья Смитов - это только часть персонажей, представленных в сериале "Rick and Morty". В сериале также присутствуют множество других интересных и запоминающихся персонажей, каждый из которых имеет свою уникальную историю и характер. На этой странице вы сможете узнать больше о каждом персонаже, его истории и роли в сериале. Мы также предлагаем вам возможность ознакомиться с интересными фактами о создании сериала и его персонажах. Присоединяйтесь к нам и погрузитесь в увлекательный мир "Rick and Morty"!',
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
export const LandingPage = () => {
|
export const LandingPage = () => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -42,7 +79,7 @@ export const LandingPage = () => {
|
|||||||
(min-width: 520px) 880px
|
(min-width: 520px) 880px
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
<NavPanel currentNavElement={'Home'} />
|
<NavPanel />
|
||||||
</PageHeader>
|
</PageHeader>
|
||||||
|
|
||||||
<Main>
|
<Main>
|
||||||
|
|||||||
@ -1,71 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { Link as Connectedlink } 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 {
|
|
||||||
BrandText,
|
|
||||||
CharName,
|
|
||||||
CharacterItem,
|
|
||||||
CharacterList,
|
|
||||||
Logo,
|
|
||||||
Main,
|
|
||||||
MainCardWrapper,
|
|
||||||
PageHeader,
|
|
||||||
SearchButton,
|
|
||||||
SearchForm,
|
|
||||||
} from "./style";
|
|
||||||
import { Header1 } from "../components/common";
|
|
||||||
import { InputField } from "../components/field/field";
|
|
||||||
import { URLs } from "../__data__/urls";
|
|
||||||
|
|
||||||
export const SearchCharacterPage = () => {
|
|
||||||
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>
|
|
||||||
<InputField label="Поиск" placeHolder="Напишите имя для поиска" />
|
|
||||||
<SearchButton>Поиск</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>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1,9 +1,8 @@
|
|||||||
import styled from "@emotion/styled";
|
import styled from "@emotion/styled";
|
||||||
|
|
||||||
import { CardWrapper } from "../components/card";
|
import { CardWrapper } from "../components/card";
|
||||||
import { Paragraph } from "../components/common";
|
|
||||||
import { Button } from "../components/button";
|
|
||||||
import { CardText } from "../components/card/card.style";
|
import { CardText } from "../components/card/card.style";
|
||||||
|
import { Paragraph } from "../components/common";
|
||||||
|
|
||||||
export const Main = styled.main`
|
export const Main = styled.main`
|
||||||
width: 1024px;
|
width: 1024px;
|
||||||
@ -20,7 +19,6 @@ export const MainCardText = styled(CardText)`
|
|||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
||||||
export const MainCardTextP = styled(Paragraph)`
|
export const MainCardTextP = styled(Paragraph)`
|
||||||
max-width: 630px;
|
max-width: 630px;
|
||||||
`;
|
`;
|
||||||
@ -55,44 +53,3 @@ export const PageFooter = styled.footer`
|
|||||||
background-color: var(--accent);
|
background-color: var(--accent);
|
||||||
margin-top: 64px;
|
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;
|
|
||||||
`;
|
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
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';
|
|
||||||
|
|
||||||
export const PageRoutes = () => (
|
|
||||||
<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>
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue
Block a user