Merge branch 'master' into fix/345

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
@@ -31,8 +30,5 @@ yarn-error.log*
 
 # vercel
 .vercel
-=======
-node_modules
-dist
-.DS_Store
->>>>>>> 01b055cce86f54da76e412cdfbbd113702f986e4
+
+credentials.json

README.md

@@ -51,4 +51,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

components/Form/Cfp/stepFour.js

@@ -8,12 +8,13 @@ import Button from "../../Buttons/button";
 function StepFour({ setStep, setForm, data }) {
   const [submitting, setSubmitting] = useState(false);
   const [disabled, setDisabled] = useState(false);
+
   const onSubmit = (e) => {
     e.preventDefault();
     setSubmitting(true);
     axios
       .post(
-        "https://sheet.best/api/sheets/91aebdc6-66cb-46c2-9c7b-4cdfc7541b56",
+        `/api/speakers/register`,
         data
       )
       .then((res) => {
@@ -26,7 +27,7 @@ function StepFour({ setStep, setForm, data }) {
       .catch((err) => {
         setSubmitting(false);
         toast.error("Failed to submit feedback. Try again", {
-            duration: '6000'
+            duration: '5600'
           });
       });
   };
@@ -52,20 +53,19 @@ function StepFour({ setStep, setForm, data }) {
         <div className="mt-6 text-dark-600 text-md">
           By clicking submit, this means you agree to follow the <a className="underline" href="https://github.com/asyncapi/spec/blob/master/CODE_OF_CONDUCT.md" target="_blank" rel="noreferrer">AsyncAPI Initiative Code of Conduct</a>
         </div>
-        <div className="float-right">
+        <div className="float-right mt-3 lg:flex lg:flex-col-reverse lg:w-full">
           <a
-            className="mr-10 text-dark-600 cursor-pointer"
+            className="mr-10 text-dark-600 cursor-pointer lg:text-center lg:pl-10 lg:mt-5"
             onClick={() => !disabled && setStep(null, 3)}
           >
             Back
           </a>
           <Button
             type="submit"
-            className="p-3 rounded-md mt-3 w-36"
             disabled={submitting || disabled}
-          >
+            className="bg-tetiary-pink p-3 rounded-md text-white mt-3 w-36 lg:w-full lg:mt-5">
             {submitting ? <ActivityLoader /> : "Submit"}
-          </Button>
+            </Button>
         </div>
       </div>
     </form>

components/Form/Cfp/stepOne.js

@@ -53,7 +53,7 @@ function StepOne({ setStep, setForm, data }) {
                   onChange={(e) => setForm({ ...data, Social: e.target.value })}
         />
         <Button type="submit"
-          className="bg-tetiary-pink p-3 rounded-md text-white mt-3 float-right w-36"
+          className="bg-tetiary-pink p-3 rounded-md text-white mt-6 float-right w-36 lg:w-full lg:mt-8"
           disabled={!data.Fullname && true}>Next</Button>
       </div>
     </form>

components/Form/Cfp/stepThree.js

@@ -4,10 +4,6 @@ import Select from "../select";
 import Button from "../../Buttons/button";
 
 const options1 = [
-  {
-    value: "Lightning talk",
-    label: "Lightning talk(5mins)",
-  },
   {
     value: "Session",
     label: "Session(20 - 25mins)",
@@ -37,7 +33,7 @@ function StepThree({ setStep, setForm, data }) {
   const [value, setValue] = useState({});
   useEffect(() => {
     setForm({ ...data, ...value});
-  }, [data, setForm, value]); 
+  }, [value]); 
   return (
     <form className="mt-3 w-[30rem] lg:w-[auto]" onSubmit={(e) => setStep(e, 4)}>
       <h1 className="text-white font-bold text-4xl lg:text-3xl">
@@ -63,21 +59,21 @@ function StepThree({ setStep, setForm, data }) {
           setValue={(val) => setValue({...value, Level: val})}
           multi={false}
         />
-        <div className="float-right">
-        <a
-            className="mr-10 text-dark-600 cursor-pointer"
-            onClick={() => setStep(null, 1)}
+        <div className="float-right mt-3 lg:flex lg:flex-col-reverse lg:w-full">
+          <a
+            className="mr-10 text-dark-600 cursor-pointer lg:text-center lg:pl-10 lg:mt-5"
+            onClick={() => setStep(null, 2)}
           >
             Back
-                  </a>
-                  <Button
-                    type="submit"
-                    disabled={!data.Format || !data.Level && true}
-                    className="p-3 rounded-md mt-3 w-36">
-                      Next
-                  </Button>
+          </a>
+          <Button
+            type="submit"
+            disabled={!data.Description || !data.Title && true}
+            className="bg-tetiary-pink p-3 rounded-md text-white mt-3 w-36 lg:w-full lg:mt-5">
+            Next
+            </Button>
+        </div>
         </div>
-      </div>
     </form>
   );
 }

components/Form/Cfp/stepTwo.js

@@ -30,17 +30,17 @@ function StepTwo({ setStep, setForm, data }) {
             border: "1px solid #E50E99",
           }}
           onChange={(e) => setForm({ ...data, Description: e.target.value })} />
-        <div className="float-right">
+        <div className="float-right mt-3 lg:flex lg:flex-col-reverse lg:w-full">
           <a
-            className="mr-10 text-dark-600 cursor-pointer"
+            className="mr-10 text-dark-600 cursor-pointer lg:text-center lg:pl-10 lg:mt-5"
             onClick={() => setStep(null, 1)}
           >
             Back
           </a>
           <Button
             type="submit"
             disabled={!data.Description || !data.Title && true}
-            className="bg-tetiary-pink p-3 rounded-md text-white mt-3 w-36">
+            className="bg-tetiary-pink p-3 rounded-md text-white mt-3 w-36 lg:w-full lg:mt-3">
             Next
             </Button>
         </div>

components/Form/paper.js

@@ -4,7 +4,7 @@ import StepOne from "./Cfp/stepOne";
 import StepTwo from "./Cfp/stepTwo";
 import StepThree from './Cfp/stepThree';
 import StepFour from './Cfp/stepFour';
-
+import cfpData from "../../config/cfp-data.json"
 const fields = [
   {
     title: "Your Information",
@@ -45,10 +45,11 @@ function Paper() {
   useEffect(() => {
     setHeight(confetiRef.current.clientHeight);
     setWidth(confetiRef.current.clientWidth);
+
   }, []);
   const stepOne =  <StepOne setStep={onStepUpdate} setForm={setFormData} data={formData} />
   let view = stepOne
-  if (step === 4) {
+  if (step === 1) {
     view = stepOne
   }
   if (step === 2) {
@@ -76,7 +77,9 @@ function Paper() {
   }
 
     return (
-        <div className="relative mt-10 sm:mt-0" id="forms" ref={confetiRef}>
+        <div className="py-28 flex flex-col justify-center items-center" id="forms" ref={confetiRef}>
+          <div>
+          <div className='lg:px-6 mt-5'>
             <h1 className="text-white font-bold text-5xl lg:text-3xl">
         Submit your talk!
             </h1>
@@ -87,7 +90,8 @@ function Paper() {
           <p>
                P.S. We do not offer travel scholarships or financial support.
           </p>
-          <p className='sm:mt-4'>Application closes on Oct 19</p>
+          <p className='sm:mt-4'>Application closes on {cfpData.CallEndDate}</p>
+        </div>
         </div>
       <div
         className="mt-5"
@@ -103,17 +107,17 @@ function Paper() {
             minHeight: "50vh",
           }}
         >
-          <div className="p-6 lg:p-0 lg:py-2 lg:pr-4 mt-12">
+          <div className="p-6 pr-14 lg:p-0 lg:py-2 lg:pr-4 mt-12">
             {fields.map((field, i) => {
               const index = i + 1 ;
               return (
                 <div
                       key={field.title}
-                      className='h-[100px]'
+                      className=' w-full'
                 >
                   <div className="flex justify-between">
-                    <div className="md:hidden">
-                      <h3 className={`text-white font-bold text-lg ${index <= step && "text-[#E50E99]"}`}>
+                    <div className="sm:hidden my-4">
+                      <h3 className={`font-bold text-lg ${(index <= step && "text-[#E50E99]") || ("text-white")}`}>
                         {field.title}
                       </h3>
                       <p className="text-dark-600">{field.description}</p>
@@ -124,7 +128,7 @@ function Paper() {
             })}
           </div>
         </div>
-        <div className="p-10 p-6">
+        <div className="p-10 ml-24 lg:ml-0">
           <p className="text-dark-400">{typeof(step) === 'number' && `Step ${step}/4`}</p>
           {view}
           <div
@@ -136,6 +140,7 @@ function Paper() {
           </div>
         </div>
       </div>
+          </div>
       </div>
   )
 }

components/Form/select.js

@@ -45,7 +45,7 @@ function Dropdown({ options, title, setValue, multi }) {
     } else {
       setValue(selectedOption.value);
     }
-  }, [multi, selectedOption, setValue]);
+  }, [selectedOption]);
   return (
     <div className="relative inline-block w-full">
       <Select

components/Form/subscription.js

@@ -1,25 +1,20 @@
 import React from 'react';
 import Button from '../Buttons/button';
 
-function Subcription() {
+function Subscription() {
 	return (
-		<div className='mt-[106px] subscription container flex justify-center'>
-			<div className='w-[1024px] min-h-[253px] lg:py-10 lg:w-full flex flex-col items-center mt-[106px]'>
+		<div className='mt-0 md:mt-[106px] subscription container flex justify-center'>
+			<div className='mt-[106px] lg:mt-0 w-[1024px] min-h-[253px] lg:py-10 lg:w-full flex flex-col items-center'>
 				<h3 className='text-[32px] text-white lg:text-center'>
 					Subscribe for AACoT’24 updates!
 				</h3>
 				<a href='https://www.asyncapi.com/newsletter' target='_blank' rel="noreferrer" className='sm:w-full'>
-				<Button
-					type='submit'
-					className='w-full md:w-[200px] mt-8 px-10' 
-				>
+				<Button type='submit' className='w-full md:w-[200px] mt-8 px-10'>
 					Subscribe
 				</Button>
-
 				</a>
 			</div>
 		</div>
 	);
 }
-
-export default Subcription;
+export default Subscription

components/Header/header.js

@@ -33,9 +33,9 @@ function Header() {
 							</div>
 							<div className='mt-[54px] relative flex items-center justify-center'>
 								<Link
-									href='#register'
+									href='#tickets'
 								>
-									<Button className='w-[250px]'>Register now</Button>
+									<Button className='w-[250px]'>Register Now</Button>
 								</Link>
 							</div>
 						</div>