8000 Added pyupload · FeverCode/GAwards@f50aabd · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit f50aabd

Browse files
FeverCodeFeverCode
committed
Added pyupload
1 parent 48a7e7e commit f50aabd

File tree

11 files changed

+76
-105
lines changed

11 files changed

+76
-105
lines changed

‎app/forms.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ class Meta:
8282
fields = ['username', 'email']
8383

8484

85-
# class PostForm(forms.ModelForm):
86-
# # photo = ImageField(label='')
85+
class PostForm(forms.ModelForm):
86+
photo = ImageField()
8787

88-
# class Meta:
89-
# model = Post
90-
# fields = ('photo', 'title', 'url', 'description', 'technologies',)
88+
class Meta:
89+
model = Post
90+
fields = ('photo', 'title', 'url', 'description', 'technologies',)

‎app/migrations/0001_initial.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# Generated by Django 3.2 on 2022-06-12 14:11
1+
# Generated by Django 3.2 on 2022-06-13 20:33
22

33
import cloudinary.models
44
from django.conf import settings
55
from django.db import migrations, models
66
import django.db.models.deletion
7+
import pyuploadcare.dj.models
78

89

910
class Migration(migrations.Migration):
@@ -23,7 +24,7 @@ class Migration(migrations.Migration):
2324
('url', models.URLField(max_length=255)),
2425
('description', models.TextField(max_length=255)),
2526
('technologies', models.CharField(blank=True, max_length=255)),
26-
('image', cloudinary.models.CloudinaryField(max_length=255, verbose_name='image')),
27+
('photo', pyuploadcare.dj.models.ImageField(default='default.png')),
2728
('date', models.DateField(auto_now_add=True)),
2829
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='posts', to=settings.AUTH_USER_MODEL)),
2930
],
@@ -46,7 +47,7 @@ class Migration(migrations.Migration):
4647
name='Profile',
4748
fields=[
4849
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
49-
('profile_photo', cloudinary.models.CloudinaryField(max_length=255, verbose_name='image')),
50+
('profile_photo', cloudinary.models.CloudinaryField(default='default.png', max_length=255, verbose_name='image')),
5051
('bio', models.TextField(blank=True, max_length=500)),
5152
('name', models.CharField(blank=True, max_length=255)),
5253
('location', models.CharField(blank=True, max_length=255)),

‎app/migrations/0002_alter_profile_profile_photo.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎app/migrations/0003_alter_profile_profile_photo.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎app/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from django.db import models
55
from cloudinary.models import CloudinaryField
66
from django.contrib.auth.models import User
7-
from django.core.validators import MaxValueValidator, MinValueValidator
7+
from pyuploadcare.dj.models import ImageField
88

99

1010
# Create your models here.
@@ -25,7 +25,7 @@ class Post(models.Model):
2525
url = models.URLField(max_length=255)
2626
description = models.TextField(max_length=255)
2727
technologies = models.CharField(max_length=255, blank=True)
28-
image = CloudinaryField('image')
28+
photo = ImageField(manual_crop='1280x720', default='default.png')
2929
user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="posts")
3030
date = models.DateField(auto_now_add=True, blank=True)
3131

‎app/templates/awards.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h1 class="postcard__title green"><a href="#">Podcast Title</a></h1>
6969
</ul>
7070
</div>
7171
</article>
72-
<article class="postcard dark yellow">
72+
{% comment %} <article class="postcard dark yellow">
7373
<a class="postcard__img_link" href="#">
7474
<img class="postcard__img" src="https://picsum.photos/501/501" alt="Image Title" />
7575
</a>
@@ -90,6 +90,6 @@ <h1 class="postcard__title yellow"><a href="#">Podcast Title</a></h1>
9090
</li>
9191
</ul>
9292
</div>
93-
</article>
93+
</article> {% endcomment %}
9494
</div>
9595
</section>

‎app/templates/users/base.html

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{% load bootstrap5 %}
2+
<!DOCTYPE html>
3+
<html>
4+
5+
<head>
6+
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
{% if title %}
9+
<title>GAwards{{title}}</title>
10+
{% else %}
11+
<title>GAwards{{title}}</title>
12+
{% endif %}
13+
<meta name="description" content="">
14+
<meta name="viewport" content="width=device-width, initial-scale=1">
15+
{% block styles %}
16+
{% bootstrap_css %}
17+
<script src="https://kit.fontawesome.com/08b4d018b1.js" crossorigin="anonymous"></script>
18+
<!-- CSS only -->
19+
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.10/css/mdb.min.css" rel="stylesheet">
21+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
22+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.3/font/bootstrap-icons.css">
23+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
24+
<link href="https://fonts.googleapis.com/css?family=Droid+Sans:400,700" rel="stylesheet">
25+
{% endblock %}
26+
</head>
27+
28+
<body>
29+
30+
31+
{% block content %} {%endblock%}
32+
33+
{% block scripts %}
34+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"
35+
integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ=="
36+
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
37+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
38+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.4/umd/popper.min.js"></script>
39+
<script type="text/javascript"
40+
src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.3.1/js/bootstrap.min.js"></script>
41+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.8.10/js/mdb.min.js"></script>
42+
<script src="https://assets.awwwards.com/dist/js/vendor.13df77655f5689a9b532.js" defer></script>
43+
<script src="https://assets.awwwards.com/dist/js/home.2734a967c43d3d4952c9.js" defer></script>
44+
<!-- JavaScript Bundle with Popper -->
45+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-pprn3073KE6tl6bjs2QrFaJGz5/SUsLqktiwsUTF55Jfv3qYSDhgCecCxMW52nD2" crossorigin="anonymous"></script>
46+
{% bootstrap_javascript %}
47+
{% endblock %}
48+
49+
50+
</body>
51+
52+
</html>

‎app/templates/users/navbar.html

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎app/templates/users/profile.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% extends "base.html" %}
1+
{% extends "users/base.html" %}
22
{% load crispy_forms_tags %}
33
{% block content %}
4-
<div class="container">
5-
<div class="content-section">
4+
<div class="container">
5+
<div style="margin-top:40px;" class="content-section">
66
<div class="media">
77
<img class="rounded-circle account-img" src="{{ user.profile_photo.image.url }}">
88
<div class="media-body">

‎app/templates/users/user-profile.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{% extends "users/base.html" %}
12
{% load static %}
23
{% block content %}
34

@@ -9,7 +10,7 @@
910
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.3/font/bootstrap-icons.css">
1011
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
1112
<link href="https://fonts.googleapis.com/css?family=Droid+Sans:400,700" rel="stylesheet">
12-
<link rel="stylesheet" type="text/css" href=" {% static 'css/baseapp.css' %} ">
13+
{% comment %} <link rel="stylesheet" type="text/css" href=" {% static 'css/baseapp.css' %} "> {% endcomment %}
1314
{% endblock %}
1415

1516

0 commit comments

Comments
 (0)
0