diff --git a/.changeset/rotten-needles-lick.md b/.changeset/rotten-needles-lick.md new file mode 100644 index 00000000..453eda6d --- /dev/null +++ b/.changeset/rotten-needles-lick.md @@ -0,0 +1,5 @@ +--- +"outstatic": patch +--- + +Feat/add some shadcn diff --git a/packages/outstatic/package.json b/packages/outstatic/package.json index 583e063f..24f0bda9 100644 --- a/packages/outstatic/package.json +++ b/packages/outstatic/package.json @@ -33,6 +33,8 @@ "@dnd-kit/utilities": "^3.2.2", "@hapi/iron": "^7.0.0", "@hookform/resolvers": "^2.9.7", + "@radix-ui/react-icons": "^1.3.0", + "@radix-ui/react-slot": "^1.0.2", "@tiptap/core": "2.1.10", "@tiptap/extension-bubble-menu": "2.1.10", "@tiptap/extension-code-block": "2.1.10", @@ -50,6 +52,7 @@ "ai": "^2.2.16", "camelcase": "^6.3.0", "change-case": "^5.4.2", + "class-variance-authority": "^0.7.0", "clsx": "^1.2.1", "cookie": "^0.5.0", "cross-fetch": "^4.0.0", diff --git a/packages/outstatic/src/client/pages/add-custom-field/index.tsx b/packages/outstatic/src/client/pages/add-custom-field.tsx similarity index 76% rename from packages/outstatic/src/client/pages/add-custom-field/index.tsx rename to packages/outstatic/src/client/pages/add-custom-field.tsx index afebc8ee..eff7825a 100644 --- a/packages/outstatic/src/client/pages/add-custom-field/index.tsx +++ b/packages/outstatic/src/client/pages/add-custom-field.tsx @@ -1,7 +1,10 @@ -import { AdminLayout, Input } from '@/components' +import { AdminLayout } from '@/components' import Alert from '@/components/Alert' import Modal from '@/components/Modal' import TagInput from '@/components/TagInput' +import { Button } from '@/components/ui/button' +import { Card, CardContent } from '@/components/ui/card' +import Input from '@/components/ui/input' import { useCreateCommitMutation } from '@/graphql/generated' import { CustomField, CustomFields, customFieldTypes } from '@/types' import { createCommitApi } from '@/utils/createCommitApi' @@ -204,17 +207,14 @@ export default function AddCustomField({ collection }: AddCustomFieldProps) { {collection} Fields {Object.keys(customFields).length > 0 ? ( - + Add Custom Field + ) : null} {!loading ? ( @@ -236,18 +236,19 @@ export default function AddCustomField({ collection }: AddCustomFieldProps) {
-

Here you can add Custom Fields to your collections.

+

Add Custom Fields to your collections.

Create your first Custom Field by clicking the button below.

-
setShowAddModal(true)} +
+

To learn more about how Custom Fields work checkout{' '} { return ( -

- - + -
+ Delete content + + + + + + + ) })}
@@ -391,29 +396,31 @@ export default function AddCustomField({ collection }: AddCustomFieldProps) { > Field type - +
@@ -490,10 +497,10 @@ export default function AddCustomField({ collection }: AddCustomFieldProps) {
- - +
@@ -559,10 +567,9 @@ export default function AddCustomField({ collection }: AddCustomFieldProps) {
- - +
)} diff --git a/packages/outstatic/src/client/pages/collections.tsx b/packages/outstatic/src/client/pages/collections.tsx index 71eff7ff..2777127d 100644 --- a/packages/outstatic/src/client/pages/collections.tsx +++ b/packages/outstatic/src/client/pages/collections.tsx @@ -1,5 +1,7 @@ import { AdminLayout } from '@/components' import Modal from '@/components/Modal' +import { Button } from '@/components/ui/button' +import { Card, CardContent } from '@/components/ui/card' import { useCreateCommitMutation, useDocumentLazyQuery @@ -141,64 +143,61 @@ export default function Collections() { <>

Collections

- -
- New Collection -
- +
{collections.map((collection) => ( -
- -
- {collection} - -
- -
+ + - Edit collection - - - - +
+ {collection} + +
- + -
-
+ Delete content + + + + + +
+ + ))} @@ -221,9 +220,8 @@ export default function Collections() {
- - +
)} diff --git a/packages/outstatic/src/client/pages/edit-document/index.tsx b/packages/outstatic/src/client/pages/edit-document.tsx similarity index 100% rename from packages/outstatic/src/client/pages/edit-document/index.tsx rename to packages/outstatic/src/client/pages/edit-document.tsx diff --git a/packages/outstatic/src/client/pages/list.tsx b/packages/outstatic/src/client/pages/list.tsx index c18bda81..a1e73879 100644 --- a/packages/outstatic/src/client/pages/list.tsx +++ b/packages/outstatic/src/client/pages/list.tsx @@ -1,4 +1,5 @@ import { AdminLayout, DocumentsTable } from '@/components' +import { Button } from '@/components/ui/button' import { useDocumentsQuery } from '@/graphql/generated' import { OstDocument } from '@/types/public' import useOutstatic from '@/utils/hooks/useOutstatic' @@ -91,13 +92,13 @@ export default function List({ collection }: ListProps) { error={error} title={collection[0].toUpperCase() + collection.slice(1)} > -
-

{collection}

- -
+
+

{collection}

+
- + +
{documents.length > 0 && (
@@ -121,18 +122,23 @@ export default function List({ collection }: ListProps) {
-

This collection has no documents yet.

+

This collection has no documents yet.

Create your first{' '} - {singular(collection)} by - clicking the button below. + + {singular(collection)} + {' '} + by clicking the button below.

- -
+
- + +

To learn more about how documents work{' '} - + {collectionName && ( diff --git a/packages/outstatic/src/client/pages/settings.tsx b/packages/outstatic/src/client/pages/settings.tsx index 7849fc7f..caecb284 100644 --- a/packages/outstatic/src/client/pages/settings.tsx +++ b/packages/outstatic/src/client/pages/settings.tsx @@ -1,7 +1,7 @@ import { AdminLayout } from '@/components' import { MetadataBuilder } from '@/components/MetadataBuilder' +import { Button } from '@/components/ui/button' import useOutstatic from '@/utils/hooks/useOutstatic' -import { clsx } from 'clsx' import { useState } from 'react' export default function Settings() { @@ -17,17 +17,9 @@ export default function Settings() {

Metadata

- +