Merge branch 'home-page-and-urls' into 'develop'

Setup urls, tested and created home page See merge request !4

Merge branch 'home-page-and-urls' into 'develop'
Setup urls, tested and created home page See merge request !4
b38f9fb0 · John Carlos Sanil · 1155bd9d · c30e8b9e · b38f9fb0 · b38f9fb0
Commit b38f9fb0 authored Mar 21, 2020 by John Carlos Sanil
Showing with 28 additions and 1 deletion

home.html froyo/templates/home.html +6 -0

tests.py froyo/tests.py +7 -0

urls.py froyo/urls.py +8 -0

views.py froyo/views.py +5 -0

urls.py thegoodplace/urls.py +2 -1

No files found.
--- a/froyo/templates/home.html
+++ b/froyo/templates/home.html
+<html>
+  <head>
+    <title>The Good Place FroYo Shop</title>
+  </head>
+  <h1>The Good Place FroYo Shop</h1>
+</html>
--- a/froyo/tests.py
+++ b/froyo/tests.py
 from django.test import TestCase

 # Create your tests here.
+
+class HomePageTest(TestCase):
+
+    def test_home_page_returns_correct_html(self):
+        response = self.client.get('/')
+        self.assertTemplateUsed(response, 'home.html')
+
--- a/froyo/urls.py
+++ b/froyo/urls.py
+from django.conf.urls import url
+
+from .views import HomePageView
+
+
+urlpatterns = [
+    url(r'^$', HomePageView.as_view(), name='home'),
+]
\ No newline at end of file
--- a/froyo/views.py
+++ b/froyo/views.py
 from django.shortcuts import render
+from django.views.generic.base import TemplateView
+

 # Create your views here.
+
+class HomePageView(TemplateView):
+    template_name = "home.html"
\ No newline at end of file
--- a/thegoodplace/urls.py
+++ b/thegoodplace/urls.py
@@ -13,9 +13,10 @@ Including another URLconf
    1. Import the include() function: from django.conf.urls import url, include
    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import include, url
 from django.contrib import admin

 urlpatterns = [
    url(r'^admin/', admin.site.urls),
+    url(r'', include('froyo.urls')),
 ]