diff --git a/db.sqlite3 b/db.sqlite3 old mode 100644 new mode 100755 index eceb0d0..6d1f59f Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/houtmarkt/__init__.py b/houtmarkt/__init__.py old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/__init__.cpython-36.pyc b/houtmarkt/__pycache__/__init__.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/__init__.cpython-38.pyc b/houtmarkt/__pycache__/__init__.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/settings.cpython-36.pyc b/houtmarkt/__pycache__/settings.cpython-36.pyc index c0ffbe8..d7a6f02 100644 Binary files a/houtmarkt/__pycache__/settings.cpython-36.pyc and b/houtmarkt/__pycache__/settings.cpython-36.pyc differ diff --git a/houtmarkt/__pycache__/settings.cpython-38.pyc b/houtmarkt/__pycache__/settings.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/urls.cpython-36.pyc b/houtmarkt/__pycache__/urls.cpython-36.pyc index cea218f..b61f971 100644 Binary files a/houtmarkt/__pycache__/urls.cpython-36.pyc and b/houtmarkt/__pycache__/urls.cpython-36.pyc differ diff --git a/houtmarkt/__pycache__/urls.cpython-38.pyc b/houtmarkt/__pycache__/urls.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/wsgi.cpython-36.pyc b/houtmarkt/__pycache__/wsgi.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/__pycache__/wsgi.cpython-38.pyc b/houtmarkt/__pycache__/wsgi.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/houtmarkt/asgi.py b/houtmarkt/asgi.py old mode 100644 new mode 100755 diff --git a/houtmarkt/settings.py b/houtmarkt/settings.py old mode 100644 new mode 100755 index 0e980d1..b81ccc6 --- a/houtmarkt/settings.py +++ b/houtmarkt/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'n2h_6t5qnp8zvke(%a%ph)xj4h8w+kgg46pld0r2^ndcme3el6' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -ALLOWED_HOSTS = ["10.10.0.217", "localhost"] +ALLOWED_HOSTS = ["10.10.0.217", "localhost", "10.10.0.203","houtmarkt.phi.aperturect.com"] # Application definition @@ -118,6 +118,6 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.0/howto/static-files/ -STATIC_URL = '/static/' -STATIC_ROOT = "/static/" +STATIC_URL = '/static' +STATIC_ROOT = "/usr/share/nginx/html/" diff --git a/houtmarkt/urls.py b/houtmarkt/urls.py old mode 100644 new mode 100755 index 87e9e7c..704864c --- a/houtmarkt/urls.py +++ b/houtmarkt/urls.py @@ -21,17 +21,17 @@ from django.urls import include urlpatterns = [ path('markt/', include('markt.urls')), - path('admin/', admin.site.urls), + path('houtmarkt/admin/', admin.site.urls), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) from django.views.generic import RedirectView urlpatterns += [ - path('', RedirectView.as_view(url='markt/', permanent=True)), + path('', RedirectView.as_view(url='/houtmarkt/admin/', permanent=True)), ] # Use static() to add url mapping to serve static files during development (only) from django.conf import settings from django.conf.urls.static import static -urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ No newline at end of file +urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/houtmarkt/wsgi.py b/houtmarkt/wsgi.py old mode 100644 new mode 100755 diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/markt/__init__.py b/markt/__init__.py old mode 100644 new mode 100755 diff --git a/markt/__pycache__/__init__.cpython-36.pyc b/markt/__pycache__/__init__.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/__init__.cpython-38.pyc b/markt/__pycache__/__init__.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/admin.cpython-36.pyc b/markt/__pycache__/admin.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/admin.cpython-38.pyc b/markt/__pycache__/admin.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/models.cpython-36.pyc b/markt/__pycache__/models.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/models.cpython-38.pyc b/markt/__pycache__/models.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/urls.cpython-36.pyc b/markt/__pycache__/urls.cpython-36.pyc index c3a0d42..5802368 100644 Binary files a/markt/__pycache__/urls.cpython-36.pyc and b/markt/__pycache__/urls.cpython-36.pyc differ diff --git a/markt/__pycache__/urls.cpython-38.pyc b/markt/__pycache__/urls.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/views.cpython-36.pyc b/markt/__pycache__/views.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/__pycache__/views.cpython-38.pyc b/markt/__pycache__/views.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/admin.py b/markt/admin.py old mode 100644 new mode 100755 diff --git a/markt/apps.py b/markt/apps.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0001_initial.py b/markt/migrations/0001_initial.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0002_auto_20200524_1448.py b/markt/migrations/0002_auto_20200524_1448.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0003_factuur_orders.py b/markt/migrations/0003_factuur_orders.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0004_auto_20200524_1506.py b/markt/migrations/0004_auto_20200524_1506.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0005_remove_order_factuur_id.py b/markt/migrations/0005_remove_order_factuur_id.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0006_order_factuur_id.py b/markt/migrations/0006_order_factuur_id.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0007_remove_order_factuur_id.py b/markt/migrations/0007_remove_order_factuur_id.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0008_auto_20200524_1522.py b/markt/migrations/0008_auto_20200524_1522.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0009_remove_factuur_orders.py b/markt/migrations/0009_remove_factuur_orders.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0010_auto_20200524_1530.py b/markt/migrations/0010_auto_20200524_1530.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0011_auto_20200524_1559.py b/markt/migrations/0011_auto_20200524_1559.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0012_auto_20200525_0113.py b/markt/migrations/0012_auto_20200525_0113.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0013_factuur_date.py b/markt/migrations/0013_factuur_date.py old mode 100644 new mode 100755 diff --git a/markt/migrations/0014_auto_20200526_1037.py b/markt/migrations/0014_auto_20200526_1037.py old mode 100644 new mode 100755 diff --git a/markt/migrations/__init__.py b/markt/migrations/__init__.py old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0001_initial.cpython-36.pyc b/markt/migrations/__pycache__/0001_initial.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0001_initial.cpython-38.pyc b/markt/migrations/__pycache__/0001_initial.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0002_auto_20200524_1251.cpython-38.pyc b/markt/migrations/__pycache__/0002_auto_20200524_1251.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0002_auto_20200524_1448.cpython-36.pyc b/markt/migrations/__pycache__/0002_auto_20200524_1448.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0002_auto_20200524_1448.cpython-38.pyc b/markt/migrations/__pycache__/0002_auto_20200524_1448.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0003_auto_20200524_1304.cpython-38.pyc b/markt/migrations/__pycache__/0003_auto_20200524_1304.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0003_factuur_orders.cpython-36.pyc b/markt/migrations/__pycache__/0003_factuur_orders.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0003_factuur_orders.cpython-38.pyc b/markt/migrations/__pycache__/0003_factuur_orders.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0004_auto_20200524_1307.cpython-38.pyc b/markt/migrations/__pycache__/0004_auto_20200524_1307.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0004_auto_20200524_1506.cpython-36.pyc b/markt/migrations/__pycache__/0004_auto_20200524_1506.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0004_auto_20200524_1506.cpython-38.pyc b/markt/migrations/__pycache__/0004_auto_20200524_1506.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0005_auto_20200524_1354.cpython-38.pyc b/markt/migrations/__pycache__/0005_auto_20200524_1354.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0005_remove_order_factuur_id.cpython-36.pyc b/markt/migrations/__pycache__/0005_remove_order_factuur_id.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0005_remove_order_factuur_id.cpython-38.pyc b/markt/migrations/__pycache__/0005_remove_order_factuur_id.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0006_auto_20200524_1403.cpython-38.pyc b/markt/migrations/__pycache__/0006_auto_20200524_1403.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0006_order_factuur_id.cpython-36.pyc b/markt/migrations/__pycache__/0006_order_factuur_id.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0006_order_factuur_id.cpython-38.pyc b/markt/migrations/__pycache__/0006_order_factuur_id.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0007_auto_20200524_1405.cpython-38.pyc b/markt/migrations/__pycache__/0007_auto_20200524_1405.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0007_remove_order_factuur_id.cpython-36.pyc b/markt/migrations/__pycache__/0007_remove_order_factuur_id.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0007_remove_order_factuur_id.cpython-38.pyc b/markt/migrations/__pycache__/0007_remove_order_factuur_id.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0008_auto_20200524_1522.cpython-36.pyc b/markt/migrations/__pycache__/0008_auto_20200524_1522.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0008_auto_20200524_1522.cpython-38.pyc b/markt/migrations/__pycache__/0008_auto_20200524_1522.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0008_factuur_orders.cpython-38.pyc b/markt/migrations/__pycache__/0008_factuur_orders.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0009_remove_factuur_orders.cpython-36.pyc b/markt/migrations/__pycache__/0009_remove_factuur_orders.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0009_remove_factuur_orders.cpython-38.pyc b/markt/migrations/__pycache__/0009_remove_factuur_orders.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0010_auto_20200524_1530.cpython-36.pyc b/markt/migrations/__pycache__/0010_auto_20200524_1530.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0010_auto_20200524_1530.cpython-38.pyc b/markt/migrations/__pycache__/0010_auto_20200524_1530.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0010_factuur_orders.cpython-38.pyc b/markt/migrations/__pycache__/0010_factuur_orders.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0011_auto_20200524_1559.cpython-36.pyc b/markt/migrations/__pycache__/0011_auto_20200524_1559.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0011_auto_20200524_1559.cpython-38.pyc b/markt/migrations/__pycache__/0011_auto_20200524_1559.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0011_remove_factuur_orders.cpython-38.pyc b/markt/migrations/__pycache__/0011_remove_factuur_orders.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0012_auto_20200525_0113.cpython-36.pyc b/markt/migrations/__pycache__/0012_auto_20200525_0113.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0012_auto_20200525_0113.cpython-38.pyc b/markt/migrations/__pycache__/0012_auto_20200525_0113.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0012_order_factuur_id.cpython-38.pyc b/markt/migrations/__pycache__/0012_order_factuur_id.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0013_auto_20200524_1434.cpython-38.pyc b/markt/migrations/__pycache__/0013_auto_20200524_1434.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0013_factuur_date.cpython-36.pyc b/markt/migrations/__pycache__/0013_factuur_date.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0013_factuur_date.cpython-38.pyc b/markt/migrations/__pycache__/0013_factuur_date.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0014_auto_20200526_1037.cpython-36.pyc b/markt/migrations/__pycache__/0014_auto_20200526_1037.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/0014_auto_20200526_1037.cpython-38.pyc b/markt/migrations/__pycache__/0014_auto_20200526_1037.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/__init__.cpython-36.pyc b/markt/migrations/__pycache__/__init__.cpython-36.pyc old mode 100644 new mode 100755 diff --git a/markt/migrations/__pycache__/__init__.cpython-38.pyc b/markt/migrations/__pycache__/__init__.cpython-38.pyc old mode 100644 new mode 100755 diff --git a/markt/models.py b/markt/models.py old mode 100644 new mode 100755 diff --git a/markt/static/css/styles.css b/markt/static/css/styles.css old mode 100644 new mode 100755 diff --git a/markt/templates/base_generic.html b/markt/templates/base_generic.html old mode 100644 new mode 100755 index 52e2eb9..886babe --- a/markt/templates/base_generic.html +++ b/markt/templates/base_generic.html @@ -8,7 +8,7 @@ {% load static %} - + -->
@@ -33,4 +33,4 @@ td:nth-child(2) {
- \ No newline at end of file + diff --git a/markt/templates/markt/factuur_detail.html b/markt/templates/markt/factuur_detail.html old mode 100644 new mode 100755 index 4ffb866..a62f719 --- a/markt/templates/markt/factuur_detail.html +++ b/markt/templates/markt/factuur_detail.html @@ -4,7 +4,7 @@ {% block content %} {% load static %} {% load l10n %} -

FACTUUR HOUTMARKTNAAM

+

FACTUUR

@@ -56,4 +56,4 @@
Klant
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/markt/tests.py b/markt/tests.py old mode 100644 new mode 100755 diff --git a/markt/urls.py b/markt/urls.py old mode 100644 new mode 100755 index 5e24bfd..5574ca4 --- a/markt/urls.py +++ b/markt/urls.py @@ -1,7 +1,9 @@ from django.urls import path from . import views +from django.views.generic import RedirectView urlpatterns = [ path('factuur/', views.FactuurDetailView.as_view(), name='factuur-detail'), -] \ No newline at end of file + +] diff --git a/markt/views.py b/markt/views.py old mode 100644 new mode 100755