modified: components/Head.tsx

modified: package-lock.json modified: package.json modified: pages/_app.tsx modified: pages/_document.tsx modified: pages/about.tsx new file: public/robots.txt new file: public/sitemap.xml modified: yarn.lock
3 years ago · 3c7f069970
parent 5db2f68229
commit 3c7f069970
14 changed files with 107 additions and 76 deletions
--- a/.history/.env_20220613182216.local
+++ b/.history/.env_20220613182216.local
--- a/.history/.env_20220613182253.local
+++ b/.history/.env_20220613182253.local
@ -1,12 +0,0 @@
-// .env.local
-
-USER_="crapshr6_robotop"
-HOST="crapshr6.beget.tech"
-DATABASE="crapshr6_pizza"
-PASSWORD="M2PJD&wG"
-
-MAILSERVER="smtp.beget.com"
-MAILNAME="service@vsst.su"
-MAILPASS = "&ekS0NPD"
-
-SITE="http://localhost:3000/api/"
--- a/.history/.env_20220613182355.local
+++ b/.history/.env_20220613182355.local
@ -1,12 +0,0 @@
-// .env.local
-
-USER_="crapshr6_robotop"
-HOST="crapshr6.beget.tech"
-DATABASE="crapshr6_robotop"
-PASSWORD="5NC*%v0v"
-
-MAILSERVER="smtp.beget.com"
-MAILNAME="service@vsst.su"
-MAILPASS = "&ekS0NPD"
-
-SITE="http://localhost:3000/api/"
--- a/.history/.env_20220613182359.local
+++ b/.history/.env_20220613182359.local
@ -1,12 +0,0 @@
-// .env.local
-
-USER_="crapshr6_robotop"
-HOST="crapshr6.beget.tech"
-DATABASE="crapshr6_robotop"
-PASSWORD="5NC*%v0v"
-
-MAILSERVER="smtp.beget.com"
-MAILNAME="service@vsst.su"
-MAILPASS = "&ekS0NPD"
-
-SITE="http://localhost:3000/api/"
--- a/.history/.env_20220613183941.local
+++ b/.history/.env_20220613183941.local
@ -1,12 +0,0 @@
-// .env.local
-
-USER_="crapshr6_robotop"
-HOST="crapshr6.beget.tech"
-DATABASE="crapshr6_robotop"
-PASSWORD="sJ9&alNk"
-
-MAILSERVER="smtp.beget.com"
-MAILNAME="service@vsst.su"
-MAILPASS = "&ekS0NPD"
-
-SITE="http://localhost:3000/api/"
--- a/components/Head.tsx
+++ b/components/Head.tsx
@ -3,6 +3,10 @@ import { useRouter } from 'next/router';
 import React from 'react';
 import { MetaProps } from '../types/layout';

+export type WithYandexMetrikaProps = {
+  children: React.ReactNode;
+}
+
 export const WEBSITE_HOST_URL = 'https://robotop.krasnikov.pro/';

 const Head = ({ customMeta }: { customMeta?: MetaProps }): JSX.Element => {
--- a/package-lock.json
+++ b/package-lock.json
@ -27,6 +27,7 @@
        "react-hook-form": "^7.33.1",
        "react-redux": "^8.0.2",
        "react-toastify": "^9.0.5",
+        "react-yandex-metrika": "^2.6.0",
        "rehype-autolink-headings": "^6.1.1",
        "rehype-slug": "^5.0.1",
        "remark-code-titles": "^0.1.2",
@ -9907,7 +9908,6 @@
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
      "engines": {
        "node": ">=0.10.0"
      }
@ -10447,7 +10447,6 @@
      "version": "15.8.1",
      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
      "dependencies": {
        "loose-envify": "^1.4.0",
        "object-assign": "^4.1.1",
@ -10457,8 +10456,7 @@
    "node_modules/prop-types/node_modules/react-is": {
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
    "node_modules/property-information": {
      "version": "6.1.1",
@ -10629,6 +10627,15 @@
        "react-dom": ">=16"
      }
    },
+    "node_modules/react-yandex-metrika": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/react-yandex-metrika/-/react-yandex-metrika-2.6.0.tgz",
+      "integrity": "sha512-8K4wExsNZtY3DTxh1G8a+zWH9Pg8fw23MJcoJ4I/562qrHRnh7L5nteq3lnNL58dnNQbuuHIRoGgMjIo+r1GjA==",
+      "peerDependencies": {
+        "prop-types": "*",
+        "react": "*"
+      }
+    },
    "node_modules/read-cache": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@ -12048,9 +12055,9 @@
      }
    },
    "node_modules/terser": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
-      "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
      "peer": true,
      "dependencies": {
        "@jridgewell/source-map": "^0.3.2",
@ -20072,8 +20079,7 @@
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
    },
    "object-hash": {
      "version": "3.0.0",
@ -20424,7 +20430,6 @@
      "version": "15.8.1",
      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
      "requires": {
        "loose-envify": "^1.4.0",
        "object-assign": "^4.1.1",
@ -20434,8 +20439,7 @@
        "react-is": {
          "version": "16.13.1",
          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-          "dev": true
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
        }
      }
    },
@ -20536,6 +20540,12 @@
        "clsx": "^1.1.1"
      }
    },
+    "react-yandex-metrika": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/react-yandex-metrika/-/react-yandex-metrika-2.6.0.tgz",
+      "integrity": "sha512-8K4wExsNZtY3DTxh1G8a+zWH9Pg8fw23MJcoJ4I/562qrHRnh7L5nteq3lnNL58dnNQbuuHIRoGgMjIo+r1GjA==",
+      "requires": {}
+    },
    "read-cache": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@ -21546,9 +21556,9 @@
      }
    },
    "terser": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
-      "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
+      "version": "5.14.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+      "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
      "peer": true,
      "requires": {
        "@jridgewell/source-map": "^0.3.2",
--- a/package.json
+++ b/package.json
@ -43,6 +43,7 @@
    "react-hook-form": "^7.33.1",
    "react-redux": "^8.0.2",
    "react-toastify": "^9.0.5",
+    "react-yandex-metrika": "^2.6.0",
    "rehype-autolink-headings": "^6.1.1",
    "rehype-slug": "^5.0.1",
    "remark-code-titles": "^0.1.2",
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@ -7,11 +7,11 @@ import { store } from '../redux/store';

 const MyApp = ({ Component, pageProps }: AppProps): JSX.Element => {
  return (
-    <ThemeProvider attribute="class" enableSystem={false} defaultTheme="light">
-       <Provider store={store}>
-        <Component {...pageProps} />
-      </Provider>
-    </ThemeProvider>
+      <ThemeProvider attribute="class" enableSystem={false} defaultTheme="light">
+        <Provider store={store}>
+            <Component {...pageProps} />
+        </Provider>
+      </ThemeProvider>
  );
 };

--- a/pages/_document.tsx
+++ b/pages/_document.tsx
@ -1,4 +1,5 @@
 import Document, { Head, Html, Main, NextScript } from 'next/document';
+import { YMInitializer } from 'react-yandex-metrika';

 class MyDocument extends Document {
  render(): JSX.Element {
@ -8,6 +9,7 @@ class MyDocument extends Document {
        <body className="bg-white dark:bg-black text-gray-900 dark:text-white">
          <Main />
          <NextScript />
+          <YMInitializer accounts={[89626868]} />
        </body>
      </Html>
    );
--- a/pages/about.tsx
+++ b/pages/about.tsx
@ -8,10 +8,10 @@ export const About = (): JSX.Element => {
        title: 'О нас',
      }}
    >
-      <h1>РоботТоп</h1>
-      <p>Мы команда робототехников школы 103 города Краснодар. С 2006 года занимаемся робототехникой. В 2022 году проводим первый Краевой 
-        робототехнический фестиваль на базе школы 103
-      </p>
+      <h2>РоботТоп</h2>
+      <p>Мы команда робототехников школы № 103 города Краснодар.</p>
+      <p>С 2006 года занимаемся робототехникой.</p>
+      <p>В 2022 году проводим первый Краевой  робототехнический фестиваль на базе школы 103 </p>
    </Layout>
  );
 };
--- a/public/robots.txt
+++ b/public/robots.txt
@ -0,0 +1,6 @@
+Sitemap: https://robotop.krasnikov.pro/sitemap.xml
+
+User-agent: *
+Allow: /*
+
+Disallow: /api/*
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <url>
+        <loc>https://robotop.krasnikoc.pro</loc>
+        <lastmod>2022-06-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc>https://robotop.krasnikoc.pro</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc>https://robotop.krasnikov.pro/posts/regulations</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc>https://robotop.krasnikov.pro/registration</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc>https://robotop.krasnikov.pro/posts/festival-schedule</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc>https://robotop.krasnikov.pro/posts/task-completion-examples</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+    <url>
+        <loc> https://robotop.krasnikov.pro/contacts</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+     <url>
+        <loc>https://robotop.krasnikov.pro/about</loc>
+        <lastmod>2022-07-20</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.8</priority>
+    </url>
+</urlset>
--- a/yarn.lock
+++ b/yarn.lock
@ -4897,7 +4897,7 @@
    "kleur" "^3.0.3"
    "sisteransi" "^1.0.5"

-"prop-types@^15.8.1":
+"prop-types@*", "prop-types@^15.8.1":
  "integrity" "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="
  "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
  "version" "15.8.1"
@ -4995,6 +4995,11 @@
  dependencies:
    "clsx" "^1.1.1"

+"react-yandex-metrika@^2.6.0":
+  "integrity" "sha512-8K4wExsNZtY3DTxh1G8a+zWH9Pg8fw23MJcoJ4I/562qrHRnh7L5nteq3lnNL58dnNQbuuHIRoGgMjIo+r1GjA=="
+  "resolved" "https://registry.npmjs.org/react-yandex-metrika/-/react-yandex-metrika-2.6.0.tgz"
+  "version" "2.6.0"
+
 "react@*", "react@^16 || ^17 || ^18", "react@^16.8 || ^17.0 || ^18.0", "react@^16.8.0 || ^17 || ^18", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^16.9.0 || ^17.0.0 || ^18", "react@^17.0.2 || ^18.0.0-0", "react@^18.0.0", "react@^18.2.0", "react@>= 16", "react@>= 16.8.0 || 17.x.x || ^18.0.0-0", "react@>=16", "react@>=16.x <=18.x", "react@>=18.0.0":
  "integrity" "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="
  "resolved" "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
@ -5674,9 +5679,9 @@
    "terser" "^5.7.2"

 "terser@^5.7.2":
-  "integrity" "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="
-  "resolved" "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz"
-  "version" "5.14.1"
+  "integrity" "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="
+  "resolved" "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"
+  "version" "5.14.2"
  dependencies:
    "@jridgewell/source-map" "^0.3.2"
    "acorn" "^8.5.0"