Merge pull request #21 from raferdev/development

Development

Author: raferdev

.changeset/forty-pumas-breathe.md

@@ -1,11 +1,4 @@
-Dockerfile
-.dockerignore
+Dockerfile.dockerignore
 node_modules
-npm-debug.log
-README.md
-.next
-.git
-.husky
-.changeset
-.vscode
-tests
+npm - debug.log
+README.md.next.git.husky.changeset.vscode

.dockerignore

@@ -1,4 +1,8 @@
 name: Build and Deploy
+concurrency:
+  group: production
+  cancel-in-progress: true
+
 on:
   push:
     branches: [main]
@@ -64,22 +68,21 @@ jobs:
         with:
           name: landing-page
           path: out
-
+      - name: Filter
+        uses: dorny/paths-filter@v2.2.1
+        id: filter
+        with:
+          filters: |
+            ngnix:
+            - '**/*
       - name: Deploy Nginx
+        if: ${{ steps.filter.outputs.ngnix }} == 'true'
         run: |
           sudo docker compose -f docker-compose.yaml build --no-cache
           sudo docker compose down
           sudo docker compose up -d
 
       - name: Update content
         run: |
-          sudo docker cp ./out server:/www/data/
-          sudo docker cp ./storybook-static server:/www/data/
-
-# - uses: dorny/paths-filter@v2.2.1
-# id: filter
-# with:
-#   filters: |
-#     ngnix:
-#       - '**/*
-#
+          sudo docker cp ./out nginx_server:/www/data/
+          sudo docker cp ./storybook-static nginx_server:/www/data/

.github/workflows/deploy.yml

@@ -1,22 +1,33 @@
 name: Playwright Tests
 on:
-  push:
-    branches: [main]
+  pull_request:
+    branches: [main, development]
 jobs:
   test:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node & Pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.9.2
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: '18'
+          cache: 'pnpm'
+      - name: Create env file
+        run: |
+          echo "${{ secrets.ENV_TEST_FILE }}" > .env.local
       - name: Install dependencies
-        run: npm ci
+        run: pnpm i
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
+      - name: Build
+        run: pnpm run build
       - name: Run Playwright tests
-        run: npx playwright test
+        run: pnpm run test.playwright
       - uses: actions/upload-artifact@v3
         if: always()
         with:

.github/workflows/tests.yml

@@ -69,6 +69,7 @@ const config: StorybookConfig = {
     if (!config.resolve) {
       throw new Error('config.resolve is undefined')
     }
+    config.devtool = 'inline-source-map'
     config.resolve.alias = {
       ...config.resolve.alias,
       '@': path.resolve(__dirname, '../src'),

.storybook/main.ts

@@ -1,5 +1,20 @@
 # landing-page
 
+## 1.8.0
+
+### Minor Changes
+
+- Add new link border
+  Add aria-label
+  Change sections images to the same size and tiny png
+  Illustration background animation is now equal in all sections
+
+## 1.7.0 2023-11-10
+
+### Minor Changes
+
+- 268e214: Add new cicd workflow
+
 ## 1.6.3 - 2023-10-28
 
 ### Patch Changes

CHANGELOG.md

@@ -1,25 +1,18 @@
 version: '3'
 
 services:
-  ngnix:
-    container_name: server
-    restart: on-failure
-    tty: true
-    build: ./nginx/tests
-    volumes:
-      - builder_nginx_vol_tests:/www/data
-    depends_on:
-      - builder
+  nginx:
+    container_name: server_nginx
+    restart: 'no'
+    build:
+      context: .
+      dockerfile: ./nginx/tests/Dockerfile
     ports:
       - 3000:80
-
-  builder:
-    env_file:
-      - .env.local
-    container_name: front-build
-    build: '.'
-    volumes:
-      - builder_nginx_vol_tests:/app/build
+    networks:
+      - running-tests
 
 volumes:
-  builder_nginx_vol_tests:
+  builder_nginx_vol:
+networks:
+  running-tests:

Dockerfile.test

@@ -1,15 +1,18 @@
-worker_processes 1;
+
+worker_processes auto;
+
 worker_rlimit_nofile 8192;
 
 events {
+  worker_connections 4096;
 }
 
 http {
 
   add_header X-Frame-Options "SAMEORIGIN";
   add_header X-XSS-Protection "1; mode=block";
-  add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' *.googletagmanager.com *.datadoghq-browser-agent.com; frame-src 'self' *.youtube.com; object-src 'self'";
-  add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload';
+  add_header Content-Security-Policy "worker-src blob:; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.googletagmanager.com *.datadoghq-browser-agent.com; frame-src 'none' *.youtube.com; object-src 'none'; base-uri 'self'; form-action 'none'; frame-ancestors 'none'; default-src 'none'; style-src 'self'; img-src 'self; font-src 'self'; manifest-src 'https://rafer.dev/';"
+  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";
   add_header Referrer-Policy "strict-origin";
   add_header Permissions-Policy "geolocation=(self),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(),payment=()";
   add_header X-Content-Type-Options nosniff;
@@ -34,7 +37,7 @@ http {
 
     listen 80;
     server_name www.rafer.dev;
-    rewrite https://rafer.dev/$request_uri permanent;
+    return 301 https://rafer.dev$request_uri;
   }
 
   server {
@@ -43,6 +46,12 @@ http {
 
     listen 80;
 
+    gzip on;
+    gzip_types text/plain application/xml font/woff2;
+    gzip_proxied no-cache no-store private expired auth;
+    gzip_min_length 1000;
+    gunzip on;
+
     resolver 127.0.0.11 valid=10s;
     resolver_timeout 5s;
 

docker-compose.test.yaml

@@ -7,7 +7,8 @@ RUN mkdir /var/cache/nginx -p
 RUN rm /etc/nginx/mime.types
 RUN rm /etc/nginx/conf.d/default.conf
 
-COPY ./nginx.conf /etc/nginx/
-COPY ./mime.types /etc/nginx/conf/
+COPY ./nginx/tests/nginx.conf /etc/nginx/
+COPY ./nginx/tests/mime.types /etc/nginx/conf/
+COPY ./out /www/data/out
 
 EXPOSE 80