diff --git a/config/settings.py b/config/settings.py
index 1598205..3ba6717 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -47,7 +47,8 @@ INSTALLED_APPS = [
'django.contrib.messages',
'whitenoise.runserver_nostatic',
'django.contrib.staticfiles',
-
+
+ 'crispy_forms',
'django_secrets'
]
@@ -75,6 +76,7 @@ TEMPLATES = [
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
+ 'django.template.context_processors.media',
],
},
},
@@ -151,4 +153,4 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
LOGIN_REDIRECT_URL = 'blog-home'
-LOGIN_URL = 'login'
\ No newline at end of file
+LOGIN_URL = 'login'
diff --git a/config/urls.py b/config/urls.py
index 20bd978..27be4df 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -13,14 +13,20 @@ 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 import settings
+from django.conf.urls.static import static
from django.contrib import admin
from django.urls import path, include
from users import views as user_views
+from innovate.admin import admin_site as innovate_admin
urlpatterns = [
path('', include('launchx.urls')),
path('innovate/', include('innovate.urls'), name='innovate'),
path('login/', user_views.login, name='login'),
path('logout/', user_views.login, name='logout'),
- path('admin/', admin.site.urls),
+ path('admin/', innovate_admin.urls),
]
+
+if settings.DEBUG:
+ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
diff --git a/innovate/admin.py b/innovate/admin.py
index 8c38f3f..d4452aa 100644
--- a/innovate/admin.py
+++ b/innovate/admin.py
@@ -1,3 +1,18 @@
from django.contrib import admin
+from .models import Team, Competitor
+from django.contrib.auth.models import User, Group
+
# Register your models here.
+class LaunchXAdminSite(admin.AdminSite):
+ site_header = "LaunchX Admin"
+ site_title = "LaunchX Admin Portal"
+ index_title = "Welcome to LaunchX Admin Page"
+
+admin_site = LaunchXAdminSite(name='launchx-admin')
+
+admin_site.register(User)
+admin_site.register(Group)
+
+admin_site.register(Competitor)
+admin_site.register(Team)
\ No newline at end of file
diff --git a/innovate/forms.py b/innovate/forms.py
new file mode 100644
index 0000000..45c3d1f
--- /dev/null
+++ b/innovate/forms.py
@@ -0,0 +1,41 @@
+from django import forms
+from django.forms import modelformset_factory
+
+from .models import Competitor, Team
+
+class CompetitorForm(forms.ModelForm):
+ name = forms.CharField(label='Full Name', widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'John Doe'}))
+ email = forms.EmailField(label='Email', widget=forms.EmailInput(attrs={'class': 'form-control', 'placeholder': 'example@email.com'}))
+
+ class Meta:
+ model = Competitor
+ fields = ['name', 'email']
+
+ def __init__(self, *args, **kwargs):
+ super(CompetitorForm, self).__init__(*args, **kwargs)
+ self.label_suffix = ''
+
+
+CompetitorFormset = modelformset_factory(
+ Competitor,
+ form=CompetitorForm,
+ min_num=2, max_num=4, extra=0)
+
+class TeamForm(forms.ModelForm):
+ name = forms.CharField(required=False, label="Team Name (Optional)", widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'BusinessX'}))
+ reciept = forms.FileField(required=False)
+
+ class Meta:
+ model = Team
+ fields = ['name', 'reciept']
+
+ def __init__(self, *args, **kwargs):
+ super(TeamForm, self).__init__(*args, **kwargs)
+ self.label_suffix = ''
+
+ def save(self, commit=True):
+ m = super(TeamForm, self).save(commit=False)
+ m.number = Team.objects.all().count() + 1
+ if commit:
+ m.save()
+ return m
\ No newline at end of file
diff --git a/innovate/migrations/0001_initial.py b/innovate/migrations/0001_initial.py
new file mode 100644
index 0000000..7f79711
--- /dev/null
+++ b/innovate/migrations/0001_initial.py
@@ -0,0 +1,42 @@
+# Generated by Django 3.1.6 on 2021-02-03 17:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Team',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('number', models.IntegerField()),
+ ('name', models.CharField(blank=True, max_length=20, null=True)),
+ ('reciept', models.FileField(blank=True, null=True, upload_to='reciepts/')),
+ ],
+ options={
+ 'verbose_name': 'Team',
+ 'verbose_name_plural': 'Teams',
+ },
+ ),
+ migrations.CreateModel(
+ name='Competitor',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(blank=True, default='', max_length=20)),
+ ('email', models.EmailField(max_length=254)),
+ ('is_leader', models.BooleanField(default=False)),
+ ('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='innovate.team')),
+ ],
+ options={
+ 'verbose_name': 'Competitor',
+ 'verbose_name_plural': 'Competitors',
+ },
+ ),
+ ]
diff --git a/innovate/models.py b/innovate/models.py
index 71a8362..50f150f 100644
--- a/innovate/models.py
+++ b/innovate/models.py
@@ -1,3 +1,43 @@
from django.db import models
+from django.core.exceptions import ValidationError
# Create your models here.
+
+class Team(models.Model):
+ number = models.IntegerField()
+ name = models.CharField(max_length=20, null=True, blank=True)
+ reciept = models.FileField(upload_to='reciepts/', null=True, blank=True)
+
+ class Meta:
+ verbose_name = "Team"
+ verbose_name_plural = "Teams"
+
+ def __str__(self):
+ return self.name
+
+ def clean(self):
+ # Don't allow teams to have the same name.
+ if Team.objects.filter(name=self.name).count() > 0:
+ raise ValidationError({'name': 'That name is already taken! Sorry.'})
+
+class Competitor(models.Model):
+ name = models.CharField(max_length=20, blank=True, default='')
+ email = models.EmailField(max_length = 254)
+ is_leader = models.BooleanField(default=False)
+
+ team = models.ForeignKey(Team, on_delete=models.CASCADE)
+
+ class Meta:
+ verbose_name = "Competitor"
+ verbose_name_plural = "Competitors"
+
+ def __str__(self):
+ return self.name
+
+ def clean(self):
+ # Don't allow teams to have the same name.
+ if Competitor.objects.filter(name=self.name).count() > 0:
+ raise ValidationError({'name': 'Somebody with that name is already registered!'})
+
+ if Competitor.objects.filter(email=self.email).count() > 0:
+ raise ValidationError({'email': 'Somebody with that email is already registered!'})
diff --git a/innovate/static/innovate/formsets.js b/innovate/static/innovate/formsets.js
new file mode 100644
index 0000000..a339cb7
--- /dev/null
+++ b/innovate/static/innovate/formsets.js
@@ -0,0 +1,250 @@
+/**
+ * jQuery Formset 1.5-pre
+ * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com)
+ * @requires jQuery 1.2.6 or later
+ *
+ * Copyright (c) 2009, Stanislaus Madueke
+ * All rights reserved.
+ *
+ * Licensed under the New BSD License
+ * See: http://www.opensource.org/licenses/bsd-license.php
+ */
+;(function($) {
+ $.fn.formset = function(opts)
+ {
+ var options = $.extend({}, $.fn.formset.defaults, opts),
+ flatExtraClasses = options.extraClasses.join(' '),
+ totalForms = $('#id_' + options.prefix + '-TOTAL_FORMS'),
+ maxForms = $('#id_' + options.prefix + '-MAX_NUM_FORMS'),
+ minForms = $('#id_' + options.prefix + '-MIN_NUM_FORMS'),
+ childElementSelector = 'input,select,textarea,label,div',
+ $$ = $(this),
+
+ applyExtraClasses = function(row, ndx) {
+ if (options.extraClasses) {
+ row.removeClass(flatExtraClasses);
+ row.addClass(options.extraClasses[ndx % options.extraClasses.length]);
+ }
+ },
+
+ updateElementIndex = function(elem, prefix, ndx) {
+ var idRegex = new RegExp(prefix + '-(\\d+|__prefix__)-'),
+ replacement = prefix + '-' + ndx + '-';
+ if (elem.attr("for")) elem.attr("for", elem.attr("for").replace(idRegex, replacement));
+ if (elem.attr('id')) elem.attr('id', elem.attr('id').replace(idRegex, replacement));
+ if (elem.attr('name')) elem.attr('name', elem.attr('name').replace(idRegex, replacement));
+ },
+
+ hasChildElements = function(row) {
+ return row.find(childElementSelector).length > 0;
+ },
+
+ showAddButton = function() {
+ return maxForms.length == 0 || // For Django versions pre 1.2
+ (maxForms.val() == '' || (maxForms.val() - totalForms.val() > 0));
+ },
+
+ /**
+ * Indicates whether delete link(s) can be displayed - when total forms > min forms
+ */
+ showDeleteLinks = function() {
+ return minForms.length == 0 || // For Django versions pre 1.7
+ (minForms.val() == '' || (totalForms.val() - minForms.val() > 0));
+ },
+
+ insertDeleteLink = function(row) {
+ var delCssSelector = $.trim(options.deleteCssClass).replace(/\s+/g, '.'),
+ addCssSelector = $.trim(options.addCssClass).replace(/\s+/g, '.');
+
+ var delButtonHTML = '' + options.deleteText +'';
+ if (options.deleteContainerClass) {
+ // If we have a specific container for the remove button,
+ // place it as the last child of that container:
+ row.find('[class*="' + options.deleteContainerClass + '"]').append(delButtonHTML);
+ } else if (row.is('TR')) {
+ // If the forms are laid out in table rows, insert
+ // the remove button into the last table cell:
+ row.children(':last').append(delButtonHTML);
+ } else if (row.is('UL') || row.is('OL')) {
+ // If they're laid out as an ordered/unordered list,
+ // insert an
after the last list item:
+ row.append('
' + delButtonHTML + '
');
+ } else {
+ // Otherwise, just insert the remove button as the
+ // last child element of the form's container:
+ row.append(delButtonHTML);
+ }
+
+ // Check if we're under the minimum number of forms - not to display delete link at rendering
+ if (!showDeleteLinks()){
+ row.find('a.' + delCssSelector).hide();
+ }
+
+ row.find('a.' + delCssSelector).click(function() {
+ var row = $(this).parents('.' + options.formCssClass),
+ del = row.find('input:hidden[id $= "-DELETE"]'),
+ buttonRow = row.siblings("a." + addCssSelector + ', .' + options.formCssClass + '-add'),
+ forms;
+ if (del.length) {
+ // We're dealing with an inline formset.
+ // Rather than remove this form from the DOM, we'll mark it as deleted
+ // and hide it, then let Django handle the deleting:
+ del.val('on');
+ row.hide();
+ forms = $('.' + options.formCssClass).not(':hidden');
+ totalForms.val(forms.length);
+ } else {
+ row.remove();
+ // Update the TOTAL_FORMS count:
+ forms = $('.' + options.formCssClass).not('.formset-custom-template');
+ totalForms.val(forms.length);
+ }
+ for (var i=0, formCount=forms.length; i');
+ row.hide();
+ } else {
+ del.before('');
+ }
+ // Hide any labels associated with the DELETE checkbox:
+ $('label[for="' + del.attr('id') + '"]').hide();
+ del.remove();
+ }
+ if (hasChildElements(row)) {
+ row.addClass(options.formCssClass);
+ if (row.is(':visible')) {
+ insertDeleteLink(row);
+ applyExtraClasses(row, i);
+ }
+ }
+ });
+
+ if ($$.length) {
+ var hideAddButton = !showAddButton(),
+ addButton, template;
+ if (options.formTemplate) {
+ // If a form template was specified, we'll clone it to generate new form instances:
+ template = (options.formTemplate instanceof $) ? options.formTemplate : $(options.formTemplate);
+ template.removeAttr('id').addClass(options.formCssClass + ' formset-custom-template');
+ template.find(childElementSelector).each(function() {
+ updateElementIndex($(this), options.prefix, '__prefix__');
+ });
+ insertDeleteLink(template);
+ } else {
+ // Otherwise, use the last form in the formset; this works much better if you've got
+ // extra (>= 1) forms (thnaks to justhamade for pointing this out):
+ if (options.hideLastAddForm) $('.' + options.formCssClass + ':last').hide();
+ template = $('.' + options.formCssClass + ':last').clone(true).removeAttr('id');
+ template.find('input:hidden[id $= "-DELETE"]').remove();
+ // Clear all cloned fields, except those the user wants to keep (thanks to brunogola for the suggestion):
+ template.find(childElementSelector).not(options.keepFieldValues).each(function() {
+ var elem = $(this);
+ // If this is a checkbox or radiobutton, uncheck it.
+ // This fixes Issue 1, reported by Wilson.Andrew.J:
+ if (elem.is('input:checkbox') || elem.is('input:radio')) {
+ elem.attr('checked', false);
+ } else {
+ elem.val('');
+ }
+ });
+ }
+ // FIXME: Perhaps using $.data would be a better idea?
+ options.formTemplate = template;
+
+ var addButtonHTML = '' + options.addText + '';
+ if (options.addContainerClass) {
+ // If we have a specific container for the "add" button,
+ // place it as the last child of that container:
+ var addContainer = $('[class*="' + options.addContainerClass + '"');
+ addContainer.append(addButtonHTML);
+ addButton = addContainer.find('[class="' + options.addCssClass + '"]');
+ } else if ($$.is('TR')) {
+ // If forms are laid out as table rows, insert the
+ // "add" button in a new table row:
+ var numCols = $$.eq(0).children().length, // This is a bit of an assumption :|
+ buttonRow = $('
' + addButtonHTML + '
').addClass(options.formCssClass + '-add');
+ $$.parent().append(buttonRow);
+ addButton = buttonRow.find('a');
+ } else {
+ // Otherwise, insert it immediately after the last form:
+ $$.filter(':last').after(addButtonHTML);
+ addButton = $$.filter(':last').next();
+ }
+
+ if (hideAddButton) addButton.hide();
+
+ addButton.click(function() {
+ var formCount = parseInt(totalForms.val()),
+ row = options.formTemplate.clone(true).removeClass('formset-custom-template'),
+ buttonRow = $($(this).parents('tr.' + options.formCssClass + '-add').get(0) || this),
+ delCssSelector = $.trim(options.deleteCssClass).replace(/\s+/g, '.');
+ applyExtraClasses(row, formCount);
+ row.insertBefore(buttonRow).show();
+ row.find(childElementSelector).each(function() {
+ updateElementIndex($(this), options.prefix, formCount);
+ });
+ totalForms.val(formCount + 1);
+ // Check if we're above the minimum allowed number of forms -> show all delete link(s)
+ if (showDeleteLinks()){
+ $('a.' + delCssSelector).each(function(){$(this).show();});
+ }
+ // Check if we've exceeded the maximum allowed number of forms:
+ if (!showAddButton()) buttonRow.hide();
+ // If a post-add callback was supplied, call it with the added form:
+ if (options.added) options.added(row);
+ return false;
+ });
+ }
+
+ return $$;
+ };
+
+ /* Setup plugin defaults */
+ $.fn.formset.defaults = {
+ prefix: 'form', // The form prefix for your django formset
+ formTemplate: null, // The jQuery selection cloned to generate new form instances
+ addText: 'Add Another', // Text for the add link
+ deleteText: 'Remove', // Text for the delete link
+ addContainerClass: null, // Container CSS class for the add link
+ deleteContainerClass: null, // Container CSS class for the delete link
+ addCssClass: 'add-row btn btn-outline-light mt-2', // CSS class applied to the add link
+ deleteCssClass: 'delete-row btn btn-outline-danger mt-2', // CSS class applied to the delete link
+ formCssClass: 'dynamic-form', // CSS class applied to each form in a formset
+ extraClasses: [], // Additional CSS classes, which will be applied to each form in turn
+ keepFieldValues: '', // jQuery selector for fields whose values should be kept when the form is cloned
+ added: null, // Function called each time a new form is added
+ removed: null, // Function called each time a form is deleted
+ hideLastAddForm: false // When set to true, hide last empty add form (becomes visible when clicking on add button)
+ };
+})(jQuery);
\ No newline at end of file
diff --git a/innovate/static/innovate/index.css b/innovate/static/innovate/index.css
new file mode 100644
index 0000000..7eb8a0d
--- /dev/null
+++ b/innovate/static/innovate/index.css
@@ -0,0 +1,42 @@
+.header {
+ text-align: center;
+}
+
+.header h1 {
+ font-size: 5em;
+ line-height: 0.8em;
+}
+
+.header h1 small {
+ font-size: 0.6em;
+}
+
+.header h3 {
+ font-size: 1.6em;
+ color: #ececec;
+ text-decoration: underline;
+}
+
+.basic-info ul {
+ list-style: none;
+ font-size: 2em;
+}
+
+li {
+ font-size: 1em;
+ font-weight: bold;
+}
+
+li:before {
+ content: '- ';
+}
+
+.list-text {
+ font-size: 0.7em;
+ font-weight: normal;
+}
+
+.sign-up {
+ margin: auto auto;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/innovate/static/innovate/signup.css b/innovate/static/innovate/signup.css
new file mode 100644
index 0000000..d2a41c9
--- /dev/null
+++ b/innovate/static/innovate/signup.css
@@ -0,0 +1,56 @@
+.row1 .header:after {
+ content: '1';
+}
+
+.row2 .header:after {
+ content: '2';
+}
+
+.row3 .header:after {
+ content: '3';
+}
+
+.row4 .header:after {
+ content: '4';
+}
+
+fieldset {
+ border-width: 15px;
+ padding: 20px;
+}
+
+legend {
+ padding-left: 20px;
+}
+
+.form-floating {
+ color: black;
+}
+
+.form-floating label {
+ margin-left: 20px;
+}
+
+.add-row {
+ text-decoration: none;
+ color: white;
+ display: block;
+}
+
+button {
+ display: block;
+ margin: 0 auto;
+}
+
+.reciept .form-floating input {
+ color: white;
+}
+
+#payment-instructions {
+ font-size: 0.9em;
+ text-decoration: none;
+}
+
+#payment-instructions:hover {
+ text-decoration: underline;
+}
\ No newline at end of file
diff --git a/innovate/static/innovate/styles.css b/innovate/static/innovate/styles.css
deleted file mode 100644
index e69de29..0000000
diff --git a/innovate/templates/innovate/confirm.html b/innovate/templates/innovate/confirm.html
new file mode 100644
index 0000000..86b6389
--- /dev/null
+++ b/innovate/templates/innovate/confirm.html
@@ -0,0 +1,13 @@
+{% extends 'launchx/base.html' %}
+{% load static %}
+
+{% block styles %}
+
+{% endblock %}
+
+{% block content %}
+
+
Congrats!
+
You've successfully signed up for InnovateTJ, please check your email for a confirmation. We'll see you
+
+{% endblock %}
\ No newline at end of file
diff --git a/innovate/templates/innovate/index.html b/innovate/templates/innovate/index.html
index 45e26a5..0c0ebda 100644
--- a/innovate/templates/innovate/index.html
+++ b/innovate/templates/innovate/index.html
@@ -1,4 +1,28 @@
{% extends "launchx/base.html" %}
+{% load static %}
+
+{% block styles %}
+
+{% endblock %}
+
{% block content %}
-
InnovateTJ!
+
+
It's time to InnovateTJ!
+
TJ's very own entrpreneurial pitch and workshop event!
+
+
+
+
+
Who: Teams of 2-4 high school students
+
What: A collaborative event where you and other innovators will develop a business pitch for real entrepreneurs with the chance of winning real money and other prizes!