Implement format with prettier

karlosvas · Jan 18, 2025 · bf5f31d · bf5f31d
1 parent 2534fbb
commit bf5f31d
Show file tree

Hide file tree

Showing 115 changed files with 2,851 additions and 4,327 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,77 +6,72 @@ on:
       - main
 
 jobs:
-  deploy-frontend:
+  build-frontend:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: "21.2.0"
-
-      - name: Install Vercel CLI
-        run: npm install -g vercel@latest
-
-      - name: List files in client directory
-        run: ls -la ./client
-
-      - name: Link and pull Vercel project for frontend
-        run: |
-          vercel link --yes --project ${{ secrets.FRONTEND_PROJECT_ID }} --scope ${{ secrets.VERCEL_TEAM }} --token=${{ secrets.VERCEL_TOKEN }}
-          vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: ./client
-
       - name: Install frontend dependencies
         run: npm install
         working-directory: ./client
-
       - name: Build frontend
         run: npm run build
         working-directory: ./client
+      - name: Upload frontend build
+        uses: actions/upload-artifact@v3
+        with:
+          name: frontend-build
+          path: ./client/dist
 
-      - name: Deploy frontend to Vercel
-        run: vercel --token ${{ secrets.VERCEL_TOKEN }}
-        working-directory: ./client
-
-  deploy-backend:
+  build-backend:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: "21.2.0"
-
-      - name: Install Vercel CLI
-        run: npm install -g vercel@latest
-
-      - name: List files in server directory
-        run: ls -la ./server
-
-      - name: Link and pull Vercel project for backend
-        run: |
-          vercel link --yes --project ${{ secrets.BACKEND_PROJECT_ID }} --scope ${{ secrets.VERCEL_TEAM }} --token=${{ secrets.VERCEL_TOKEN }}
-            vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: ./server
-
       - name: Install backend dependencies
         run: npm install
         working-directory: ./server
-
       - name: Build backend
         run: npm run build
         working-directory: ./server
+      - name: Upload backend build
+        uses: actions/upload-artifact@v3
+        with:
+          name: backend-build
+          path: ./server/public
 
-      - name: List files in server directory after build
-        run: ls -la ./server/public
+  deploy-both:
+    needs: [build-frontend, build-backend]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Vercel CLI
+        run: npm install -g vercel@latest
+
+      # Frontend deployment
+      - name: Download frontend build
+        uses: actions/download-artifact@v3
+        with:
+          name: frontend-build
+          path: ./client/build
+      - name: Deploy frontend
+        run: |
+          vercel link --yes --project ${{ secrets.FRONTEND_PROJECT_ID }} --scope ${{ secrets.VERCEL_TEAM }} --token=${{ secrets.VERCEL_TOKEN }}
+          vercel --token ${{ secrets.VERCEL_TOKEN }}
+        working-directory: ./client
 
-      - name: Deploy backend to Vercel
-        run: vercel --token ${{ secrets.VERCEL_TOKEN }}
-        working-directory: ./server
+      # Backend deployment
+      - name: Download backend build
+        uses: actions/download-artifact@v3
+        with:
+          name: backend-build
+          path: ./server/public
+      - name: Deploy backend
+        run: |
+          vercel link --yes --project ${{ secrets.BACKEND_PROJECT_ID }} --scope ${{ secrets.VERCEL_TEAM }} --token=${{ secrets.VERCEL_TOKEN }}
+          vercel --token ${{ secrets.VERCEL_TOKEN }}
+        working-directory: ./server
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,11 @@ dist-ssr
 client/dist
 *.local
 
+# Debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
@@ -26,8 +31,25 @@ client/dist
 
 # Environment Variables
 .env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
 # Petitions
 *.http
 .vercel
-peticiones
+peticiones
+
+# Vercel
+.vercel
+vercel.json
+
+# Testing
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+
+# TypeScript cache
+*.tsbuildinfo
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,18 @@
+# Dependencies
+node_modules
+package-lock.json
+
+# Build directories
+dist
+build
+public
+
+# GitHub specific
+.github
+.git
+
+# Environment files
+.env*
+
+# Cache
+.cache
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "tabWidth": 2,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "semi": true,
+  "printWidth": 80
+}
diff --git a/README.md b/README.md
@@ -1,56 +1,61 @@
-# Marta - Spanish Teacher
-
-Welcome to the official website of Marta, your trusted Spanish teacher. Here you'll find all the necessary information about her classes, prices, and teaching methods.  
-**Official URL: https://thefluentspanishhouse.com**
-
-## About Marta
-
-Marta is a Spanish teacher with years of experience teaching students of all ages and levels. Her dynamic and personalized approach has helped many students achieve their language goals.
-
-## Classes
-
-We offer a variety of classes to suit your needs:
-
-- **Individual Classes:** Perfect for personalized attention and learning at your own pace.
-- **Group Classes:** Ideal for learning in a collaborative environment and making new friends.
-- **Online Classes:** Complete flexibility to learn from anywhere in the world.
-
-## Prices
-
-Class prices vary depending on the type and duration. Here's a breakdown:
-
-- **Individual Classes: €21**
-
-- **Group Classes: €15**
-
-- **Free Beginner Classes with Test Included: €0**
-
-## Contact
-
-For more information or to book a class, you can contact Marta through:
-
-- **Email:** mar411geca@gmail.com
-- **Phone:** +34 617 286 125
-- [Contact Form](https://thefluentspanishhouse.com/contact)
-
-## Social Media
-
-Follow me on my social media to stay updated with the latest news and promotions!
-
-- [Facebook](https://www.facebook.com/thefluentspanishhouse/)
-
-## Contributions
-
-If you have any suggestions or want to contribute to the development of this website, feel free to fork and send a pull request. ❤️  
-Or if you find any bugs or issues, report them via an Issue. 🪲  
-Thank you in advance.
-
-## License
-
-This project is under the MIT License. For more details, see the [LICENSE](LICENSE) file.  
-[Terms and Conditions](https://thefluentspanishhouse.vercel.app/info)  
-[Privacy Policy](https://thefluentspanishhouse.vercel.app/info)  
-
----
-
-We hope you enjoy learning Spanish with me. See you in class!
+# Marta - Spanish Teacher
+
+Welcome to the official website of Marta, your trusted Spanish teacher. Here you'll find all the necessary information about her classes, prices, and teaching methods.  
+**Official URL: https://thefluentspanishhouse.com**
+
+## About Marta
+
+Marta is a Spanish teacher with years of experience teaching students of all ages and levels. Her dynamic and personalized approach has helped many students achieve their language goals.
+
+## Classes
+
+We offer a variety of classes to suit your needs:
+
+- **Individual Classes:** Perfect for personalized attention and learning at your own pace.
+- **Group Classes:** Ideal for learning in a collaborative environment and making new friends.
+- **Online Classes:** Complete flexibility to learn from anywhere in the world.
+
+## Prices
+
+Class prices vary depending on the type and duration. Here's a breakdown:
+
+- **Individual Classes: €21**
+
+- **Group Classes: €15**
+- **Free Beginner Classes with Test Included: €0**
+
+## Contact
+
+For more information or to book a class, you can contact Marta through:
+
+- **Email:** mar411geca@gmail.com
+- **Phone:** +34 617 286 125
+- [Contact Form](https://thefluentspanishhouse.com/contact)
+
+## Social Media
+
+Follow me on my social media to stay updated with the latest news and promotions!
+
+- [Facebook](https://www.facebook.com/thefluentspanishhouse/)
+
+## Contributions
+
+If you have any suggestions or want to contribute to the development of this website, feel free to fork and send a pull request. ❤️  
+Or if you find any bugs or issues, report them via an Issue. 🪲
+
+**Before submitting a PR, please ensure your code is properly formatted using Prettier:**
+
+1. Check formatting: `npm run format`
+2. Fix formatting issues: `npm run format:fix`
+
+Thank you in advance.
+
+## License
+
+This project is under the MIT License. For more details, see the [LICENSE](LICENSE) file.  
+[Terms and Conditions](https://thefluentspanishhouse.vercel.app/info)  
+[Privacy Policy](https://thefluentspanishhouse.vercel.app/info)
+
+---
+
+We hope you enjoy learning Spanish with me. See you in class!
diff --git a/client/.eslintrc.cjs b/client/.eslintrc.cjs
diff --git a/client/.gitignore b/client/.gitignore
diff --git a/client/index.html b/client/index.html
@@ -1,30 +1,43 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/x-icon" href="/logos/logo.png" />
-    <meta name="google-site-verification" content="KoIjSkj0QJojJLaxWSdR2tVqUkQud4wTzee7cg__2rg" />
+    <meta
+      name="google-site-verification"
+      content="KoIjSkj0QJojJLaxWSdR2tVqUkQud4wTzee7cg__2rg"
+    />
     <link rel="canonical" href="https://thefluentspanishhouse.vercel.app/" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, shrink-to-fit=no"
+    />
     <title>The Fluent Spanish House</title>
-    <script src="https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit" defer></script>
+    <script
+      src="https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit"
+      defer
+    ></script>
   </head>
   <body>
-    <div class="cf-turnstile" data-sitekey="0x4AAAAAAA1R3eULw-muNS8T" data-size="invisible"></div>
+    <div
+      class="cf-turnstile"
+      data-sitekey="0x4AAAAAAA1R3eULw-muNS8T"
+      data-size="invisible"
+    ></div>
     <div id="root"></div>
   </body>
   <!-- React Script -->
   <script type="module" src="/src/Index.tsx"></script>
   <!-- Inicializar Turnstile Invisible -->
   <script type="module">
-    document.addEventListener("DOMContentLoaded", function () {
-      if (typeof turnstile !== "undefined") {
-        turnstile.render(".cf-turnstile", {
-          sitekey: "0x4AAAAAAA1R3eULw-muNS8T",
-          size: "invisible",
+    document.addEventListener('DOMContentLoaded', function () {
+      if (typeof turnstile !== 'undefined') {
+        turnstile.render('.cf-turnstile', {
+          sitekey: '0x4AAAAAAA1R3eULw-muNS8T',
+          size: 'invisible',
         });
       } else {
-        console.error("Cloudflare Turnstile script not loaded.");
+        console.error('Cloudflare Turnstile script not loaded.');
       }
     });
   </script>