Merge branch 'quiz-gallery' into dev

2024-05-20 21:15:36 +03:00 · 2024-05-20 21:15:36 +03:00 · 700a3da36c
commit 700a3da36c
parent c49099b52e b650ce09af
133 changed files with 1413 additions and 517 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1,12 +1,16 @@
 <!doctype html>
 <html lang="en">
-
  <head>
    <meta charset="utf-8" />

    <title>Pena Quiz</title>
-  <meta name="description" content="Веб-сервис с инструментами для повышения эффективности маркетологов." />
-  <meta name="keywords" content=" Экосистема маркетинговых инструментов, 
+    <meta
+      name="description"
+      content="Веб-сервис с инструментами для повышения эффективности маркетологов."
+    />
+    <meta
+      name="keywords"
+      content=" Экосистема маркетинговых инструментов, 
    Инструменты для социальных исследований,
    Малый бизнес, 
    Маркетинговые инструменты, 
@ -26,11 +30,14 @@
    Анализ данных, 
    Улучшение результатов, 
    Увеличение прибыли, 
-    Повышение конкурентоспособности " />
+    Повышение конкурентоспособности "
+    />

-  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" sizes="any" /><!-- 32×32 -->
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" sizes="any" />
+    <!-- 32×32 -->
    <link rel="icon" href="%PUBLIC_URL%/favicon.svg" type="image/svg+xml" />
-  <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.png" /><!-- 180×180 -->
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.png" />
+    <!-- 180×180 -->

    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

@ -39,62 +46,118 @@
    <meta http-equiv="Pragma" content="no-cache" />
    <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=Rubik:wght@400;500;600&display=swap" rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Rubik:wght@400;500;600&display=swap"
+      rel="stylesheet"
+    />
    <!-- Yandex.Metrika counter -->
    <script type="text/javascript">
      (function (m, e, t, r, i, k, a) {
-      m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
+        m[i] =
+          m[i] ||
+          function () {
+            (m[i].a = m[i].a || []).push(arguments);
+          };
        m[i].l = 1 * new Date();
-      for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
-      k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
-    })
-      (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+        for (var j = 0; j < document.scripts.length; j++) {
+          if (document.scripts[j].src === r) {
+            return;
+          }
+        }
+        (k = e.createElement(t)),
+          (a = e.getElementsByTagName(t)[0]),
+          (k.async = 1),
+          (k.src = r),
+          a.parentNode.insertBefore(k, a);
+      })(
+        window,
+        document,
+        "script",
+        "https://mc.yandex.ru/metrika/tag.js",
+        "ym",
+      );

-    const domain = location.hostname
+      const domain = location.hostname;
      if (domain === "quiz.pena.digital") {
        ym(96979576, "init", {
          clickmap: true,
          trackLinks: true,
          accurateTrackBounce: true,
-        webvisor: true
+          webvisor: true,
        });

        // <!-- Top.Mail.Ru counter -->
        var _tmr = window._tmr || (window._tmr = []);
-      _tmr.push({ id: "3513005", type: "pageView", start: (new Date()).getTime() });
+        _tmr.push({
+          id: "3513005",
+          type: "pageView",
+          start: new Date().getTime(),
+        });
        (function (d, w, id) {
          if (d.getElementById(id)) return;
-        var ts = d.createElement("script"); ts.type = "text/javascript"; ts.async = true; ts.id = id;
+          var ts = d.createElement("script");
+          ts.type = "text/javascript";
+          ts.async = true;
+          ts.id = id;
          ts.src = "https://top-fwz1.mail.ru/js/code.js";
-        var f = function () { var s = d.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ts, s); };
-        if (w.opera == "[object Opera]") { d.addEventListener("DOMContentLoaded", f, false); } else { f(); }
+          var f = function () {
+            var s = d.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(ts, s);
+          };
+          if (w.opera == "[object Opera]") {
+            d.addEventListener("DOMContentLoaded", f, false);
+          } else {
+            f();
+          }
        })(document, window, "tmr-code");
        // <!-- /Top.Mail.Ru counter -->
-
-    };
+      }
      if (domain === "squiz.pena.digital") {
        ym(96979625, "init", {
          clickmap: true,
          trackLinks: true,
          accurateTrackBounce: true,
-        webvisor: true
+          webvisor: true,
        });
-    };
+      }
      if (domain === "penaquiz.online" || domain === "penaquiz.ru") {
        ym(97241101, "init", {
          clickmap: true,
          trackLinks: true,
          accurateTrackBounce: true,
-        webvisor: true
+          webvisor: true,
        });
-    };
-
+      }
    </script>
    <noscript>
-    <div><img src="https://mc.yandex.ru/watch/96979576" style="position:absolute; left:-9999px;" alt="" /></div>
-    <div><img src="https://mc.yandex.ru/watch/96979625" style="position:absolute; left:-9999px;" alt="" /></div>
-    <div><img src="https://mc.yandex.ru/watch/97241101" style="position:absolute; left:-9999px;" alt="" /></div>
-    <div><img src="https://top-fwz1.mail.ru/counter?id=3513005;js=na" style="position:absolute;left:-9999px;" alt="Top.Mail.Ru" /></div>
+      <div>
+        <img
+          src="https://mc.yandex.ru/watch/96979576"
+          style="position: absolute; left: -9999px"
+          alt=""
+        />
+      </div>
+      <div>
+        <img
+          src="https://mc.yandex.ru/watch/96979625"
+          style="position: absolute; left: -9999px"
+          alt=""
+        />
+      </div>
+      <div>
+        <img
+          src="https://mc.yandex.ru/watch/97241101"
+          style="position: absolute; left: -9999px"
+          alt=""
+        />
+      </div>
+      <div>
+        <img
+          src="https://top-fwz1.mail.ru/counter?id=3513005;js=na"
+          style="position: absolute; left: -9999px"
+          alt="Top.Mail.Ru"
+        />
+      </div>
    </noscript>
    <!-- /Yandex.Metrika counter -->
  </head>
@ -103,5 +166,4 @@
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
  </body>
-
 </html>
--- a/src/App.tsx
+++ b/src/App.tsx
@ -43,6 +43,7 @@ import { useUserAccountFetcher } from "@utils/hooks/useUserAccountFetcher";

 const MyQuizzesFull = lazy(() => import("./pages/createQuize/MyQuizzesFull"));

+const QuizGallery = lazy(() => import("./pages/createQuize/QuizGallery"));
 const ViewPage = lazy(() => import("./pages/ViewPublicationPage"));
 const Analytics = lazy(() => import("./pages/Analytics/Analytics"));
 const EditPage = lazy(() => import("./pages/startPage/EditPage"));
@ -201,6 +202,10 @@ export default function App() {
            />
          }
        />
+        <Route
+          path="/gallery"
+          element={<LazyLoading children={<QuizGallery />} />}
+        />
        <Route
          path="/list"
          element={<LazyLoading children={<MyQuizzesFull />} />}
--- a/src/api/quiz.ts
+++ b/src/api/quiz.ts
@ -164,6 +164,28 @@ export const addQuizImages = async (
  }
 };

+export const copyQuizTemplate = async (
+  qid: string,
+): Promise<[number | null, string?]> => {
+  try {
+    const { id } = await makeRequest<{ Qid: string }, { id: number }>({
+      method: "POST",
+      url: `${API_URL}/quiz/template`,
+      body: { Qid: qid },
+    });
+
+    if (!id) {
+      return [null, `Не удалось скопировать шаблон квиза.`];
+    }
+
+    return [id];
+  } catch (nativeError) {
+    const [error] = parseAxiosError(nativeError);
+
+    return [null, `Не удалось скопировать шаблон квиза. ${error}`];
+  }
+};
+
 export const quizApi = {
  create: createQuiz,
  getList: getQuizList,
@ -172,6 +194,7 @@ export const quizApi = {
  copy: copyQuiz,
  delete: deleteQuiz,
  addImages: addQuizImages,
+  copyTemplate: copyQuizTemplate,
 };

 const defaultCreateQuizBody: CreateQuizRequest = {
--- a/src/assets/quiz-template-1.png
+++ b/src/assets/quiz-template-1.png
--- a/src/assets/quiz-template-2.png
+++ b/src/assets/quiz-template-2.png
--- a/src/assets/quiz-template-3.png
+++ b/src/assets/quiz-template-3.png
--- a/src/assets/quiz-template-4.png
+++ b/src/assets/quiz-template-4.png
--- a/src/assets/quiz-template-5.png
+++ b/src/assets/quiz-template-5.png
--- a/src/assets/quiz-template-6.png
+++ b/src/assets/quiz-template-6.png
--- a/src/assets/quiz-templates/auto/auto-1.jpg
+++ b/src/assets/quiz-templates/auto/auto-1.jpg
--- a/src/assets/quiz-templates/auto/auto-10.jpg
+++ b/src/assets/quiz-templates/auto/auto-10.jpg
--- a/src/assets/quiz-templates/auto/auto-2.jpg
+++ b/src/assets/quiz-templates/auto/auto-2.jpg
--- a/src/assets/quiz-templates/auto/auto-3.jpg
+++ b/src/assets/quiz-templates/auto/auto-3.jpg
--- a/src/assets/quiz-templates/auto/auto-4.jpg
+++ b/src/assets/quiz-templates/auto/auto-4.jpg
--- a/src/assets/quiz-templates/auto/auto-5.jpg
+++ b/src/assets/quiz-templates/auto/auto-5.jpg
--- a/src/assets/quiz-templates/auto/auto-6.jpg
+++ b/src/assets/quiz-templates/auto/auto-6.jpg
--- a/src/assets/quiz-templates/auto/auto-7.jpg
+++ b/src/assets/quiz-templates/auto/auto-7.jpg
--- a/src/assets/quiz-templates/auto/auto-8.jpg
+++ b/src/assets/quiz-templates/auto/auto-8.jpg
--- a/src/assets/quiz-templates/auto/auto-9.jpg
+++ b/src/assets/quiz-templates/auto/auto-9.jpg
--- a/src/assets/quiz-templates/education/education-1.jpg
+++ b/src/assets/quiz-templates/education/education-1.jpg
--- a/src/assets/quiz-templates/education/education-10.jpg
+++ b/src/assets/quiz-templates/education/education-10.jpg
--- a/src/assets/quiz-templates/education/education-2.jpg
+++ b/src/assets/quiz-templates/education/education-2.jpg
--- a/src/assets/quiz-templates/education/education-3.jpg
+++ b/src/assets/quiz-templates/education/education-3.jpg
--- a/src/assets/quiz-templates/education/education-4.jpg
+++ b/src/assets/quiz-templates/education/education-4.jpg
--- a/src/assets/quiz-templates/education/education-5.jpg
+++ b/src/assets/quiz-templates/education/education-5.jpg
--- a/src/assets/quiz-templates/education/education-6.jpg
+++ b/src/assets/quiz-templates/education/education-6.jpg
--- a/src/assets/quiz-templates/education/education-7.jpg
+++ b/src/assets/quiz-templates/education/education-7.jpg
--- a/src/assets/quiz-templates/education/education-8.jpg
+++ b/src/assets/quiz-templates/education/education-8.jpg
--- a/src/assets/quiz-templates/education/education-9.jpg
+++ b/src/assets/quiz-templates/education/education-9.jpg
--- a/src/assets/quiz-templates/health/health-1.jpg
+++ b/src/assets/quiz-templates/health/health-1.jpg
--- a/src/assets/quiz-templates/health/health-10.jpg
+++ b/src/assets/quiz-templates/health/health-10.jpg
--- a/src/assets/quiz-templates/health/health-11.jpg
+++ b/src/assets/quiz-templates/health/health-11.jpg
--- a/src/assets/quiz-templates/health/health-12.jpg
+++ b/src/assets/quiz-templates/health/health-12.jpg
--- a/src/assets/quiz-templates/health/health-13.jpg
+++ b/src/assets/quiz-templates/health/health-13.jpg
--- a/src/assets/quiz-templates/health/health-14.jpg
+++ b/src/assets/quiz-templates/health/health-14.jpg
--- a/src/assets/quiz-templates/health/health-15.jpg
+++ b/src/assets/quiz-templates/health/health-15.jpg
--- a/src/assets/quiz-templates/health/health-16.jpg
+++ b/src/assets/quiz-templates/health/health-16.jpg
--- a/src/assets/quiz-templates/health/health-17.jpg
+++ b/src/assets/quiz-templates/health/health-17.jpg
--- a/src/assets/quiz-templates/health/health-18.jpg
+++ b/src/assets/quiz-templates/health/health-18.jpg
--- a/src/assets/quiz-templates/health/health-19.jpg
+++ b/src/assets/quiz-templates/health/health-19.jpg
--- a/src/assets/quiz-templates/health/health-2.jpg
+++ b/src/assets/quiz-templates/health/health-2.jpg
--- a/src/assets/quiz-templates/health/health-20.jpg
+++ b/src/assets/quiz-templates/health/health-20.jpg
--- a/src/assets/quiz-templates/health/health-3.jpg
+++ b/src/assets/quiz-templates/health/health-3.jpg
--- a/src/assets/quiz-templates/health/health-4.jpg
+++ b/src/assets/quiz-templates/health/health-4.jpg
--- a/src/assets/quiz-templates/health/health-5.jpg
+++ b/src/assets/quiz-templates/health/health-5.jpg
--- a/src/assets/quiz-templates/health/health-6.jpg
+++ b/src/assets/quiz-templates/health/health-6.jpg
--- a/src/assets/quiz-templates/health/health-7.jpg
+++ b/src/assets/quiz-templates/health/health-7.jpg
--- a/src/assets/quiz-templates/health/health-8.jpg
+++ b/src/assets/quiz-templates/health/health-8.jpg
--- a/src/assets/quiz-templates/health/health-9.jpg
+++ b/src/assets/quiz-templates/health/health-9.jpg
--- a/src/assets/quiz-templates/production/production-1.jpg
+++ b/src/assets/quiz-templates/production/production-1.jpg
--- a/src/assets/quiz-templates/production/production-10.jpg
+++ b/src/assets/quiz-templates/production/production-10.jpg
--- a/src/assets/quiz-templates/production/production-2.jpg
+++ b/src/assets/quiz-templates/production/production-2.jpg
--- a/src/assets/quiz-templates/production/production-3.jpg
+++ b/src/assets/quiz-templates/production/production-3.jpg
--- a/src/assets/quiz-templates/production/production-4.jpg
+++ b/src/assets/quiz-templates/production/production-4.jpg
--- a/src/assets/quiz-templates/production/production-5.jpg
+++ b/src/assets/quiz-templates/production/production-5.jpg
--- a/src/assets/quiz-templates/production/production-6.jpg
+++ b/src/assets/quiz-templates/production/production-6.jpg
--- a/src/assets/quiz-templates/production/production-7.jpg
+++ b/src/assets/quiz-templates/production/production-7.jpg
--- a/src/assets/quiz-templates/production/production-8.jpg
+++ b/src/assets/quiz-templates/production/production-8.jpg
--- a/src/assets/quiz-templates/production/production-9.jpg
+++ b/src/assets/quiz-templates/production/production-9.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-1.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-1.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-10.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-10.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-2.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-2.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-3.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-3.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-4.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-4.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-5.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-5.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-6.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-6.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-7.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-7.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-8.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-8.jpg
--- a/src/assets/quiz-templates/real-estate/real-estate-9.jpg
+++ b/src/assets/quiz-templates/real-estate/real-estate-9.jpg
--- a/src/assets/quiz-templates/repair/repair-1.jpg
+++ b/src/assets/quiz-templates/repair/repair-1.jpg
--- a/src/assets/quiz-templates/repair/repair-10.jpg
+++ b/src/assets/quiz-templates/repair/repair-10.jpg
--- a/src/assets/quiz-templates/repair/repair-2.jpg
+++ b/src/assets/quiz-templates/repair/repair-2.jpg
--- a/src/assets/quiz-templates/repair/repair-3.jpg
+++ b/src/assets/quiz-templates/repair/repair-3.jpg
--- a/src/assets/quiz-templates/repair/repair-4.jpg
+++ b/src/assets/quiz-templates/repair/repair-4.jpg
--- a/src/assets/quiz-templates/repair/repair-5.jpg
+++ b/src/assets/quiz-templates/repair/repair-5.jpg
--- a/src/assets/quiz-templates/repair/repair-6.jpg
+++ b/src/assets/quiz-templates/repair/repair-6.jpg
--- a/src/assets/quiz-templates/repair/repair-7.jpg
+++ b/src/assets/quiz-templates/repair/repair-7.jpg
--- a/src/assets/quiz-templates/repair/repair-8.jpg
+++ b/src/assets/quiz-templates/repair/repair-8.jpg
--- a/src/assets/quiz-templates/repair/repair-9.jpg
+++ b/src/assets/quiz-templates/repair/repair-9.jpg
--- a/src/assets/quiz-templates/research/research-1.jpg
+++ b/src/assets/quiz-templates/research/research-1.jpg
--- a/src/assets/quiz-templates/research/research-10.jpg
+++ b/src/assets/quiz-templates/research/research-10.jpg
--- a/src/assets/quiz-templates/research/research-2.jpg
+++ b/src/assets/quiz-templates/research/research-2.jpg
--- a/src/assets/quiz-templates/research/research-3.jpg
+++ b/src/assets/quiz-templates/research/research-3.jpg
--- a/src/assets/quiz-templates/research/research-4.jpg
+++ b/src/assets/quiz-templates/research/research-4.jpg
--- a/src/assets/quiz-templates/research/research-5.jpg
+++ b/src/assets/quiz-templates/research/research-5.jpg
--- a/src/assets/quiz-templates/research/research-6.jpg
+++ b/src/assets/quiz-templates/research/research-6.jpg
--- a/src/assets/quiz-templates/research/research-7.jpg
+++ b/src/assets/quiz-templates/research/research-7.jpg
--- a/src/assets/quiz-templates/research/research-8.jpg
+++ b/src/assets/quiz-templates/research/research-8.jpg
--- a/src/assets/quiz-templates/research/research-9.jpg
+++ b/src/assets/quiz-templates/research/research-9.jpg
--- a/src/assets/quiz-templates/services/service-1.jpg
+++ b/src/assets/quiz-templates/services/service-1.jpg
--- a/src/assets/quiz-templates/services/service-10.jpg
+++ b/src/assets/quiz-templates/services/service-10.jpg
--- a/src/assets/quiz-templates/services/service-11.jpg
+++ b/src/assets/quiz-templates/services/service-11.jpg
--- a/src/assets/quiz-templates/services/service-2.jpg
+++ b/src/assets/quiz-templates/services/service-2.jpg
--- a/src/assets/quiz-templates/services/service-3.jpg
+++ b/src/assets/quiz-templates/services/service-3.jpg
--- a/src/assets/quiz-templates/services/service-4.jpg
+++ b/src/assets/quiz-templates/services/service-4.jpg
--- a/src/assets/quiz-templates/services/service-5.jpg
+++ b/src/assets/quiz-templates/services/service-5.jpg
--- a/src/assets/quiz-templates/services/service-6.jpg
+++ b/src/assets/quiz-templates/services/service-6.jpg
--- a/src/assets/quiz-templates/services/service-7.jpg
+++ b/src/assets/quiz-templates/services/service-7.jpg
--- a/src/assets/quiz-templates/services/service-8.jpg
+++ b/src/assets/quiz-templates/services/service-8.jpg
--- a/src/assets/quiz-templates/services/service-9.jpg
+++ b/src/assets/quiz-templates/services/service-9.jpg
--- a/Show More
+++ b/Show More