From 853706b36bff59a2cf02b50f10cd99d37f4752ae Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Thu, 31 Aug 2023 12:59:45 +0300
Subject: [PATCH] 0.7.0 static pages

---
 GeneralApp/urls.py                 |  1 +
 GeneralApp/views.py                | 41 ++++++++++++++++++++++++++----
 templates/pages/p_static_page.html |  5 ++++
 3 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 templates/pages/p_static_page.html

diff --git a/GeneralApp/urls.py b/GeneralApp/urls.py
index b462c55..9836359 100644
--- a/GeneralApp/urls.py
+++ b/GeneralApp/urls.py
@@ -6,5 +6,6 @@ from .views import *
 
 urlpatterns = [
     path('', MainPage, name='main'),
+    path('<str:url>/', StaticPageView, name='static_page'),
     path('test_code', test_code, name='test_code'),
 ]
\ No newline at end of file
diff --git a/GeneralApp/views.py b/GeneralApp/views.py
index 54097d6..feb5c45 100644
--- a/GeneralApp/views.py
+++ b/GeneralApp/views.py
@@ -33,16 +33,18 @@ def test_code(request):
 
 
 def MainPage(request):
-
-    # from ReferenceDataApp.funcs import parse_data, search_cities_in_db, search_airports_in_db
-    # res = search_airports_in_db('ang')
-    # res = parse_data()
+    from RoutesApp.forms import RouteForm
 
     page = StaticPage.objects.get(url='main')
 
+    from ArticlesApp.models import ArticleModel
+    arts = ArticleModel.objects.filter(enable=True).order_by('-modifiedDT')
+
     Dict = {
         'page': page,
-        'FAQ': page.FAQ_items.filter(enable=True)
+        'FAQ': page.FAQ_items.filter(enable=True),
+        'route_form': RouteForm(),
+        'articles': arts,
     }
 
     breadcrumbs_Dict = {
@@ -53,3 +55,32 @@ def MainPage(request):
     return HttpResponse(t.render(Dict, request))
 
 
+
+def StaticPageView(request, url):
+    from RoutesApp.forms import RouteForm
+
+    Dict = {}
+
+    if url == '':
+        return MainPage(request)
+    elif url in ('customer_search', 'mover_search'):
+        Dict.update({'route_form': RouteForm(),})
+    # elif  url == 'works':
+    #     return WorksPage(request)
+    elif url in ['main']:
+        raise Http404
+
+    try:
+        page = StaticPage.objects.get(url=url)
+    except StaticPage.DoesNotExist:
+        raise Http404
+
+
+    Dict.update({
+        'page': page,
+    })
+
+    t = loader.get_template('pages/p_static_page.html')
+    return HttpResponse(t.render(Dict, request))
+
+
diff --git a/templates/pages/p_static_page.html b/templates/pages/p_static_page.html
new file mode 100644
index 0000000..aa5de4e
--- /dev/null
+++ b/templates/pages/p_static_page.html
@@ -0,0 +1,5 @@
+{% extends "tb_base.html" %}
+
+{% block content %}
+
+{% endblock %}
\ No newline at end of file