Skip to content

Commit aadfbf5

Browse files
committed
Merge branch 'Dev' into blog-styles
2 parents 2b3cdf5 + 7f223e6 commit aadfbf5

File tree

254 files changed

+8521
-6053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+8521
-6053
lines changed

.vs/ProjectSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"CurrentProjectSetting": null
3-
}
3+
}

.vs/VSWorkspaceState.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"ExpandedNodes": [
3-
""
4-
],
2+
"ExpandedNodes": [""],
53
"PreviewInSolutionExplorer": false
6-
}
4+
}

README.md

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<h1 style="margin-top: 1em; text-align: center; margin-bottom: 3em;">
32
<p><a href="https://spaceyatech.com/"><img src="./src/assets/images/sytLogo.png" alt="SpaceYaTech" width="195"></a></p>
43
<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 @@
76
<hr>
87

98
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.
9+
1010
<hr>
1111

1212
## Table of Contents
@@ -22,7 +22,7 @@ Welcome to the SpaceYaTech website redesign project! This Readme provides compre
2222

2323
## Project Description
2424

25-
The SpaceYaTech website is being redesigned to enhance its user experience and visual appeal.
25+
The SpaceYaTech website is being redesigned to enhance its user experience and visual appeal.
2626

2727
The new website will be built using the following tech stack:
2828

@@ -35,6 +35,7 @@ The new website will be built using the following tech stack:
3535
Figma Design Reference: [Figma Design](https://www.figma.com/file/QZwtseXogSFjLNz64uLwjV/SYT-Website-Redesign-Complete?type=design&node-id=1113%3A7655&t=xSmmgQWxa0Z31bfo-1)
3636

3737
## Project Set Up
38+
3839
Follow these steps to get the project up and running on your local machine:
3940

4041
1. **Clone the repository**
@@ -47,30 +48,29 @@ Follow these steps to get the project up and running on your local machine:
4748

4849
2. **Navigate into the directory**
4950

50-
Change your current directory to the project's directory:
51+
Change your current directory to the project's directory:
5152

52-
```bash
53-
cd SYT-Web-Redesign
54-
```
53+
```bash
54+
cd SYT-Web-Redesign
55+
```
5556

5657
3. **Install the dependencies**
5758

58-
Run the following command:
59+
Run the following command:
5960

60-
```bash
61-
npm install
62-
```
61+
```bash
62+
npm install
63+
```
6364

6465
4. **Start the development server**
6566

66-
Now you can start the development server and begin developing:
67+
Now you can start the development server and begin developing:
6768

68-
```bash
69-
npm run dev
70-
```
71-
72-
The project should now be running at http://localhost:5173 (or another port if 5173 is already in use).
69+
```bash
70+
npm run dev
71+
```
7372

73+
The project should now be running at http://localhost:5173 (or another port if 5173 is already in use).
7474

7575
## Project Structure
7676

@@ -85,16 +85,16 @@ The project follows a standard directory structure:
8585
├── src
8686
│ ├── api
8787
│ ├── APP
88-
│ │ ├── components
89-
│ │ ├── pages
88+
│ │ ├── components
89+
│ │ ├── pages
9090
│ │ ├── index.js
9191
│ ├── assets
9292
│ │ ├── images
9393
│ ├── context
9494
│ ├── hooks
95-
│ │ ├── Mutations
96-
│ │ ├── Queries
97-
│ │ ├── useAuth.jsx
95+
│ │ ├── Mutations
96+
│ │ ├── Queries
97+
│ │ ├── useAuth.jsx
9898
│ ├── router
9999
│ ├── utilities
100100
│ └── ...
@@ -111,9 +111,9 @@ The project follows a standard directory structure:
111111

112112
For effective collaboration and communication, we recommend the following channels:
113113

114-
- **[Discord Sever](https://discord.gg/pnDtnJScPu)**: Join the SpaceYaTech community on Discord.
114+
- **[Discord Sever](https://discord.gg/pnDtnJScPu)**: Join the SpaceYaTech community on Discord.
115115

116-
- **[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.
116+
- **[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.
117117

118118
- **[GitHub Discussions](https://github.com/SpaceyaTech/SYT-Web-Redesign/discussions)**: Use GitHub Discussions for general discussions, feature requests, and questions related to the project.
119119

@@ -149,7 +149,6 @@ Please see our [Contributing Guidelines](docs/CONTRIBUTING.md) for detailed info
149149

150150
## Code of Conduct
151151

152-
153152
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.
154153

155154
## Tech Stacks Used for Development:
@@ -159,10 +158,10 @@ We follow the [![Contributor Covenant](https://img.shields.io/badge/Contributor%
159158
![Vite](https://img.shields.io/badge/vite-%23646CFF.svg?style=for-the-badge&logo=vite&logoColor=white)
160159
![ESLint](https://img.shields.io/badge/ESLint-4B3263?style=for-the-badge&logo=eslint&logoColor=white)
161160

162-
163-
[//]: # (https://github.com/Ileriayo/markdown-badges)
161+
[//]: # "https://github.com/Ileriayo/markdown-badges"
164162

165163
<strong>Thank you</strong> for your interest and contributions to the SpaceYaTech website redesign project. Together, we can create an outstanding website experience!
166164

167-
# Contributors
165+
# Contributors
166+
168167
[![Contributors](https://contrib.rocks/image?repo=SpaceyaTech/SYT-Web-Redesign)](https://github.com/SpaceyaTech/SYT-Web-Redesign/graphs/contributors)

components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
"components": "@/components",
1515
"utils": "@/utilities/utils"
1616
}
17-
}
17+
}

docs/CODE_OF_CONDUCT.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# Contributor Covenant Code of Conduct
2+
23
<hr>
34

45
## Our Pledge
6+
57
<hr>
68

79
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.
810

911
## Standards of Conduct
12+
1013
<hr>
1114

1215
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
2124

2225
Examples of participant behavior that is inappropriate include:
2326

24-
- The use of sexual language or imagery, as well as unwanted approaches or attention
25-
- Trolls, offensive language, and political and personal attacks
27+
- The use of sexual language or imagery, as well as unwanted approaches or attention
28+
- Trolls, offensive language, and political and personal attacks
2629
- Harassment in public or private
27-
- A physical or electronic address, or other private information, published without express consent
30+
- A physical or electronic address, or other private information, published without express consent
2831
- Other actions that can be regarded unsuitable in a professional context
2932

30-
3133
## Scope
34+
3235
<hr>
3336

3437
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.
3538

3639
## Enforcement
40+
3741
<hr>
3842

3943
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.
4044

4145
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.
4246

4347
## Attribution
48+
4449
<hr>
4550

4651
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).
4752

4853
## Acknowledgments
54+
4955
<hr>
5056

51-
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.
57+
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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Contributing to the SpaceYaTech Website Redesign Project
2+
23
<hr>
34

45
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
1920
To set up your local development environment, follow these steps:
2021

2122
1. Clone the project repository to your local machine:
22-
``` ssh
23+
24+
```ssh
2325
git clone git@github.com:SpaceyaTech/SYT-Web-Redesign.git
2426
```
25-
or
26-
``` HTTP
27+
28+
or
29+
30+
```HTTP
2731
git clone https://github.com/SpaceyaTech/SYT-Web-Redesign.git
2832
```
2933

3034
2. Navigate to the project directory:
35+
3136
```
3237
cd SYT-Web-Redesign.
3338
```
3439

3540
3. Install project dependencies:
41+
3642
```
3743
npm install
3844
```
3945

4046
4. Start the development server:
47+
4148
```
4249
npm run dev
4350
```
@@ -49,6 +56,7 @@ To set up your local development environment, follow these steps:
4956
To work on a new feature or bug fix, follow these steps to create and switch to a new branch:
5057

5158
1. Create a new branch based on the `main` branch:
59+
5260
```
5361
git checkout -b feature/your-feature-name
5462
```
@@ -67,6 +75,7 @@ To work on a new feature or bug fix, follow these steps to create and switch to
6775
To push your changes to the upstream repository and make them available for review, follow these steps:
6876

6977
1. Push your changes to your forked repository:
78+
7079
```
7180
git push origin feature/your-feature-name
7281
```
@@ -91,4 +100,4 @@ the changes you made and how they contribute to the overall project.
91100

92101
## Summary
93102

94-
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!
103+
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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
{
2-
"compilerOptions": {
3-
"baseUrl": ".",
4-
"paths": {
5-
"@/*": [
6-
"./src/*"
7-
]
8-
}
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"@/*": ["./src/*"]
96
}
10-
}
7+
}
8+
}

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
},
2020
"dependencies": {
2121
"@emailjs/browser": "^3.11.0",
22-
"@headlessui/react": "^1.7.15",
22+
"@headlessui/react": "^2.1.2",
23+
"@hookform/resolvers": "^3.9.0",
2324
"@hookstate/core": "^4.0.1",
2425
"@tanstack/react-query": "^5.22.2",
2526
"@tanstack/react-query-devtools": "^5.24.0",
@@ -36,18 +37,20 @@
3637
"react-dom": "^18.2.0",
3738
"react-fast-marquee": "^1.6.2",
3839
"react-helmet-async": "^2.0.5",
39-
"react-hook-form": "^7.48.2",
40+
"react-hook-form": "^7.52.1",
4041
"react-hot-toast": "^2.4.1",
4142
"react-icons": "^5.2.1",
4243
"react-lazy-load-image-component": "^1.6.0",
4344
"react-photo-album": "^2.3.0",
4445
"react-router-dom": "^6.11.2",
4546
"react-share": "^5.1.0",
4647
"react-simple-wysiwyg": "^2.2.5",
48+
"recharts": "^2.12.7",
4749
"tailwind-merge": "^2.3.0",
4850
"tailwind-scrollbar-hide": "^1.1.7",
4951
"tailwindcss-animate": "^1.0.7",
50-
"yet-another-react-lightbox": "^3.15.6"
52+
"yet-another-react-lightbox": "^3.15.6",
53+
"yup": "^1.4.0"
5154
},
5255
"devDependencies": {
5356
"@playwright/test": "^1.44.1",

playwright.config.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-import-module-exports
12
import { defineConfig, devices } from "@playwright/test";
23

34
/**

0 commit comments

Comments
 (0)