Merge branch 'main' of https://git.itguild.info/apuc/guild_front into fixed/components

src/components/Modal/ModalRegistration/ModalRegistration.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
 
 import { useFormValidation } from "@hooks/useFormValidation";
 import { useNotification } from "@hooks/useNotification";
@@ -17,6 +18,7 @@ import "./modalRegistration.scss";
 export const ModalRegistration = ({ active, setActive }) => {
   const [loader, setLoader] = useState(false);
   const [isPartner, setIsPartner] = useState(false);
+  const navigate = useNavigate();
 
   const fields = {
     username: "",
@@ -145,6 +147,7 @@ export const ModalRegistration = ({ active, setActive }) => {
               onClick={async (e) => {
                 e.preventDefault();
                 await handleSubmit(e);
+                navigate("/welcome-page");
               }}
               styles="button-box__submit"
             >

src/pages/WelcomePage/WelcomePage.jsx

@@ -1,4 +1,5 @@
 import React, { useState } from "react";
+import { useNavigate } from "react-router";
 
 import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
 import BaseButton from "@components/Common/BaseButton/BaseButton";
@@ -12,6 +13,7 @@ import "./welcomePage.scss";
 
 export const WelcomePage = () => {
   const [loader, setLoader] = useState(false);
+  const navigate = useNavigate();
 
   return (
     <div className="welcome-page">
@@ -39,6 +41,7 @@ export const WelcomePage = () => {
             <BaseButton
               onClick={() => {
                 setLoader(true);
+                navigate("/profile");
               }}
               styles="button-box__submit"
             >