🚧 Upgrade to latest Flowershow (V2 - with MarkdownDB)

.eslintrc.json

@@ -1,10 +1,5 @@
 {
-  "extends": [
-    "plugin:@nrwl/nx/react",
-    "next",
-    "next/core-web-vitals",
-    "../../.eslintrc.json"
-  ],
+  "extends": ["next", "next/core-web-vitals", "../../.eslintrc.json"],
   "ignorePatterns": [".obsidian/**/*", ".next/**/*", "out/**/*"],
   "overrides": [
     {

.github/workflows/e2e.yml

@@ -0,0 +1,57 @@
+name: Run E2E Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out E2E tests repo
+        uses: actions/checkout@v2
+        with:
+          repository: datopian/flowershow-template-e2e
+
+      - name: Check out this repo into test-app
+        uses: actions/checkout@v2
+        with:
+          path: test-app
+
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+
+      - name: Install dependencies of E2E tests
+        run: |
+          npm ci
+          npx playwright install --with-deps
+
+      - name: Install dependencies of this repo
+        run: npm ci
+        working-directory: test-app
+
+      - name: Replace template /content with fixture content
+        run: |
+          rm -rf test-app/content
+          cp -r fixtures/content test-app/content
+
+      - name: Build the app
+        run: npm run export
+        working-directory: test-app
+
+      - name: Run the tests
+        run: npx playwright test
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30

.gitignore

@@ -35,9 +35,8 @@ yarn-error.log*
 # vercel
 .vercel
 
-
-# Contentlayer
-.contentlayer
-
+# editor
 .obsidian
-sandbox
+
+# markdowndb
+markdown.db

.prettierignore

@@ -0,0 +1,9 @@
+.obsidian/
+.next/
+out/
+dist/
+excalidraw/
+content/
+meta/
+.github/
+pnpm-lock.yaml

components/MdxPage.tsx

@@ -0,0 +1,32 @@
+import React from "react";
+import { MDXRemote } from "next-mdx-remote";
+import { Mermaid, Pre } from "@portaljs/core";
+
+import layouts from "../layouts";
+
+// Custom components/renderers to pass to MDX.
+// Since the MDX files aren't loaded by webpack, they have no knowledge of how
+// to handle import statements. Instead, you must include components in scope
+// here.
+const components = {
+  mermaid: Mermaid,
+  pre: Pre,
+};
+
+export default function MdxPage({ source, frontMatter }) {
+  const Layout = ({ children }) => {
+    if (frontMatter.layout) {
+      const LayoutComponent = layouts[frontMatter.layout];
+      return <LayoutComponent {...frontMatter}>{children}</LayoutComponent>;
+    }
+    return <>{children}</>;
+  };
+
+  return (
+    <main id="mdxpage" className="prose mx-auto">
+      <Layout>
+        <MDXRemote {...source} components={components} />
+      </Layout>
+    </main>
+  );
+}

components/custom/InitiativeCard.jsx

@@ -5,7 +5,7 @@ export default function InitiativeCard({ initiative }) {
     <li className="group relative flex flex-col items-start m-0 p-0">
       <div role="heading" className="text-base font-semibold text-primary">
         <div className="absolute -inset-x-4 -inset-y-6 z-0 scale-95 bg-zinc-100 opacity-0 transition group-hover:scale-100 group-hover:opacity-100 sm:-inset-x-6 sm:rounded-2xl"></div>
-        <Link href={initiative.url_path} className="flex flex-col transition font-medium text-primary group-hover:text-secondary">
+        <Link href={initiative.urlPath} className="flex flex-col transition font-medium text-primary group-hover:text-secondary">
           <span className="absolute -inset-x-4 -inset-y-6 z-20 sm:-inset-x-6 sm:rounded-2xl" />
           {initiative.image && <img src={initiative.image} className="z-10 w-full aspect-video object-cover object-left m-0 rounded-lg shadow-sm" />}
           <span className="relative z-10 mt-4">
@@ -21,4 +21,4 @@ export default function InitiativeCard({ initiative }) {
       </p>
     </li>
   )
-}
+}

config/siteConfig.ts

@@ -0,0 +1,16 @@
+import { defaultConfig } from "@portaljs/core";
+import userConfig from "../content/config.mjs";
+
+// TODO types
+const siteConfig: any = {
+  ...defaultConfig,
+  ...userConfig,
+  // prevent theme object overrides for
+  // values not provided in userConfig
+  theme: {
+    ...defaultConfig.theme,
+    ...userConfig?.theme,
+  },
+};
+
+export default siteConfig;