diff --git a/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc b/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc new file mode 100644 index 0000000..2a36828 Binary files /dev/null and b/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc differ diff --git a/plovidba_aplikacija/__pycache__/urls.cpython-38.pyc b/plovidba_aplikacija/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..9d2ac15 Binary files /dev/null and b/plovidba_aplikacija/__pycache__/urls.cpython-38.pyc differ diff --git a/plovidba_aplikacija/__pycache__/views.cpython-38.pyc b/plovidba_aplikacija/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000..db6c988 Binary files /dev/null and b/plovidba_aplikacija/__pycache__/views.cpython-38.pyc differ diff --git a/plovidba_aplikacija/templates/plovidba_aplikacija/base.html b/plovidba_aplikacija/templates/plovidba_aplikacija/base.html new file mode 100644 index 0000000..c87692f --- /dev/null +++ b/plovidba_aplikacija/templates/plovidba_aplikacija/base.html @@ -0,0 +1,10 @@ + + + + +

My First Heading

+ +

My first paragraph.

+ + + diff --git a/plovidba_aplikacija/views.py b/plovidba_aplikacija/views.py index 7c210e4..692bcda 100644 --- a/plovidba_aplikacija/views.py +++ b/plovidba_aplikacija/views.py @@ -1,11 +1,12 @@ from django.shortcuts import render -# Create your views here. - from rest_framework import viewsets from .models import ObjektSigurnosti from .serializers import ObjektSigurnostiSerializer +def home(request): + return render(request, 'base.html') + class ObjektSigurnostiViewSet(viewsets.ModelViewSet): queryset = ObjektSigurnosti.objects.all() serializer_class = ObjektSigurnostiSerializer diff --git a/plovidba_projekt/__pycache__/settings.cpython-38.pyc b/plovidba_projekt/__pycache__/settings.cpython-38.pyc index e372535..0b59ec2 100644 Binary files a/plovidba_projekt/__pycache__/settings.cpython-38.pyc and b/plovidba_projekt/__pycache__/settings.cpython-38.pyc differ diff --git a/plovidba_projekt/__pycache__/urls.cpython-38.pyc b/plovidba_projekt/__pycache__/urls.cpython-38.pyc index e1d9cec..1b0a7fb 100644 Binary files a/plovidba_projekt/__pycache__/urls.cpython-38.pyc and b/plovidba_projekt/__pycache__/urls.cpython-38.pyc differ diff --git a/plovidba_projekt/settings.py b/plovidba_projekt/settings.py index fc95643..5cc93a8 100644 --- a/plovidba_projekt/settings.py +++ b/plovidba_projekt/settings.py @@ -69,7 +69,7 @@ ROOT_URLCONF = 'plovidba_projekt.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [os.path.join(BASE_DIR, 'templates')], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/plovidba_projekt/urls.py b/plovidba_projekt/urls.py index 00a6697..c7ae430 100644 --- a/plovidba_projekt/urls.py +++ b/plovidba_projekt/urls.py @@ -15,8 +15,11 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import path, include +from plovidba_aplikacija.views import home urlpatterns = [ path('admin/', admin.site.urls), -] + path('api/', include('plovidba_aplikacija.urls')), + path('', home, name='base'), +] \ No newline at end of file