[fix] env (#51)

walitoff · Dec 10, 2024 · 7937517 · 7937517
1 parent 4848450
commit 7937517
Show file tree

Hide file tree

Showing 11 changed files with 598 additions and 507 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,13 +1,4 @@
 # These are supported funding model platforms
 
 github: rvalitov
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 custom: ['https://donations.walitoff.com'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff --git a/.github/workflows/codacy-coverage-reporter.yml b/.github/workflows/codacy-coverage-reporter.yml
@@ -6,6 +6,7 @@ on:
     branches: [ "main" ]
 
   # Allows you to run this workflow manually from the Actions tab
+  # eslint-disable-next-line yml/no-empty-mapping-value
   workflow_dispatch:
 
 # Default to bash

diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
@@ -7,6 +7,7 @@ on:
     branches: [ "main" ]
 
   # Allows you to run this workflow manually from the Actions tab
+  # eslint-disable-next-line yml/no-empty-mapping-value
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -38,18 +39,18 @@ jobs:
     steps:
       - name: Install Hugo CLI
         run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${{ env.HUGO_VERSION }}/hugo_extended_${{ env.HUGO_VERSION }}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb
       - name: Install Dart Sass Embedded
         run: sudo snap install dart-sass-embedded
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup Node.js ${NODE_VERSION}
+      - name: Setup Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${NODE_VERSION}
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
       - name: Setup Pages
         id: pages

diff --git a/.github/workflows/tests.js.yml b/.github/workflows/tests.js.yml
@@ -18,12 +18,12 @@ jobs:
       fail-fast: false
       matrix:
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        node-version: [ latest, 23.x, 22.x, 20.x ]
+        node-version: [ latest, 23.x, 22.x, 21, 20.x ]
 
     steps:
       - name: Install Hugo CLI
         run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${{ env.HUGO_VERSION }}/hugo_extended_${{ env.HUGO_VERSION }}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb
       - name: Install Dart Sass Embedded
         run: sudo snap install dart-sass-embedded
@@ -55,18 +55,18 @@ jobs:
     steps:
       - name: Install Hugo CLI
         run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${{ env.HUGO_VERSION }}/hugo_extended_${{ env.HUGO_VERSION }}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb
       - name: Install Dart Sass Embedded
         run: sudo snap install dart-sass-embedded
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup Node.js ${NODE_VERSION}
+      - name: Setup Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${NODE_VERSION}
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
       - name: Install Node.js dependencies
         run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
@@ -110,13 +110,15 @@ jobs:
             mobile.report.json
       - name: Upload files to Imgbb
         id: upload-files-imgbb
-        uses: McCzarny/upload-image@v1.2.5
+        uses: McCzarny/upload-image@v1.3.0
         with:
           path: |
             mobile.jpg
             desktop.jpg
           uploadMethod: imgbb
           apiKey: '${{ secrets.IMGBB_API_KEY }}'
+          # Images will be automatically deleted after 30 days
+          expiration: 86400
       - name: Publish info
         uses: peter-evans/create-or-update-comment@v4
         with:
@@ -125,7 +127,7 @@ jobs:
             ### Lighthouse Report
             |  Mobile  |  Desktop |
             |----|----|
-            | ![Lighthouse Mobile Report Score](${{steps.upload-files-imgbb.outputs.url[0]}}) | ![Lighthouse Desktop Report Score](${{steps.upload-files-imgbb.outputs.url[1]}}) |
+            | ![Lighthouse Mobile Report Score](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[0]}}) | ![Lighthouse Desktop Report Score](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[1]}}) |
 
             [Download report ZIP](${{ steps.lighthouseUploadReport.outputs.artifact-url }})
 
@@ -145,18 +147,18 @@ jobs:
     steps:
       - name: Install Hugo CLI
         run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${{ env.HUGO_VERSION }}/hugo_extended_${{ env.HUGO_VERSION }}_linux-amd64.deb \
           && sudo dpkg -i ${{ runner.temp }}/hugo.deb
       - name: Install Dart Sass Embedded
         run: sudo snap install dart-sass-embedded
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup Node.js ${NODE_VERSION}
+      - name: Setup Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${NODE_VERSION}
+          node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
       - name: Install Node.js dependencies
         run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
@@ -182,7 +184,7 @@ jobs:
             ./*.jpg
       - name: Upload files to Imgbb
         id: upload-files-imgbb
-        uses: McCzarny/upload-image@v1.2.5
+        uses: McCzarny/upload-image@v1.3.0
         with:
           # Device viewport sizes https://blisk.io/devices
           path: |
@@ -214,84 +216,103 @@ jobs:
             2048x1152.jpg
           uploadMethod: imgbb
           apiKey: '${{ secrets.IMGBB_API_KEY }}'
+          # Images will be automatically deleted after 30 days
+          expiration: 86400
       - name: Publish the images
         uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             #### Screenshots
+            
             <details>
             <summary>Smartphones</summary>
+            
             #### iPhone 5 (320x568)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPhone 5 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[0]}}) | ![iPhone 5 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[1]}}) |
+            | ![iPhone 5 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[0]}}) | ![iPhone 5 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[1]}}) |
 
             #### Honor 20 Pro (360x780)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![Honor 20 Pro portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[2]}}) | ![Honor 20 Pro portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[3]}}) |
+            | ![Honor 20 Pro portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[2]}}) | ![Honor 20 Pro portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[3]}}) |
 
             #### iPhone X (375x812)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPhone X portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[4]}}) | ![iPhone X portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[5]}}) |
+            | ![iPhone X portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[4]}}) | ![iPhone X portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[5]}}) |
 
             #### iPhone 12/13 Pro (390x844)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPhone 12 Pro portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[6]}}) | ![iPhone 12 Pro portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[7]}}) |
+            | ![iPhone 12 Pro portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[6]}}) | ![iPhone 12 Pro portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[7]}}) |
 
             #### iPhone 14/15 Pro Max (430x932)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPhone 14 Pro Max portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[8]}}) | ![iPhone 14 Pro Max portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[9]}}) |
+            | ![iPhone 14 Pro Max portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[8]}}) | ![iPhone 14 Pro Max portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[9]}}) |
+            
             </details>
 
             <details>
             <summary>Tablets</summary>
+            
             #### iPad Mini 4 / Pro 9 (768x1024)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPad Mini portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[10]}}) | ![iPad Mini portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[11]}}) |
+            | ![iPad Mini portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[10]}}) | ![iPad Mini portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[11]}}) |
 
             #### iPad 10 (810x1080)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPad 10 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[12]}}) | ![iPad 10 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[13]}}) |
+            | ![iPad 10 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[12]}}) | ![iPad 10 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[13]}}) |
 
             #### iPad Pro 10 (834x1112)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPad Pro 10 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[14]}}) | ![iPad Pro 10 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[15]}}) |
+            | ![iPad Pro 10 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[14]}}) | ![iPad Pro 10 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[15]}}) |
 
             #### iPad Pro 12 (1024x1366)
+            
             |  Portrait Mode  |  Landscape Mode |
             |----|----|
-            | ![iPad Pro 12 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[16]}}) | ![iPad Pro 12 portrait mode screenshot](${{steps.upload-files-imgbb.outputs.url[17]}}) |
+            | ![iPad Pro 12 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[16]}}) | ![iPad Pro 12 portrait mode screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[17]}}) |
+            
             </details>
 
             <details>
             <summary>Notebooks</summary>
+            
             |  MacBook Air 13.3"/15.4" (1440x900) |  MacBook 12" (2304x1440) |
             |----|----|
-            | ![MacBook Air 13.3" screenshot](${{steps.upload-files-imgbb.outputs.url[18]}}) | ![MacBook 12" screenshot](${{steps.upload-files-imgbb.outputs.url[19]}}) |
+            | ![MacBook Air 13.3" screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[18]}}) | ![MacBook 12" screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[19]}}) |
 
             |  Laptop-S 1280x800 |  Laptop-M 1366x768 |
             |----|----|
-            | ![Laptop-S 1280x800 screenshot](${{steps.upload-files-imgbb.outputs.url[20]}}) | ![Laptop-M 1366x768 screenshot](${{steps.upload-files-imgbb.outputs.url[21]}}) |
+            | ![Laptop-S 1280x800 screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[20]}}) | ![Laptop-M 1366x768 screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[21]}}) |
+            
             </details>
 
             <details>
             <summary>Desktop</summary>
 
             |  2560x1440 |  1920x1080 |
             |----|----|
-            | ![2560x1440 screenshot](${{steps.upload-files-imgbb.outputs.url[22]}}) | ![1920x1080 screenshot](${{steps.upload-files-imgbb.outputs.url[23]}}) |
+            | ![2560x1440 screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[22]}}) | ![1920x1080 screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[23]}}) |
 
             |  iMac Pro Retina 5K 27" (3200x1800) |  iMac Retina 4K 21.5" (2048x1152) |
             |----|----|
-            | ![iMac Pro Retina 5K 27" screenshot](${{steps.upload-files-imgbb.outputs.url[24]}}) | ![iMac Retina 4K 21.5" screenshot](${{steps.upload-files-imgbb.outputs.url[25]}}) |
+            | ![iMac Pro Retina 5K 27" screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[24]}}) | ![iMac Retina 4K 21.5" screenshot](${{(fromJson(steps.upload-files-imgbb.outputs.urls))[25]}}) |
+            
             </details>
 
             [Full ZIP](${{ steps.upload-files-artifacts.outputs.artifact-url }})
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,9 +9,9 @@ If you want to contribute, please follow this guideline.
 3. Clone your fork to your PC.
 4. Install dependencies, run command: `$ npm ci`
 5. Create a new branch for your contributions
-6. Write your code. Some helping commands (they should run inside `src` directory):
-   * Build page: `$ hugo`. The built page will be `/src/public/index.html`.
-   * Run local Hugo server to monitor your changes in real-time as you write code: `$ hugo server -D`
+6. Write your code. Some helping commands:
+   * Build page: `npm run build`. The built page will be `/src/public/index.html`.
+   * Run local Hugo server to monitor your changes in real-time as you write code: `npm run start-server`
 7. Test your code with command `$ npm test`. It should pass, otherwise fix the errors. Some commands available for
    automatic fix of errors:
    * For ESLint (JS): `$ npm run lint:fix`

diff --git a/README.md b/README.md
@@ -44,9 +44,9 @@ The project is made with Hugo for website generation, UIkit for UI, Jest for tes
 1. Configure the website options in `/src/config.toml`.
 2. Adjust texts to your needs or add translations in `/src/data/`.
    To order the languages use the `weight` parameter.
-3. Optionally add your own CSS in `/src/layours/partials/styles.css`
+3. Optionally add your own CSS in `/src/assets/custom.css`
 4. Optionally run tests with Jest if you modify the JS code: `npm test`
-5. Build the page with Hugo, run `hugo --minify` in `/src/` directory.
+5. Build the page with Hugo, run `npm run build`.
    The generated page will be in `/src/public/index.html`.
 
 ## Contributions