Fix conflicts

.dockerignore

@@ -0,0 +1,8 @@
+.eslintrc.json
+.git
+.github
+.gitignore
+Dockerfile
+LICENSE
+tailwind.config.js
+tsconfig.json

.github/workflows/deploy.yaml

@@ -1,11 +1,11 @@
----
-name: 'deploy'
+name: 'Deploy'
 
-# yamllint disable-line rule:truthy
 on:
   push:
     branches:
       - main
+  repository_dispatch:
+    types: [ deploy ]
   workflow_dispatch:
 
 concurrency:
@@ -17,13 +17,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: tidev/tidev.io
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to private registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.TIDEV_REGISTRY_URL }}
+          username: ${{ secrets.TIDEV_REGISTRY_USERNAME }}
+          password: ${{ secrets.TIDEV_REGISTRY_PASSWORD }}
+
+      - name: Build and push
+        id: build
+        uses: docker/build-push-action@v5
         with:
-          fetch-depth: 0
+          push: true
+          tags: ${{ secrets.TIDEV_REGISTRY_URL }}/${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
       - name: Push to dokku
         uses: dokku/github-action@master
         with:
-          branch: 'main'
+          deploy_docker_image: ${{ secrets.TIDEV_REGISTRY_URL }}/${{ steps.meta.outputs.tags }}@${{ steps.build.outputs.digest }}
+          git_push_flags: '--force'
           git_remote_url: 'ssh://[email protected]:22/tidev.io'
-          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+          ssh_private_key: ${{ secrets.DO_SSH_PRIVATE_KEY }}

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:20-alpine
+
+WORKDIR /app
+COPY . /app
+
+RUN corepack enable && \
+	pnpm install --frozen-lockfile && \
+	pnpm run build
+
+ENV NODE_ENV production
+EXPOSE 80/tcp
+CMD [ "pnpm", "start" ]

components/footer.tsx

@@ -32,7 +32,7 @@ export default function Footer() {
                         </svg>
                     </Link>
                 </div>
-                <p className='mt-8 text-sm leading-6 text-center text-gray-400 dark:text-gray-200'>© 2023 TiDev, Inc. - 38 Court Square West, Centreville, AL 35042</p>
+                <p className='mt-8 text-sm leading-6 text-center text-gray-400 dark:text-gray-200'>© {new Date().getFullYear()} TiDev, Inc. - 38 Court Square West, Centreville, AL 35042</p>
             </div>
         </section>
     );

package.json

@@ -15,12 +15,12 @@
         "@google-cloud/storage": "7.7.0",
         "formidable": "3.5.1",
         "fs-extra": "11.2.0",
-        "globby": "14.0.0",
+        "globby": "14.0.1",
         "gray-matter": "4.0.3",
         "markdown-it": "14.0.0",
-        "next": "14.0.4",
-        "next-auth": "4.24.5",
-        "next-seo": "6.4.0",
+        "next": "14.1.0",
+        "next-auth": "4.24.6",
+        "next-seo": "6.5.0",
         "open-pdf-sign": "0.1.7",
         "pdf-lib": "1.17.1",
         "pdfjs-dist": "4.0.379",
@@ -35,17 +35,17 @@
         "@types/formidable": "3.4.5",
         "@types/lodash": "4.14.202",
         "@types/markdown-it": "13.0.7",
-        "@types/node": "20.10.6",
-        "@types/react": "18.2.46",
+        "@types/node": "20.11.19",
+        "@types/react": "18.2.55",
         "@types/react-pdf": "6.2.0",
         "@types/react-signature-canvas": "1.0.5",
-        "@types/uuid": "9.0.7",
-        "autoprefixer": "10.4.16",
+        "@types/uuid": "9.0.8",
+        "autoprefixer": "10.4.17",
         "concurrently": "8.2.2",
         "eslint": "8.56.0",
-        "eslint-config-next": "14.0.4",
-        "postcss": "8.4.33",
-        "tailwindcss": "3.4.0",
+        "eslint-config-next": "14.1.0",
+        "postcss": "8.4.35",
+        "tailwindcss": "3.4.1",
         "typescript": "5.3.3"
     },
     "engines": {

pages/blog/[slug].tsx

@@ -40,7 +40,7 @@ export default function BlogPost({ page }: InferGetStaticPropsType<typeof getSta
                             <span>{data.category}</span>
                         </span>
                         <p className='pt-2 text-xs font-medium'>
-                            {data.date}
+                            {new Date(data.date).toLocaleDateString('en')}
                             <br />
                             {data.author}
                         </p>

pages/blog/index.tsx

@@ -26,9 +26,9 @@ export default function Blog(props: InferGetStaticPropsType<typeof getStaticProp
                                     {page.title}
                                 </Link>
                             </h2>
-                            <p className='text-sm'>{page.teaser}…</p>
-                            <p className='pt-2 text-xs font-medium text-gray-500'>
-                                {page.author} · <span className='mx-1'>{page.date}</span>
+                            <p className='text-sm text-gray-500'>{page.teaser}…</p>
+                            <p className='pt-2 text-xs font-medium'>
+                                {page.author} · <span className='mx-1'>{new Date(page.date ?? new Date()).toLocaleDateString('en')}</span>
                             </p>
                         </div>
                     ))}