move example project

getcronit · Feb 13, 2022 · 4e34508 · 4e34508
1 parent 2da0031
commit 4e34508
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 148 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/quick_request.md b/.github/ISSUE_TEMPLATE/quick_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml
diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml
diff --git a/examples/my-gatsby-site/.gitignore → examples/demo/.gitignore b/examples/my-gatsby-site/.gitignore → examples/demo/.gitignore
diff --git a/examples/my-gatsby-site/CHANGELOG.md → examples/demo/CHANGELOG.md b/examples/my-gatsby-site/CHANGELOG.md → examples/demo/CHANGELOG.md
diff --git a/examples/my-gatsby-site/README.md → examples/demo/README.md b/examples/my-gatsby-site/README.md → examples/demo/README.md
diff --git a/examples/my-gatsby-site/gatsby-browser.js → examples/demo/gatsby-browser.js b/examples/my-gatsby-site/gatsby-browser.js → examples/demo/gatsby-browser.js
diff --git a/examples/my-gatsby-site/gatsby-config.js → examples/demo/gatsby-config.js b/examples/my-gatsby-site/gatsby-config.js → examples/demo/gatsby-config.js
@@ -8,7 +8,7 @@ module.exports = {
     {
       resolve: '@jaenjs/jaen',
       options: {
-        jaenProjectId: 1
+        jaenProjectId: 2
       }
     },
     '@chakra-ui/gatsby-plugin',

diff --git a/examples/my-gatsby-site/gatsby-ssr.js → examples/demo/gatsby-ssr.js b/examples/my-gatsby-site/gatsby-ssr.js → examples/demo/gatsby-ssr.js
diff --git a/examples/my-gatsby-site/jaen-config.js → examples/demo/jaen-config.js b/examples/my-gatsby-site/jaen-config.js → examples/demo/jaen-config.js
diff --git a/...tsby-site/jaen-data/[email protected] → ...ples/demo/jaen-data/[email protected] b/...tsby-site/jaen-data/[email protected] → ...ples/demo/jaen-data/[email protected]
diff --git a/...atsby-site/jaen-data/[email protected] → examples/demo/jaen-data/[email protected] b/...atsby-site/jaen-data/[email protected] → examples/demo/jaen-data/[email protected]
diff --git a/...es/my-gatsby-site/jaen-data/internal.json → examples/demo/jaen-data/internal.json b/...es/my-gatsby-site/jaen-data/internal.json → examples/demo/jaen-data/internal.json
@@ -12,13 +12,29 @@
       "organization": {
         "name": "Example, Inc.",
         "url": "https://example.com",
-        "logo": "https://lengstorf.com/android-chrome-512x512.png"
+        "logo": "https://osg.snek.at/storage/BQACAgQAAxkDAAIGEGIHjCjfdFFSe3Y7teMnwoRmtHm5AAI9DAACH4xBUE1uwhSrbVRpIwQ"
       },
       "social": {
         "twitter": "@jlengstorf",
         "fbAppID": ""
       },
       "categories": [
+        {
+          "slug": "test",
+          "name": "Test Category"
+        },
+        {
+          "slug": "test",
+          "name": "Test Category"
+        },
+        {
+          "slug": "test",
+          "name": "Test Category"
+        },
+        {
+          "slug": "test",
+          "name": "Test Category"
+        },
         {
           "slug": "test",
           "name": "Test Category"

diff --git a/examples/my-gatsby-site/jaen-pages.json → examples/demo/jaen-pages.json b/examples/my-gatsby-site/jaen-pages.json → examples/demo/jaen-pages.json
diff --git a/examples/my-gatsby-site/package.json → examples/demo/package.json b/examples/my-gatsby-site/package.json → examples/demo/package.json
diff --git a/examples/my-gatsby-site/site-metadata.json → examples/demo/site-metadata.json b/examples/my-gatsby-site/site-metadata.json → examples/demo/site-metadata.json
diff --git a/...les/my-gatsby-site/src/blocks/Pricing.tsx → examples/demo/src/blocks/Pricing.tsx b/...les/my-gatsby-site/src/blocks/Pricing.tsx → examples/demo/src/blocks/Pricing.tsx
diff --git a/examples/my-gatsby-site/src/blocks/index.ts → examples/demo/src/blocks/index.ts b/examples/my-gatsby-site/src/blocks/index.ts → examples/demo/src/blocks/index.ts
diff --git a/...y-gatsby-site/src/components/BlogCard.tsx → examples/demo/src/components/BlogCard.tsx b/...y-gatsby-site/src/components/BlogCard.tsx → examples/demo/src/components/BlogCard.tsx
diff --git a/.../my-gatsby-site/src/components/Footer.tsx → examples/demo/src/components/Footer.tsx b/.../my-gatsby-site/src/components/Footer.tsx → examples/demo/src/components/Footer.tsx
diff --git a/...es/my-gatsby-site/src/components/Hero.tsx → examples/demo/src/components/Hero.tsx b/...es/my-gatsby-site/src/components/Hero.tsx → examples/demo/src/components/Hero.tsx
diff --git a/.../my-gatsby-site/src/components/Navbar.tsx → examples/demo/src/components/Navbar.tsx b/.../my-gatsby-site/src/components/Navbar.tsx → examples/demo/src/components/Navbar.tsx
diff --git a/...sby-site/src/components/SubscribeForm.tsx → ...les/demo/src/components/SubscribeForm.tsx b/...sby-site/src/components/SubscribeForm.tsx → ...les/demo/src/components/SubscribeForm.tsx
diff --git a/...es/my-gatsby-site/src/components/index.ts → examples/demo/src/components/index.ts b/...es/my-gatsby-site/src/components/index.ts → examples/demo/src/components/index.ts
diff --git a/examples/my-gatsby-site/src/images/icon.png → examples/demo/src/images/icon.png b/examples/my-gatsby-site/src/images/icon.png → examples/demo/src/images/icon.png
diff --git a/...by-site/src/notifications/CookieModal.tsx → ...es/demo/src/notifications/CookieModal.tsx b/...by-site/src/notifications/CookieModal.tsx → ...es/demo/src/notifications/CookieModal.tsx
diff --git a/examples/my-gatsby-site/src/pages/404.js → examples/demo/src/pages/404.js b/examples/my-gatsby-site/src/pages/404.js → examples/demo/src/pages/404.js
diff --git a/examples/my-gatsby-site/src/pages/index.tsx → examples/demo/src/pages/index.tsx b/examples/my-gatsby-site/src/pages/index.tsx → examples/demo/src/pages/index.tsx
diff --git a/...gatsby-site/src/templates/ArticlePage.tsx → examples/demo/src/templates/ArticlePage.tsx b/...gatsby-site/src/templates/ArticlePage.tsx → examples/demo/src/templates/ArticlePage.tsx
diff --git a/...my-gatsby-site/src/templates/BlogPage.tsx → examples/demo/src/templates/BlogPage.tsx b/...my-gatsby-site/src/templates/BlogPage.tsx → examples/demo/src/templates/BlogPage.tsx
diff --git a/examples/my-gatsby-site/tsconfig.json → examples/demo/tsconfig.json b/examples/my-gatsby-site/tsconfig.json → examples/demo/tsconfig.json
diff --git a/examples/my-gatsby-site/yarn-error.log → examples/demo/yarn-error.log b/examples/my-gatsby-site/yarn-error.log → examples/demo/yarn-error.log
diff --git a/packages/jaen/src/bin/run b/packages/jaen/src/bin/run
@@ -21,21 +21,21 @@ program
   .description('run build steps for jaen-pages')
   .option(
     '-m, --migration <url>',
-    'jaen-pages migration (default: process.env.JAEN_PAGES_MIGRATION_URL)',
-    process.env.JAEN_PAGES_MIGRATION_URL
+    'jaen-pages migration (default: process.env.JAEN_MIGRATION_URL)',
+    process.env.JAEN_MIGRATION_URL
   )
   .action(async options => {
-    const JAEN_PAGES_MIGRATION_URL = options.migration
+    const JAEN_MIGRATION_URL = options.migration
 
-    if (!JAEN_PAGES_MIGRATION_URL) {
+    if (!JAEN_MIGRATION_URL) {
       console.error(
         '[jaen-pages] Failed to run migration -> Please specify a migration URL'
       )
       process.exit(1)
     }
 
     try {
-      await runMigration(JAEN_PAGES_MIGRATION_URL)
+      await runMigration(JAEN_MIGRATION_URL)
     } catch (err) {
       console.error(
         '[jaen-pages] Failed to run migration -> You must run this command inside your gatsby app!',

diff --git a/packages/jaen/src/internal-plugins/pages/ui/components/tabs/Pages/PageContent/index.tsx b/packages/jaen/src/internal-plugins/pages/ui/components/tabs/Pages/PageContent/index.tsx
@@ -36,7 +36,7 @@ import {HiCloudUpload} from '@react-icons/all-files/hi/HiCloudUpload'
 export type ContentValues = {
   title: string
   slug: string
-  imageUrl?: string
+  image?: string
   description?: string
   excludedFromIndex?: boolean
 }
@@ -77,9 +77,9 @@ export const PageContent = (props: PageContentProps) => {
     onAction: action => {
       if (action.type === 'SELECTOR_SELECT') {
         console.log(action.payload.item)
-        const imageUrl = action.payload.item.src
+        const image = action.payload.item.src
 
-        setValue('imageUrl', imageUrl, {
+        setValue('image', image, {
           shouldDirty: true
         })
       }
@@ -92,6 +92,8 @@ export const PageContent = (props: PageContentProps) => {
       ...values
     }
 
+    alert(JSON.stringify(vs, null, 2))
+
     props.onSubmit(vs)
 
     setDefaultValues(vs)
@@ -114,7 +116,7 @@ export const PageContent = (props: PageContentProps) => {
   }
 
   const handleImageRemove = () => {
-    setValue('imageUrl', undefined, {
+    setValue('image', '', {
       shouldDirty: true
     })
   }
@@ -213,7 +215,7 @@ export const PageContent = (props: PageContentProps) => {
 
                       <Controller
                         control={control}
-                        name="imageUrl"
+                        name="image"
                         render={({field: {value}}) => (
                           <Stack
                             direction="row"

diff --git a/packages/jaen/src/internal-plugins/pages/ui/components/tabs/Pages/index.tsx b/packages/jaen/src/internal-plugins/pages/ui/components/tabs/Pages/index.tsx
@@ -28,8 +28,10 @@ const PagesTab = (props: PagesTabProps) => {
   }
 
   const handlePageUpdate = React.useCallback(
-    (values: ContentValues) =>
-      selection && props.onPageUpdate(selection.id, values),
+    (values: ContentValues) => {
+      alert(`Page updated: ${JSON.stringify(values)}`)
+      selection && props.onPageUpdate(selection.id, values)
+    },
     [selection]
   )
 
@@ -89,7 +91,7 @@ const PagesTab = (props: PagesTabProps) => {
                 title: selection.jaenPageMetadata.title,
                 slug: selection.slug,
                 description: selection.jaenPageMetadata.description,
-                imageUrl: selection.jaenPageMetadata.image,
+                image: selection.jaenPageMetadata.image,
                 excludedFromIndex: selection.excludedFromIndex
               }}
               onSubmit={handlePageUpdate}

diff --git a/packages/jaen/src/internal-plugins/pages/ui/tabs/Pages.tsx b/packages/jaen/src/internal-plugins/pages/ui/tabs/Pages.tsx
@@ -129,7 +129,8 @@ export const PagesContainer = withRedux(() => {
           slug: values.slug,
           jaenPageMetadata: {
             title: values.title,
-            description: values.description
+            description: values.description,
+            image: values.image
           },
           excludedFromIndex: values.excludedFromIndex
         })

diff --git a/packages/jaen/src/internal-plugins/pages/ui/toolbar/HomeButton.tsx b/packages/jaen/src/internal-plugins/pages/ui/toolbar/HomeButton.tsx
@@ -1,13 +1,14 @@
 import {Button} from '@chakra-ui/react'
+import {useSite} from '@jaen/services/site'
 import {FiHome} from '@react-icons/all-files/fi/FiHome'
 import {Link} from 'gatsby'
 
 export const HomeButton = () => {
-  const siteTitle = 'Ballons & Balloons' // useStaticQuery site meta data
+  const site = useSite()
 
   return (
     <Button size="xs" variant={'darkghost'} leftIcon={<FiHome />}>
-      <Link to="/">Ballons & Ballons</Link>
+      <Link to="/">{site.siteMetadata.title || 'Home'}</Link>
     </Button>
   )
 }