From c03e4d40eae08c4b4f4df5872deab60354034d50 Mon Sep 17 00:00:00 2001 From: r-southworth Date: Thu, 14 Nov 2024 13:34:33 -0500 Subject: [PATCH 1/2] remove policy pages and move to support.learngrove.com --- src/content/policies/en/terms.mdx | 8 +++---- src/content/policies/es/terms.mdx | 8 +++---- src/content/policies/fr/terms.mdx | 8 +++---- src/pages/policies/community.astro | 34 ------------------------------ src/pages/policies/salestax.astro | 33 ----------------------------- src/pages/policies/seller.astro | 33 ----------------------------- 6 files changed, 12 insertions(+), 112 deletions(-) delete mode 100644 src/pages/policies/community.astro delete mode 100644 src/pages/policies/salestax.astro delete mode 100644 src/pages/policies/seller.astro diff --git a/src/content/policies/en/terms.mdx b/src/content/policies/en/terms.mdx index e2709e20..3d9e4f1a 100644 --- a/src/content/policies/en/terms.mdx +++ b/src/content/policies/en/terms.mdx @@ -21,7 +21,7 @@ The individual listing the Resource or Event (“Creator”) is solely responsib Users of the LearnGrove Marketplace include members (“Members”) who have registered for a buyer or seller account (“Account”) and visitors (“Visitors”) who browse the marketplace without registering for an Account (“Visitors”). Together Members and Visitors are our users (“Users”). -By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/privacy), [Copyright & Trademark Policy](/policies/copyright), [Community Guidelines](/policies/community), [Seller Fees and Payout Rates Policy](/policies/seller) and any other terms or policies which are incorporated as part of these Terms. +By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/privacy), [Copyright & Trademark Policy](/policies/copyright), [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/), [Seller Fees and Payout Rates Policy](https://support.learngrove.co/creators-fees/) and any other terms or policies which are incorporated as part of these Terms. ## 1. Membership @@ -89,7 +89,7 @@ If you’re a Creator, any Resources or Events you’ve posted will no longer be ### a. Community Guidelines -As a User of our Services, you are required to follow our [Community Guidelines](/policies/community) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. +As a User of our Services, you are required to follow our [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. ### b. Comments, Ratings & Reviews @@ -180,7 +180,7 @@ Refund requests may be submitted to support@learngrove.co for the following reas ### b. Earnings -For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](/policies/seller). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. +For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](https://support.learngrove.co/creators-fees/). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. **Payouts.** Sellers may initiate a payout at their discretion through their seller account page. Payouts will automatically be dispersed after two years in accordance with United States requirements if a Seller does not initiate a payout manually. @@ -196,7 +196,7 @@ Sellers are responsible for the collection and payment of sales tax, use tax, go - Product Tax Codes. You must provide an accurate tax code for each Listing. In cases where there is a pre-populated tax code you must verify that the tax code is correct. You may be liable for any under payments or penalties as a result of misclassification of your Listing. - Indemnification. You agree to indemnify and hold harmless Datagrove, its employees, officers, directors, agents, and affiliates from and against all costs, expenses, damages, judgments, and liabilities including attorney’s fees resulting from allegations, threats, claims, suits, or other proceedings bring by any taxing authority, related to your failure to properly remit any taxes which are owed by you in connection with your use of the Services. -**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](/policies/salestax). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. +**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](https://support.learngrove.co/creators-taxes/). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. ## 6. Privacy diff --git a/src/content/policies/es/terms.mdx b/src/content/policies/es/terms.mdx index 884b563a..3a298d97 100644 --- a/src/content/policies/es/terms.mdx +++ b/src/content/policies/es/terms.mdx @@ -21,7 +21,7 @@ The individual listing the Resource or Event (“Creator”) is solely responsib Users of the LearnGrove Marketplace include members (“Members”) who have registered for a buyer or seller account (“Account”) and visitors (“Visitors”) who browse the marketplace without registering for an Account (“Visitors”). Together Members and Visitors are our users (“Users”). -By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/es/privacy), [Copyright & Trademark Policy](/es/policies/copyright), [Community Guidelines](/es/policies/community), [Seller Fees and Payout Rates Policy](/es/policies/seller) and any other terms or policies which are incorporated as part of these Terms. +By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/es/privacy), [Copyright & Trademark Policy](/es/policies/copyright), [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/), [Seller Fees and Payout Rates Policy](https://support.learngrove.co/creators-fees/) and any other terms or policies which are incorporated as part of these Terms. ## 1. Membership @@ -89,7 +89,7 @@ If you’re a Creator, any Resources or Events you’ve posted will no longer be ### a. Community Guidelines -As a User of our Services, you are required to follow our [Community Guidelines](/es/policies/community) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. +As a User of our Services, you are required to follow our [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. ### b. Comments, Ratings & Reviews @@ -180,7 +180,7 @@ Refund requests may be submitted to support@learngrove.co for the following reas ### b. Earnings -For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](/es/policies/seller). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. +For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](https://support.learngrove.co/creators-fees/). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. **Payouts.** Sellers may initiate a payout at their discretion through their seller account page. Payouts will automatically be dispersed after two years in accordance with United States requirements if a Seller does not initiate a payout manually. @@ -196,7 +196,7 @@ Sellers are responsible for the collection and payment of sales tax, use tax, go - Product Tax Codes. You must provide an accurate tax code for each Listing. In cases where there is a pre-populated tax code you must verify that the tax code is correct. You may be liable for any under payments or penalties as a result of misclassification of your Listing. - Indemnification. You agree to indemnify and hold harmless Datagrove, its employees, officers, directors, agents, and affiliates from and against all costs, expenses, damages, judgments, and liabilities including attorney’s fees resulting from allegations, threats, claims, suits, or other proceedings bring by any taxing authority, related to your failure to properly remit any taxes which are owed by you in connection with your use of the Services. -**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](/es/policies/salestax). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. +**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](https://support.learngrove.co/creators-taxes/). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. ## 6. Privacy diff --git a/src/content/policies/fr/terms.mdx b/src/content/policies/fr/terms.mdx index 249f42a2..c78a4cc0 100644 --- a/src/content/policies/fr/terms.mdx +++ b/src/content/policies/fr/terms.mdx @@ -21,7 +21,7 @@ The individual listing the Resource or Event (“Creator”) is solely responsib Users of the LearnGrove Marketplace include members (“Members”) who have registered for a buyer or seller account (“Account”) and visitors (“Visitors”) who browse the marketplace without registering for an Account (“Visitors”). Together Members and Visitors are our users (“Users”). -By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/fr/privacy), [Copyright & Trademark Policy](/fr/policies/copyright), [Community Guidelines](/fr/policies/community), [Seller Fees and Payout Rates Policy](/fr/policies/seller) and any other terms or policies which are incorporated as part of these Terms. +By using our Services as a Visitor, Member, or in any other manner, you agree to follow these Terms, including the terms of our [Privacy Policy](/fr/privacy), [Copyright & Trademark Policy](/fr/policies/copyright), [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/), [Seller Fees and Payout Rates Policy](https://support.learngrove.co/creators-fees/) and any other terms or policies which are incorporated as part of these Terms. ## 1. Membership @@ -89,7 +89,7 @@ If you’re a Creator, any Resources or Events you’ve posted will no longer be ### a. Community Guidelines -As a User of our Services, you are required to follow our [Community Guidelines](/fr/policies/community) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. +As a User of our Services, you are required to follow our [Community Guidelines](https://support.learngrove.co/frequently-asked/community-guidelines/) which are incorporated as part of these Terms. We may modify or add to these rules at our discretion. If you violate any of these rules, we may take action against your Account, such as removing Content you’ve posted, removing Resources from your Account, suspending or terminating your Account, removing Resources from your Buyer, issuing a refund to your Buyer(s), or any additional action that we deem necessary. ### b. Comments, Ratings & Reviews @@ -180,7 +180,7 @@ Refund requests may be submitted to support@learngrove.co for the following reas ### b. Earnings -For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](/fr/policies/seller). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. +For each sale through the LearnGrove marketplace, sellers will be paid with the formula stated on our [Seller Fees and Payouts policy](https://support.learngrove.co/creators-fees/). Datagrove may change the payout policy at its discretion. Changes will be communicated to Sellers prior to their effective date. **Payouts.** Sellers may initiate a payout at their discretion through their seller account page. Payouts will automatically be dispersed after two years in accordance with United States requirements if a Seller does not initiate a payout manually. @@ -196,7 +196,7 @@ Sellers are responsible for the collection and payment of sales tax, use tax, go - Product Tax Codes. You must provide an accurate tax code for each Listing. In cases where there is a pre-populated tax code you must verify that the tax code is correct. You may be liable for any under payments or penalties as a result of misclassification of your Listing. - Indemnification. You agree to indemnify and hold harmless Datagrove, its employees, officers, directors, agents, and affiliates from and against all costs, expenses, damages, judgments, and liabilities including attorney’s fees resulting from allegations, threats, claims, suits, or other proceedings bring by any taxing authority, related to your failure to properly remit any taxes which are owed by you in connection with your use of the Services. -**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](/fr/policies/salestax). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. +**Our Obligations.** Beginning on the start date identified for each jurisdiction, Datagrove will calculate, collect, and remit Sales Tax on applicable orders in accordance with our list of [Marketplace Collection Agreements](https://support.learngrove.co/creators-taxes/). You hereby authorize us to engage in marketplace collection on your behalf and you understand that we may cease such collection at any time. You are responsible for ensuring proper registration, collection, and remittance of sales tax on your sales. ## 6. Privacy diff --git a/src/pages/policies/community.astro b/src/pages/policies/community.astro deleted file mode 100644 index 807f89bc..00000000 --- a/src/pages/policies/community.astro +++ /dev/null @@ -1,34 +0,0 @@ ---- -import Layout from "@layouts/PageLayout.astro"; -import { getLangFromUrl, useTranslations } from "@i18n/utils"; -import { getCollection } from "astro:content"; - -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); - -const policyPage = await getCollection( - "policies", - ({ data }) => - data.lang === lang && data.policyType === "communityGuidelines" -); -const { Content } = await policyPage[0].render(); ---- - - -
-
-

- {t("h1ElementText.community")} -

- -
-
- -
-
- diff --git a/src/pages/policies/salestax.astro b/src/pages/policies/salestax.astro deleted file mode 100644 index ff96cd3d..00000000 --- a/src/pages/policies/salestax.astro +++ /dev/null @@ -1,33 +0,0 @@ ---- -import Layout from "@layouts/PageLayout.astro"; -import { getLangFromUrl, useTranslations } from "@i18n/utils"; -import { getCollection } from "astro:content"; - -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); - -const policyPage = await getCollection( - "policies", - ({ data }) => data.lang === lang && data.policyType === "marketplacetax" -); -const { Content } = await policyPage[0].render(); ---- - - -
-
-

- {t("hElementText.marketplacetax")} -

- -
-
- -
-
- diff --git a/src/pages/policies/seller.astro b/src/pages/policies/seller.astro deleted file mode 100644 index bea177bc..00000000 --- a/src/pages/policies/seller.astro +++ /dev/null @@ -1,33 +0,0 @@ ---- -import Layout from "@layouts/PageLayout.astro"; -import { getLangFromUrl, useTranslations } from "@i18n/utils"; -import { getCollection } from "astro:content"; - -const lang = getLangFromUrl(Astro.url); -const t = useTranslations(lang); - -const policyPage = await getCollection( - "policies", - ({ data }) => data.lang === lang && data.policyType === "sellerFeePayout" -); -const { Content } = await policyPage[0].render(); ---- - - -
-
-

- {t("hElementText.sellerFeePayout")} -

- -
-
- -
-
- From 4f9f08a73e3c00732d271612fa53ecd7f649f517 Mon Sep 17 00:00:00 2001 From: r-southworth Date: Tue, 26 Nov 2024 11:14:18 -0500 Subject: [PATCH 2/2] fix favorite list updates for resources main, fix free resource filter, create post image required, help center --- package-lock.json | 6 +- src/components/common/MobileProfileBtn.tsx | 8 +- src/components/common/ProfileBtn.tsx | 8 +- src/components/common/notices/Banner.tsx | 4 +- src/components/members/UserProfileView.tsx | 2 +- src/components/posts/AddFavorite.tsx | 111 +++++++++++---------- src/components/posts/CreateEditPost.tsx | 3 +- src/components/posts/ViewUserFavorites.tsx | 4 +- src/components/services/FiltersMobile.tsx | 1 + src/components/services/ResourcesMain.tsx | 2 +- src/pages/faq.astro | 27 ----- src/pages/faq.ts | 5 + 12 files changed, 89 insertions(+), 92 deletions(-) delete mode 100644 src/pages/faq.astro create mode 100644 src/pages/faq.ts diff --git a/package-lock.json b/package-lock.json index 5cbfbcd5..e1cf2acc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17122,9 +17122,9 @@ } }, "node_modules/supabase": { - "version": "1.207.9", - "resolved": "https://registry.npmjs.org/supabase/-/supabase-1.207.9.tgz", - "integrity": "sha512-BJPwsAd2UBIpQawcQV3/xKHEZ8YrrkHYpgibxCZbG+RuxuhTtkHG7zR4I3LylIIEwcKp3hmDKu/hO1m2NT5RXA==", + "version": "1.223.10", + "resolved": "https://registry.npmjs.org/supabase/-/supabase-1.223.10.tgz", + "integrity": "sha512-a5Wi562n0eiV3w359qiCjewyVad688Z3+JHdvLybdlITrwvNIcR6QYqRR6EzjKY5V/sNCqC+5sNf40wDYAYcHg==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/src/components/common/MobileProfileBtn.tsx b/src/components/common/MobileProfileBtn.tsx index d96fcac4..d1e037d3 100644 --- a/src/components/common/MobileProfileBtn.tsx +++ b/src/components/common/MobileProfileBtn.tsx @@ -111,7 +111,13 @@ export const MobileProfileBtn = () => { > {renderWhenUser()}
- {t("buttons.faq")} + + {t("buttons.faq")} +
diff --git a/src/components/common/ProfileBtn.tsx b/src/components/common/ProfileBtn.tsx index 7b959dcc..f3ddbe6a 100644 --- a/src/components/common/ProfileBtn.tsx +++ b/src/components/common/ProfileBtn.tsx @@ -111,7 +111,13 @@ export const ProfileBtn = () => { > {renderWhenUser()}
- {t("buttons.faq")} + + {t("buttons.faq")} +
diff --git a/src/components/common/notices/Banner.tsx b/src/components/common/notices/Banner.tsx index 3ebacef0..ded87817 100644 --- a/src/components/common/notices/Banner.tsx +++ b/src/components/common/notices/Banner.tsx @@ -89,7 +89,7 @@ const Banner: Component = (props) => { target="_blank" >
-
+
{props.content}
- ))} - -
- -
- } heading={"Save To"} buttonId={`addFavoriteBtn ${props.id}`} buttonClass="absolute right-0 top-0 z-30" @@ -315,7 +273,52 @@ export const FavoriteButton: Component = (props) => { } headingLevel={6} - > + > +
+
+ 0 && + !loading() + } + > + {favoritesLists().map((list) => ( + + ))} + +
+ +
+