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
replace style.css by components
2024-05-02 22:59:08 +03:00 · 2024-05-02 22:57:42 +03:00 · 2024-04-20 22:34:55 +03:00 · 2024-04-20 22:33:06 +03:00 · 2024-04-20 15:14:49 +03:00 · 2024-04-20 13:23:27 +03:00
28 changed files with 734 additions and 344 deletions
--- a/html/index.html
+++ b/html/index.html
@@ -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>
--- a/html/second.html
+++ b/html/second.html
@@ -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>
--- a/index.d.ts
+++ b/index.d.ts
@@ -0,0 +1,9 @@
 declare module '*.png' {
  const path: string;
  export default path;
 }
 declare module '*.svg' {
  const path: string;
  export default path;
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,8 @@
            "version": "1.0.0",
            "license": "ISC",
            "dependencies": {
                "@emotion/react": "^11.11.4",
                "@emotion/styled": "^11.11.5",
                "@ijl/cli": "^5.1.0",
                "@types/react": "^18.2.74",
                "@types/react-dom": "^18.2.24",
@@ -1808,6 +1810,163 @@
                "node": ">=10.0.0"
            }
        },
        "node_modules/@emotion/babel-plugin": {
            "version": "11.11.0",
            "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz",
            "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==",
            "dependencies": {
                "@babel/helper-module-imports": "^7.16.7",
                "@babel/runtime": "^7.18.3",
                "@emotion/hash": "^0.9.1",
                "@emotion/memoize": "^0.8.1",
                "@emotion/serialize": "^1.1.2",
                "babel-plugin-macros": "^3.1.0",
                "convert-source-map": "^1.5.0",
                "escape-string-regexp": "^4.0.0",
                "find-root": "^1.1.0",
                "source-map": "^0.5.7",
                "stylis": "4.2.0"
            }
        },
        "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": {
            "version": "1.9.0",
            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
        },
        "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
            "version": "4.0.0",
            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
            "engines": {
                "node": ">=10"
            },
            "funding": {
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
        "node_modules/@emotion/babel-plugin/node_modules/source-map": {
            "version": "0.5.7",
            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
            "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
            "engines": {
                "node": ">=0.10.0"
            }
        },
        "node_modules/@emotion/cache": {
            "version": "11.11.0",
            "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
            "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==",
            "dependencies": {
                "@emotion/memoize": "^0.8.1",
                "@emotion/sheet": "^1.2.2",
                "@emotion/utils": "^1.2.1",
                "@emotion/weak-memoize": "^0.3.1",
                "stylis": "4.2.0"
            }
        },
        "node_modules/@emotion/hash": {
            "version": "0.9.1",
            "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz",
            "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ=="
        },
        "node_modules/@emotion/is-prop-valid": {
            "version": "1.2.2",
            "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz",
            "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==",
            "dependencies": {
                "@emotion/memoize": "^0.8.1"
            }
        },
        "node_modules/@emotion/memoize": {
            "version": "0.8.1",
            "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
            "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
        },
        "node_modules/@emotion/react": {
            "version": "11.11.4",
            "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz",
            "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==",
            "dependencies": {
                "@babel/runtime": "^7.18.3",
                "@emotion/babel-plugin": "^11.11.0",
                "@emotion/cache": "^11.11.0",
                "@emotion/serialize": "^1.1.3",
                "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
                "@emotion/utils": "^1.2.1",
                "@emotion/weak-memoize": "^0.3.1",
                "hoist-non-react-statics": "^3.3.1"
            },
            "peerDependencies": {
                "react": ">=16.8.0"
            },
            "peerDependenciesMeta": {
                "@types/react": {
                    "optional": true
                }
            }
        },
        "node_modules/@emotion/serialize": {
            "version": "1.1.4",
            "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz",
            "integrity": "sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==",
            "dependencies": {
                "@emotion/hash": "^0.9.1",
                "@emotion/memoize": "^0.8.1",
                "@emotion/unitless": "^0.8.1",
                "@emotion/utils": "^1.2.1",
                "csstype": "^3.0.2"
            }
        },
        "node_modules/@emotion/sheet": {
            "version": "1.2.2",
            "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz",
            "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA=="
        },
        "node_modules/@emotion/styled": {
            "version": "11.11.5",
            "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.5.tgz",
            "integrity": "sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==",
            "dependencies": {
                "@babel/runtime": "^7.18.3",
                "@emotion/babel-plugin": "^11.11.0",
                "@emotion/is-prop-valid": "^1.2.2",
                "@emotion/serialize": "^1.1.4",
                "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
                "@emotion/utils": "^1.2.1"
            },
            "peerDependencies": {
                "@emotion/react": "^11.0.0-rc.0",
                "react": ">=16.8.0"
            },
            "peerDependenciesMeta": {
                "@types/react": {
                    "optional": true
                }
            }
        },
        "node_modules/@emotion/unitless": {
            "version": "0.8.1",
            "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz",
            "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ=="
        },
        "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
            "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
            "peerDependencies": {
                "react": ">=16.8.0"
            }
        },
        "node_modules/@emotion/utils": {
            "version": "1.2.1",
            "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz",
            "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg=="
        },
        "node_modules/@emotion/weak-memoize": {
            "version": "0.3.1",
            "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz",
            "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww=="
        },
        "node_modules/@ijl/cli": {
            "version": "5.1.0",
            "resolved": "https://registry.npmjs.org/@ijl/cli/-/cli-5.1.0.tgz",
@@ -2128,6 +2287,11 @@
            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.0.tgz",
            "integrity": "sha512-5EWrvLmglK+imbCJY0+INViFWUHg1AHel1sq4ZVSfdcNqGy9Edv3UB9IIzzg+xPaUcAgZYcfVs2fBcwDeZzU0A=="
        },
        "node_modules/@types/parse-json": {
            "version": "4.0.2",
            "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
            "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
        },
        "node_modules/@types/prop-types": {
            "version": "15.7.12",
            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
@@ -2625,6 +2789,20 @@
                "webpack": ">=5"
            }
        },
        "node_modules/babel-plugin-macros": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
            "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
            "dependencies": {
                "@babel/runtime": "^7.12.5",
                "cosmiconfig": "^7.0.0",
                "resolve": "^1.19.0"
            },
            "engines": {
                "node": ">=10",
                "npm": ">=6"
            }
        },
        "node_modules/babel-plugin-polyfill-corejs2": {
            "version": "0.4.10",
            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
@@ -2847,6 +3025,14 @@
                "url": "https://github.com/sponsors/ljharb"
            }
        },
        "node_modules/callsites": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
            "engines": {
                "node": ">=6"
            }
        },
        "node_modules/caniuse-lite": {
            "version": "1.0.30001606",
            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz",
@@ -3128,6 +3314,21 @@
                "node": ">= 0.10"
            }
        },
        "node_modules/cosmiconfig": {
            "version": "7.1.0",
            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
            "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
            "dependencies": {
                "@types/parse-json": "^4.0.0",
                "import-fresh": "^3.2.1",
                "parse-json": "^5.0.0",
                "path-type": "^4.0.0",
                "yaml": "^1.10.0"
            },
            "engines": {
                "node": ">=10"
            }
        },
        "node_modules/cross-spawn": {
            "version": "7.0.3",
            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -3481,6 +3682,14 @@
                "node": ">=4"
            }
        },
        "node_modules/error-ex": {
            "version": "1.3.2",
            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
            "dependencies": {
                "is-arrayish": "^0.2.1"
            }
        },
        "node_modules/es-define-property": {
            "version": "1.0.0",
            "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
@@ -3940,6 +4149,11 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
        "node_modules/find-root": {
            "version": "1.1.0",
            "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
            "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
        },
        "node_modules/find-up": {
            "version": "6.3.0",
            "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
@@ -4737,6 +4951,29 @@
                "url": "https://opencollective.com/immer"
            }
        },
        "node_modules/import-fresh": {
            "version": "3.3.0",
            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
            "dependencies": {
                "parent-module": "^1.0.0",
                "resolve-from": "^4.0.0"
            },
            "engines": {
                "node": ">=6"
            },
            "funding": {
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
        "node_modules/import-fresh/node_modules/resolve-from": {
            "version": "4.0.0",
            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
            "engines": {
                "node": ">=4"
            }
        },
        "node_modules/import-local": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
@@ -4868,6 +5105,11 @@
                "node": ">= 0.10"
            }
        },
        "node_modules/is-arrayish": {
            "version": "0.2.1",
            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
        },
        "node_modules/is-buffer": {
            "version": "1.1.6",
            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -5125,6 +5367,11 @@
                "node": ">=6"
            }
        },
        "node_modules/lines-and-columns": {
            "version": "1.2.4",
            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
        },
        "node_modules/loader-runner": {
            "version": "4.3.0",
            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -5585,6 +5832,34 @@
                "node": ">=6"
            }
        },
        "node_modules/parent-module": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
            "dependencies": {
                "callsites": "^3.0.0"
            },
            "engines": {
                "node": ">=6"
            }
        },
        "node_modules/parse-json": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
            "dependencies": {
                "@babel/code-frame": "^7.0.0",
                "error-ex": "^1.3.1",
                "json-parse-even-better-errors": "^2.3.0",
                "lines-and-columns": "^1.1.6"
            },
            "engines": {
                "node": ">=8"
            },
            "funding": {
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
        "node_modules/parseurl": {
            "version": "1.3.3",
            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -7054,6 +7329,11 @@
                "webpack": "^5.0.0"
            }
        },
        "node_modules/stylis": {
            "version": "4.2.0",
            "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz",
            "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw=="
        },
        "node_modules/supports-color": {
            "version": "7.2.0",
            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7792,6 +8072,14 @@
            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
        },
        "node_modules/yaml": {
            "version": "1.10.2",
            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
            "engines": {
                "node": ">= 6"
            }
        },
        "node_modules/yocto-queue": {
            "version": "0.1.0",
            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "r-and-m",
-    "version": "1.0.0",
+    "version": "0.0.0",
    "description": "![Рик огурчик!!!](./docs/cucumber.webp)",
    "main": "./src/index.tsx",
    "directories": {
@@ -17,6 +17,8 @@
    "author": "",
    "license": "ISC",
    "dependencies": {
        "@emotion/react": "^11.11.4",
        "@emotion/styled": "^11.11.5",
        "@ijl/cli": "^5.1.0",
        "@types/react": "^18.2.74",
        "@types/react-dom": "^18.2.24",
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,14 +1,16 @@
-import React from 'react';
+import React from "react";
 import { Global } from "@emotion/react";
-import { LandingPage } from './pages/landing'
+import { LandingPage } from "./pages/landing";
-
+import { globalStyles } from "./global-styles";
 import './style/main.css'
 const App = () => {
  return (
-    <LandingPage />
+    <>
      <Global styles={globalStyles} />
      <LandingPage />
    </>
  );
 };
 export default App;
--- a/src/assets/icons/external-link.svg
+++ b/src/assets/icons/external-link.svg
@@ -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>
--- a/src/assets/icons/index.ts
+++ b/src/assets/icons/index.ts
@@ -0,0 +1 @@
 export { default as externalIcon } from './external-link.svg';
--- a/src/assets/images/index.ts
+++ b/src/assets/images/index.ts
@@ -0,0 +1 @@
 export * as landing from './landing';
--- a/src/assets/images/landing/beth.png
+++ b/src/assets/images/landing/beth.png
--- a/src/assets/images/landing/index.ts
+++ b/src/assets/images/landing/index.ts
@@ -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';
--- a/src/assets/images/landing/jerry.png
+++ b/src/assets/images/landing/jerry.png
--- a/src/assets/images/landing/morty.png
+++ b/src/assets/images/landing/morty.png
--- a/src/assets/images/landing/rick.png
+++ b/src/assets/images/landing/rick.png
--- a/src/components/card/card.style.ts
+++ b/src/components/card/card.style.ts
@@ -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;
 `;
--- a/src/components/card/card.tsx
+++ b/src/components/card/card.tsx
@@ -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,
 };
--- a/src/components/card/index.ts
+++ b/src/components/card/index.ts
@@ -0,0 +1,2 @@
 export { Card } from './card'
 export { CardWrapper } from './card.style'
--- a/src/components/common.ts
+++ b/src/components/common.ts
@@ -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;
 `;
--- a/src/components/link/index.ts
+++ b/src/components/link/index.ts
@@ -0,0 +1 @@
 export { Link } from './link'
--- a/src/components/link/link.styled.ts
+++ b/src/components/link/link.styled.ts
@@ -0,0 +1,33 @@
 import styled from "@emotion/styled";
 import { css } from "@emotion/react";
 export const StyledLink = styled.a<{
  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;
      `;
    }
  }}
 `;
--- a/src/components/link/link.tsx
+++ b/src/components/link/link.tsx
@@ -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 inheritColor={props.inheritColor} contrast={props.contrast} href={props.href} {...linkProps}>
      {props.children}
      {isExternal && <img src={externalIcon} alt="external link icon" />}
    </StyledLink>
  );
 };
 Link.defaultProps = {
  contrast: false,
  inheritColor: false,
 }
--- a/src/components/nav-panel/index.ts
+++ b/src/components/nav-panel/index.ts
@@ -0,0 +1 @@
 export { NavPanel } from './nav-panel'
--- a/src/components/nav-panel/nav-panel.style.ts
+++ b/src/components/nav-panel/nav-panel.style.ts
@@ -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;
 `;
--- a/src/components/nav-panel/nav-panel.tsx
+++ b/src/components/nav-panel/nav-panel.tsx
@@ -0,0 +1,28 @@
 import React from "react";
 import { Link } from "../link";
 import { Nav, NavList } from "./nav-panel.style";
 const navList = [
  { title: "Home", href: "#01" },
  { title: "Персонажи", href: "#02" },
  { title: "Локации", href: "#03" },
  { title: "Эризоды", href: "#04" },
 ];
 export function NavPanel() {
  return (
    <Nav className="nav">
      <NavList>
        {navList.map((element, index) => (
          <li key={element.href}>
            <Link contrast={Boolean(index)} href={element.href}>
              {element.title}
            </Link>
          </li>
        ))}
      </NavList>
    </Nav>
  );
 }
--- a/src/global-styles.ts
+++ b/src/global-styles.ts
@@ -0,0 +1,33 @@
 import { css } from "@emotion/react";
 export const globalStyles = css`
  :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%;
  }
 `;
--- a/src/pages/landing.tsx
+++ b/src/pages/landing.tsx
@@ -1,98 +1,121 @@
 import React 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 {
  BrandText,
  Logo,
  Main,
  MainCardImg,
  MainCardText,
  MainCardTextP,
  MainCardWrapper,
  PageFooter,
  PageHeader,
 } 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 = () => {
  return (
    <>
-      <header id="header">
+      <PageHeader>
-        <img
+        <Logo
-          className="logo"
+          height="44px"
          height="44p"
          width="227"
-          src="./assets/logo_4x.png"
+          src={logo4x}
          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="
          (max-width: 240px) 100px,
          (min-width: 320px) 440px,
          (min-width: 520px) 880px
        "
        />
        <NavPanel />
      </PageHeader>
-        <nav className="nav">
+      <Main>
-          <ul>
+        <MainCardWrapper as="header">
-            <li>
+          <MainCardText>
-              <a className="link" href="#01">
+            <Header1>
                Home
              </a>
            </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 />
-              <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">
+        {data.map((item, index) => (
-          <div className="card-text">
+          <Card
-            <h1 className="h1">
+            directionReverse={index % 2 === 0}
-              Персонажи из <br />
+            key={item.id}
-              <span className="brand-text">огурчиковой вселенной</span>
+            title={item.title}
-            </h1>
+            image={item.image}
            link={item.link}
            subTitle={item.subTitle}
          >
            {item.body}
          </Card>
        ))}
      </Main>
-            <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>
    </>
  );
 };
--- a/src/pages/style.ts
+++ b/src/pages/style.ts
@@ -0,0 +1,55 @@
 import styled from "@emotion/styled";
 import { CardWrapper } from "../components/card";
 import { CardText } from "../components/card/card.style";
 import { Paragraph } from "../components/common";
 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;
 `;
--- a/src/style/main.css
+++ b/src/style/main.css
@@ -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;
 }
Author	SHA1	Message	Date
primakov	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
primakov	3652b99f4c	replace style.css by components	2024-05-02 22:57:42 +03:00
primakov	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
primakov	79bed2dae6	(#1 ) Добил вёрстку центральных блоков landing	2024-04-20 22:33:06 +03:00
primakov	68e94680e3	(#1 ) Landing on Card component	2024-04-20 15:14:49 +03:00
primakov	388aec2050	Подготовка компонента на лэндинг	2024-04-20 13:23:27 +03:00
primakov	d79676cbb4	13.04 components + maps	2024-04-13 19:26:25 +03:00
primakov	f2df14caa3	check jenkins script	2024-04-11 12:53:50 +03:00
primakov	9eafbace4c	fix images	2024-04-09 23:52:33 +03:00
		`@@ -0,0 +1 @@`
							`export { default as externalIcon } from './external-link.svg';`
		`@@ -0,0 +1,2 @@`
							`export { Card } from './card'`
							`export { CardWrapper } from './card.style'`