minor deploy and workflow changes #11

.github/actions/build/action.yml

@@ -0,0 +1,9 @@
+name: "Build"
+description: "Build the project."
+
+runs:
+  using: "composite"
+  steps:
+    - name: Build
+      shell: bash
+      run: npm run build

.github/actions/deploy/action.yml

@@ -0,0 +1,19 @@
+name: 'Deploy'
+description: 'Deploy the project.'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: No jekyll
+      run: touch out/.nojekyll
+    - name: Deploy
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: gh-pages
+        folder: out
+        clean: true
+        target-folder: .
+        git-config-name: ${{ github.actor }}
+        git-config-email: ${{ github.actor }}@users.noreply.github.com
+        commit-message: Deploy from commit ${{ github.sha }}

.github/workflows/actions/test/action.yml → .github/actions/test/action.yml

@@ -1,14 +1,16 @@
-name: "Test"
-description: "Lint and test the project."
+name: 'Test'
+description: 'Lint and test the project.'
 
 runs:
-  using: "composite"
+  using: 'composite'
   steps:
     - name: Lint
+      shell: bash
       run: |
         npm run lint
         npm run lint:editorconfig
     - name: Prettier rules check
+      shell: bash
       run: npm run prettier-check
     - name: e2e
       uses: cypress-io/github-action@v5
@@ -17,4 +19,5 @@ runs:
         start: npm start
         record: false
     - name: Check seo
+      shell: bash
       run: npm run check-seo

.github/workflows/build.yml

@@ -10,8 +10,13 @@ concurrency:
 
 jobs:
   build:
-    name: Build
+    name: Build on Node.js ${{ matrix.version }}
     runs-on: ubuntu-latest
+    env:
+      GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
+      FORMSPREE_ID: ${{ secrets.FORMSPREE_ID }}
+      HOTJAR_ID: ${{ secrets.HOTJAR_ID }}
+      HOTJAR_SNIPPET_VERSION: ${{ secrets.HOTJAR_SNIPPET_VERSION }}
     strategy:
       matrix:
         version: [18, 20, 22]
@@ -26,4 +31,3 @@ jobs:
         uses: ./.github/actions/test
       - name: Build
         uses: ./.github/actions/build
-

.github/workflows/deploy.yml

@@ -19,6 +19,12 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
+    env:
+      GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID }}
+      FORMSPREE_ID: ${{ secrets.FORMSPREE_ID }}
+      HOTJAR_ID: ${{ secrets.HOTJAR_ID }}
+      HOTJAR_SNIPPET_VERSION: ${{ secrets.HOTJAR_SNIPPET_VERSION }}
+      ASSETS_BASE_PATH: /salsaviva
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
@@ -28,16 +34,5 @@ jobs:
           node_version: 18
       - name: Build
         uses: ./.github/actions/build
-        with:
-          assets_path: 'assets'
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: out
-          clean: true
-          target-folder: .
-          git-config-name: ${{ github.actor }}
-          git-config-email: ${{ github.actor }}@users.noreply.github.com
-          commit-message: Deploy from commit ${{ github.sha }}
+        uses: ./.github/actions/deploy

app/env.mjs

@@ -1,5 +1,5 @@
 import {createEnv} from '@t3-oss/env-nextjs';
-import {z} from 'zod';
+import {any, z} from 'zod';
 
 /**
  * Checks if a string is not empty.
@@ -35,6 +35,7 @@ const server = {
   CONTACT_PHONE: notEmptyString,
   LOCATION_GOOGLE_MAPS_LINK: notEmptyString.url(),
   LOCATION_ADDRESS_TEXT: notEmptyString,
+  ASSETS_BASE_PATH: any(),
 };
 
 const client = {};
@@ -62,5 +63,6 @@ export const env = createEnv({
     CONTACT_PHONE: process.env.CONTACT_PHONE,
     LOCATION_GOOGLE_MAPS_LINK: process.env.LOCATION_GOOGLE_MAPS_LINK,
     LOCATION_ADDRESS_TEXT: process.env.LOCATION_ADDRESS_TEXT,
+    ASSETS_BASE_PATH: process.env.ASSETS_BASE_PATH,
   },
 });

app/manifest.ts

@@ -0,0 +1,41 @@
+import {MetadataRoute} from 'next';
+import {env} from './env.mjs';
+import tailwindConfig from '../tailwind.config';
+
+const colors = tailwindConfig.theme.extend.colors;
+const {alternate = 'black'} = colors;
+
+const {ASSETS_BASE_PATH = ''} = env;
+
+// eslint-disable-next-line jsdoc/require-jsdoc
+export default function manifest(): MetadataRoute.Manifest {
+  return {
+    name: 'Salsaviva - Salsa, Bachata and Kizomba in Yerevan',
+    short_name: 'Salsaviva',
+    description: 'Social dance school in Yerevan',
+    theme_color: alternate,
+    background_color: alternate,
+    display: 'standalone',
+    orientation: 'portrait',
+    scope: '/',
+    start_url: '/',
+    icons: [
+      {
+        src: `${ASSETS_BASE_PATH}/icons/logo_192.png`,
+        type: 'image/png',
+        sizes: '192x192',
+      },
+      {
+        src: `${ASSETS_BASE_PATH}/icons/logo_maskable_192.png`,
+        type: 'image/png',
+        sizes: '192x192',
+        purpose: 'maskable',
+      },
+      {
+        src: `${ASSETS_BASE_PATH}/icons/logo_512.png`,
+        type: 'image/png',
+        sizes: '512x512',
+      },
+    ],
+  };
+}

app/metadata.ts

@@ -4,6 +4,9 @@
 
 import {Metadata} from 'next';
 import {origin} from './origin';
+import {env} from './env.mjs';
+
+const {ASSETS_BASE_PATH = ''} = env;
 
 const metadata: Metadata = {
   title: {
@@ -24,14 +27,14 @@ const metadata: Metadata = {
     'social dance',
   ],
   authors: [{name: 'Ukorvl', url: 'https://github.com/ukorvl'}],
-  manifest: '/manifest.json',
+  manifest: `${ASSETS_BASE_PATH}/manifest.json`,
   metadataBase: new URL(origin),
   openGraph: {
     title: 'Salsaviva',
     description: 'Salsa, Bachata and Kizomba in Yerevan',
     images: [
       {
-        url: '/og.jpg',
+        url: `${ASSETS_BASE_PATH}/og.jpg`,
         width: 800,
         height: 600,
       },
@@ -45,24 +48,24 @@ const metadata: Metadata = {
     card: 'summary_large_image',
     title: 'Salsaviva',
     description: 'Salsa, Bachata and Kizomba in Yerevan',
-    images: ['/og.jpg'],
+    images: [`${ASSETS_BASE_PATH}/og.jpg`],
     site: '@salsaviva',
   },
   icons: [
     {
       rel: 'icon',
       sizes: 'any',
-      url: '/icons/favicon.ico',
+      url: `${ASSETS_BASE_PATH}/icons/favicon.ico`,
     },
     {
       rel: 'icon',
       type: 'image/svg+xml',
-      url: '/icons/icon.svg',
+      url: `${ASSETS_BASE_PATH}/icons/icon.svg`,
     },
     {
       rel: 'apple-touch-icon',
       sizes: '180x180',
-      url: '/icons/apple-touch-icon.png',
+      url: `${ASSETS_BASE_PATH}/icons/apple-touch-icon.png`,
     },
   ],
   robots: {