From 4e66587ad7aed3bb17771091f9fe3c22f89ca4f8 Mon Sep 17 00:00:00 2001 From: rushilwiz Date: Wed, 26 Aug 2020 02:42:57 -0400 Subject: [PATCH] added forms.py and base.html --- homepage/forms.py | 16 ++++ homepage/migrations/0002_answer_emotion.py | 18 +++++ .../migrations/0003_auto_20200825_2220.py | 18 +++++ .../migrations/0004_auto_20200825_2233.py | 73 +++++++++++++++++++ homepage/templates/homepage/base.html | 38 ++++++++++ homepage/templates/homepage/finish.html | 5 ++ 6 files changed, 168 insertions(+) create mode 100644 homepage/forms.py create mode 100644 homepage/migrations/0002_answer_emotion.py create mode 100644 homepage/migrations/0003_auto_20200825_2220.py create mode 100644 homepage/migrations/0004_auto_20200825_2233.py create mode 100644 homepage/templates/homepage/base.html create mode 100644 homepage/templates/homepage/finish.html diff --git a/homepage/forms.py b/homepage/forms.py new file mode 100644 index 0000000..3655db6 --- /dev/null +++ b/homepage/forms.py @@ -0,0 +1,16 @@ +from django import forms +from django.contrib.auth.models import User +import re +from .models import Answer, EMOTION_CHOICES + +class PollForm(forms.ModelForm): + hi = forms.CharField(max_length=200, required=True) + lo = forms.CharField(max_length=200, required=True) + emotion = forms.ChoiceField(widget=forms.RadioSelect, choices=EMOTION_CHOICES, required=True) + name = forms.CharField(max_length=100) + place = forms.CharField(max_length=100) + question = forms.CharField(max_length=200) + + class Meta: + model = Answer + fields = ['hi', 'lo', 'emotion', 'name', 'place', 'question'] \ No newline at end of file diff --git a/homepage/migrations/0002_answer_emotion.py b/homepage/migrations/0002_answer_emotion.py new file mode 100644 index 0000000..2d88d93 --- /dev/null +++ b/homepage/migrations/0002_answer_emotion.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.8 on 2020-08-25 21:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('homepage', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='answer', + name='emotion', + field=models.CharField(blank=True, max_length=200, null=True), + ), + ] diff --git a/homepage/migrations/0003_auto_20200825_2220.py b/homepage/migrations/0003_auto_20200825_2220.py new file mode 100644 index 0000000..5c1d510 --- /dev/null +++ b/homepage/migrations/0003_auto_20200825_2220.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.8 on 2020-08-25 22:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('homepage', '0002_answer_emotion'), + ] + + operations = [ + migrations.AlterField( + model_name='answer', + name='emotion', + field=models.CharField(blank=True, choices=[('happy', 'Happy'), ('meh', 'Meh'), ('sad', 'Sad')], default='meh', max_length=8, null=True), + ), + ] diff --git a/homepage/migrations/0004_auto_20200825_2233.py b/homepage/migrations/0004_auto_20200825_2233.py new file mode 100644 index 0000000..ff74e51 --- /dev/null +++ b/homepage/migrations/0004_auto_20200825_2233.py @@ -0,0 +1,73 @@ +# Generated by Django 3.0.8 on 2020-08-25 22:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('homepage', '0003_auto_20200825_2220'), + ] + + operations = [ + migrations.RenameField( + model_name='poll', + old_name='askEmotion', + new_name='ask_emotion', + ), + migrations.RenameField( + model_name='poll', + old_name='askHi', + new_name='ask_hi', + ), + migrations.RenameField( + model_name='poll', + old_name='askLo', + new_name='ask_lo', + ), + migrations.RenameField( + model_name='poll', + old_name='askName', + new_name='ask_name', + ), + migrations.RenameField( + model_name='poll', + old_name='askPlace', + new_name='ask_place', + ), + migrations.RenameField( + model_name='poll', + old_name='askQuestion', + new_name='ask_question', + ), + migrations.RenameField( + model_name='poll', + old_name='EmotionText', + new_name='emotion_text', + ), + migrations.RenameField( + model_name='poll', + old_name='HiText', + new_name='hi_text', + ), + migrations.RenameField( + model_name='poll', + old_name='LoText', + new_name='lo_text', + ), + migrations.RenameField( + model_name='poll', + old_name='NameText', + new_name='name_text', + ), + migrations.RenameField( + model_name='poll', + old_name='PlaceText', + new_name='place_text', + ), + migrations.RenameField( + model_name='poll', + old_name='QuestionText', + new_name='question_text', + ), + ] diff --git a/homepage/templates/homepage/base.html b/homepage/templates/homepage/base.html new file mode 100644 index 0000000..0d701d9 --- /dev/null +++ b/homepage/templates/homepage/base.html @@ -0,0 +1,38 @@ +{% load static %} + + + + + + + + + + + + + + + + + + + + + HiLo Arlington + + + + + + {% block content %}{% endblock content %} + + + + + + diff --git a/homepage/templates/homepage/finish.html b/homepage/templates/homepage/finish.html new file mode 100644 index 0000000..9fc8b37 --- /dev/null +++ b/homepage/templates/homepage/finish.html @@ -0,0 +1,5 @@ +{% extends 'homepage/base.html' %} +{% load static %} + +{% block content %} +{% enblock %} \ No newline at end of file