Skip to content

Commit 1650175

Browse files
ArseniyXArseniyX
committed
Merge branch 'main' of github.com:shopnex-ai/shopnex into builder-io
2 parents 2875891 + 3959457 commit 1650175

37 files changed

+9758
-2625
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---
98

109
**Describe the bug**
1110
A clear and concise description of what the bug is.
1211

1312
**To Reproduce**
1413
Steps to reproduce the behavior:
14+
1515
1. Go to '...'
1616
2. Click on '....'
1717
3. Scroll down to '....'
@@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
27+
28+
- OS: [e.g. iOS]
29+
- Browser [e.g. chrome, safari]
30+
- Version [e.g. 22]
3031

3132
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
33+
34+
- Device: [e.g. iPhone6]
35+
- OS: [e.g. iOS8.1]
36+
- Browser [e.g. stock browser, safari]
37+
- Version [e.g. 22]
3638

3739
**Additional context**
3840
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---
98

109
**Is your feature request related to a problem? Please describe.**

‎.github/workflows/ci.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
on:
2-
- push
3-
- pull_request
2+
- push
3+
- pull_request
44

55
jobs:
6-
cache-and-install:
7-
runs-on: ubuntu-latest
6+
cache-and-install:
7+
runs-on: ubuntu-latest
88

9-
steps:
10-
- name: Checkout
11-
uses: actions/checkout@v4
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v4
1212

13-
- uses: pnpm/action-setup@v4
14-
name: Install pnpm
15-
with:
16-
version: 9
17-
run_install: false
13+
- uses: pnpm/action-setup@v4
14+
name: Install pnpm
15+
with:
16+
version: 9
17+
run_install: false
1818

19-
- name: Install Node.js
20-
uses: actions/setup-node@v4
21-
with:
22-
node-version: 20
23-
cache: 'pnpm'
19+
- name: Install Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: 20
23+
cache: "pnpm"
2424

25-
- name: Install dependencies
26-
run: pnpm install
25+
- name: Install dependencies
26+
run: pnpm install

‎.prettierrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"trailingComma": "es5",
3+
"tabWidth": 4,
4+
"semi": true,
5+
"singleQuote": false
6+
}

‎.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
2+
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
33
}

‎.vscode/launch.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"name": "Next.js: debug full stack",
9-
"type": "node",
10-
"request": "launch",
11-
"program": "${workspaceFolder}/node_modules/next/dist/bin/next",
12-
"runtimeArgs": ["--inspect"],
13-
"skipFiles": ["<node_internals>/**"],
14-
"serverReadyAction": {
15-
"action": "debugWithChrome",
16-
"killOnServerStop": true,
17-
"pattern": "- Local:.+(https?://.+)",
18-
"uriFormat": "%s",
19-
"webRoot": "${workspaceFolder}"
20-
},
21-
"cwd": "${workspaceFolder}"
22-
}
23-
]
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Next.js: debug full stack",
9+
"type": "node",
10+
"request": "launch",
11+
"program": "${workspaceFolder}/node_modules/next/dist/bin/next",
12+
"runtimeArgs": ["--inspect"],
13+
"skipFiles": ["<node_internals>/**"],
14+
"serverReadyAction": {
15+
"action": "debugWithChrome",
16+
"killOnServerStop": true,
17+
"pattern": "- Local:.+(https?://.+)",
18+
"uriFormat": "%s",
19+
"webRoot": "${workspaceFolder}"
20+
},
21+
"cwd": "${workspaceFolder}"
22+
}
23+
]
2424
}

‎CODE_OF_CONDUCT.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
25+
- Focusing on what is best not just for us as individuals, but for the
2626
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
30+
- The use of sexualized language or imagery, and sexual attention or
3131
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
3535
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
36+
- Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behavior, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within

‎CONTRIBUTING.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Thank you for your interest in contributing to ShopNex! Your contributions help
88

99
1. Click the **Fork** button on the GitHub repository.
1010
2. Clone your forked repository:
11-
```sh
12-
git clone https://github.com/shopnex-ai/shopnex.git
13-
```
11+
```sh
12+
git clone https://github.com/shopnex-ai/shopnex.git
13+
```
1414
3. Navigate to the project directory:
15-
```sh
16-
cd shopnex
17-
```
15+
```sh
16+
cd shopnex
17+
```
1818

1919
### 2. Set Up the Project
2020

@@ -45,13 +45,13 @@ npm test # or the relevant command for your tech stack
4545
### 6. Submit a Pull Request
4646
4747
1. Push your changes to your fork:
48-
```sh
49-
git push origin feature-branch-name
50-
```
48+
```sh
49+
git push origin feature-branch-name
50+
```
5151
2. Open a pull request:
52-
- Go to the original repository on GitHub.
53-
- Click **New Pull Request**.
54-
- Select your branch and provide a clear description of the changes.
52+
- Go to the original repository on GitHub.
53+
- Click **New Pull Request**.
54+
- Select your branch and provide a clear description of the changes.
5555
5656
### 7. Code Review and Merging
5757
@@ -67,4 +67,3 @@ Please follow our [Code of Conduct](CODE_OF_CONDUCT.md) to ensure a welcoming en
6767
If you have any questions, feel free to open an issue or ask in the project's discussion forums.
6868

6969
Happy coding! 🚀
70-

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
66

77
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
88

9-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ currently being supported with security updates.
77

88
| Version | Supported |
99
| ------- | ------------------ |
10-
| 1.x | :white_check_mark: |
10+
| 1.x | :white_check_mark: |
1111

1212
## Reporting a Vulnerability
1313

‎dev2.db

892 KB
Binary file not shown.

‎docker-compose.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
version: '3'
1+
version: "3"
22

33
services:
4-
payload:
5-
image: node:18-alpine
6-
ports:
7-
- '3000:3000'
8-
volumes:
9-
- .:/home/node/app
10-
- node_modules:/home/node/app/node_modules
11-
working_dir: /home/node/app/
12-
command: sh -c "corepack enable && corepack prepare pnpm@latest --activate && pnpm install && pnpm dev"
13-
depends_on:
14-
- mongo
15-
# - postgres
16-
env_file:
17-
- .env
4+
payload:
5+
image: node:18-alpine
6+
ports:
7+
- "3000:3000"
8+
volumes:
9+
- .:/home/node/app
10+
- node_modules:/home/node/app/node_modules
11+
working_dir: /home/node/app/
12+
command: sh -c "corepack enable && corepack prepare pnpm@latest --activate && pnpm install && pnpm dev"
13+
depends_on:
14+
- mongo
15+
# - postgres
16+
env_file:
17+
- .env
1818

19-
# Ensure your DATABASE_URI uses 'mongo' as the hostname ie. mongodb://mongo/my-db-name
20-
mongo:
21-
image: mongo:latest
22-
ports:
23-
- '27017:27017'
24-
command:
25-
- --storageEngine=wiredTiger
26-
volumes:
27-
- data:/data/db
28-
logging:
29-
driver: none
19+
# Ensure your DATABASE_URI uses 'mongo' as the hostname ie. mongodb://mongo/my-db-name
20+
mongo:
21+
image: mongo:latest
22+
ports:
23+
- "27017:27017"
24+
command:
25+
- --storageEngine=wiredTiger
26+
volumes:
27+
- data:/data/db
28+
logging:
29+
driver: none
3030

31-
# Uncomment the following to use postgres
32-
# postgres:
33-
# restart: always
34-
# image: postgres:latest
35-
# volumes:
36-
# - pgdata:/var/lib/postgresql/data
37-
# ports:
38-
# - "5432:5432"
31+
# Uncomment the following to use postgres
32+
# postgres:
33+
# restart: always
34+
# image: postgres:latest
35+
# volumes:
36+
# - pgdata:/var/lib/postgresql/data
37+
# ports:
38+
# - "5432:5432"
3939

4040
volumes:
41-
data:
42-
# pgdata:
43-
node_modules:
41+
data:
42+
# pgdata:
43+
node_modules:

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"lint": "cross-env NODE_OPTIONS=--no-deprecation next lint",
1818
"lint:quiet": "cross-env NODE_OPTIONS=--no-deprecation next lint --quiet",
1919
"payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
20-
"start": "cross-env NODE_OPTIONS=--no-deprecation next start"
20+
"start": "cross-env NODE_OPTIONS=--no-deprecation next start",
21+
"format": "prettier --write ."
2122
},
2223
"dependencies": {
2324
"@builder.io/dev-tools": "^1.6.29",

0 commit comments

Comments
 (0)