From dc03aa3eebf4d94d408f3c2d8b4665dc0f7c4147 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Fri, 18 Aug 2023 12:08:41 +0530 Subject: [PATCH 1/4] add scroll animation on hero img; --- packages/website/_includes/default.html | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/website/_includes/default.html b/packages/website/_includes/default.html index 9d50114..e4ac476 100644 --- a/packages/website/_includes/default.html +++ b/packages/website/_includes/default.html @@ -1,4 +1,4 @@ - + @@ -48,6 +48,7 @@ html { font-size: var(--base-font-size); + scroll-timeline: --root-scroll block; } body { @@ -60,6 +61,7 @@ margin: 0; color: #3a3a3a; -webkit-font-smoothing: antialiased; + } body.docs { max-width: 70ch; @@ -483,6 +485,20 @@ .people-say-bottom .say { --shadow-y: -5px; } + + @keyframes hero-img-progress { + from { + transform: rotateX(4deg) rotateY(-6deg); + } + + to { + transform: rotateX(-40deg) rotateY(100deg); + } + } + .screenshot { + animation: hero-img-progress auto linear; + animation-timeline: --root-scroll; + } From 4b2f5e03eebf9e244bcc969627fab5ad2ebb17ef Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Wed, 30 Aug 2023 17:42:29 +0530 Subject: [PATCH 2/4] add terms page --- packages/website/terms.html | 229 ++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) create mode 100644 packages/website/terms.html diff --git a/packages/website/terms.html b/packages/website/terms.html new file mode 100644 index 0000000..18d2c9b --- /dev/null +++ b/packages/website/terms.html @@ -0,0 +1,229 @@ +--- +layout: default.html +--- + +

Terms & Conditions

+ +

Last updated: Aug 30, 2023

+ +

+ Web Maker ("us", "we", or "our") operates the https://webmaker.app website + (the "Service"). +

+ +

+ This page informs you of our policies regarding the collection, use, and + disclosure of personal data when you use our Service and the choices you have + associated with that data. +

+ +

+ By using the Service, you agree to the collection and use of information in + accordance with this policy. +

+ +

Information Collection And Use

+ +

+ We collect several different types of information for various purposes to + provide and improve our Service to you. +

+ +

Types of Data Collected

+ +

Personal Data

+ +

+ Only when choose to login to our Service, we may ask you to provide us with + certain personally identifiable information that can be used to contact or + identify you ("Personal Data"). Personally identifiable information may + include, but is not limited to: +

+ + + +

Usage Data

+ +

+ We may also collect anonymous information (non identifiable) how the Service + is accessed and used ("Usage Data"). This Usage Data may include information + such as your computer's Internet Protocol address (e.g. IP address), browser + type, browser version, the pages of our Service that you visit, the time and + date of your visit, the time spent on those pages, unique device identifiers + and other diagnostic data. +

+ +

Use of Data

+ +

Web Maker uses the collected data for various purposes:

+ + +

Transfer Of Data

+

+ Your information, including Personal Data, may be transferred to — and + maintained on — computers located outside of your state, province, country or + other governmental jurisdiction where the data protection laws may differ than + those from your jurisdiction. +

+

+ Your consent to this Privacy Policy followed by your submission of such + information represents your agreement to that transfer. +

+

+ Web Maker will take all steps reasonably necessary to ensure that your data is + treated securely and in accordance with this Privacy Policy and no transfer of + your Personal Data will take place to an organization or a country unless + there are adequate controls in place including the security of your data and + other personal information. +

+ +

Disclosure Of Data

+ +

Legal Requirements

+

+ Web Maker may disclose your Personal Data in the good faith belief that such + action is necessary to: +

+ + +

Security Of Data

+

+ The security of your data is important to us, but remember that no method of + transmission over the Internet, or method of electronic storage is 100% + secure. We strive to use commercially acceptable means to protect your + Personal Data. The Service works over encrypted Secure Socket Layer (SSL) + technology. +

+ +

Service Providers

+

+ We may employ third party companies and individuals to facilitate our Service + ("Service Providers"), to provide the Service on our behalf, to perform + Service-related services or to assist us in analyzing how our Service is used. +

+

+ These third parties have access to your Personal Data only to perform these + tasks on our behalf and are obligated not to disclose or use it for any other + purpose. +

+ +

Analytics

+

+ We may use third-party Service Providers to monitor and analyze the use of our + Service. +

+ + +

Links To Other Sites

+

+ Our Service may contain links to other sites that are not operated by us. If + you click on a third party link, you will be directed to that third party's + site. We strongly advise you to review the Privacy Policy of every site you + visit. +

+

+ We have no control over and assume no responsibility for the content, privacy + policies or practices of any third party sites or services. +

+ +

Children's Privacy

+

Our Service does not address anyone under the age of 13 ("Children").

+

+ We do not knowingly collect personally identifiable information from anyone + under the age of 13. If you are a parent or guardian and you are aware that + your Children has provided us with Personal Data, please contact us. If we + become aware that we have collected Personal Data from children without + verification of parental consent, we take steps to remove that information + from our servers. +

+ +

Refunds & Cancellations

+

+ All fees are inclusive of taxes, according to the geo-location from where you + make the purchase. +

+

+ You have the right to cancel your plan and downgrade at any moment, which gets + effective from next billing cycle. +

+

+ If you are not happy with the service, you can request for a full refund + within 15 days. No questions asked! +

+

+ Downgrading from a paid plan to a free plan can lead to loss of content, + features, or capacity of your account. Web Maker does not accept any liability + for such loss. +

+ +

Changes To This Privacy Policy

+

+ We may update our Privacy Policy from time to time. We will notify you of any + changes by posting the new Privacy Policy on this page. +

+

+ We will let you know via email and/or a prominent notice on our Service, prior + to the change becoming effective and update the "effective date" at the top of + this Privacy Policy. +

+

+ You are advised to review this Privacy Policy periodically for any changes. + Changes to this Privacy Policy are effective when they are posted on this + page. +

+ +

Contact Us

+

If you have any questions about this Privacy Policy, please contact us:

+ From 8c0b315eeb02e23f41d5d9e9a306e61fc9272f73 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Mon, 4 Sep 2023 08:59:47 +0530 Subject: [PATCH 3/4] add query param code read mode --- src/components/app.jsx | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/app.jsx b/src/components/app.jsx index 42c3207..d17aefd 100644 --- a/src/components/app.jsx +++ b/src/components/app.jsx @@ -82,6 +82,8 @@ const version = '5.0.3'; // Read forced settings as query parameters window.forcedSettings = {}; +window.codeHtml = ''; +window.codeCss = ''; if (location.search) { let match = location.search.replace(/^\?/, '').match(/settings=([^=]*)/); if (match) { @@ -93,6 +95,14 @@ if (location.search) { window.forcedSettings[pair[0]] = pair[1]; }); } + + const params = new URLSearchParams(location.search); + window.codeHtml = params.get('html') + ? decodeURIComponent(params.get('html')) + : ''; + window.codeCss = params.get('css') + ? decodeURIComponent(params.get('css')) + : ''; } export default class App extends Component { @@ -121,7 +131,9 @@ export default class App extends Component { prefs: {}, currentItem: { title: '', - externalLibs: { js: '', css: '' } + externalLibs: { js: '', css: '' }, + html: window.codeHtml, + css: window.codeCss }, catalogs: {} }; @@ -219,11 +231,16 @@ export default class App extends Component { } } ); + // Get synced `preserveLastCode` setting to get back last code (or not). db.getSettings(this.defaultSettings).then(result => { - if (result.preserveLastCode && lastCode) { + if (window.codeHtml || window.codeCss) { + log('Load item from query params', lastCode); + this.setCurrentItem(this.state.currentItem).then(() => { + this.refreshEditor(); + }); + } else if (result.preserveLastCode && lastCode) { this.setState({ unsavedEditCount: 0 }); - log('Load last unsaved item', lastCode); this.setCurrentItem(lastCode).then(() => this.refreshEditor()); } else { From db744a7fe131f0000b2d32be0a0c6e5c6cd9ffcb Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Mon, 4 Sep 2023 09:32:26 +0530 Subject: [PATCH 4/4] add prettificaiton n fix decode err --- src/components/app.jsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/app.jsx b/src/components/app.jsx index d17aefd..71bac5d 100644 --- a/src/components/app.jsx +++ b/src/components/app.jsx @@ -97,12 +97,8 @@ if (location.search) { } const params = new URLSearchParams(location.search); - window.codeHtml = params.get('html') - ? decodeURIComponent(params.get('html')) - : ''; - window.codeCss = params.get('css') - ? decodeURIComponent(params.get('css')) - : ''; + window.codeHtml = params.get('html') || ''; + window.codeCss = params.get('css') || ''; } export default class App extends Component { @@ -236,6 +232,8 @@ export default class App extends Component { db.getSettings(this.defaultSettings).then(result => { if (window.codeHtml || window.codeCss) { log('Load item from query params', lastCode); + this.prettifyHandler('html'); + this.prettifyHandler('css'); this.setCurrentItem(this.state.currentItem).then(() => { this.refreshEditor(); });