fix: fixes an issue where the enter key was redirecting the user to w…

…rong page
perimetre · Jan 19, 2022 · 2a9289b · 2a9289b
1 parent 6d125f1
commit 2a9289b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -7,6 +7,7 @@
     "close": "Close",
     "add": "Add",
     "back": "Back",
+    "next": "Next",
     "exit": "Exit",
     "logout": "Logout"
   },

diff --git a/next-env.d.ts b/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/src/apollo/generated/graphql.tsx b/src/apollo/generated/graphql.tsx
@@ -6028,17 +6028,6 @@ export type ProjectModuleDataFragment = {
   };
 };
 
-export type ProjectDataFragment = {
-  __typename?: 'Project';
-  id: number;
-  title: string;
-  slug: string;
-  cabinetWidth?: number | null | undefined;
-  gable: number;
-  type: { __typename?: 'Type'; id: number; slug: string };
-  collection: { __typename?: 'Collection'; id: number; slug: string };
-};
-
 export type LoginMutationVariables = Exact<{
   user: UserSingIn;
 }>;
@@ -7282,6 +7271,17 @@ export type DeleteProjectModuleMutation = {
   deleteManyProjectModule: { __typename?: 'AffectedRowsOutput'; count: number };
 };
 
+export type ProjectDataFragment = {
+  __typename?: 'Project';
+  id: number;
+  title: string;
+  slug: string;
+  cabinetWidth?: number | null | undefined;
+  gable: number;
+  type: { __typename?: 'Type'; id: number; slug: string };
+  collection: { __typename?: 'Collection'; id: number; slug: string };
+};
+
 export type ProjectCartQueryVariables = Exact<{
   slug: Scalars['String'];
 }>;

diff --git a/src/components/Templates/ProjectCreation/index.tsx b/src/components/Templates/ProjectCreation/index.tsx
@@ -7,6 +7,7 @@ import Spinner from '../../UI/Spinner';
 import SkeletonImage from '../../UI/SkeletonImage';
 import UnitSwitch from '../../Elements/UnitSwitch';
 import { ArrowLeft, ArrowRight } from 'react-feather';
+import { FormattedMessage } from 'react-intl';
 
 export type ProjectCreationTemplateProps = {
   title: string;
@@ -103,6 +104,7 @@ const ProjectCreationTemplate: React.FC<ProjectCreationTemplateProps> = ({
             <Button
               disabled={disablePrev || loading}
               className="px-6 py-2"
+              type="button"
               onClick={(e) => {
                 // Using stopPropagation and preventDefault because this is triggering onsubmit on form for a unknown reason
                 e.preventDefault();
@@ -111,11 +113,11 @@ const ProjectCreationTemplate: React.FC<ProjectCreationTemplateProps> = ({
               }}
             >
               <ArrowLeft />
-              Back
+              <FormattedMessage id="common.back" />
             </Button>
           )}
           <Button disabled={disableNext || loading} className="px-6 py-2" type="submit">
-            Next
+            <FormattedMessage id="common.next" />
             {loading ? <Spinner className="w-5 h-5 ml-2" /> : <ArrowRight />}
           </Button>
         </div>

diff --git a/src/components/UI/NavbarButton/index.tsx b/src/components/UI/NavbarButton/index.tsx
@@ -9,6 +9,7 @@ type NavbarButtonProps = DetailedHTMLProps<ButtonHTMLAttributes<HTMLButtonElemen
 const NavbarButton: React.FC<NavbarButtonProps> = ({ icon, iconPosition = 'right', children, ...buttonProps }) => (
   <button
     className="flex items-center justify-center h-full px-4 hover:bg-mui-gray-50 transition-colors duration-75 group gap-2"
+    type="button"
     {...buttonProps}
   >
     {iconPosition === 'left' && icon}