Merge branch 'OpenSignLabs:staging' into issue/168

Author: rishabjasrotia

apps/OpenSign/src/components/AppendFormInForm.js

@@ -241,39 +241,37 @@ const AppendFormInForm = (props) => {
               className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
             />
           </div>
-
           <div className="mb-3">
             <label
-              htmlFor="phone"
+              htmlFor="email"
               className="block text-xs text-gray-700 font-semibold"
             >
-              Phone
+              Email
               <span style={{ color: "red", fontSize: 13 }}> *</span>
             </label>
             <input
-              type="text"
-              id="phone"
-              value={phone}
-              onChange={(e) => setPhone(e.target.value)}
+              type="email"
+              id="email"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
               required
               disabled={addYourself}
               className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
             />
           </div>
-
           <div className="mb-3">
             <label
-              htmlFor="email"
+              htmlFor="phone"
               className="block text-xs text-gray-700 font-semibold"
             >
-              Email
+              Phone
               <span style={{ color: "red", fontSize: 13 }}> *</span>
             </label>
             <input
-              type="email"
-              id="email"
-              value={email}
-              onChange={(e) => setEmail(e.target.value)}
+              type="text"
+              id="phone"
+              value={phone}
+              onChange={(e) => setPhone(e.target.value)}
               required
               disabled={addYourself}
               className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"

apps/OpenSignServer/files/verification_email.html

@@ -10,7 +10,7 @@
     <br />
     <p><a href="{{{link}}}" style="background-color: lightskyblue; cursor: pointer; border-radius: 5px; padding: 10px; border-style: solid; border-width: 2px; text-decoration: none; font-weight: bolder; color:blue">Verify email</a></p>
     <br />
-    <p>ExampleApp</p>
+    <p><a href="https://www.opensignlabs.com">OpenSign™</a></p>
 </body>
 
-</html>
+</html>

apps/OpenSignServer/index.js

@@ -73,7 +73,7 @@ export const config = {
   masterKey: process.env.MASTER_KEY || '', //Add your master key here. Keep it secret!
   masterKeyIps: ['0.0.0.0/0', '::1'], // '::1'
   serverURL: process.env.SERVER_URL || 'http://localhost:8080/app', // Don't forget to change to https if needed
-  // verifyUserEmails: true,
+  verifyUserEmails: true,
   publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app',
   // Your apps name. This will appear in the subject and body of the emails that are sent.
   appName: 'Open Sign',