From c5fb12ffb8b6c92a12b45a27f700f6121e947458 Mon Sep 17 00:00:00 2001 From: emaric Date: Wed, 10 Jan 2024 12:29:03 +0100 Subject: [PATCH] =?UTF-8?q?uspje=C5=A1na=20skripta,=20poku=C5=A1aj=20rende?= =?UTF-8?q?ra?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/serializers.cpython-38.pyc | Bin 0 -> 674 bytes .../__pycache__/urls.cpython-38.pyc | Bin 0 -> 479 bytes .../__pycache__/views.cpython-38.pyc | Bin 0 -> 763 bytes .../templates/plovidba_aplikacija/base.html | 10 ++++++++++ plovidba_aplikacija/views.py | 5 +++-- .../__pycache__/settings.cpython-38.pyc | Bin 2890 -> 2919 bytes .../__pycache__/urls.cpython-38.pyc | Bin 977 -> 1125 bytes plovidba_projekt/settings.py | 2 +- plovidba_projekt/urls.py | 7 +++++-- 9 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc create mode 100644 plovidba_aplikacija/__pycache__/urls.cpython-38.pyc create mode 100644 plovidba_aplikacija/__pycache__/views.cpython-38.pyc create mode 100644 plovidba_aplikacija/templates/plovidba_aplikacija/base.html diff --git a/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc b/plovidba_aplikacija/__pycache__/serializers.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..2a36828db8f92ecdcd828b66365873eccabd54cb GIT binary patch literal 674 zcmZ`$Jx{|h5cNlr251WdQy1ngl~@r%l|W(whKePMWVy9LX`Lq6X%VdOFAzU~zhtp7 zF|#pomq@hY++ za7s>z3RL(=RH*4Rc;HE>q7mu0-r)}EQ@`c3&7{fhwRP{bsqI{hr+QY6vg?JN7p}@C z`187PNQU692cStp6-gLKQN=)tJ+Oo;4l;r7{p1>b>-}Oy`I>cijaBm`P!!r`z{l_R z{^uK<=}P*R5YiYS&ij#%g_z4+3*k3~$P2YF7`KJESxD2ISlpry;ZPeNU1i!R_d;wN zsx^G3#|P;pEXk##YN7PJ+D}ikn^i@bmZn%{YAns)HPFYpW)Q22dS_ArQzelW_w5Y@O7(g+Gby(KBfNv literal 0 HcmV?d00001 diff --git a/plovidba_aplikacija/__pycache__/urls.cpython-38.pyc b/plovidba_aplikacija/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9d2ac15931a341caf712253bb5d413799c0fcc1d GIT binary patch literal 479 zcmYjNJx{|h5VeyuNxz^h@EbZ%i4`G)1T#p4GDMLow?2wnCys2V2pBu_7ufkrUYYtA zSm4}BfF(cOdv|_!=W)N^A$SI_?=Yf-e0uW#w2)ljHFpS{a4Jbjb6N&@Ks^s+SVnn- zamXXtD&st+1fn&`6G#>*Z$Zpsp1g&qQl3J9YI{xB!JOtD-pBF`Jo15Cl4Cyo|ImW^tQFp5hh)0g`JF!eH`yH zF4Zs>2FG)ew{l%X+yjNmd=S0wojrVwFHeiH0d0!R;(C=mDXzdQt*VP!s+HhVR+P_B vt$yjG*2-`CC$L(IC7X!_D}1w2{p`}SQt?K@x&Iy0Lm1E=?FBI%gnQpVh%=0# literal 0 HcmV?d00001 diff --git a/plovidba_aplikacija/__pycache__/views.cpython-38.pyc b/plovidba_aplikacija/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..db6c9888b42dcd8515996f1d6702bab6c6889042 GIT binary patch literal 763 zcmZ8fy>8nu5GEyCKekhNE08zvVxVhL6aiA8Q{BNx210;9i>xi1lAI&uz(zOcIf{17 zD{<|VSLoC`Ic6^j^gq~ZrAlFv*fDt%xo)!{llhGL)wb2b@1;hpS}`v`Qc zG)%ZpcBQ_z+Sw;0!!R-ax>)Oto0rQL>c+YfbC<7ka}A|5mC`TnE7*i{XV;~8f-RqtrrgM)T+6KMZMxn2-m0l|OsuFd<1oZn5Ii^9yF#~@ z7&H@HF%h7Ey`TMGOhh^siQ?3XfBRaHTU2qb-E5NjB+qME={)y?Jg*wn8p5MIziXvA z?LdSDeB7YYg|j}C#`pw%``R6G9$NbtUa4bV9sAxmxSiPi9>u!Vmxe literal 0 HcmV?d00001 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 e3725354091a3823e4062eca6bb6b6f23f79ddc2..0b59ec209a3583f2dfd547b7b6257d091f95d14d 100644 GIT binary patch delta 266 zcmX>l_FRlNl$V!_0SIPQ&P#nYkyn;6Vxso?`c(ETfd!JOY$-AenbH|kI8tO&&an`;;oS(rFWHeX>~$jB(Nxr{xEkx_l} rMUGRfELr)Pd6Q>x=CerweOV+unV(Ca%>u-`*%Y}H`4ok8mQ2PJ#W^hL zj8T#)N>NfN$|))-swrwfsGg#cqB(~xlQBvOhBgeTNn+a diff --git a/plovidba_projekt/__pycache__/urls.cpython-38.pyc b/plovidba_projekt/__pycache__/urls.cpython-38.pyc index e1d9cec9fa17f2271c7935749ab5d42e60cdd959..1b0a7fb1a37449d6da1565c5d52488e4b530e959 100644 GIT binary patch delta 277 zcmcb}{**&Il$V!_0SLZU%}ZU*%)sy%#6bq^K#l_t7e`FgmUYNwjbdeFNMTH2$zjW7 zk78$JNM%W3O=ZgB$l`2f0?oo0+Fy#gbT%sb3{gkdt4QnUa(kpIDHS znVp!NnU$zlT9i|Ki{TbaQerV!UtVHvs-GtJWL{;vfT{7=r^47aL5}mX%;+NM%W3NoC4n&0=e2 zN@t8>Phkya&}7@#F`G$<@fJ%#Vo637TVhIXW}d#ECdcG5W`oJ6nPu2GfhH7jPJYXr R#=`+*vIy`n@-XxK2LK@k8MFWZ 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