Skip to content

Commit 8abfe1d

Browse files
authored
Merge branch 'master' into updated
2 parents 21134b7 + ad0b1bd commit 8abfe1d

File tree

6 files changed

+54
-22
lines changed

6 files changed

+54
-22
lines changed

.github/workflows/django.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Django CI
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
strategy:
14+
max-parallel: 4
15+
matrix:
16+
python-version: [3.7, 3.8, 3.9]
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Set up Python ${{ matrix.python-version }}
21+
uses: actions/setup-python@v3
22+
with:
23+
python-version: ${{ matrix.python-version }}
24+
- name: Install Dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install -r requirements.txt
28+
- name: Run Tests
29+
run: |
30+
python manage.py test

README.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1 @@
1-
# ⚡ Run
21

3-
***For `Windows` & `MacOS`***
4-
``` bash
5-
python manage.py runserver
6-
```
7-
***For `Linux`***
8-
``` bash
9-
python3 manage.py runserver
10-
```
11-
12-
# 🖼️ Home Page
13-
<div align=center>
14-
<img src="https://github.com/radadiavasu/shoppifly/blob/master/media/productimg/homepage.jpg">
15-
16-
17-
# 🧠 Future Enhancement
18-
19-
***Build `Fashion Recommandation System` for `Top-Wear` and `Bottom-Wear`.***

requirements.txt

-156 Bytes
Binary file not shown.

shoppifly/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# SECURITY WARNING: don't run with debug turned on in production!
2727
DEBUG = True
2828

29-
ALLOWED_HOSTS = []
29+
ALLOWED_HOSTS = ['.vercel.app']
3030

3131

3232
# Application definition
@@ -171,4 +171,4 @@
171171
messages.WARNING: 'danger',
172172
messages.ERROR: 'danger',
173173
50: 'critical',
174-
}
174+
}

shoppifly/vercel.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//<<<<<<< main
12
{
23
"builds": [{
34
"src": "shoppifly/wsgi.py",
@@ -10,4 +11,19 @@
1011
"dest": "shoppifly/wsgi.py"
1112
}
1213
]
13-
}
14+
}
15+
=======
16+
{
17+
"builds": [{
18+
"src": "shoppifly/wsgi.py",
19+
"use": "@vercel/python",
20+
"config": { "maxLambdaSize": "15mb", "runtime": "python3.10" }
21+
}],
22+
"routes": [
23+
{
24+
"src": "/(.*)",
25+
"dest": "shoppifly/wsgi.py"
26+
}
27+
]
28+
}
29+
>>>>>>> master

shoppifly/wsgi.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,9 @@
1515

1616
application = get_wsgi_application()
1717

18+
# <<<<<<< main
1819

19-
# app = application
20+
# # app = application
21+
# =======
22+
# app = application
23+
# >>>>>>> master

0 commit comments

Comments
 (0)