Skip to content

W
willowisp
Commit 3ea66a87 authored by thisLexic's avatar thisLexic
Browse files
Options

added details of each hero but the details page is missing the hero image. Fix is to follow

parent dcc17ae2
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 6 deletions
willowisp/geckodriver.log
View file @ 3ea66a87
...@@ -337,3 +337,33 @@ JavaScript error: resource://services-settings/RemoteSettingsClient.jsm, line 14 ...@@ -337,3 +337,33 @@ JavaScript error: resource://services-settings/RemoteSettingsClient.jsm, line 14
1583564985789 Marionette WARN TLS certificate errors will be ignored for this session 1583564985789 Marionette WARN TLS certificate errors will be ignored for this session
1583564987697 Marionette INFO Stopped listening on port 40445 1583564987697 Marionette INFO Stopped listening on port 40445
JavaScript error: resource://services-settings/RemoteSettingsClient.jsm, line 144: Error: Unknown callback JavaScript error: resource://services-settings/RemoteSettingsClient.jsm, line 144: Error: Unknown callback
1583565664655 mozrunner::runner INFO Running command: "/usr/bin/firefox" "-marionette" "-foreground" "-no-remote" "-profile" "/tmp/rust_mozprofileFXMTQD"
1583565665440 addons.webextension.doh-rollout@mozilla.org WARN Loading extension 'doh-rollout@mozilla.org': Reading manifest: Invalid extension permission: networkStatus
1583566589623 mozrunner::runner INFO Running command: "/usr/bin/firefox" "-marionette" "-foreground" "-no-remote" "-profile" "/tmp/rust_mozprofile12iJpH"
1583566590368 addons.webextension.doh-rollout@mozilla.org WARN Loading extension 'doh-rollout@mozilla.org': Reading manifest: Invalid extension permission: networkStatus
1583566592151 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: mozillaAddons
1583566592151 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: telemetry
1583566592151 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: resource://pdf.js/
1583566592152 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: about:reader*
1583566595067 Marionette INFO Listening on port 39131
1583566595140 Marionette WARN TLS certificate errors will be ignored for this session
1583566597105 Marionette INFO Stopped listening on port 39131
1583566635917 mozrunner::runner INFO Running command: "/usr/bin/firefox" "-marionette" "-foreground" "-no-remote" "-profile" "/tmp/rust_mozprofile9sfvT9"
1583566636656 addons.webextension.doh-rollout@mozilla.org WARN Loading extension 'doh-rollout@mozilla.org': Reading manifest: Invalid extension permission: networkStatus
1583566638335 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: mozillaAddons
1583566638335 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: telemetry
1583566638335 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: resource://pdf.js/
1583566638336 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: about:reader*
1583566641147 Marionette INFO Listening on port 37153
1583566641235 Marionette WARN TLS certificate errors will be ignored for this session
1583566642977 Marionette INFO Stopped listening on port 37153
JavaScript error: resource://services-settings/RemoteSettingsClient.jsm, line 144: Error: Unknown callback
1583566662929 mozrunner::runner INFO Running command: "/usr/bin/firefox" "-marionette" "-foreground" "-no-remote" "-profile" "/tmp/rust_mozprofileuFdqie"
1583566663749 addons.webextension.doh-rollout@mozilla.org WARN Loading extension 'doh-rollout@mozilla.org': Reading manifest: Invalid extension permission: networkStatus
1583566665472 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: mozillaAddons
1583566665473 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: telemetry
1583566665473 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: resource://pdf.js/
1583566665473 addons.webextension.screenshots@mozilla.org WARN Loading extension 'screenshots@mozilla.org': Reading manifest: Invalid extension permission: about:reader*
1583566668367 Marionette INFO Listening on port 34453
1583566668447 Marionette WARN TLS certificate errors will be ignored for this session
1583566670539 Marionette INFO Stopped listening on port 34453
willowisp/heroes/templates/heroes/detail_cloud.html 0 → 100644
View file @ 3ea66a87
{% load static %}
<!DOCTYPE html>
<html>
<head>
<title>Detail - Cloud</title>
</head>
<body>
<img src="./cloud.png" style="width: 10vw;" />
<h1>Detail - Cloud</h1>
<dl>
<dt>Health Points</dt><dd>600</dd>
<dt>Base Attack Damage</dt><dd>57</dd>
<dt>Skills</dt><dd>Nimbus, Rain Cloud, Thunderbolt</dd>
<dt>Lore</dt><dd>I am a cloud. When I pee you call it 'rain'.</dd>
</dl>
</body>
</html>
\ No newline at end of file
willowisp/heroes/templates/heroes/detail_jester.html 0 → 100644
View file @ 3ea66a87
<!DOCTYPE html>
<html>
<head>
<title>Detail - Jester</title>
</head>
<body>
<img src="./jester.png" style="width: 10vw;"/>
<h1>Detail - Jester</h1>
<dl>
<dt>Health Points</dt><dd>660</dd>
<dt>Base Attack Damage</dt><dd>64</dd>
<dt>Skills</dt><dd>Laugh, Dance, Smile</dd>
<dt>Lore</dt><dd>I do it for the LOLs.</dd>
</dl>
</body>
</html>
\ No newline at end of file
willowisp/heroes/templates/heroes/detail_sunflowey.html 0 → 100644
View file @ 3ea66a87
<!DOCTYPE html>
<html>
<head>
<title>Detail - Sunflowey</title>
</head>
<body>
<img src="./sunflowey.png" style="width: 10vw;" />
<h1>Detail - Sunflowey</h1>
<dl>
<dt>Health Points</dt><dd>650</dd>
<dt>Base Attack Damage</dt><dd>43</dd>
<dt>Skills</dt><dd>Power Pellet, Sunshine, Pollen Punch</dd>
<dt>Lore</dt><dd>I am Sunflowey. Sometimes a sun, sometimes a flower.</dd>
</dl>
</body>
</html>
\ No newline at end of file
willowisp/heroes/templates/heroes/home_page.html
View file @ 3ea66a87
...@@ -5,21 +5,21 @@ ...@@ -5,21 +5,21 @@
</head> </head>
<body> <body>
<h1 id="cName">Cloud</h1> <h1><a href="/heroes/cloud" id="cName">Cloud</a></h1>
<dl> <dl>
<dt>Health Points</dt><dd id="cHealth">600</dd> <dt>Health Points</dt><dd id="cHealth">600</dd>
<dt>Base Attack Damage</dt><dd id="cAttack">57</dd> <dt>Base Attack Damage</dt><dd id="cAttack">57</dd>
</dl> </dl>
<h1 id="jName">Jester</h1> <h1><a href="/heroes/jester" id="jName">Jester</a></h1>
<dl> <dl>
<dt>Health Points</dt><dd id="jHealth">660</dd> <dt>Health Points</dt><dd id="jHealth">660</dd>
<dt>Base Attack Damage</dt><dd id="jAttack">64</dd> <dt>Base Attack Damage</dt><dd id="jAttack">64</dd>
</dl> </dl>
<h1 id="sName">Sunflowey</h1> <h1><a href="/heroes/sunflowey" id="sName">Sunflowey</a></h1>
<dl> <dl>
<dt>Health Points</dt><dd id="sHealth">650</dd> <dt>Health Points</dt><dd id="sHealth">650</dd>
<dt>Base Attack Damage</dt><dd id="sAttack">43</dd> <dt>Base Attack Damage</dt><dd id="sAttack">43</dd>
......
willowisp/heroes/tests.py
View file @ 3ea66a87
...@@ -41,6 +41,9 @@ class NewVisitorTest(unittest.TestCase): ...@@ -41,6 +41,9 @@ class NewVisitorTest(unittest.TestCase):
detail = self.browser.find_element_by_id('sAttack') detail = self.browser.find_element_by_id('sAttack')
self.assertEqual(detail.get_attribute('innerHTML'), '43') self.assertEqual(detail.get_attribute('innerHTML'), '43')
# When she selects one of the heroes, she is sent to another page
# containing more information about the hero (additional stats, lore, image).
self.browser.get('http://127.0.0.1:8000/heroes/cloud')
......
willowisp/heroes/urls.py
View file @ 3ea66a87
from django.conf.urls import url from django.conf.urls import url
from .views import home_page from .views import home_page, cloud, jester, sunflowey
urlpatterns = [ urlpatterns = [
url(r'^$', home_page, name = 'home_page'), url(r'^$', home_page, name = 'home_page'),
url(r'^heroes/cloud$', cloud, name = 'cloud'),
url(r'^heroes/jester$', jester, name = 'jester'),
url(r'^heroes/sunflowey$', sunflowey, name = 'sunflowey'),
] ]
\ No newline at end of file
willowisp/heroes/views.py
View file @ 3ea66a87
...@@ -2,3 +2,12 @@ from django.shortcuts import render ...@@ -2,3 +2,12 @@ from django.shortcuts import render
def home_page(request): def home_page(request):
return render(request, 'heroes/home_page.html') return render(request, 'heroes/home_page.html')
def cloud(request):
return render(request, 'heroes/detail_cloud.html')
def jester(request):
return render(request, 'heroes/detail_jester.html')
def sunflowey(request):
return render(request, 'heroes/detail_sunflowey.html')
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment