Merge branch 'Dev' into blog-styles

.vs/ProjectSettings.json

@@ -1,3 +1,3 @@
 {
   "CurrentProjectSetting": null
-}
+}

.vs/VSWorkspaceState.json

@@ -1,6 +1,4 @@
 {
-  "ExpandedNodes": [
-    ""
-  ],
+  "ExpandedNodes": [""],
   "PreviewInSolutionExplorer": false
-}
+}

README.md

@@ -1,4 +1,3 @@
-
 <h1 style="margin-top: 1em; text-align: center; margin-bottom: 3em;">
   <p><a href="https://spaceyatech.com/"><img src="./src/assets/images/sytLogo.png" alt="SpaceYaTech" width="195"></a></p>
   <p> <img src="https://media.giphy.com/media/hvRJCLFzcasrR4ia7z/giphy.gif" alt="Waving Hand" width="25px" height="25px"> Welcome to SpaceYaTech Website Redesign!</p>
@@ -7,6 +6,7 @@
 <hr>
 
 Welcome to the SpaceYaTech website redesign project! This Readme provides comprehensive information about the project, including project description, project structure, communication channels, roadmap, license information, acknowledgments, and links to other important files.
+
 <hr>
 
 ## Table of Contents
@@ -22,7 +22,7 @@ Welcome to the SpaceYaTech website redesign project! This Readme provides compre
 
 ## Project Description
 
-The SpaceYaTech website is being redesigned to enhance its user experience and visual appeal. 
+The SpaceYaTech website is being redesigned to enhance its user experience and visual appeal.
 
 The new website will be built using the following tech stack:
 
@@ -35,6 +35,7 @@ The new website will be built using the following tech stack:
 Figma Design Reference: [Figma Design](https://www.figma.com/file/QZwtseXogSFjLNz64uLwjV/SYT-Website-Redesign-Complete?type=design&node-id=1113%3A7655&t=xSmmgQWxa0Z31bfo-1)
 
 ## Project Set Up
+
 Follow these steps to get the project up and running on your local machine:
 
 1. **Clone the repository**
@@ -47,30 +48,29 @@ Follow these steps to get the project up and running on your local machine:
 
 2. **Navigate into the directory**
 
-    Change your current directory to the project's directory:
+   Change your current directory to the project's directory:
 
-    ```bash
-    cd SYT-Web-Redesign
-    ```
+   ```bash
+   cd SYT-Web-Redesign
+   ```
 
 3. **Install the dependencies**
 
-    Run the following command:
+   Run the following command:
 
-    ```bash
-    npm install
-    ```
+   ```bash
+   npm install
+   ```
 
 4. **Start the development server**
 
-    Now you can start the development server and begin developing:
+   Now you can start the development server and begin developing:
 
-    ```bash
-    npm run dev
-    ```
-
-    The project should now be running at http://localhost:5173 (or another port if 5173 is already in use).
+   ```bash
+   npm run dev
+   ```
 
+   The project should now be running at http://localhost:5173 (or another port if 5173 is already in use).
 
 ## Project Structure
 
@@ -85,16 +85,16 @@ The project follows a standard directory structure:
 ├── src
 │   ├── api
 │   ├── APP
-│   │   ├── components 
-│   │   ├── pages 
+│   │   ├── components
+│   │   ├── pages
 │   │   ├── index.js
 │   ├── assets
 │   │   ├── images
 │   ├── context
 │   ├── hooks
-│   │   ├── Mutations 
-│   │   ├── Queries 
-│   │   ├── useAuth.jsx 
+│   │   ├── Mutations
+│   │   ├── Queries
+│   │   ├── useAuth.jsx
 │   ├── router
 │   ├── utilities
 │   └── ...
@@ -111,9 +111,9 @@ The project follows a standard directory structure:
 
 For effective collaboration and communication, we recommend the following channels:
 
-- **[Discord Sever](https://discord.gg/pnDtnJScPu)**: Join the SpaceYaTech community on Discord. 
+- **[Discord Sever](https://discord.gg/pnDtnJScPu)**: Join the SpaceYaTech community on Discord.
 
-- **[Rocket.Chat](https://www.rocket.chat/install#Apps)**: Join the SpaceYaTech on Rocket.Chat platform. Share your Rocket.Chat username with the project maintainers to get an invitation. 
+- **[Rocket.Chat](https://www.rocket.chat/install#Apps)**: Join the SpaceYaTech on Rocket.Chat platform. Share your Rocket.Chat username with the project maintainers to get an invitation.
 
 - **[GitHub Discussions](https://github.com/SpaceyaTech/SYT-Web-Redesign/discussions)**: Use GitHub Discussions for general discussions, feature requests, and questions related to the project.
 
@@ -149,7 +149,6 @@ Please see our [Contributing Guidelines](docs/CONTRIBUTING.md) for detailed info
 
 ## Code of Conduct
 
-
 We follow the [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](docs/CODE_OF_CONDUCT.md). Please review it to understand our community standards and expected behavior.
 
 ## Tech Stacks Used for Development:
@@ -159,10 +158,10 @@ We follow the [![Contributor Covenant](https://img.shields.io/badge/Contributor%
 ![Vite](https://img.shields.io/badge/vite-%23646CFF.svg?style=for-the-badge&logo=vite&logoColor=white)
 ![ESLint](https://img.shields.io/badge/ESLint-4B3263?style=for-the-badge&logo=eslint&logoColor=white)
 
-
-[//]: # (https://github.com/Ileriayo/markdown-badges)
+[//]: # "https://github.com/Ileriayo/markdown-badges"
 
 <strong>Thank you</strong> for your interest and contributions to the SpaceYaTech website redesign project. Together, we can create an outstanding website experience!
 
-# Contributors 
+# Contributors
+
 [![Contributors](https://contrib.rocks/image?repo=SpaceyaTech/SYT-Web-Redesign)](https://github.com/SpaceyaTech/SYT-Web-Redesign/graphs/contributors)

components.json

@@ -14,4 +14,4 @@
     "components": "@/components",
     "utils": "@/utilities/utils"
   }
-}
+}

docs/CODE_OF_CONDUCT.md

@@ -1,12 +1,15 @@
 # Contributor Covenant Code of Conduct
+
 <hr>
 
 ## Our Pledge
+
 <hr>
 
 In the interest of fostering an inclusive and welcoming community, we as members, contributors, and maintainers pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
 
 ## Standards of Conduct
+
 <hr>
 
 We expect all members of our community to abide by the following standards of conduct:
@@ -21,31 +24,34 @@ We expect all members of our community to abide by the following standards of co
 
 Examples of participant behavior that is inappropriate include:
 
-- The use of sexual language or imagery, as well as unwanted approaches or attention 
-- Trolls, offensive language, and political and personal attacks 
+- The use of sexual language or imagery, as well as unwanted approaches or attention
+- Trolls, offensive language, and political and personal attacks
 - Harassment in public or private
-- A physical or electronic address, or other private information, published without express consent 
+- A physical or electronic address, or other private information, published without express consent
 - Other actions that can be regarded unsuitable in a professional context
 
-
 ## Scope
+
 <hr>
 
 This code of conduct applies to all community spaces, both online and offline, as well as any public or private communication pertaining to our community.
 
 ## Enforcement
+
 <hr>
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the community moderators at [email address]. All complaints will be reviewed and investigated promptly and fairly.
 
 Community moderators are responsible for enforcing the code of conduct and have the right and responsibility to take appropriate action, including issuing warnings, temporary or permanent bans, or any other actions they deem necessary to maintain a positive and inclusive community.
 
 ## Attribution
+
 <hr>
 
 This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 2.0, available at [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).
 
 ## Acknowledgments
+
 <hr>
 
-We would like to thank the contributors to the [Contributor Covenant](https://www.contributor-covenant.org) for providing a foundation for community codes of conduct. Their work helps us foster a safe, welcoming, and inclusive environment for all members of our community.
+We would like to thank the contributors to the [Contributor Covenant](https://www.contributor-covenant.org) for providing a foundation for community codes of conduct. Their work helps us foster a safe, welcoming, and inclusive environment for all members of our community.

docs/CONTRIBUTING.md

@@ -1,4 +1,5 @@
 # Contributing to the SpaceYaTech Website Redesign Project
+
 <hr>
 
 Please note that we do have [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
@@ -19,25 +20,31 @@ We appreciate your interest in contributing to the SpaceYaTech website redesign
 To set up your local development environment, follow these steps:
 
 1. Clone the project repository to your local machine:
-   ``` ssh
+
+   ```ssh
    git clone [email protected]:SpaceyaTech/SYT-Web-Redesign.git
    ```
-   or 
-    ``` HTTP
+
+   or
+
+   ```HTTP
    git clone https://github.com/SpaceyaTech/SYT-Web-Redesign.git
    ```
 
 2. Navigate to the project directory:
+
    ```
    cd SYT-Web-Redesign.
    ```
 
 3. Install project dependencies:
+
    ```
    npm install
    ```
 
 4. Start the development server:
+
    ```
    npm run dev
    ```
@@ -49,6 +56,7 @@ To set up your local development environment, follow these steps:
 To work on a new feature or bug fix, follow these steps to create and switch to a new branch:
 
 1. Create a new branch based on the `main` branch:
+
    ```
    git checkout -b feature/your-feature-name
    ```
@@ -67,6 +75,7 @@ To work on a new feature or bug fix, follow these steps to create and switch to
 To push your changes to the upstream repository and make them available for review, follow these steps:
 
 1. Push your changes to your forked repository:
+
    ```
    git push origin feature/your-feature-name
    ```
@@ -91,4 +100,4 @@ the changes you made and how they contribute to the overall project.
 
 ## Summary
 
-By following these guidelines, you can effectively contribute to the SpaceYaTech website redesign project. Your contributions are highly valued and appreciated. Thank you for helping us improve the website and create a better experience for our users!
+By following these guidelines, you can effectively contribute to the SpaceYaTech website redesign project. Your contributions are highly valued and appreciated. Thank you for helping us improve the website and create a better experience for our users!

jsconfig.json

@@ -1,10 +1,8 @@
 {
-    "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "@/*": [
-                "./src/*"
-            ]
-        }
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
     }
-}
+  }
+}

package.json

@@ -19,7 +19,8 @@
   },
   "dependencies": {
     "@emailjs/browser": "^3.11.0",
-    "@headlessui/react": "^1.7.15",
+    "@headlessui/react": "^2.1.2",
+    "@hookform/resolvers": "^3.9.0",
     "@hookstate/core": "^4.0.1",
     "@tanstack/react-query": "^5.22.2",
     "@tanstack/react-query-devtools": "^5.24.0",
@@ -36,18 +37,20 @@
     "react-dom": "^18.2.0",
     "react-fast-marquee": "^1.6.2",
     "react-helmet-async": "^2.0.5",
-    "react-hook-form": "^7.48.2",
+    "react-hook-form": "^7.52.1",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^5.2.1",
     "react-lazy-load-image-component": "^1.6.0",
     "react-photo-album": "^2.3.0",
     "react-router-dom": "^6.11.2",
     "react-share": "^5.1.0",
     "react-simple-wysiwyg": "^2.2.5",
+    "recharts": "^2.12.7",
     "tailwind-merge": "^2.3.0",
     "tailwind-scrollbar-hide": "^1.1.7",
     "tailwindcss-animate": "^1.0.7",
-    "yet-another-react-lightbox": "^3.15.6"
+    "yet-another-react-lightbox": "^3.15.6",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.44.1",

playwright.config.cjs

@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies, import/no-import-module-exports
 import { defineConfig, devices } from "@playwright/test";
 
 /**