use TextLayout in privacy, terms and docs

pages/docs/[[...slug]].js

@@ -7,7 +7,7 @@ import Link from 'next/link';
 import { useRouter } from 'next/router';
 
 import Layout from '../../components/layout';
-import { Icon } from '../../components/jambonz-ui';
+import { Icon, TextLayout } from '../../components/jambonz-ui';
 import { getData, getDocs, getDocsPaths } from '../../lib/data';
 
 function Sidebar({data}) {
@@ -90,9 +90,7 @@ export default function Docs({ data, docs }) {
       <div className="docs">
         <div className="wrap docs__wrap">
           <Sidebar data={data.docs} />
-          <div className="docs__html">
-            <div dangerouslySetInnerHTML={{ __html: docs.contentHtml }} />
-          </div>
+          <TextLayout data={docs} />
         </div>
       </div>
     </Layout>

pages/privacy.js

@@ -1,25 +1,29 @@
 import Layout from '../components/layout';
-import { Hero } from '../components/jambonz-ui';
-import { getData, getDocs } from '../lib/data';
-import TextLayout from '../components/text-layout';
+import { Hero, TextLayout } from '../components/jambonz-ui';
+import { getData, getParsedMarkdown } from '../lib/data';
 
-export default function Privacy({ data, docs }) {
+// You'll need to load the nodejs path module
+import path from 'path';
+
+export default function Privacy({ data, parsed }) {
   return (
     <Layout siteData={data.site}>
       <Hero data={data.privacy.hero} subStyle="privacy" />
-      <TextLayout data={docs} />
+      <TextLayout data={parsed} />
     </Layout>
   );
 }
 
 export async function getStaticProps() {
   const data = getData('privacy');
-  const docs = await getDocs(['rest', 'privacy.md']);
+
+  // Use the new public method in a more ad hoc manner like this...
+  const parsed = await getParsedMarkdown(path.join(process.cwd(), 'pages', 'privacy.md'));
 
   return {
     props: {
       data,
-      docs,
+      parsed,
     },
   };
 }

pages/privacy.md

@@ -0,0 +1,63 @@
+In order to provide you with the service, jambonz needs to collect some personal information about you.
+
+Additionally, you may have end user customers that access the jambonz service, and in the course of providing these peoplewith service we may end up collecting some information about them as well.  To keep things straight, we'll refer to you as the "Customer", and your end users as "End Users".
+
+Whew!  Now, with that out of the way, let's review some basic facts about privacy which we think you should be aware of.
+
+##### About Customer Data
+
+1. We do not share your data with any third party, unless it is necessary to provide the service, or we are required to by law.  In no cases do we sell your data to any third party.
+
+2. The primary personal information we collect about you is your email address, which we use as a form of identification within the system and to be able to reach out to you for things like password reset requests, etc.  You can also create an account on jambonz using Google or Github as an oauth provider, and if you grant this access, we will retrieve and store your email address and name from those providers.
+
+3. If you sign up for a paid plan, we will direct you to our third-party billing partner (currently Stripe) to enter your credit card details.  We do not have access to your credit card number or CVC, nor do we store those in our database or anywhere on our servers.
+
+4. To work with your preferred carriers and speech service providers, you will need to provide us some information about those vendors and services.  We will store this information in our databaseto utilize these services on your behalf.  You can change or delete this information at any time from our system, and all related information will be removedfrom all our systems immediately.
+
+5. We will also collect IP addresses that you use to access the the service from.  In some cases, such as when we need to direct calls to devices you have registered, we will store these IP addresses in our database for a short period of time.
+
+6. You can delete your jambonz account at any point in time, and we will remove your account and substantially all your data immediately.  We may retain a minimum amount of data necessary for activities like resolving disputes, analyzing, and improving system performance, etc.
+
+##### About End-User Data
+
+1. While making calls, your End User customers may share private and confidential information over the audio connection established through jambonz -- e.g., credit card numbers, account numbers etc.  We never store audio recordings -- or transcriptions of audio recordings -- in our databases or on our servers, so this kind of information about your End User customers can never be exposed from our systems.  We thought you'd you want to know this.
+
+2. While delivering calls for your End Users, we will receive information such as the phone numbers and IP addresses they are calling from, the numbers or other identifiers of the people, services, or devices they are trying to reach, along with information like the time and length of the call, etc.  This information is typically referred to as a "Call Detail Record" and unless you modify your account settings (see the next point below) we will store Call Detail Records for your end users in our database.
+
+3. You can opt out of Call Detail Record reporting by disabling the feature in the self-service portal.  If you do choose to opt out, the only information we will store about your End Users will be the IP addresses of devices that they register to make/receive calls because this information is needed to successfully provide that service.End User IP address information is only stored in our database for a period of one hour from the most successful recent device registration request.
+
+##### Location of Service
+
+Our servers are located in the USA, and your calls (media and signaling) will transit through these servers.
+
+##### A Few Words about GDPR
+
+**The General Data Protection Regulation** (GDPR) in the **European Economic Area** (EEA) distinguishes between data "controllers" and "processors".  A controller decides why and how to process personal information.  A processor processes personal information on behalf of a controller based on the controller’s instructions.
+
+jambonz is primarily a data controller; we use information included in the Customer Data such as your carrier sip trunk details and speech credentials as part of our legitimate interest of providing you with the service you expect.
+
+When handling calls from your End Users, jambonz also acts as a data processor, in that we are processing End User data such as phone numbers and IP addresses under your instructions for routing and managing the end user's calls.
+
+Under the GDPR, you have the right to:
+
+- Request access to your personal data. This enables you to receive a copy of the personal data we hold about you and to check that we are lawfully processing it.
+- Request correction of the personal data that we hold about you. This enables you to have any incomplete or inaccurate information we hold about you corrected.
+- Request erasure of your personal data. This enables you to ask us to delete or remove personal data where there is no good reason for us continuing to process it. You also have the right to ask us to delete or remove your personal data where you have exercised your right to object to processing.
+- Opt-out from our communications.  Please note that you cannot unsubscribe from service-related messages.
+- Object to processing of your personal data, for example, if we are relying on a legitimate interest (or those of a third party) and there is something about your particular situation which makes you want to object to processing on this basis.
+- Request the restriction of processing of your personal data. This enables you to ask us to suspend the processing of personal data about you, for example if you want us to establish its accuracy or the reason for processing it.
+- Request the transfer of your personal data to another party (right to data portability).
+
+##### California Consumer Access and Deletion Rights
+
+If you would like more information about our use of Customer Data or End User Data, you can request:
+
+- that we provide details about the categories of personal information that we collect about you, including how we collect and share it;
+- that we provide you access to the personal information we collect about you; and
+- that we delete the personal information we have about you.
+
+Please note that when request this, we will take steps to verify that you are authorized to make the request.
+
+##### How we secure personal information
+
+We use appropriate technical and organizational measures to protect the security of your personal information both online and offline. These measures vary based on the sensitivity of the personal information we collect, process and store and the current state of technology. 

pages/terms.js

@@ -1,25 +1,29 @@
 import Layout from '../components/layout';
-import { Hero } from '../components/jambonz-ui';
-import { getData, getDocs } from '../lib/data';
-import TextLayout from '../components/text-layout';
+import { Hero, TextLayout } from '../components/jambonz-ui';
+import { getData, getParsedMarkdown } from '../lib/data';
 
-export default function Terms({ data, docs }) {
+// You'll need to load the nodejs path module
+import path from 'path';
+
+export default function Terms({ data, parsed }) {
   return (
     <Layout siteData={data.site}>
       <Hero data={data.terms.hero} subStyle="terms" />
-      <TextLayout data={docs} />
+      <TextLayout data={parsed} />
     </Layout>
   );
 }
 
 export async function getStaticProps() {
   const data = getData('terms');
-  const docs = await getDocs(['rest', 'terms.md']);
+  
+  // Use the new public method in a more ad hoc manner like this...
+  const parsed = await getParsedMarkdown(path.join(process.cwd(), 'pages', 'terms.md'));
 
   return {
     props: {
       data,
-      docs,
+      parsed,
     },
   };
 }

pages/terms.md

@@ -0,0 +1,35 @@
+Please read carefully this jambonz Cloud Beta Agreement (this “Agreement”), which contains the terms and conditions that govern your access to and use of the jambonz Services (as defined below) and is an agreement between Drachtio Communication Services LLC, a MA LLChaving offices at 50 Terminal St, Suite 722 Building 2, Charlestown USA (also referred to as “jambonz,” “we,” “us,” or “our”) and you or the entity you represent (“Customer,” “you,” or “your”).
+
+By clicking the check box presented with these terms or by accessing or using the jambonz Services (“Acceptance”), you will create a legally enforceable contract where you agree to be bound by all terms and conditions of this agreement without modification. This Agreement takes effect on Acceptance (the “Effective Date”). You represent to us that you are lawfully able to enter into contracts (e.g., you are not a minor). If you are entering into this Agreement for an entity, such as the company you work for, you represent to us that you have legal authority to bind that entity.
+
+**IF YOU CANNOT OR DO NOT AGREE TO ALL TERMS AND CONDITIONS IN THIS AGREEMENT, YOU SHOULD NOT CLICK THE CHECK BOX PRESENTED WITH THESE TERMS AND YOU ARE PROHIBITED FROM ACCESSING OR USING THE JAMBONZ SERVICES.**
+
+#### <center><b>TERMS AND CONDITIONS</b></center>
+
+##### 1. JAMBONZ SERVICES.
+
+This is a beta. You must not rely on it or use it for anything where it would be a problem if it did not work at all or did not work properly. We will try to keep the service available and functioning for the duration of the beta, but we do not guarantee to do so. Basically, we hope it works, and we'll probably try to fix important things if we find they don't work, but we're not responsible or liable to you if it doesn't work, or if we don't fix it.
+
+We may change or discontinue any or all of the jambonz Services or change or remove functionality of any or all of the jambonz Services during the beta period. We will do our best to notify you in advance of planned changes.
+
+##### 2. PERIOD OF THE BETA
+
+The Beta is expected to run for a period of two months or so from late May-July 2021.  We may extend or contract the length of the beta based on our assessment of how it is going.  Our intention is to launch a production release on completion of the beta, but we reserve the right to decide when and if there will be a production release of the jambonz cloud services.
+
+##### 3. TERMS AND TERMINATION
+
+We reserve the right to cancel your service at any time during the beta, and for any reason at all, or for no reason.  In practice, we only foresee this happening if your actions are somehow impeding the beta process, causing harm to our systems or other systems or users, or are deemed by us to be malicious in any way.
+
+##### 4. PAYMENTS
+
+The beta is free of charge.  The credit card payment functionality will be operating in a test-only mode during the beta, and if you are willing to help us test it, we may issue you a test credit card number that will enable you to do so.
+
+##### 5. YOUR RESPONSIBILITIES
+
+You agree to the following to participate in the beta:
+
+- You will sign up for the beta using a valid email address that belongs to you.
+- You agree to accept email notifications from us during the beta at that email address.  These may describe changes to the beta, new features, or have questions seeking your feedback.
+- You will not deliberately take actions that are intended to degrade or damage the service for others, or to use the system in any manner intended to cause harm on other systems or people, or to conduct any sort of fraudulent activities whatsoever.  
+- You will not run production (i.e. revenue-producing, for you) traffic on the system during beta.
+- You will engage with us during the beta to provide feedback and suggestions based on your experience.