Merge branch 'add/views' into 'develop'

added views and urls and a base html file for heroes.html See merge request !2

Merge branch 'add/views' into 'develop'
added views and urls and a base html file for heroes.html See merge request !2
feb84c71 · Cian Laguesma · f391e107 · 8f5273eb · feb84c71 · feb84c71
Commit feb84c71 authored Mar 10, 2020 by Cian Laguesma
10 changed files
--- a/db.sqlite3
+++ b/db.sqlite3
--- a/heroes/templates/cloud.png
+++ b/heroes/templates/cloud.png
--- a/heroes/templates/heroes.html
+++ b/heroes/templates/heroes.html
+<html>
+  <head>
+    <h1>The Will of the Wisps Wiki</h1>
+  </head>
+</html>
--- a/heroes/templates/jester.png
+++ b/heroes/templates/jester.png
--- a/heroes/templates/sunflowey.png
+++ b/heroes/templates/sunflowey.png
--- a/heroes/urls.py
+++ b/heroes/urls.py
+from django.conf.urls import url
+from .views import home_page, hero_cloud, hero_jester, hero_sunflowey
+urlpatterns = [
+    url(r'^heroes$', home_page, name='home_page'),
+    url(r'^hero/cloud$', hero_cloud, name='hero_cloud'),
+    url(r'^hero/jester$', hero_jester, name='hero_jester'),
+    url(r'^hero/sunflowey$', hero_sunflowey, name='hero_sunflowey')
+]
--- a/heroes/views.py
+++ b/heroes/views.py
 from django.shortcuts import render

 # Create your views here.
+
+
+def home_page(request):
+    return render(request, 'heroes.html')
+
+
+def hero_cloud(request):
+    return render(request, 'detail_cloud.html')
+
+
+def hero_jester(request):
+    return render(request, 'detail_jester.html')
+
+
+def hero_sunflowey(request):
+    return render(request, 'detail_sunflowey.html')
--- a/lab1_functional_test.py
+++ b/lab1_functional_test.py
 from selenium import webdriver
 import unittest

+
 class NewVisitorTest(unittest.TestCase):
-	def setUp(self):
-		self.browser = webdriver.Firefox()
-		
-	def tearDown(self):
-		self.browser.quit()
-
-	def test_can_display_a_heroes_list_and_more_information_per_hero(self):
-		# Widget has heard about a new wiki app for the game called The Will of the Wisps. 
-		# She goes to check out its homepage
-		browser.get('http://localhost:8000')
-
-		# She notices the page title and header mention 
-		# 'The Will of the Wisps Wiki'
-		self.assertIn('The Will of the Wisps Wiki', self.browser.title)
-		
-		# She sees a list containing three heroes with their corresponding 
-		# names, health points, and damage 
+    def setUp(self):
+        self.browser = webdriver.Firefox()
+
+    def tearDown(self):
+        self.browser.quit()
+
+    def test_can_display_a_heroes_list_and_more_information_per_hero(self):
+        # Widget has heard about a new wiki app for the game called The Will of the Wisps.
+        # She goes to check out its homepage
+        browser.get('http://localhost:8000/heroes')
+
+        # She notices the page title and header mention
+        # 'The Will of the Wisps Wiki'
+        self.assertIn('The Will of the Wisps Wiki', self.browser.title)
+
+        # She sees a list containing three heroes with their corresponding
+        # names, health points, and damage
        self.assertIn('')
-		
-		# When she selects one of the heroes, she is sent to another page
-		# containing more information about the hero (additional stats, lore, image).
-		
-		# She spots the page title and header mentions the name of the hero she selected.
-		
-		# While she is in a specific hero's page, she sees a button labeled "Back to Heroes List".
-		# She clicks this and she is redirected back to the wiki's homepage.	
-		
-		self.fail('Finish the test!')
\ No newline at end of file
+
+    # When she selects one of the heroes, she is sent to another page
+    # containing more information about the hero (additional stats, lore, image).
+
+    # She spots the page title and header mentions the name of the hero she selected.
+
+    # While she is in a specific hero's page, she sees a button labeled "Back to Heroes List".
+    # She clicks this and she is redirected back to the wiki's homepage.
+
+        self.fail('Finish the test!')
--- a/willowisp/settings.py
+++ b/willowisp/settings.py
@@ -37,6 +37,7 @@ INSTALLED_APPS = [
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
+    'heroes',
 ]

 MIDDLEWARE = [

--- a/willowisp/urls.py
+++ b/willowisp/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('heroes.urls'))
 ]