Second class, second block

rafaelmv · Jan 28, 2016 · 20070ab · 20070ab
1 parent 26e2bca
commit 20070ab
Show file tree

Hide file tree

Showing 27 changed files with 136 additions and 5 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Shoppy/settings.py b/Shoppy/settings.py
@@ -121,4 +121,11 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, 'static')    
+]
+
 STATIC_URL = '/static/'
+
+MEDIA_ROOT = 'media'
+MEDIA_URL = '/media/'
diff --git a/Shoppy/settings.pyc b/Shoppy/settings.pyc
diff --git a/Shoppy/urls.py b/Shoppy/urls.py
@@ -1,7 +1,9 @@
 from django.conf.urls import url, include
 from django.contrib import admin
+from django.conf import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^', include('products.urls')),
-]
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/Shoppy/urls.pyc b/Shoppy/urls.pyc
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/media/leche.jpg b/media/leche.jpg
diff --git a/media/leche_DmkCTZA.jpg b/media/leche_DmkCTZA.jpg
diff --git a/media/queso.jpg b/media/queso.jpg
diff --git a/media/taza.jpg b/media/taza.jpg
diff --git a/media/taza_9SswOT1.jpg b/media/taza_9SswOT1.jpg
diff --git a/products/.DS_Store b/products/.DS_Store
diff --git a/products/forms.py b/products/forms.py
@@ -0,0 +1,8 @@
+from django import forms
+from .models import Product
+
+
+class ProductForm(forms.ModelForm):
+    class Meta:
+        model = Product
+        fields = '__all__'
diff --git a/products/forms.pyc b/products/forms.pyc
diff --git a/products/migrations/0002_product_image.py b/products/migrations/0002_product_image.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-01-28 01:21
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('products', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='image',
+            field=models.ImageField(blank=True, upload_to=b''),
+        ),
+    ]
diff --git a/products/migrations/0002_product_image.pyc b/products/migrations/0002_product_image.pyc
diff --git a/products/models.py b/products/models.py
@@ -8,6 +8,10 @@ class Product(models.Model):
     description = models.CharField(max_length=255)
     category = models.CharField(max_length=255)
     price = models.DecimalField(max_digits=6, decimal_places=2)
+    image = models.ImageField(blank=True)
 
     def __str__(self):
         return self.name
+
+    class Meta:
+        ordering = ('id',)
diff --git a/products/models.pyc b/products/models.pyc
diff --git a/products/urls.py b/products/urls.py
@@ -3,5 +3,7 @@
 
 
 urlpatterns = [
-    url(r'^$', views.hello_world, name='hello')
+    url(r'^$', views.hello_world, name='hello'),
+    url(r'^product/(?P<pk>[0-9]+)/$', views.product_detail),
+    url(r'^product/new', views.new_product, name="new_product")
 ]
diff --git a/products/urls.pyc b/products/urls.pyc
diff --git a/products/views.py b/products/views.py
@@ -1,7 +1,8 @@
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
 from django.template import loader
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404
 
+from .forms import ProductForm
 from .models import Product
 
 
@@ -12,3 +13,38 @@ def hello_world(request):
         'product': product
     }
     return HttpResponse(template.render(context, request))
+
+
+def product_detail(request, pk):
+    product = get_object_or_404(Product, pk=pk)
+    template = loader.get_template('product_detail.html')
+    context = {
+        'product': product
+    }
+
+    return HttpResponse(template.render(context, request))
+
+
+def new_product(request):
+    if request.method == 'POST':
+        form = ProductForm(request.POST)
+        if form.is_valid():
+            product = form.save()
+            product.save()
+            return HttpResponseRedirect('/')
+    else:
+        form = ProductForm()
+
+
+    template = loader.get_template('new_product.html')
+    context = {
+        'form': form
+    }
+    return HttpResponse(template.render(context, request))
+
+
+
+
+
+
+
diff --git a/products/views.pyc b/products/views.pyc
diff --git a/queso.jpg b/queso.jpg
diff --git a/static/css/base.css b/static/css/base.css
@@ -0,0 +1,9 @@
+body {
+    font-family: "HelveticaNeue-Light"
+}
+
+img {
+    width: 200px;
+    height: 200px;
+}
+
diff --git a/templates/index.html b/templates/index.html
@@ -1,18 +1,25 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+
+    {% load staticfiles %}
     <meta charset="UTF-8">
     <title>Hello World</title>
+    <link rel="stylesheet" href="{% static 'css/base.css' %}">
 </head>
 <body>
     <h1 style="color:red">
         Hola
     </h1>
+    <a href="{% url 'products.views.new_product' %}">New products</a>
     <ul>
         {% for pr in product %}
             <li>
-                {{ pr.name }} | 
+                <a href="{% url 'products.views.product_detail' pk=pr.pk %}">
+                    {{ pr.name }} | 
+                </a>
                 {{ pr.description }}
+                <img src="{{ pr.image.url }}" alt="">
             </li>
         {% endfor %}
     </ul>

diff --git a/templates/new_product.html b/templates/new_product.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>New article</title>
+</head>
+<body>
+    <h1>New article</h1>
+
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Submit</button>
+    </form>
+</body>
+</html>
diff --git a/templates/product_detail.html b/templates/product_detail.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    {% load staticfiles %}
+    <meta charset="UTF-8">
+    <title>{{ product.name }}</title>
+    <link rel="stylesheet" href="{% static 'css/base.css' %}">
+</head>
+<body>
+    <h1>{{ product.name }}</h1>
+    <h2>{{ product.description }}</h2>
+
+    <p>
+        {{ product.category }} |
+        {{ product.price }}
+    </p>
+
+    <img src="{{ product.image.url }}" alt="">
+</body>
+</html>