Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 8-7-2024 #227

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9351030
Update 01-05-2024 (#158)
JimmyTron May 8, 2024
5b4a877
Merge branch 'main' into Dev
sonylomo May 15, 2024
194d1b8
update 12-06-2024 (#190)
JimmyTron Jun 12, 2024
11e304a
Create PULL_REQUEST_TEMPLATE
spaceyatech-org Jun 12, 2024
e28455a
Merge branch 'main' into Dev
sonylomo Jun 18, 2024
3dd0484
Fix accessibility issues (#192)
alvyynm Jun 18, 2024
65890ac
Add unit and e2e tests (#193)
nyandika Jun 18, 2024
373e105
feat: initial dashboard tables (#199)
sonylomo Jun 21, 2024
422d7c7
style: broken stuff
sonylomo Jul 2, 2024
73821c5
Fixes "unexpected application error" thrown in the shop/item/itemID …
alvyynm Jul 2, 2024
b62f787
Fixes #197: Redesign shop single item view (#207)
alvyynm Jul 9, 2024
0f85d6c
developed (#211)
Avinashshiyani Jul 9, 2024
6b29961
Shop homepage redesign (#208)
Joe-Mwangi Jul 18, 2024
590cc70
fixed link (#210)
Joe-Mwangi Jul 18, 2024
8474c2d
Checkout page redesign (#214)
ramo-dev Jul 18, 2024
48c7940
removing duplicate files (#185)
mingabire809 Jul 18, 2024
534d466
Admin shop sales (#215)
Andrew-Ochieng Jul 18, 2024
a9b4b07
fix: a billion lint errors
sonylomo Jul 18, 2024
0bbe954
Revert "fix: a billion lint errors"
sonylomo Jul 18, 2024
a967798
Reapply "fix: a billion lint errors"
sonylomo Jul 18, 2024
14d1e45
Fix: A Billion Lint Errors in dev 😭😭 (#216)
sonylomo Jul 29, 2024
186ac75
Fix footer spacing issues (#223)
alvyynm Aug 6, 2024
17d8c3a
feat: inventory page report implemented #202 (#217)
CodedVeli Aug 6, 2024
c945dee
fix stretched featured product images (#220)
Joe-Mwangi Aug 8, 2024
7f223e6
Checkout page (#225)
ramo-dev Aug 8, 2024
2b09e14
Doc: Add instructions on how to run linting checks (#232)
alvyynm Aug 13, 2024
c28a4bb
Integrate new shop apis + bug fixes (#229)
alvyynm Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 1 addition & 8 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ module.exports = {
"airbnb",
"airbnb/hooks",
"eslint:recommended",
// "plugin:prettier/recommended",
"prettier",
"plugin:react/recommended",
],
plugins: ["react", "prettier"],
overrides: [
{
env: {
Expand Down Expand Up @@ -49,11 +48,5 @@ module.exports = {
alphabetize: { order: "asc", caseInsensitive: true },
},
],
"prettier/prettier": [
"error",
{
endOfLine: "auto",
},
],
},
};
28 changes: 28 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[Have you read the contributing guidelines ?](https://github.com/SpaceyaTech/SYT-Web-Redesign/blob/Dev/docs/CONTRIBUTING.md)

# What is the purpose of your _pull request_?

- [ ] Bug fix
- [ ] New feature
- [ ] Documentation

# Proposed changes

# Warning

Please read these points carefully and answer honestly with an `X`
into all the boxes. Example : [X]

Before submitting a _pull request_ make sure you have:

- [ ] Read the guidelines for contributing.
- [ ] Wrote some tests.
- [ ] Respected the linting guidelines (read the guide below for help).

## How to Check and Fix Linting Issues

Run `npm run validate`. This command will run prettier and eslint checks to ensure linting guidelines are respected.

- If the command exits with code 0 (build is successful), there are no linting issues.

- If the command exits with a code other than 0, scroll up the command output and look for identified linting issues. Fix them and revalidate to check if the issues have been resolved by re-running the command.
20 changes: 10 additions & 10 deletions .github/workflows/labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: Import open source standard labels

on:
push:
branches: [ main ]
branches: [main]

jobs:
labels:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-node@v2
with:
node-version: '14'
- uses: SpaceyaTech/gh-action-open-source-labels@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
owner-name: ${{ github.repository_owner }}
repository-name: ${{ github.event.repository.name }}
force: false
- uses: actions/setup-node@v2
with:
node-version: "20"
- uses: SpaceyaTech/gh-action-open-source-labels@main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
owner-name: ${{ github.repository_owner }}
repository-name: ${{ github.event.repository.name }}
force: false
38 changes: 38 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Unit and E2E tests
on:
push:
branches: [main, Dev]
pull_request:
branches: [main, Dev]
jobs:
tests:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Prepare .env file
run: |
rm -f .env && touch .env
echo "REACT_APP_API_BASE_URL=https://example.com" >> .env
echo "VITE_SERVICE_ID=123fAkE" >> .env
echo "VITE_TEMPLATE_ID=123fAkE" >> .env
echo "VITE_PUBLIC_ID=123fAkE" >> .env
- uses: actions/setup-node@v3
with:
node-version: "20.x"
- name: Install dependencies
run: npm install
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Build the app
run: npm run build
- name: Run Unit tests
run: npm run test
- name: Run Playwright tests
run: npm run test:e2e
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 5
18 changes: 18 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Lint, Format and Build
on:
push:
branches: [main, Dev]
pull_request:
branches: [main, Dev]
jobs:
validate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20.x"
- name: Install dependencies
run: npm install
- name: Run code validation (includes linting, prettier and building)
run: npm run validate
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ coverage

# Ignore all HTML files:
*.html
.env
.env
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.yarn
.next
dist
node_modules
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"singleQuote": false
}
2 changes: 1 addition & 1 deletion .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"CurrentProjectSetting": null
}
}
6 changes: 2 additions & 4 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"ExpandedNodes": [
""
],
"ExpandedNodes": [""],
"PreviewInSolutionExplorer": false
}
}
53 changes: 26 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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
Expand All @@ -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:

Expand All @@ -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**
Expand All @@ -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

Expand All @@ -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
│ └── ...
Expand All @@ -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.

Expand Down Expand Up @@ -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:
Expand All @@ -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)
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": false,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/index.css",
"baseColor": "gray",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/utilities/utils"
}
}
16 changes: 11 additions & 5 deletions docs/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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.
Loading
Loading