Skip to content

W
willowisp
Commit a42e891d authored by Karlo Cabugwang's avatar Karlo Cabugwang
Browse files
Options

fixed static images, added buttons and finished lab

parent 57b2838f
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 35 deletions
heroes/templates/detail_cloud.html
View file @ a42e891d
......@@ -4,7 +4,7 @@
<title>Detail - Cloud</title>
</head>
<body>
<img src="https://opengameart.org/content/violet-cloud" style="width: 10vw;" />
<img src="/static/cloud.png" style="width: 10vw;" />
<h1>Detail - Cloud</h1>
<dl>
<dt>Health Points</dt><dd>600</dd>
......@@ -12,5 +12,7 @@
<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>
<a href="/heroes"><button type="button">Back to Heroes List</button></a>
</body>
</html>
\ No newline at end of file
heroes/templates/detail_jester.html
View file @ a42e891d
......@@ -4,7 +4,7 @@
<title>Detail - Jester</title>
</head>
<body>
<img src="./jester.png" style="width: 10vw;"/>
<img src="/static/jester.png" style="width: 10vw;"/>
<h1>Detail - Jester</h1>
<dl>
<dt>Health Points</dt><dd>660</dd>
......@@ -12,5 +12,6 @@
<dt>Skills</dt><dd>Laugh, Dance, Smile</dd>
<dt>Lore</dt><dd>I do it for the LOLs.</dd>
</dl>
<a href="/heroes"><button type="button">Back to Heroes List</button></a>
</body>
</html>
\ No newline at end of file
heroes/templates/detail_sunflowey.html
View file @ a42e891d
......@@ -4,7 +4,7 @@
<title>Detail - Sunflowey</title>
</head>
<body>
<img src="./sunflowey.png" style="width: 10vw;" />
<img src="/static/sunflowey.png" style="width: 10vw;" />
<h1>Detail - Sunflowey</h1>
<dl>
<dt>Health Points</dt><dd>650</dd>
......@@ -12,5 +12,7 @@
<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>
<a href="/heroes"><button type="button">Back to Heroes List</button></a>
</body>
</html>
\ No newline at end of file
heroes/urls.py
View file @ a42e891d
......@@ -6,4 +6,4 @@ urlpatterns = [
url(r'^heroes/cloud$', CloudView.as_view(), name='cloud'),
url(r'^heroes/jester$', JesterView.as_view(), name='jester'),
url(r'^heroes/sunflowey$', SunfloweyView.as_view(), name='sunflowey'),
]
\ No newline at end of file
]
\ No newline at end of file
lab1_functional_test.py
View file @ a42e891d
......@@ -10,33 +10,26 @@ class NewVisitorTest(unittest.TestCase):
# def tearDown(self):
# self.browser.quit()
def test_can_start_and_open(self):
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
self.browser.get('http://localhost:8000/heroes')
self.assertIn('The Will of the Wisps Wiki', self.browser.title)
self.fail('Finish the Test')
# 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/tasks')
# self.assertTemplateUsed(response,'home.html')
# # 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 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
# She sees a list containing three heroes with their corresponding
# names, health points, and damage
# # When she selects one of the heroes, she is sent to another page
# # containing more information about the hero (additional stats, lore, image).
# 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.
# 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.
# 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!')
# self.fail('Finish the test!')
if __name__ == '__main__':
unittest.main(warnings='ignore')
\ No newline at end of file
willowisp/manage.py 0 → 100644
View file @ a42e891d
#!/usr/bin/env python
import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "willowisp.settings")
try:
from django.core.management import execute_from_command_line
except ImportError:
# The above import may fail for some other reason. Ensure that the
# issue is really that Django is missing to avoid masking other
# exceptions on Python 2.
try:
import django
except ImportError:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
)
raise
execute_from_command_line(sys.argv)
willowisp/settings.py
View file @ a42e891d
......@@ -20,7 +20,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '@uax7_%6x$3+%u)fl-!1@9(_+!e2i!25o^h*v&6$xy7miqvx_)'
SECRET_KEY = 'l@pztf$4id+0guq_1whrio6%a@m@h&+5m6pqh(29&wldhxa$jx'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
......@@ -37,6 +37,7 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'heroes',
]
MIDDLEWARE = [
......@@ -74,14 +75,10 @@ WSGI_APPLICATION = 'willowisp.wsgi.application'
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'willowisp',
'USER': 'postgres',
'PASSWORD': 'mamamo',
'HOST': 'localhost',
'PORT': '5060',
}
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
......
willowisp/urls.py
View file @ a42e891d
......@@ -13,9 +13,11 @@ 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')),
]
willowisp/willowisp/settings.py 0 → 100644
View file @ a42e891d
"""
Django settings for willowisp project.
Generated by 'django-admin startproject' using Django 1.11.17.
For more information on this file, see
https://docs.djangoproject.com/en/1.11/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.11/ref/settings/
"""
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '@uax7_%6x$3+%u)fl-!1@9(_+!e2i!25o^h*v&6$xy7miqvx_)'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'willowisp.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]
WSGI_APPLICATION = 'willowisp.wsgi.application'
# Database
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'willowisp',
'USER': 'postgres',
'PASSWORD': 'mamamo',
'HOST': 'localhost',
'PORT': '5060',
}
}
# Password validation
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/1.11/topics/i18n/
LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
USE_I18N = True
USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.11/howto/static-files/
STATIC_URL = '/static/'
willowisp/willowisp/urls.py 0 → 100644
View file @ a42e891d
"""willowisp URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/1.11/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
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.contrib import admin
urlpatterns = [
url(r'^admin/', admin.site.urls),
]
willowisp/willowisp/wsgi.py 0 → 100644
View file @ a42e891d
"""
WSGI config for willowisp project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "willowisp.settings")
application = get_wsgi_application()
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