From 78e63ae454f725115733ac553a02db7c59e336a7 Mon Sep 17 00:00:00 2001
From: francesco
Date: Mon, 18 Dec 2023 01:40:42 +0100
Subject: [PATCH] Cleanup
---
.../recipes/copy_entity/copy_button_use.tsx | 6 +--
.../src/docs/recipes/copy_entity/full.tsx | 2 +-
.../custom_datasource/custom_datasource.tsx | 2 +-
.../document_as_subcollection/full.tsx | 5 +--
examples/example_pro/tailwind.config.js | 3 +-
.../ui/collection_editor/PropertyEditView.tsx | 4 +-
.../src/hooks/useFirebaseAuthController.ts | 22 +++++-----
website/docs/custom_top_level_views.mdx | 8 ++--
website/docs/customization_quickstart.mdx | 1 +
website/docs/index.mdx | 1 +
website/docs/properties/fields/selects.mdx | 1 +
website/docs/recipes/blog.mdx | 4 +-
website/docs/recipes/copy_entity.mdx | 13 +++---
.../recipes/documents_as_subcollections.mdx | 7 ++-
.../typedoc-custom-pugin/myTypeDocPlugin.js | 4 +-
.../recipes/copy_entity/copy_button.tsx | 9 +---
.../recipes/copy_entity/copy_button_use.tsx | 6 +--
.../samples_v3/recipes/copy_entity/full.tsx | 2 +-
website/src/pages/enterprise.tsx | 6 +--
website/src/pages/openai.tsx | 8 +---
.../data_enhancement/BatchProcessing.tsx | 4 +-
.../data_enhancement/DataStructure.tsx | 6 +--
.../enterprise/EnterpriseArchitectures.tsx | 6 +--
.../partials/enterprise/EnterpriseHero.tsx | 2 +-
website/src/partials/features/RealTime.tsx | 7 +--
.../src/partials/general/PagesBackground.tsx | 4 +-
website/src/partials/general/TwoColumns.tsx | 1 -
website/src/partials/home/HeroButtons.tsx | 3 +-
.../src/partials/home/SchemaEditorIntro.tsx | 8 +---
.../partials/pricing/FireCMSCloudVersions.tsx | 44 +++++++++----------
website/src/theme/Footer/Layout/index.js | 1 -
.../DocsVersionDropdownNavbarItem.js | 3 +-
.../version-2.0.0/firebase_setup.md | 6 +--
33 files changed, 79 insertions(+), 130 deletions(-)
diff --git a/examples/example_pro/src/docs/recipes/copy_entity/copy_button_use.tsx b/examples/example_pro/src/docs/recipes/copy_entity/copy_button_use.tsx
index b0a7555da..12da486f5 100644
--- a/examples/example_pro/src/docs/recipes/copy_entity/copy_button_use.tsx
+++ b/examples/example_pro/src/docs/recipes/copy_entity/copy_button_use.tsx
@@ -1,10 +1,6 @@
import { buildCollection, CollectionActionsProps } from "@firecms/core";
import { CopyEntityButton } from "./copy_button";
-import {
- Product,
- productsCollection,
- properties
-} from "./simple_product_collection";
+import { Product, productsCollection, properties } from "./simple_product_collection";
export const productsCollectionCopy = buildCollection({
name: "Products copy target",
diff --git a/examples/example_pro/src/docs/recipes/copy_entity/full.tsx b/examples/example_pro/src/docs/recipes/copy_entity/full.tsx
index ddad69a70..502732292 100644
--- a/examples/example_pro/src/docs/recipes/copy_entity/full.tsx
+++ b/examples/example_pro/src/docs/recipes/copy_entity/full.tsx
@@ -1,7 +1,7 @@
import {
- Button,
buildCollection,
buildProperties,
+ Button,
CollectionActionsProps,
Entity,
EntityCollection,
diff --git a/examples/example_pro/src/docs/recipes/custom_datasource/custom_datasource.tsx b/examples/example_pro/src/docs/recipes/custom_datasource/custom_datasource.tsx
index 671dd3d0a..6cfb5ca1f 100644
--- a/examples/example_pro/src/docs/recipes/custom_datasource/custom_datasource.tsx
+++ b/examples/example_pro/src/docs/recipes/custom_datasource/custom_datasource.tsx
@@ -5,8 +5,8 @@ import {
Entity,
FetchCollectionProps,
FetchEntityProps,
- useBuildDataSource,
SaveEntityProps,
+ useBuildDataSource,
} from "@firecms/core";
import { FirebaseApp } from "firebase/app";
import { useFirestoreDelegate } from "@firecms/firebase_pro";
diff --git a/examples/example_pro/src/docs/recipes/document_as_subcollection/full.tsx b/examples/example_pro/src/docs/recipes/document_as_subcollection/full.tsx
index b76b6852f..dd39d5e53 100644
--- a/examples/example_pro/src/docs/recipes/document_as_subcollection/full.tsx
+++ b/examples/example_pro/src/docs/recipes/document_as_subcollection/full.tsx
@@ -1,8 +1,5 @@
import React from "react";
-import {
- buildCollection,
- EntityCollectionsBuilder,
-} from "@firecms/core";
+import { buildCollection, EntityCollectionsBuilder, } from "@firecms/core";
import "typeface-rubik";
import "@fontsource/ibm-plex-mono";
diff --git a/examples/example_pro/tailwind.config.js b/examples/example_pro/tailwind.config.js
index 54b2fe5f6..db68782fa 100644
--- a/examples/example_pro/tailwind.config.js
+++ b/examples/example_pro/tailwind.config.js
@@ -4,7 +4,8 @@ export default {
content: [
"./index.html",
"./src/**/*.{js,ts,jsx,tsx}",
- "../**/node_modules/@firecms/**/src/**/*.{js,ts,jsx,tsx}",
+ "../../node_modules/firecms/src/**/*.{js,ts,jsx,tsx}",
+ "../../node_modules/@firecms/**/src/**/*.{js,ts,jsx,tsx}",
],
theme: {
extend: {
diff --git a/packages/collection_editor/src/ui/collection_editor/PropertyEditView.tsx b/packages/collection_editor/src/ui/collection_editor/PropertyEditView.tsx
index 9c4b17a7b..68958fe76 100644
--- a/packages/collection_editor/src/ui/collection_editor/PropertyEditView.tsx
+++ b/packages/collection_editor/src/ui/collection_editor/PropertyEditView.tsx
@@ -460,8 +460,8 @@ function PropertyEditView({
error={Boolean(selectedWidgetError)}
value={selectedFieldConfigId ?? ""}
placeholder={"Select a property widget"}
- // open={selectOpen}
- // onOpenChange={setSelectOpen}
+ open={selectOpen}
+ onOpenChange={setSelectOpen}
position={"item-aligned"}
disabled={disabled}
renderValue={(value) => {
diff --git a/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts b/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts
index 59934a783..8ebf8db95 100644
--- a/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts
+++ b/packages/firebase_firecms/src/hooks/useFirebaseAuthController.ts
@@ -1,24 +1,24 @@
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import {
+ ApplicationVerifier,
+ Auth,
+ ConfirmationResult,
createUserWithEmailAndPassword as createUserWithEmailAndPasswordFirebase,
+ FacebookAuthProvider,
fetchSignInMethodsForEmail as fetchSignInMethodsForEmailFirebase,
getAuth,
+ GithubAuthProvider,
GoogleAuthProvider,
+ OAuthProvider,
+ onAuthStateChanged,
+ signInAnonymously,
signInWithEmailAndPassword,
+ signInWithPhoneNumber,
signInWithPopup,
signOut,
- User as FirebaseUser,
- OAuthProvider,
- Auth,
- FacebookAuthProvider,
- GithubAuthProvider,
TwitterAuthProvider,
- signInAnonymously,
- ApplicationVerifier,
- signInWithPhoneNumber,
- ConfirmationResult,
- onAuthStateChanged
+ User as FirebaseUser
} from "firebase/auth";
import { FirebaseApp } from "firebase/app";
import { FirebaseAuthController, FirebaseSignInOption, FirebaseSignInProvider, Role } from "../types";
diff --git a/website/docs/custom_top_level_views.mdx b/website/docs/custom_top_level_views.mdx
index afa3a2760..0670041b2 100644
--- a/website/docs/custom_top_level_views.mdx
+++ b/website/docs/custom_top_level_views.mdx
@@ -46,9 +46,10 @@ For custom views you can define the following props:
### Example:
A quick example for a custom view:
+
import CodeBlock from "@theme/CodeBlock";
-import CustomViewSampleApp
- from "!!raw-loader!../samples/samples_v3/custom_cms_view/CustomViewSampleApp";
+import CustomViewSampleApp from "!!raw-loader!../samples/samples_v3/custom_cms_view/CustomViewSampleApp";
+import ExampleCMSView from "!!raw-loader!../samples/samples_v3/custom_cms_view/ExampleCMSView";
{CustomViewSampleApp}
@@ -56,8 +57,7 @@ import CustomViewSampleApp
Your custom view is implemented as any regular React component that uses
some hooks provided by the CMS:
-import ExampleCMSView
- from "!!raw-loader!../samples/samples_v3/custom_cms_view/ExampleCMSView";
+
{ExampleCMSView}
diff --git a/website/docs/customization_quickstart.mdx b/website/docs/customization_quickstart.mdx
index 1d4320632..1cd4acfc9 100644
--- a/website/docs/customization_quickstart.mdx
+++ b/website/docs/customization_quickstart.mdx
@@ -4,6 +4,7 @@ title: Customization quickstart
sidebar_label: Customization quickstart
---
+
import { DocsCloudCTA } from "../src/DocsCloudCTA";
:::note
diff --git a/website/docs/index.mdx b/website/docs/index.mdx
index 38da8bfc5..8381f5b38 100644
--- a/website/docs/index.mdx
+++ b/website/docs/index.mdx
@@ -6,6 +6,7 @@ slug: /
---
+
import { DocsCloudCTA } from "../src/DocsCloudCTA";
- - Unlimited projects
- - Unlimited collections
- - All available form fields
- - Schema editor and inference from data
- - Advanced data import and export
- - Default roles
- - 3 users
+ - Unlimited projects
+ - Unlimited collections
+ - All available form fields
+ - Schema editor and inference from data
+ - Advanced data import and export
+ - Default roles
+ - 3 users
@@ -54,13 +52,13 @@ export function FireCMSCloudVersions() {
Perfect for small teams and startups.
- - Everything in the free tier
- - Custom fields and custom views
- - Unlimited users and roles
- - Unlimited data export
- - Theme and logo customization
- - Custom user roles
- - GPT-4 content generation
+ - Everything in the free tier
+ - Custom fields and custom views
+ - Unlimited users and roles
+ - Unlimited data export
+ - Theme and logo customization
+ - Custom user roles
+ - GPT-4 content generation
@@ -83,13 +81,13 @@ export function FireCMSCloudVersions() {
Perfect for large teams and enterprises.
- - Everything in PLUS
- - Custom authentication and access control
- - SAML SSO
- - Custom domain
- - Full CMS components customization
- - Priority support
- - Roadmap prioritization
+ - Everything in PLUS
+ - Custom authentication and access control
+ - SAML SSO
+ - Custom domain
+ - Full CMS components customization
+ - Priority support
+ - Roadmap prioritization
diff --git a/website/src/theme/Footer/Layout/index.js b/website/src/theme/Footer/Layout/index.js
index b18845163..27e3ebed8 100644
--- a/website/src/theme/Footer/Layout/index.js
+++ b/website/src/theme/Footer/Layout/index.js
@@ -1,7 +1,6 @@
import React from "react";
import Layout from "@theme-original/Footer/Layout";
import { Newsletter } from "../../../partials/general/Newsletter";
-import useBaseUrl from "@docusaurus/useBaseUrl";
import { EnterpriseTeaser } from "../../../partials/general/EnterpriseTeaser";
import { useLocation } from "@docusaurus/router";
diff --git a/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js b/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
index 17634c3a7..e8d07f9d1 100644
--- a/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
+++ b/website/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.js
@@ -1,8 +1,7 @@
import React from "react";
import { useLocation } from "@docusaurus/router";
-import DocsVersionDropdownNavbarItem
- from "@theme-original/NavbarItem/DocsVersionDropdownNavbarItem";
+import DocsVersionDropdownNavbarItem from "@theme-original/NavbarItem/DocsVersionDropdownNavbarItem";
export default function DocsVersionDropdownNavbarItemWrapper(props) {
const { pathname } = useLocation();
diff --git a/website/versioned_docs/version-2.0.0/firebase_setup.md b/website/versioned_docs/version-2.0.0/firebase_setup.md
index 66f9e1744..949511899 100644
--- a/website/versioned_docs/version-2.0.0/firebase_setup.md
+++ b/website/versioned_docs/version-2.0.0/firebase_setup.md
@@ -39,7 +39,7 @@ service cloud.firestore {
}
```
-but ideally you will want to make it more restricitve. For the demo in the website, you could have rules
+but ideally you will want to make it more restrictive. For the demo in the website, you could have rules
like this:
```
@@ -51,8 +51,8 @@ service cloud.firestore {
// everything is private by default
match /{document=**} {
- allow read: false;
- allow write: false;
+ allow read: if false;
+ allow write: if false;
}
// allow every read to products collection but write only to authenticated users