Add terms and conditions links on signup forms

src/components/AccountTerms.tsx

@@ -0,0 +1,22 @@
+export function AccountTerms() {
+  return (
+    <div className="mt-3 text-left text-xs leading-normal text-gray-500">
+      By continuing to use our services, you acknowledge that you have both read
+      and agree to our{' '}
+      <a
+        href="/terms"
+        className="font-medium underline underline-offset-2 hover:text-black"
+      >
+        Terms of Service
+      </a>{' '}
+      and{' '}
+      <a
+        href="/privacy"
+        className="font-medium underline underline-offset-2 hover:text-black"
+      >
+        Privacy Policy
+      </a>
+      .
+    </div>
+  );
+}

src/components/AuthenticationFlow/LoginPopup.astro

@@ -1,5 +1,6 @@
 ---
 import Popup from '../Popup/Popup.astro';
+import { AccountTerms } from '../AccountTerms';
 import { AuthenticationForm } from './AuthenticationForm';
 ---
 
@@ -13,8 +14,17 @@ import { AuthenticationForm } from './AuthenticationForm';
     </p>
   </div>
   <AuthenticationForm client:load />
-  <div class='mt-6 text-center text-sm text-slate-600'>
+  <div
+    class='mt-3 w-full rounded-md border py-2 text-center text-sm text-slate-600'
+  >
     Don't have an account?{' '}
-    <a href='/signup' class='font-medium text-[#4285f4]'> Sign up</a>
+    <a
+      href='/signup'
+      class='font-medium text-blue-700 hover:text-blue-600 hover:underline'
+    >
+      Sign up
+    </a>
   </div>
+
+  <AccountTerms />
 </Popup>

src/pages/forgot-password.astro

@@ -1,6 +1,7 @@
 ---
 import { ForgotPasswordForm } from '../components/AuthenticationFlow/ForgotPasswordForm';
 import AccountLayout from '../layouts/AccountLayout.astro';
+import {AccountTerms} from "../components/AccountTerms";
 ---
 
 <AccountLayout title='Forgot Password' noIndex={true}>
@@ -20,12 +21,16 @@ import AccountLayout from '../layouts/AccountLayout.astro';
 
       <ForgotPasswordForm client:load />
 
-      <div class='mt-6 text-center text-sm'>
-        Don't have an account? <a
-          href='/signup'
-          class='font-medium text-blue-600 transition duration-150 ease-in-out hover:text-blue-500'
-          >Sign up</a
+      <div
+          class='mt-3 w-full rounded-md border py-2 text-center text-sm text-slate-600'
+      >
+        Don't have an account?{' '}
+        <a
+            href='/signup'
+            class='font-medium text-blue-700 hover:text-blue-600 hover:underline'
         >
+          Sign up
+        </a>
       </div>
     </div>
   </div>

src/pages/login.astro

@@ -1,4 +1,5 @@
 ---
+import { AccountTerms } from '../components/AccountTerms';
 import { AuthenticationForm } from '../components/AuthenticationFlow/AuthenticationForm';
 import AccountLayout from '../layouts/AccountLayout.astro';
 ---
@@ -22,12 +23,19 @@ import AccountLayout from '../layouts/AccountLayout.astro';
 
       <AuthenticationForm client:load />
 
-      <div class='mt-6 text-center text-sm text-slate-600'>
+      <div
+        class='mt-3 w-full rounded-md border py-2 text-center text-sm text-slate-600'
+      >
         Don't have an account?{' '}
-        <a href='/signup' class='font-medium text-blue-700 hover:text-blue-600'>
+        <a
+          href='/signup'
+          class='font-medium text-blue-700 hover:text-blue-600 hover:underline'
+        >
           Sign up
         </a>
       </div>
+
+      <AccountTerms />
     </div>
   </div>
 </AccountLayout>

src/pages/privacy.md

@@ -12,7 +12,7 @@ By using or accessing the Services in any manner, you acknowledge that you accep
 
 This Privacy Policy covers our treatment of personally identifiable information ("Personal Information") that we gather when you are accessing or using our Services, but not to the practices of companies we don’t own or control, or people that we don’t manage. We gather various types of Personal Information from our users, as explained in more detail below, and we use this Personal Information internally in connection with our Services, including to personalize, provide, and improve our services, to allow you to set up a user account and profile, to contact you and allow other users to contact you, to fulfill your requests for certain products and services, and to analyze how you use the Services. In certain cases, we may also share some Personal Information with third parties, but only as described below.
 
-As noted in the Terms of Use, we do not knowingly collect or solicit personal information from anyone under the age of 13. If you are under 13, please do not attempt to register for the Services or send any personal information about yourself to us. If we learn that we have collected personal information from a child under age 13, we will delete that information as quickly as possible. If you believe that a child under 13 may have provided us personal information, please contact us at kamranahmed.se@gmail.com.
+As noted in the Terms of Use, we do not knowingly collect or solicit personal information from anyone under the age of 13. If you are under 13, please do not attempt to register for the Services or send any personal information about yourself to us. If we learn that we have collected personal information from a child under age 13, we will delete that information as quickly as possible. If you believe that a child under 13 may have provided us personal information, please contact us at info@roadmap.sh.
 
 ## Will roadmap.sh ever change this Privacy Policy?
 
@@ -24,7 +24,7 @@ Information You Provide to Us:
 
 We receive and store any information you knowingly provide to us. For example, through the registration process and/or through your account settings, we may collect Personal Information such as your name, title, email address, phone number, and third-party account credentials (for example, your log-in credentials for Twitter or other third party sites. If you provide your third-party account credentials to us or otherwise sign in to the Services through a third party site or service, you understand some content and/or information in those accounts (“Third Party Account Information”) may be transmitted into your account with us if you authorize such transmissions], and that Third Party Account Information transmitted to our Services is covered by this Privacy Policy. Certain information may be required to register with us or to take advantage of some of our features.
 
-We may communicate with you if you’ve provided us the means to do so. For example, if you’ve given us your email address, we may send you promotional email offers on behalf of other businesses, or email you about your use of the Services. Also, we may receive a confirmation when you open an email from us. This confirmation helps us make our communications with you more interesting and improve our services. If you do not want to receive communications from us, please email us at kamranahmed.se@gmail.com.
+We may communicate with you if you’ve provided us the means to do so. For example, if you’ve given us your email address, we may send you promotional email offers on behalf of other businesses, or email you about your use of the Services. Also, we may receive a confirmation when you open an email from us. This confirmation helps us make our communications with you more interesting and improve our services. If you do not want to receive communications from us, please email us at info@roadmap.sh.
 
 ## Information Collected Automatically
 
@@ -65,16 +65,16 @@ Through your account settings, you may access, and, in some cases, edit or delet
 - age or birthday
 - username
 
-The information you can view, update, and delete may change as the Services change. If you have any questions about viewing or updating information we have on file about you, please contact us at kamranahmed.se@gmail.com.
+The information you can view, update, and delete may change as the Services change. If you have any questions about viewing or updating information we have on file about you, please contact us at info@roadmap.sh.
 
-Under California Civil Code Sections 1798.83-1798.84, California residents are entitled to ask us for a notice identifying the categories of Personal Information which we share with our affiliates and/or third parties for marketing purposes, and providing contact information for such affiliates and/or third parties. If you are a California resident and would like a copy of this notice, please submit a written request to: kamranahmed.se@gmail.com.
+Under California Civil Code Sections 1798.83-1798.84, California residents are entitled to ask us for a notice identifying the categories of Personal Information which we share with our affiliates and/or third parties for marketing purposes, and providing contact information for such affiliates and/or third parties. If you are a California resident and would like a copy of this notice, please submit a written request to: info@roadmap.sh.
 
 ## What choices do I have?
 
 You can always opt not to disclose information to us, but keep in mind some information may be needed to register with us or to take advantage of some of our features.
 
-You may be able to add, update, or delete information as explained above. When you update information, however, we may maintain a copy of the unrevised information in our records. You may request deletion of your account by contacting us at kamranahmed.se@gmail.com and we will disassociate our email address and Twitter account from any content or other information provided to us. Some information may remain in our records after your deletion of such information from your account. We may use any aggregated data derived from or incorporating your Personal Information after you update or delete it, but not in a manner that would identify you personally.
+You may be able to add, update, or delete information as explained above. When you update information, however, we may maintain a copy of the unrevised information in our records. You may request deletion of your account by contacting us at info@roadmap.sh and we will disassociate our email address and Twitter account from any content or other information provided to us. Some information may remain in our records after your deletion of such information from your account. We may use any aggregated data derived from or incorporating your Personal Information after you update or delete it, but not in a manner that would identify you personally.
 
 ## What if I have questions about this policy?
 
-If you have any questions or concerns regarding our privacy policies, please send us a detailed message to kamranahmed.se@gmail.com, and we will try to resolve your concerns.
+If you have any questions or concerns regarding our privacy policies, please send us a detailed message to info@roadmap.sh, and we will try to resolve your concerns.

src/pages/signup.astro

@@ -1,6 +1,7 @@
 ---
 import { AuthenticationForm } from '../components/AuthenticationFlow/AuthenticationForm';
 import AccountLayout from '../layouts/AccountLayout.astro';
+import {AccountTerms} from "../components/AccountTerms";
 ---
 
 <AccountLayout
@@ -27,12 +28,14 @@ import AccountLayout from '../layouts/AccountLayout.astro';
 
       <AuthenticationForm type='signup' client:load />
 
-      <div class='mt-6 text-center text-sm text-slate-600'>
+      <div class='mt-3 w-full rounded-md border py-2 text-center text-sm text-slate-600'>
         Already have an account? <a
           href='/login'
           class='font-medium text-blue-700 hover:text-blue-600'>Login</a
         >
       </div>
+
+      <AccountTerms />
     </div>
   </div>
 </AccountLayout>

src/pages/terms.md

@@ -8,7 +8,7 @@ noIndex: true
 
 PLEASE NOTE THAT YOUR USE OF AND ACCESS TO OUR SERVICES (DEFINED BELOW) ARE SUBJECT TO THE FOLLOWING TERMS; IF YOU DO NOT AGREE TO ALL OF THE FOLLOWING, YOU MAY NOT USE OR ACCESS THE SERVICES IN ANY MANNER.
 
-Welcome to roadmap.sh. Please read on to learn the rules and restrictions that govern your use of our website(s), products, services and applications (the “Services”). If you have any questions, comments, or concerns regarding these terms or the Services, please contact us at kamranahmed.se@gmail.com.
+Welcome to roadmap.sh. Please read on to learn the rules and restrictions that govern your use of our website(s), products, services and applications (the “Services”). If you have any questions, comments, or concerns regarding these terms or the Services, please contact us at info@roadmap.sh.
 
 These Terms of Use (the “Terms”) are a binding contract between you and roadmap.sh (“roadmap.sh,” “we”, and “us”). You must agree to and accept all of the Terms, or you don’t have the right to use the Services. Your using the Services in any way means that you agree to all of these Terms, and these Terms will remain in effect while you use the Services. These Terms include the provisions in this document, as well as those in the Privacy Policy and Copyright Dispute Policy.
 
@@ -24,7 +24,7 @@ Except for changes by us as described here, no other amendment or modification o
 
 You can view the current roadmap.sh [Privacy Policy here](/privacy).
 
-The Children’s Online Privacy Protection Act (“COPPA”) requires that online service providers obtain parental consent before they knowingly collect personally identifiable information online from children who are under 13. We do not knowingly collect or solicit personally identifiable information from children under 13. If you are a child under 13, please do not attempt to register for the Services or send any personal information about yourself to us. If we learn we have collected personal information from a child under 13, we will delete that information as quickly as possible. If you believe that a child under 13 may have provided us personal information, please contact us at kamranahmed.se@gmail.com.
+The Children’s Online Privacy Protection Act (“COPPA”) requires that online service providers obtain parental consent before they knowingly collect personally identifiable information online from children who are under 13. We do not knowingly collect or solicit personally identifiable information from children under 13. If you are a child under 13, please do not attempt to register for the Services or send any personal information about yourself to us. If we learn we have collected personal information from a child under 13, we will delete that information as quickly as possible. If you believe that a child under 13 may have provided us personal information, please contact us at info@roadmap.sh.
 
 ## What are the basics of using roadmap.sh?
 
@@ -96,7 +96,7 @@ The roadmap.sh Services are currently free, but we reserve the right to charge f
 
 ## What if I want to stop using roadmap.sh?
 
-You’re free to do that at any time, by contacting us at kamranahmed.se@gmail.com; please refer to our Privacy Policy, as well as the licenses above, to understand how we treat information you provide to us after you have stopped using our Services. roadmap.sh is also free to terminate (or suspend access to) your use of the Services or your account, for any reason in our discretion, including your breach of these Terms. roadmap.sh has the sole right to decide whether you are in violation of any of the restrictions set forth in these Terms.
+You’re free to do that at any time, by contacting us at info@roadmap.sh; please refer to our Privacy Policy, as well as the licenses above, to understand how we treat information you provide to us after you have stopped using our Services. roadmap.sh is also free to terminate (or suspend access to) your use of the Services or your account, for any reason in our discretion, including your breach of these Terms. roadmap.sh has the sole right to decide whether you are in violation of any of the restrictions set forth in these Terms.
 
 Account termination may result in destruction of any Content associated with your account, so keep that in mind before you decide to terminate your account. We will try to provide advance notice to you prior to our terminating your account so that you are able to retrieve any important User Submissions you may have stored in your account (to the extent allowed by law and these Terms), but we may not do so if we determine it would be impractical, illegal, not in the interest of someone’s safety or security, or otherwise harmful to the rights or property of roadmap.sh.