Skip to content

Commit dc30212

Browse files
Matthew HolmesMatthew Holmes
Matthew Holmes
authored and
Matthew Holmes
committed
you can ignore lab 03 redo folder
1 parent 7d58200 commit dc30212

File tree

62 files changed

+842
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+842
-159
lines changed

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/admin.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
# Register your models here.
55

6-
admin.site.register(List)
7-
6+
admin.site.register(List)

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/migrations/0001_initial.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.0.3 on 2022-03-31 04:04
1+
# Generated by Django 4.0.3 on 2022-04-04 19:37
22

33
from django.conf import settings
44
from django.db import migrations, models
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
1919
fields=[
2020
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
2121
('new', models.CharField(max_length=50)),
22-
('date', models.DateTimeField(auto_now=True)),
22+
('date', models.DateField(auto_now=True)),
2323
('delete', models.BooleanField(default=False)),
2424
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
2525
],

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/models.py‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
21
from django.db import models
32
from django.contrib.auth.models import User
4-
53
# Create your models here.
64

75
class List(models.Model):
8-
new= models.CharField( max_length=50)
9-
# '%m/%d/%Y'
10-
date= models.DateField( auto_now=True)
11-
user= models.ForeignKey(User, on_delete= models.CASCADE)
6+
new= models.CharField(max_length=50)
7+
date= models.DateField(auto_now=True)
8+
user= models.ForeignKey(User, on_delete=models.CASCADE)
129
delete= models.BooleanField(default=False)
13-
10+
1411
def __str__(self):
15-
return F"{self.new}: {self.date}"
12+
return f'{self.new}: {self.date}'

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/templates/grocery_app/index.html‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,29 @@
44
<meta charset="UTF-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>Grocery list</title>
7+
<title>Grocery List</title>
88
</head>
99
<body>
10-
<div>
11-
<!-- {{new}}: adds item to grocery list -->
12-
<form action="{% url 'save' %}" method="POST">
13-
{{new}}
14-
{% csrf_token %}
15-
<button type="submit">Submit</button>
10+
<h1>Home</h1>
11+
12+
<form action="{% url 'save' %}" method="POST">
13+
{% csrf_token %}
14+
{{new_item}}
15+
<button type="submit">Submit</button>
16+
</form>
17+
18+
{% for item in show_items %}
19+
20+
<ul>
21+
22+
<form action="{% url 'delete' item.id %}" method="GET">
23+
<label for="del">{{item}}</label>
24+
<input type="checkbox" name="del" id="del">
25+
<button type="submit" name="del">Delete</button>
1626
</form>
17-
</div>
18-
<br>
19-
<div>
20-
{% for i in folder %}
21-
<ul>
22-
{% comment %} {{i}} {% endcomment %}
23-
{% if i.delete == False %}
24-
<form action="">
25-
<label for="1">{{i}}</label>
26-
<input type="radio" name="1" id="">
27-
</form>
28-
<!-- {{i}} -->
29-
{% endif %}
30-
</ul>
31-
{% endfor %}
32-
</div>
27+
</ul>
28+
29+
{% endfor %}
30+
3331
</body>
3432
</html>

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/urls.py‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
"""grocery_app URL Configuration
1+
"""grocery_proj URL Configuration
22
3+
The `urlpatterns` list routes URLs to views. For more information please see:
4+
https://docs.djangoproject.com/en/4.0/topics/http/urls/
35
Examples:
46
Function views
57
1. Add an import: from my_app import views
68
2. Add a URL to urlpatterns: path('', views.home, name='home')
7-
9+
Class-based views
10+
1. Add an import: from other_app.views import Home
11+
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
12+
Including another URLconf
13+
1. Import the include() function: from django.urls import include, path
14+
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
815
"""
9-
from . import views
16+
1017
from django.urls import path
18+
from . import views
1119

1220
urlpatterns = [
13-
# /list
14-
path('list/', views.home, name='home' ),
15-
path('save/', views.save, name='save' )
16-
]
21+
# home/
22+
path('home/', views.home, name='home'),
23+
path('save/', views.save, name='save'),
24+
path('delete/<int:id>/', views.delete, name='delete'),
25+
]

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_app/views.py‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
1-
from hashlib import new
2-
from django.shortcuts import render
1+
from django.shortcuts import get_object_or_404, render
32
from django import forms
43
from django.http import HttpResponseRedirect
54
from django.urls import reverse
65
from . models import List
76

8-
# Create your views here.
9-
class new_list(forms.Form):
10-
text= forms.CharField(label='',widget=forms.TextInput(
7+
class NewItem(forms.Form):
8+
item= forms.CharField(label='',widget=forms.TextInput(
119
attrs={'placeholder': 'Add new item'}), max_length=10)
1210

13-
11+
# Create your views here.
1412
def home(request):
15-
# folder= List.objects.all().order_by('date')
16-
folder= List.objects.filter(delete= False).order_by('-date')
13+
show_items= List.objects.filter(delete= False).order_by('date')
1714
context= {
18-
"new": new_list(),
19-
'folder': folder
15+
'new_item': NewItem,
16+
'show_items': show_items
2017
}
21-
return render(request, "grocery_app/index.html", context)
18+
19+
return render(request, 'grocery_app/index.html', context)
2220

2321
def save(request):
24-
if request.method == 'POST':
25-
form= new_list(request.POST)
22+
if request.method == "POST":
23+
form= NewItem(request.POST)
2624
if form.is_valid():
27-
text= form.cleaned_data['text']
25+
text= form.cleaned_data['item']
2826
user= request.user
29-
30-
list= List()
27+
#
28+
list=List()
3129
list.new= text
3230
list.user= user
3331
list.save()
3432
return HttpResponseRedirect(reverse('home'))
3533

34+
def delete(request, id):
35+
if request.method == 'GET':
36+
List.objects.filter(id=id).delete()
37+
# list= get_object_or_404(List, id=id)
38+
# list.delete
39+
return HttpResponseRedirect(reverse('home'))
40+
41+

‎Code/matthew/django/labs/03_grocery_list/grocery_list/grocery_proj/settings.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
2121

2222
# SECURITY WARNING: keep the secret key used in production secret!
23-
SECRET_KEY = 'django-insecure-0fbz7@^6glp0s=x4#e2tf9%dzave8%gqpbrh0lei)3qsip53t%'
23+
SECRET_KEY = 'django-insecure-&y%_hrq12*fw6=&&a4%lwl#-e*(sekapntn5_ig*m%2+q@wrj%'
2424

2525
# SECURITY WARNING: don't run with debug turned on in production!
2626
DEBUG = True
@@ -123,4 +123,3 @@
123123
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
124124

125125
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
126-
DATE_INPUT_FORMATS = ('%d-%m-%Y','%Y-%m-%d')

‎Code/matthew/django/lectures/05_/chirpy_app/__init__.py‎ renamed to ‎Code/matthew/django/labs/03_grocery_list/redo/grocery_app/__init__.py‎

File renamed without changes.

‎Code/matthew/django/lectures/05_/chirpy_app/admin.py‎ renamed to ‎Code/matthew/django/labs/03_grocery_list/redo/grocery_app/admin.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.contrib import admin
2-
from . models import Cheep
2+
from . models import List
3+
34
# Register your models here.
45

5-
admin.site.register(Cheep)
6+
admin.site.register(List)

‎Code/matthew/django/lectures/05_/chirpy_app/apps.py‎ renamed to ‎Code/matthew/django/labs/03_grocery_list/redo/grocery_app/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.apps import AppConfig
22

33

4-
class ChirpyAppConfig(AppConfig):
4+
class GroceryAppConfig(AppConfig):
55
default_auto_field = 'django.db.models.BigAutoField'
6-
name = 'chirpy_app'
6+
name = 'grocery_app'

0 commit comments

Comments
 (0)