mab_18 > project_base

.gitignore

@@ -4,7 +4,7 @@ __pycache__/
 *$py.class
 
 settings_local.py
-MAB18_site/settings_local.py
+project_base/settings_local.py
 
 */migrations/*.py
 

README.md

@@ -12,7 +12,7 @@ Download and create a virtual environment (make sure that your environment can h
 
 ```
 git clone https://github.com/l0tt/MAB18.git
-cd MAB18/MAB18_web/MAB18_site
+cd MAB18/MAB18_web/project_base
 virtualenv venv
 
 source ./venv/bin/activate

manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MAB18_site.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project_base.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

marktplatz/views.py

@@ -103,7 +103,7 @@ class ProductsView(generic.ListView):
 
 
             years = {''}
-            for Product in context['Product_list']:
+            for Product in context['product_list']:
                 if not years.__contains__(Product.year):
                     years.add(Product.year)
                 for country in Product.country:
@@ -124,7 +124,7 @@ class ProductsView(generic.ListView):
 
 
 
-    template_name = 'marktplatz/Product_overwiev.html'
+    template_name = 'marktplatz/product_overview.html'
 
 class DetailView(generic.DetailView):
     model = Product

MAB18_site/settings.py → project_base/settings.py

@@ -1,5 +1,5 @@
 """
-Django settings for MAB18_site project.
+Django settings for project_base project.
 
 Generated by 'django-admin startproject' using Django 2.0.7.
 
@@ -276,12 +276,12 @@ MIDDLEWARE = [
 #  'htmlmin.middleware.MarkRequestMiddleware',
 
 
-ROOT_URLCONF = 'MAB18_site.urls'
+ROOT_URLCONF = 'project_base.urls'
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(PACKAGE_ROOT, "templates"),'./templates','./MAB18_site', ],
+        'DIRS': [os.path.join(PACKAGE_ROOT, "templates"),'./templates','./project_base', ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -295,7 +295,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'MAB18_site.wsgi.application'
+WSGI_APPLICATION = 'project_base.wsgi.application'
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 

MAB18_site/templates/base_generic.html → project_base/templates/base_generic.html

@@ -28,7 +28,7 @@
 
  <nav class="navbar navbar-expand-sm navbar-fixed-top" style="padding-left: 15px; padding-bottom: 0px; margin-bottom: 2px" >
      <div class="container-fluid rounded-0" style="padding-left: 2px">
-  <a class="navbar-brand navbar-right" href="{% url 'projects' %}">
+  <a class="navbar-brand navbar-right" href="{% url 'Products' %}">
      <img src="{% static 'newMAB.png' %}" alt="MAB20" height="40px" width="auto" style="margin: auto; padding-bottom: 2px" >
   </a>
 
@@ -38,7 +38,7 @@
   <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
 
     <div class="navbar-nav navbar-right">
-      <a class="nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'projects' %}">PROJECTS</a>
+      <a class="nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'Products' %}">PROJECTS</a>
               <a class="nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'submit' %}">SUBMIT</a>
 
         <a class=" nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'about' %}">ABOUT</a>

MAB18_site/urls.py → project_base/urls.py

@@ -1,4 +1,4 @@
-"""MAB18_site URL Configuration
+"""project_base URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/2.0/topics/http/urls/

MAB18_site/wsgi.py → project_base/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for MAB18_site project.
+WSGI config for project_base project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "MAB18_site.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project_base.settings")
 
 application = get_wsgi_application()