Skip to content

Commit 3d90b79

Browse files
authored
Merge pull request #101 from KevinMichaelCamp/master
Django - Dojo Ninjas
2 parents 5526337 + 86743ae commit 3d90b79

File tree

20 files changed

+320
-0
lines changed

20 files changed

+320
-0
lines changed

kevin_camp/django/dojo_ninjas/apps/__init__.py

Whitespace-only changes.

kevin_camp/django/dojo_ninjas/apps/dojo_ninjas/__init__.py

Whitespace-only changes.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.contrib import admin
5+
6+
# Register your models here.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.apps import AppConfig
5+
6+
7+
class DojoNinjasConfig(AppConfig):
8+
name = 'dojo_ninjas'
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-17 20:55
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
initial = True
11+
12+
dependencies = [
13+
]
14+
15+
operations = [
16+
migrations.CreateModel(
17+
name='Dojo',
18+
fields=[
19+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
20+
('name', models.CharField(max_length=255)),
21+
('city', models.CharField(max_length=255)),
22+
('state', models.CharField(max_length=2)),
23+
],
24+
),
25+
migrations.CreateModel(
26+
name='Ninja',
27+
fields=[
28+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
29+
('first_name', models.CharField(max_length=255)),
30+
('last_name', models.CharField(max_length=255)),
31+
],
32+
),
33+
]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-17 21:14
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
import django.db.models.deletion
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
('dojo_ninjas', '0001_initial'),
13+
]
14+
15+
operations = [
16+
migrations.AddField(
17+
model_name='ninja',
18+
name='dojo',
19+
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='dojo', to='dojo_ninjas.Dojo'),
20+
preserve_default=False,
21+
),
22+
]
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-17 21:39
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations, models
6+
import django.db.models.deletion
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
('dojo_ninjas', '0002_ninja_dojo'),
13+
]
14+
15+
operations = [
16+
migrations.AlterField(
17+
model_name='ninja',
18+
name='dojo',
19+
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ninjas', to='dojo_ninjas.Dojo'),
20+
),
21+
]

kevin_camp/django/dojo_ninjas/apps/dojo_ninjas/migrations/__init__.py

Whitespace-only changes.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models
5+
6+
# Create your models here.
7+
class Dojo(models.Model):
8+
name = models.CharField(max_length=255)
9+
city = models.CharField(max_length=255)
10+
state = models.CharField(max_length=2)
11+
desc = models.TextField()
12+
13+
class Ninja(models.Model):
14+
first_name = models.CharField(max_length=255)
15+
last_name = models.CharField(max_length=255)
16+
dojo = models.ForeignKey(Dojo, related_name="ninjas")
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
h1{
2+
color: darkblue;
3+
}

0 commit comments

Comments
 (0)