diff --git a/.gitignore b/.gitignore index 43513b109..751c7ec0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -myenv/ \ No newline at end of file +myenv/ +eshop_env/ \ No newline at end of file diff --git a/__pycache__/manage.cpython-311.pyc b/__pycache__/manage.cpython-311.pyc new file mode 100644 index 000000000..6c1ede184 Binary files /dev/null and b/__pycache__/manage.cpython-311.pyc differ diff --git a/backend/__pycache__/__init__.cpython-311.pyc b/backend/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 000000000..a52381b07 Binary files /dev/null and b/backend/__pycache__/__init__.cpython-311.pyc differ diff --git a/backend/__pycache__/settings.cpython-311.pyc b/backend/__pycache__/settings.cpython-311.pyc new file mode 100644 index 000000000..963019868 Binary files /dev/null and b/backend/__pycache__/settings.cpython-311.pyc differ diff --git a/backend/__pycache__/urls.cpython-311.pyc b/backend/__pycache__/urls.cpython-311.pyc new file mode 100644 index 000000000..558499fb6 Binary files /dev/null and b/backend/__pycache__/urls.cpython-311.pyc differ diff --git a/backend/__pycache__/wsgi.cpython-311.pyc b/backend/__pycache__/wsgi.cpython-311.pyc new file mode 100644 index 000000000..d1809eeb3 Binary files /dev/null and b/backend/__pycache__/wsgi.cpython-311.pyc differ diff --git a/base/__pycache__/__init__.cpython-311.pyc b/base/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 000000000..618aaf1d9 Binary files /dev/null and b/base/__pycache__/__init__.cpython-311.pyc differ diff --git a/base/__pycache__/admin.cpython-311.pyc b/base/__pycache__/admin.cpython-311.pyc new file mode 100644 index 000000000..f54720363 Binary files /dev/null and b/base/__pycache__/admin.cpython-311.pyc differ diff --git a/base/__pycache__/apps.cpython-311.pyc b/base/__pycache__/apps.cpython-311.pyc new file mode 100644 index 000000000..b3253c3ad Binary files /dev/null and b/base/__pycache__/apps.cpython-311.pyc differ diff --git a/base/__pycache__/models.cpython-311.pyc b/base/__pycache__/models.cpython-311.pyc new file mode 100644 index 000000000..9540ee1d1 Binary files /dev/null and b/base/__pycache__/models.cpython-311.pyc differ diff --git a/base/__pycache__/serializers.cpython-311.pyc b/base/__pycache__/serializers.cpython-311.pyc new file mode 100644 index 000000000..d19651439 Binary files /dev/null and b/base/__pycache__/serializers.cpython-311.pyc differ diff --git a/base/__pycache__/signals.cpython-311.pyc b/base/__pycache__/signals.cpython-311.pyc new file mode 100644 index 000000000..efa9b1e0c Binary files /dev/null and b/base/__pycache__/signals.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0001_initial.cpython-311.pyc b/base/migrations/__pycache__/0001_initial.cpython-311.pyc new file mode 100644 index 000000000..3f09fb5b7 Binary files /dev/null and b/base/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0002_order_orderitem_review_shippingaddress.cpython-311.pyc b/base/migrations/__pycache__/0002_order_orderitem_review_shippingaddress.cpython-311.pyc new file mode 100644 index 000000000..11cf875cf Binary files /dev/null and b/base/migrations/__pycache__/0002_order_orderitem_review_shippingaddress.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0003_product_image.cpython-311.pyc b/base/migrations/__pycache__/0003_product_image.cpython-311.pyc new file mode 100644 index 000000000..9b9e33cd9 Binary files /dev/null and b/base/migrations/__pycache__/0003_product_image.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0004_auto_20210119_1500.cpython-311.pyc b/base/migrations/__pycache__/0004_auto_20210119_1500.cpython-311.pyc new file mode 100644 index 000000000..1824fd0fe Binary files /dev/null and b/base/migrations/__pycache__/0004_auto_20210119_1500.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0005_review_createdat.cpython-311.pyc b/base/migrations/__pycache__/0005_review_createdat.cpython-311.pyc new file mode 100644 index 000000000..10dd82f0a Binary files /dev/null and b/base/migrations/__pycache__/0005_review_createdat.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0006_remove_order_createdat.cpython-311.pyc b/base/migrations/__pycache__/0006_remove_order_createdat.cpython-311.pyc new file mode 100644 index 000000000..a42be957e Binary files /dev/null and b/base/migrations/__pycache__/0006_remove_order_createdat.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0007_auto_20210121_1614.cpython-311.pyc b/base/migrations/__pycache__/0007_auto_20210121_1614.cpython-311.pyc new file mode 100644 index 000000000..77f35c848 Binary files /dev/null and b/base/migrations/__pycache__/0007_auto_20210121_1614.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/0008_review_createdat.cpython-311.pyc b/base/migrations/__pycache__/0008_review_createdat.cpython-311.pyc new file mode 100644 index 000000000..c1976a386 Binary files /dev/null and b/base/migrations/__pycache__/0008_review_createdat.cpython-311.pyc differ diff --git a/base/migrations/__pycache__/__init__.cpython-311.pyc b/base/migrations/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 000000000..0854dfbec Binary files /dev/null and b/base/migrations/__pycache__/__init__.cpython-311.pyc differ diff --git a/base/urls/__pycache__/order_urls.cpython-311.pyc b/base/urls/__pycache__/order_urls.cpython-311.pyc new file mode 100644 index 000000000..0e79a35de Binary files /dev/null and b/base/urls/__pycache__/order_urls.cpython-311.pyc differ diff --git a/base/urls/__pycache__/product_urls.cpython-311.pyc b/base/urls/__pycache__/product_urls.cpython-311.pyc new file mode 100644 index 000000000..882f8981f Binary files /dev/null and b/base/urls/__pycache__/product_urls.cpython-311.pyc differ diff --git a/base/urls/__pycache__/user_urls.cpython-311.pyc b/base/urls/__pycache__/user_urls.cpython-311.pyc new file mode 100644 index 000000000..8f3ae586d Binary files /dev/null and b/base/urls/__pycache__/user_urls.cpython-311.pyc differ diff --git a/base/views/__pycache__/order_views.cpython-311.pyc b/base/views/__pycache__/order_views.cpython-311.pyc new file mode 100644 index 000000000..355fef97f Binary files /dev/null and b/base/views/__pycache__/order_views.cpython-311.pyc differ diff --git a/base/views/__pycache__/product_views.cpython-311.pyc b/base/views/__pycache__/product_views.cpython-311.pyc new file mode 100644 index 000000000..c8873a733 Binary files /dev/null and b/base/views/__pycache__/product_views.cpython-311.pyc differ diff --git a/base/views/__pycache__/user_views.cpython-311.pyc b/base/views/__pycache__/user_views.cpython-311.pyc new file mode 100644 index 000000000..c83c568dc Binary files /dev/null and b/base/views/__pycache__/user_views.cpython-311.pyc differ diff --git a/requirements.txt b/requirements.txt index 1a5304c00..5b1ac5748 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ click==7.1.2 colorama==0.4.4 cs50==5.0.4 distlib==0.3.1 -Django==3.1.4 +Django==3.0.0 django-ckeditor==5.9.0 django-cors-headers==3.5.0 django-crispy-forms==1.9.2 @@ -19,7 +19,7 @@ django-filter==2.3.0 django-js-asset==1.2.2 django-storages==1.9.1 djangorestframework==3.11.1 -djangorestframework-simplejwt==4.4.0 +djangorestframework-simplejwt==4.5.0 docutils==0.15.2 filelock==3.0.12 Flask==1.1.2 @@ -34,8 +34,8 @@ jmespath==0.10.0 lazy-object-proxy==1.4.3 MarkupSafe==1.1.1 mccabe==0.6.1 -Pillow==8.0.1 -psycopg2==2.8.5 +Pillow +psycopg2 pycodestyle==2.6.0 PyJWT==1.7.1 pylint==2.6.0