Merge branch 'develop' into 'master'

Merge FinalVersion to Master See merge request !2

Merge branch 'develop' into 'master'
Merge FinalVersion to Master See merge request !2
71bee5df · Alex Bernard Francia · 996fbb3b · 7be687c3 · 71bee5df · 71bee5df
Commit 71bee5df authored Mar 07, 2020 by Alex Bernard Francia
23 changed files
--- a/.gitignore
+++ b/.gitignore
+virtualenv/
+db.sqlite3
+geckodriver.log
+geckodriver.exe
+myenv/
+__pycache__
+*.pyc
--- a/Lab1/functional_test.py
+++ b/Lab1/functional_test.py
+from selenium import webdriver
+
+browser = webdriver.Firefox()
+browser.get('localhost:8000')
+
+assert 'Django' in browser.title
+	# 	unittest.main(warnings='ignore')
\ No newline at end of file
--- a/Lab1/heroes/__init__.py
+++ b/Lab1/heroes/__init__.py
--- a/Lab1/heroes/admin.py
+++ b/Lab1/heroes/admin.py
+from django.contrib import admin
+
+# Register your models here.
--- a/Lab1/heroes/apps.py
+++ b/Lab1/heroes/apps.py
+from django.apps import AppConfig
+
+
+class HeroesConfig(AppConfig):
+    name = 'heroes'
--- a/Lab1/heroes/migrations/__init__.py
+++ b/Lab1/heroes/migrations/__init__.py
--- a/Lab1/heroes/models.py
+++ b/Lab1/heroes/models.py
+from django.db import models
+
+# Create your models here.
--- a/Lab1/heroes/templates/cloud.png
+++ b/Lab1/heroes/templates/cloud.png
--- a/Lab1/heroes/templates/detail_cloud.html
+++ b/Lab1/heroes/templates/detail_cloud.html
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Detail - Cloud</title>
+</head>
+<body>
+<img id = cloudimage src="./cloud.png" style="width: 10vw;" />
+<h1>Detail - Cloud</h1>
+<dl id = 'cloudstatslore'>
+<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>
+<h2><a href = ../heroes>Back to Heroes List</a></h2>
+</body>
+</html>
\ No newline at end of file
--- a/Lab1/heroes/templates/detail_jester.html
+++ b/Lab1/heroes/templates/detail_jester.html
+<!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>
+<h2><a href = ../heroes>Back to Heroes List</a></h2>
+</body>
+</html>
\ No newline at end of file
--- a/Lab1/heroes/templates/detail_sunflowey.html
+++ b/Lab1/heroes/templates/detail_sunflowey.html
+<!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>
+<h2><a href = ../heroes>Back to Heroes List</a></h2>
+</body>
+</html>
\ No newline at end of file
--- a/Lab1/heroes/templates/home_page.html
+++ b/Lab1/heroes/templates/home_page.html
+<!DOCTYPE html>
+<html>
+<head>
+	<title>The Will of the Wisps Wiki</title>
+</head>
+<body>
+<h1 id='title'>The Will of the Wisps Wiki<h1>
+
+
+<img id ='cloudpic' src="./cloud.png" style="width: 10vw;"/>
+<h1 id = 'cloudtitle'><a href = hero/cloud>Cloud</a></h1>
+<dl id = 'cloudstats'>
+<dt>Health Points</dt><dd>600</dd>
+<dt>Base Attack Damage</dt><dd>57</dd>
+</dl>
+
+<img id = 'sunfloweypic' src="./sunflowey.png" style="width: 10vw;"/>
+<h1 id = 'sunfloweytitle'><a href = hero/sunflowey>Sunflowey</a></h1>
+<dl id = 'sunfloweystats'>
+<dt>Health Points</dt><dd>650</dd>
+<dt>Base Attack Damage</dt><dd>43</dd>
+</dl>
+
+
+<img id = 'jesterpic' src="./jester.png" style="width: 10vw;"/>
+<h1 id = 'jestertitle'><a href = hero/jester>Jester</a></h1>
+<dl id = 'jesterstats'>
+<dt>Health Points</dt><dd>660</dd>
+<dt>Base Attack Damage</dt><dd>64</dd>
+</dl>
+
+</body>
+</html>
\ No newline at end of file
--- a/Lab1/heroes/templates/jester.png
+++ b/Lab1/heroes/templates/jester.png
--- a/Lab1/heroes/templates/sunflowey.png
+++ b/Lab1/heroes/templates/sunflowey.png
--- a/Lab1/heroes/tests.py
+++ b/Lab1/heroes/tests.py
+from django.test import TestCase
+
+# Create your tests here.
--- a/Lab1/heroes/urls.py
+++ b/Lab1/heroes/urls.py
+from django.conf.urls import url
+
+from .views import go_to_home_page
+from .views import go_to_cloud
+from .views import go_to_sunflowey
+from .views import go_to_jester
+
+urlpatterns = [
+	# url(r'^admin/', admin.site.urls),
+	# path('admin/', admin.site.urls),
+	# path('detail_sunflowey',views.sunflowey),
+ #    path('detail_jester',views.jester),
+ #    path('detail_cloud',views.cloud),
+ #    path('heroes',views.home),
+
+    url(r'^heroes$', go_to_home_page,name='homepage'),
+    url(r'^hero/cloud$', go_to_cloud,name='cloudpage'),
+    url(r'^hero/sunflowey$', go_to_sunflowey,name='sunfloweypage'),
+    url(r'^hero/jester$', go_to_jester,name='jesterpage'),
+
+]
\ No newline at end of file
--- a/Lab1/heroes/views.py
+++ b/Lab1/heroes/views.py
+from django.shortcuts import render
+
+# from django.http import HttpResponse
+
+def go_to_home_page(request):
+	return render(request,'home_page.html')
+
+def go_to_cloud(request):
+	return render(request,"detail_cloud.html")
+
+def go_to_sunflowey(request):
+	return render(request,"detail_sunflowey.html")
+
+def go_to_jester(request):
+	return render(request,"detail_jester.html")
+
+
+
+
+
+# Create your views here.
--- a/Lab1/lab1_functional_test.py
+++ b/Lab1/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
+		self.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)
+
+		self.assertTrue(self.browser.find_element_by_id("title"))
+
+		
+		
+		
+		# She sees a list containing three heroes with their corresponding 
+		# names, health points, and damage 
+
+		self.assertTrue(self.browser.find_element_by_id("cloudpic"))
+		self.assertTrue(self.browser.find_element_by_id("cloudtitle"))
+
+		self.assertTrue(self.browser.find_element_by_id("sunfloweypic"))
+		self.assertTrue(self.browser.find_element_by_id("sunfloweytitle"))
+
+		self.assertTrue(self.browser.find_element_by_id("jesterpic"))
+		self.assertTrue(self.browser.find_element_by_id("jestertitle"))
+
+		self.assertTrue(self.browser.find_element_by_id("cloudstats"))
+		self.assertTrue(self.browser.find_element_by_id("sunfloweystats"))
+		self.assertTrue(self.browser.find_element_by_id("jesterstats"))
+		
+		# When she selects one of the heroes, she is sent to another page
+		# containing more information about the hero (additional stats, lore, image).
+		elem = self.browser.find_element_by_link_text("Cloud")
+		elem.click()
+
+		self.assertTrue(self.browser.find_element_by_id("cloudimage"))
+		self.assertTrue(self.browser.find_element_by_id("cloudstatslore"))
+		# self.browser.get('http://localhost:8000/hero/cloud')
+		
+		# She spots the page title and header mentions the name of the hero she selected.
+		self.assertIn('Detail - Cloud', self.browser.title)
+		
+		# 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.
+		elem = self.browser.find_element_by_link_text("Back to Heroes List")
+		elem.click()
+		self.assertIn('The Will of the Wisps Wiki', self.browser.title)
+		
+		self.fail('Finish the test!')
+
+if __name__ == '__main__':
+	unittest.main(warnings='ignore')
+
+
--- a/Lab1/manage.py
+++ b/Lab1/manage.py
+#!/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)
--- a/Lab1/willowisp/__init__.py
+++ b/Lab1/willowisp/__init__.py
--- a/Lab1/willowisp/settings.py
+++ b/Lab1/willowisp/settings.py
+"""
+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 = 'lp0j9ma48$vs*9qs7p9o@o^8#u9av2(br@#96)52)nywf4g5&$'
+
+# 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',
+    'heroes',
+]
+
+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.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# 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/'
--- a/Lab1/willowisp/urls.py
+++ b/Lab1/willowisp/urls.py
+"""willowisp URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/3.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+
+from django.conf.urls import include, url
+from django.contrib import admin
+
+
+urlpatterns = [
+    # path('admin/', admin.site.urls),
+    # path('', include('heroes.urls')),
+
+    url(r'^admin/', admin.site.urls),
+    url(r'', include('heroes.urls')),
+]
--- a/Lab1/willowisp/wsgi.py
+++ b/Lab1/willowisp/wsgi.py
+"""
+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()