проверка валидности почты, отправка с правильного домена

package-lock.json

@@ -41,6 +41,7 @@
                 "typescript": "^4.4.2",
                 "use-debounce": "^9.0.4",
                 "web-vitals": "^2.1.0",
+                "yup": "^1.3.2",
                 "zustand": "^4.3.8"
             },
             "devDependencies": {
@@ -14597,6 +14598,11 @@
             "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
             "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
         },
+        "node_modules/property-expr": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
+            "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
+        },
         "node_modules/proxy-addr": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -16637,6 +16643,11 @@
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
             "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
         },
+        "node_modules/tiny-case": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+            "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q=="
+        },
         "node_modules/tiny-invariant": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
@@ -16674,6 +16685,11 @@
                 "node": ">=0.6"
             }
         },
+        "node_modules/toposort": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+            "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
+        },
         "node_modules/tough-cookie": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
@@ -18095,6 +18111,28 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/yup": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/yup/-/yup-1.3.2.tgz",
+            "integrity": "sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ==",
+            "dependencies": {
+                "property-expr": "^2.0.5",
+                "tiny-case": "^1.0.3",
+                "toposort": "^2.0.2",
+                "type-fest": "^2.19.0"
+            }
+        },
+        "node_modules/yup/node_modules/type-fest": {
+            "version": "2.19.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+            "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+            "engines": {
+                "node": ">=12.20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/zustand": {
             "version": "4.3.8",
             "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.3.8.tgz",
@@ -28353,6 +28391,11 @@
                 }
             }
         },
+        "property-expr": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
+            "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
+        },
         "proxy-addr": {
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -29853,6 +29896,11 @@
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
             "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
         },
+        "tiny-case": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+            "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q=="
+        },
         "tiny-invariant": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
@@ -29881,6 +29929,11 @@
             "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
             "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
         },
+        "toposort": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+            "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
+        },
         "tough-cookie": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
@@ -30956,6 +31009,24 @@
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
             "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
         },
+        "yup": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/yup/-/yup-1.3.2.tgz",
+            "integrity": "sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ==",
+            "requires": {
+                "property-expr": "^2.0.5",
+                "tiny-case": "^1.0.3",
+                "toposort": "^2.0.2",
+                "type-fest": "^2.19.0"
+            },
+            "dependencies": {
+                "type-fest": {
+                    "version": "2.19.0",
+                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+                    "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
+                }
+            }
+        },
         "zustand": {
             "version": "4.3.8",
             "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.3.8.tgz",

package.json

@@ -36,6 +36,7 @@
         "typescript": "^4.4.2",
         "use-debounce": "^9.0.4",
         "web-vitals": "^2.1.0",
+        "yup": "^1.3.2",
         "zustand": "^4.3.8"
     },
     "scripts": {

src/api/contactForm.ts

@@ -1,14 +1,13 @@
 import axios from "axios";
 
 
-const apiUrl = "https://admin.pena.digital/feedback";
 
 export function sendContactFormRequest(body: {
 
     contact: string;
     whoami: string;
 }) {
-    return axios(apiUrl + "/callme", {
+    return axios("https://squiz.pena.digital/feedback/callme", {
         method: "POST",
         headers: {
             "Content-Type": "application/json",

src/index.tsx

@@ -18,6 +18,7 @@ import MyQuizzesFull from "./pages/createQuize/MyQuizzesFull";
 import ContactFormModal from "@ui_kit/ContactForm";
 import ImageCrop from "@ui_kit/Modal/ImageCrop";
 import Landing from "./pages/Landing/Landing";
+import { SnackbarProvider } from 'notistack'
 
 const routeslink: {
   path: string;
@@ -38,6 +39,7 @@ const root = createRoot(document.getElementById("root")!);
 root.render(
   <DndProvider backend={HTML5Backend}>
     <ThemeProvider theme={lightTheme}>
+      <SnackbarProvider>
       <ContactFormModal />
       <BrowserRouter>
         <Routes>
@@ -49,6 +51,7 @@ root.render(
           <Route path="/" element={<Landing/>}/>
         </Routes>
       </BrowserRouter>
+      </SnackbarProvider>
     </ThemeProvider>
   </DndProvider>
 );

src/stores/contactForm.ts

@@ -2,7 +2,6 @@ import { create } from "zustand";
 import { sendContactFormRequest } from "../api/contactForm";
 import { getMessageFromFetchError } from "../utils/backendMessageHandler";
 
-
 interface ContactFormStore {
   isModalOpen: boolean;
   isSubmitDisabled: boolean;
@@ -40,9 +39,9 @@ export const sendContactForm = async (): Promise<string | null> => {
   const { mail, phoneNumberField, telegramField, whatsappField } = useContactFormStore.getState();
 
   if (!mail) return "Почта не указана";
-  let contact = `phonenumber:${phoneNumberField}`;
+  if (!mail.includes("@")) return "Почта некорректна";
-  if (telegramField) contact += `\ntelegram:${telegramField}`;
+  let contact = "Опросник, предрегистрация";
-  if (whatsappField) contact += `\nwhatsapp:${whatsappField}`;
+
 
   try {
     useContactFormStore.setState({ isSubmitDisabled: true });

yarn.lock

@@ -7839,6 +7839,11 @@ prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+property-expr@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
@@ -9156,6 +9161,11 @@ thunky@^1.0.2:
   resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+tiny-case@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz"
+  integrity sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==
+
 tiny-invariant@^1.0.6:
   version "1.3.1"
   resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
@@ -9183,6 +9193,11 @@ toidentifier@1.0.1:
   resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"
+  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
+
 tough-cookie@^4.0.0:
   version "4.1.2"
   resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz"
@@ -9297,6 +9312,11 @@ type-fest@^0.21.3, "type-fest@>=0.17.0 <4.0.0":
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
+type-fest@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz"
+  integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
@@ -10010,6 +10030,16 @@ yocto-queue@^0.1.0:
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yup@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.npmjs.org/yup/-/yup-1.3.2.tgz"
+  integrity sha512-6KCM971iQtJ+/KUaHdrhVr2LDkfhBtFPRnsG1P8F4q3uUVQ2RfEM9xekpha9aA4GXWJevjM10eDcPQ1FfWlmaQ==
+  dependencies:
+    property-expr "^2.0.5"
+    tiny-case "^1.0.3"
+    toposort "^2.0.2"
+    type-fest "^2.19.0"
+
 zustand@^4.3.8:
   version "4.3.8"
   resolved "https://registry.npmjs.org/zustand/-/zustand-4.3.8.tgz"