From 4e5efe780be0b1d28f563367c7934feb835c3e2a Mon Sep 17 00:00:00 2001 From: renzon Date: Fri, 26 Jan 2018 18:17:52 -0200 Subject: [PATCH 1/2] Added trademark exception to licensing --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 49e4d630..e9393890 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,12 @@ To run server locally (with virtualenv activated): python manager.py runserver ``` +#License Details + +The AGPL license here cover everything relate to source code but Python Pro logo and Image. +So you need to change this data for you own trademark. + + Have fun! From c36764ed4e557743506f805a30fb90ab85d70c26 Mon Sep 17 00:00:00 2001 From: renzon Date: Thu, 1 Mar 2018 09:47:51 -0300 Subject: [PATCH 2/2] Removed app leads close #227 Command: python manage.py migrate leads zero is needed to erase all app's tables --- pythonpro/leads/__init__.py | 1 - pythonpro/leads/admin.py | 11 --- pythonpro/leads/apps.py | 6 -- pythonpro/leads/migrations/0001_initial.py | 23 ------- pythonpro/leads/migrations/__init__.py | 0 pythonpro/leads/models.py | 8 --- .../leads/templates/leads/lead_form.html | 26 ------- pythonpro/leads/tests/__init__.py | 0 pythonpro/leads/tests/test_views.py | 69 ------------------- pythonpro/leads/urls.py | 9 --- pythonpro/leads/views.py | 23 ------- pythonpro/settings.py | 1 - pythonpro/tests/test_urls.py | 2 +- pythonpro/urls.py | 2 - 14 files changed, 1 insertion(+), 180 deletions(-) delete mode 100644 pythonpro/leads/__init__.py delete mode 100644 pythonpro/leads/admin.py delete mode 100644 pythonpro/leads/apps.py delete mode 100644 pythonpro/leads/migrations/0001_initial.py delete mode 100644 pythonpro/leads/migrations/__init__.py delete mode 100644 pythonpro/leads/models.py delete mode 100644 pythonpro/leads/templates/leads/lead_form.html delete mode 100644 pythonpro/leads/tests/__init__.py delete mode 100644 pythonpro/leads/tests/test_views.py delete mode 100644 pythonpro/leads/urls.py delete mode 100644 pythonpro/leads/views.py diff --git a/pythonpro/leads/__init__.py b/pythonpro/leads/__init__.py deleted file mode 100644 index cfae2e63..00000000 --- a/pythonpro/leads/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'pythonpro.leads.apps.LeadsConfig' diff --git a/pythonpro/leads/admin.py b/pythonpro/leads/admin.py deleted file mode 100644 index 07537c70..00000000 --- a/pythonpro/leads/admin.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.contrib import admin - -from pythonpro.leads.models import Lead - - -class LeadAdmin(admin.ModelAdmin): - list_display = 'name email creation'.split() - date_hierarchy = 'creation' - - -admin.site.register(Lead, LeadAdmin) diff --git a/pythonpro/leads/apps.py b/pythonpro/leads/apps.py deleted file mode 100644 index 534d242e..00000000 --- a/pythonpro/leads/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class LeadsConfig(AppConfig): - name = 'pythonpro.leads' - verbose_name = 'Leads of Website' diff --git a/pythonpro/leads/migrations/0001_initial.py b/pythonpro/leads/migrations/0001_initial.py deleted file mode 100644 index 2cad5956..00000000 --- a/pythonpro/leads/migrations/0001_initial.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.0b1 on 2017-10-29 22:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Lead', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('email', models.EmailField(max_length=254, unique=True)), - ('creation', models.DateTimeField(auto_now_add=True)), - ], - ), - ] diff --git a/pythonpro/leads/migrations/__init__.py b/pythonpro/leads/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pythonpro/leads/models.py b/pythonpro/leads/models.py deleted file mode 100644 index 415bab9a..00000000 --- a/pythonpro/leads/models.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.db import models - - -class Lead(models.Model): - """Class representing leads, e.g. people interested on courses""" - name = models.CharField(max_length=100) - email = models.EmailField(unique=True) - creation = models.DateTimeField(auto_now_add=True) diff --git a/pythonpro/leads/templates/leads/lead_form.html b/pythonpro/leads/templates/leads/lead_form.html deleted file mode 100644 index ac9d9988..00000000 --- a/pythonpro/leads/templates/leads/lead_form.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Title - - - -
- {% csrf_token %} - {{ form.non_field_errors }} -
- - {{ form.name.errors }} - {{ form.name }} -
-
- - {{ form.email.errors }} - {{ form.email }} -
- -
- - - \ No newline at end of file diff --git a/pythonpro/leads/tests/__init__.py b/pythonpro/leads/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pythonpro/leads/tests/test_views.py b/pythonpro/leads/tests/test_views.py deleted file mode 100644 index e76a0b3f..00000000 --- a/pythonpro/leads/tests/test_views.py +++ /dev/null @@ -1,69 +0,0 @@ -import pytest -from django.urls import reverse - -from pythonpro.leads.models import Lead - - -@pytest.fixture -def new_resp(client, transactional_db): - return client.post( - reverse('leads:new'), - { - 'name': 'Renzo', - 'email': 'renzo@python.pro.br' - } - ) - - -def test_new_lead_status(new_resp): - assert 302 == new_resp.status_code - - -@pytest.mark.usefixtures("new_resp") -def test_saved_lead(): - assert Lead.objects.exists() - - -@pytest.fixture() -def blank_resp(client, transactional_db): - return client.post( - reverse('leads:new'), - { - 'name': '', - 'email': '' - } - ) - - -@pytest.mark.django_db(transaction=True) -def test_error_status(blank_resp): - assert 200 == blank_resp.status_code - - -@pytest.mark.parametrize( - 'form_content', - [ - '