From d4e0452e34355240c26313ef5687984b89b89648 Mon Sep 17 00:00:00 2001
From: Guillaume
- 10 free templates -
-- Support our work on the open-source tools -
-- 📃 Access to dozens of pro{' '} - templates + 🪄 {pricing.SOLO.templatesQuota}{' '} + + AI-generated templates + {' '} + per month
- 🪄 {pricing.SOLO.templatesQuota}{' '} - - AI-generated templates + ☁️{' '} + + Synchronize {pricing.SOLO.syncQuota} API mocks {' '} - per month + accross your devices
Community support
-+ Support our work on the open-source tools +
+- ☁️ Sync your API mocks accross your devices -
++ ☁️ Deploy your API mocks in the cloud (Q4 2024) +
+- Support our work on the open-source tools -
-- 📃 Access to dozens of pro{' '} - templates -
-+
🪄 {pricing.TEAM.templatesQuota}{' '} AI-generated templates @@ -514,35 +512,59 @@ const Plans: FunctionComponent<{ showFree: boolean; showTagline: boolean }> = per month per seat
- Priority support1 + ☁️{' '} + + Synchronize {pricing.TEAM.syncQuota} API mocks + accross your team + {' '} + and collaborate in real-time
Organizations up to 10 seats
+Organizations up to {pricing.TEAM.maxSeats} seats
+ Support our work on the open-source tools +
+- ☁️ Sync your API mocks accross your team -
++ ☁️ Deploy your API mocks in the cloud (Q4 2024) +
+- Support our work on the open-source tools -
-- 📃 Access to dozens of pro{' '} - templates + 🪄 {pricing.ENTERPRISE.templatesQuota}{' '} + + AI-generated templates + {' '} + per month per seat
- 🪄 {pricing.ENTERPRISE.templatesQuota}{' '} - - AI-generated templates + ☁️{' '} + + Synchronize {pricing.ENTERPRISE.syncQuota} API mocks + accross your team {' '} - per month per seat + and collaborate in real-time
Unlimited seats
+Unlimited seats (minimum 3)
-+ Support our work on the open-source tools +
+- ☁️ Sync your API mocks accross your team -
++ ☁️ Deploy your API mocks in the cloud (Q4 2024) +
+Mockoon is now used by thousands of developers and companies around the world and has been{' '} - downloaded more than 500k times. + downloaded more than 600k times.
@@ -166,7 +166,8 @@ const About: FunctionComponent<{You can also support us by subscribing to our{' '} Pro plans and enjoy a whole new level of - capabilities: AI-powered API mocks generation, + capabilities: AI-powered API mocks generation,{' '} + data synchronization and real-time collaboration, enterprise-grade support, and more to come!
diff --git a/pages/account/subscription.tsx b/pages/account/subscription.tsx index 70c4af9e..b849f530 100644 --- a/pages/account/subscription.tsx +++ b/pages/account/subscription.tsx @@ -9,6 +9,7 @@ import PaddleScript from '../../components/paddle'; import Spinner from '../../components/spinner'; import { frequencyNames, planNames } from '../../constants/plans'; import Layout from '../../layout/layout'; +import { Plans } from '../../models/user.model'; import { useAuth } from '../../utils/auth'; import { useCurrentSubscriptionLinks, @@ -251,34 +252,90 @@ const AccountSubscription: FunctionComponent = function () {- AI generated mocks used ( - {userData?.templatesQuotaUsed}/ - {userData?.templatesQuota}) -
++ AI generated mocks used ( + {userData?.templatesQuotaUsed}/ + {userData?.templatesQuota}) +
+ + Resets monthly - Next reset on{' '} + {new Date( + userData?.nextQuotaResetOn * 1000 + ).toDateString()} + ++ Cloud environments ( + {userData?.cloudSyncItemsQuotaUsed}/ + {userData?.cloudSyncItemsQuota}) +
+ + {(userData?.plan === Plans.TEAM || + userData?.plan === Plans.ENTERPRISE) && + 'Quota shared with your team - '} + Maximum of{' '} + {userData?.cloudSyncSizeQuota / 1000000}MB per + environment + +
No, you don't need an internet connection to use Mockoon.
Everything runs locally.
+
+ However, an internet connection is required to use our{' '}
+ cloud services.
Yes, we have Pro plans that offers additional features like AI-powered API mocks generation, + data synchronization and real-time collaboration, enterprise-grade support, and more!
- This policy is effective as of 1 July 2021 and was last updated - on 1 July 2021. + This policy is effective as of July 1st, 2021 and was last + updated on April 2nd, 2024.
@@ -37,13 +37,14 @@ const Privacy: FunctionComponent = function () {
- When you visit our website or use our application, our servers + When you visit our website or use our applications, our servers may automatically log the standard data provided by your web - browser. It may include your device's Internet Protocol (IP) - address, your browser type and version, the pages you visit, the - time and date of your visit, the time spent on each page, other - details about your visit, and technical details that occur in - conjunction with any errors you may encounter. + browser or network devices. It may include your device's + Internet Protocol (IP) address, your browser type and version, + the pages you visit, the time and date of your visit, the time + spent on each page, other details about your visit, and + technical details that occur in conjunction with any errors you + may encounter.
Please be aware that while this information may not be @@ -54,8 +55,8 @@ const Privacy: FunctionComponent = function () { 3. Collection and Use of Information
- We may collect personal information from you when you do any of - the following on our website: + We may collect anonymous information when you do any of the + following:
+ We may collect personal information from you when you do any of + the following on our website: +
+@@ -191,22 +211,14 @@ const Privacy: FunctionComponent = function () { have the right to contact a regulatory body or data protection authority in relation to your complaint.
-- We use “cookies” to collect information about you and your - activity across our site. A cookie is a small piece of data that - our website stores on your computer, and accesses each time you - visit, so we can understand how you use our site. This helps us - serve you content based on preferences you have specified. -
-Our website may link to external sites that are not operated by us. Please be aware that we have no control over the content and policies of those sites, and cannot accept responsibility or liability for their respective privacy practices.
-At our discretion, we may change our privacy policy to reflect updates to our business processes, current acceptable practices, @@ -219,7 +231,7 @@ const Privacy: FunctionComponent = function () { opportunity to opt in to or opt out of, as applicable, any new uses of your personal information.
-
For any questions or concerns regarding your privacy, you may
contact us using the following details:{' '}
diff --git a/pages/pro.tsx b/pages/pro.tsx
index f78ab07e..462c5746 100644
--- a/pages/pro.tsx
+++ b/pages/pro.tsx
@@ -20,7 +20,7 @@ const faq: AccordionData = [
{
title: 'When will the "coming soon" services be available?',
content:
- 'We don\'t have a release date yet, but we would like to make the data synchronization for solo developers available in Q2 of this year. There is no ETA yet for the team synchronization.
Subscribe to the product updates below to be notified of new releases.'
+ 'We can only provide an approximate availability period. You can subscribe to the product updates below to be notified of new releases.'
},
{
title: 'Can I give feedback or join a beta test?',
@@ -38,9 +38,9 @@ const faq: AccordionData = [
"Community support is the free support channel for Mockoon users. It is available on our GitHub repository or Discord server."
},
{
- title: 'What is the "priority support" (Team and Enterprise plan)?',
+ title: 'What is the "priority support" (Enterprise plan)?',
content:
- 'We will provide a priority support channel for your team by email or through the platform of your choice (Slack, etc.). Our priority support service is provided during regular business hours and working days in Luxembourg (9 am to 5 pm, Monday to Friday, Luxembourg time (CET/CEST), excluding public holidays). Please refer to the terms of service for more information.'
+ 'We will provide a priority support channel for your team by email or through the platform of your choice (Slack, etc.). Our priority support service is provided during regular business hours and working days (9 am to 5 pm CET/CEST, Monday to Friday). Please refer to the terms of service for more information.'
},
{
title: 'What is the "welcome online training" (Enterprise plan)?',
@@ -75,7 +75,12 @@ const faq: AccordionData = [
{
title: 'Do you offer discounts for schools, bootcamps or students?',
content:
- 'We offer a discount for education purposes by providing educational institutions with a discount on the Solo plan. Do not hesitate to contact us to become a partner.'
+ 'We provide educational institutions with free Solo plans for all their students. Do not hesitate to contact us to become a partner.'
+ },
+ {
+ title: 'Do you have a discount for startups?',
+ content:
+ 'We offer substantial discounts for startups and bootstrapped entrepreneurs who did not raise funds. Do not hesitate to contact us to learn about the conditions and benefits of the program.'
},
{
title: 'How can I cancel my subscription?',
diff --git a/pages/public-roadmap.tsx b/pages/public-roadmap.tsx
index 6d9f52c2..0b144d3d 100644
--- a/pages/public-roadmap.tsx
+++ b/pages/public-roadmap.tsx
@@ -36,6 +36,16 @@ const faq: AccordionData = [
const tasks = {
released: [
+ {
+ link: '/docs/latest/mockoon-cloud/data-synchronization-team-collaboration/',
+ title: 'Real-time collaboration for teams',
+ pro: true
+ },
+ {
+ link: '/docs/latest/mockoon-cloud/data-synchronization-team-collaboration/',
+ title: 'Data synchronization for solo developers',
+ pro: true
+ },
{
link: '/docs/latest/variables/environment-variables/',
title: 'Environment variables support in templating',
@@ -97,21 +107,16 @@ const tasks = {
target: '_blank'
},
{
- link: '/pro/',
- title: 'Data synchronization for solo developers',
- pro: true
+ link: '/course/',
+ title: 'Official online course',
+ pro: true,
+ target: null
}
],
comingSoon: [
{
link: '/pro/',
- title: 'Real-time collaboration for teams',
- pro: true,
- target: null
- },
- {
- link: '/course/',
- title: 'Official online course',
+ title: 'API deployments in the cloud',
pro: true,
target: null
}
diff --git a/pages/sponsor-us.tsx b/pages/sponsor-us.tsx
index 131e9461..5f18e7bb 100644
--- a/pages/sponsor-us.tsx
+++ b/pages/sponsor-us.tsx
@@ -38,7 +38,7 @@ const SponsorUs: FunctionComponent = function () {
Entirely free, Mockoon saves time for{' '} thousands of people around the world every day - and recently crossed 500k downloads! + and recently crossed 600k downloads!
Reaching this level of satisfaction requires a{' '} @@ -86,7 +86,8 @@ const SponsorUs: FunctionComponent = function () {
You can also support us by subscribing to our{' '} Pro plans and enjoy a whole new level of - capabilities: AI-powered API mocks generation, enterprise-grade + capabilities: AI-powered API mocks generation, data + synchronization and real-time collaboration, enterprise-grade support, and more to come!
-
By accepting this Agreement, you represent and warrant that you
@@ -379,19 +384,103 @@ const Terms: FunctionComponent = function () {
Service does not relieve you of the obligation to pay any
outstanding fees accrued prior to the termination or cessation.
+ The AI assistant is a feature available to all our customers of
+ our Pro plans. Its usage is subject to the quotas specified in
+ the plan details and visible in your account. You can access the
+ AI assistant from the desktop application.
+
+ We do not guarantee the accuracy, reliability, or completeness
+ of the AI assistant's responses. The AI assistant is not a
+ substitute for professional advice, and you should not rely on
+ it as the sole basis for making decisions. You are solely
+ responsible for verifying the accuracy and relevance of the
+ information provided by the AI assistant.
+
+ We do not make any representation or warranty regarding the
+ availability, performance, or functionality of the AI assistant.
+ The AI assistant may be subject to downtime, errors, or
+ interruptions, and we do not guarantee that it will be available
+ at all times. We will make commercially reasonable efforts to
+ ensure the availability and performance of the AI assistant, and
+ inform you of any planned maintenance or downtime through our
+ Service status page.
+
+ The data synchronization and real-time collaboration feature
+ ("Synchronization Feature") is available to all our customers of
+ our Pro plans. It is subject to the quotas specified in the plan
+ details and visible in your{' '}
+
+ account management interface
+
+ .
+
+ We do not make any representation or warranty regarding the
+ availability, performance, or functionality of the
+ Synchronization Feature. The Synchronization Feature may be
+ subject to downtime, errors, or interruptions, and we do not
+ guarantee that it will be available at all times. We will make
+ commercially reasonable efforts to ensure the availability and
+ performance of the Synchronization Feature, and inform you of
+ any planned maintenance or downtime through our Service status
+ page.
+
+ Aside from the above-mentioned quotas, the Synchronization
+ Feature is subject to some technical limitations and monitoring,
+ including but not limited to the maximum number of devices that
+ can be synchronized from the same IP address, the maximum number
+ of concurrent requests to our servers or the volume of data that
+ can be transmitted over a certain period of time. These
+ limitations are designed to ensure fair usage of our
+ infrastructure and to prevent abuse or excessive load on our
+ systems. We reserve the right to modify or adjust the technical
+ limitations of the Synchronization Feature at any time. We
+ further reserve the right to suspend or terminate your access to
+ the Synchronization Feature if we determine that your usage is
+ unreasonable or causing an undue burden on our infrastructure.
+
+ While we take reasonable measures to ensure the durability and
+ integrity of the data synchronized through the Synchronization
+ Feature, it is not a backup service. We do not guarantee the
+ retention or availability of your data. You are solely
+ responsible for maintaining backups of your data and ensuring
+ that you have the necessary copies of your data in the event of
+ loss or corruption.
+
Our Service may include certain usage quotas, such as storage,
deployments, or AI assistant invocations, depending on the plan
you have subscribed to. These usage quotas are provided to
ensure fair usage of our services and to maintain the optimal
- performance of our infrastructure.
+ performance of our infrastructure. They are visible in your{' '}
+
+ account management interface
+
+ .
- The usage quotas allocated to your account will reset at the
- beginning of each billing cycle. Unused quotas from the previous
- billing cycle will not be carried over to the next billing
- cycle.
+ The usage quotas allocated monthly to your account will reset at
+ the beginning of each billing cycle. Unused quotas from the
+ previous billing cycle will not be carried over to the next
+ billing cycle.
The usage quotas assigned to your account are personal and
@@ -401,42 +490,31 @@ const Terms: FunctionComponent = function () {
We reserve the right to modify or adjust the usage quotas at any
- time, subject to providing you with reasonable advance notice.
- Such modifications or adjustments may be communicated through
- written notice, email notifications, or by posting the updated
- quotas within our Service.
+ time, subject to providing you with reasonable advance notice if
+ such modifications or adjustments are likely to have a material
+ adverse effect on the availability, performance, or
+ functionality of the Service. Such modifications or adjustments
+ may be communicated through written notice, email notifications,
+ or by posting the updated quotas within our Service.
Support services are available for customers subscribed to the
- Pro and Enterprise plans of our Service. These plans include
- access to our support team for assistance with technical issues,
- inquiries, and general product-related questions.
+ Enterprise plan of our Service. This plan includes access to our
+ support team for assistance with technical issues, inquiries,
+ and general product-related questions.
Support services are provided during regular business hours and
- working days in Luxembourg, unless otherwise specified in the
- plan details or separately agreed upon in writing. Our business
- hours are from{' '}
-
- 9 am to 5 pm, Monday to Friday, Luxembourg time (CET/CEST),
- excluding public holidays in Luxembourg
-
- .
+ working days in the CET/CEST timezone, unless otherwise
+ specified in the plan details or separately agreed upon in
+ writing. Our business hours are from{' '}
+ 9 am to 5 pm CET/CEST, Monday to Friday.
- The initial response time for support inquiries is as follows:
+ The initial response time for support inquiries is of{' '}
+ one business day.
The support services encompass assistance and guidance regarding
the functionality, features, and usage of our Service. Our
@@ -484,7 +562,7 @@ const Terms: FunctionComponent = function () {
communicated to you through written notice or by posting updated
information within our Service.
As part of our Enterprise plan, we offer a one hour online video
call training session per company, per year. This training
@@ -496,7 +574,7 @@ const Terms: FunctionComponent = function () {
After subscribing, a representative from our Company will reach
out to you to coordinate the training session.
The term of this Agreement shall begin upon your acceptance of
these terms of service and shall automatically renew for the
@@ -534,7 +612,7 @@ const Terms: FunctionComponent = function () {
clauses relating to intellectual property rights, limitation of
liability, indemnification, and dispute resolution.
THE SERVICES AND SUPPORT SERVICES ARE PROVIDED "AS IS" AND THE
COMPANY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING,
@@ -546,7 +624,7 @@ const Terms: FunctionComponent = function () {
DELIVERABLES.
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, EXCEPT FOR
@@ -573,7 +651,7 @@ const Terms: FunctionComponent = function () {
THE PARTIES HAVE RELIED ON THESE LIMITATIONS IN DETERMINING
WHETHER TO ENTER THIS AGREEMENT.
This Agreement, including its terms and conditions, may be
updated or modified by us from time to time. Any updates or
@@ -616,7 +694,7 @@ const Terms: FunctionComponent = function () {
communications, or understandings, whether written or oral,
relating to such subject matter.
This Agreement and any dispute arising out of or in connection
with this Agreement shall be governed by and construed in
@@ -630,7 +708,7 @@ const Terms: FunctionComponent = function () {
venue of such courts and waive any objections to the exercise of
personal jurisdiction over you by such courts.
This Agreement constitutes a binding contract between you and
us. You may not assign or transfer any rights or obligations
diff --git a/public/images/docs/latest/api-endpoints/crud-routes/add-crud-route.png b/public/images/docs/latest/api-endpoints/crud-routes/add-crud-route.png
index fba625d98aeae570939801a557cdcf6057bb20c4..c85d9f7e694fe9d81698bc5cef112763174443a1 100644
GIT binary patch
literal 11255
zcmeHtWmH^Imt`S^OK__IA!zX6?hqh&aCZ_sxO;%$PH=Y$2oAxWpdq-syZb!8ue+zG
zr)RqV&7WDT-m0owZ@pXh$lm*$dqWlFrO;7`Q9vLNy7UKeWe^Ca0k~L@5P*>$I+K?-
z7zbr3Q4n+lvI_!{gQUepKDnkHE_!I_m}bzN*hZuu5i(_?fYV|8K*;vt;;$6vX oLwRszNi~=Hx<{)o>xWaq(kuTd8B}_5F=E
z6%1^{&DdO*+S;9)e0(^Sn$Mx3POk@mqTeWK1Zj19TP+O8AD90A+wP-qaa6O_ZGLef
zjcnSmU0I*AI$-cP9UYx})=HR4P_Seonfd&+!fHp4@+!w>m{Nc&;Zh&2G{+EKDeJ`|
zd>3e@7i<17h;>$wPgd2&uTW2PIU^H~!`ot?l$s0a8xbqSBhfI4m_2tu$t&J}d*AJL
z%-$vWspf^ mxZZl=Vm4*_uX7CR?q@LqLP8qa^4pmkbNxox#98Xf` 1
zc3wcP`jwE^{Wf|Q^aFchBh6 eHRYF8B%k6o5)pAVZ2
zngEtYfVr=$sH$>0Fs}i4qQ5Zo{=cN1Qslyl>xDB6dqTMCNMVf
+ Cloud services status page:{' '}
+
+ https://mockoon.com/status/
+
11. Usage quotas
+
+
+ 11. Description of the cloud Services
+
+ a. AI assistant
+
+ b. Data synchronization and real-time collaboration
+
+
+
+ 12. Usage quotas and limitations
+
12. Priority support services
+ 13. Priority support services
-
13. Welcome training
+ 14. Welcome training
14. Term and termination
+ 15. Term and termination
15. Disclaimer
+ 16. Disclaimer
- 16. Limit of Liability and Waiver of Consequential Damages.
+ 17. Limit of Liability and Waiver of Consequential Damages.
17. Miscellaneous
+ 18. Miscellaneous
18. Governing law
+ 19. Governing law
19. Binding agreement
+ 20. Binding agreement
j~1x?;Z>GiLR%$1J16u!jT
zH~b_;&p*>U8yXTs+xfIj%oCiVy4vgmZEi*laOMkFcz(TNFXnPPI4PKE_g*O@j
I#ciC|nD@!s&aDTmtJ}YcQ1Tp1m-p**x
z1(arwPRcvThIZq{vNm*)>G#gbIOW$MS7g%qEuo7wR{watvxl7RSv7G~mDW^#4^Q{BPOvf7KNKm%D9U
zW!NMQ4YTKe4s*Ur
KkuMJwuQTo7Q0(BohP$kC7
zlSBYv2E9pt*Yqh8G)DQYgBCeMLaSr0s=0DV(9n|%LK32iV*n`7@Ws