heroku
This commit is contained in:
parent
90e9a158cd
commit
596d9e0358
66
ih/files.py
66
ih/files.py
|
|
@ -1,33 +1,33 @@
|
|||
import os
|
||||
|
||||
|
||||
# Return file string and filename
|
||||
def get_file_from_request(request, fieldname):
|
||||
file_l = ''
|
||||
for i in request.FILES[fieldname]:
|
||||
file_l = file_l + i
|
||||
|
||||
return file_l, str(request.FILES[fieldname])
|
||||
|
||||
|
||||
# Write file to /dev/shm and return ar handler
|
||||
def write_to_shm(file, name):
|
||||
f = open('/dev/shm/' + name, 'w')
|
||||
f.write(file)
|
||||
f.close()
|
||||
|
||||
return '/dev/shm/' + name
|
||||
|
||||
|
||||
# Remove file from /dev/shm
|
||||
def rm_from_shm(name):
|
||||
try:
|
||||
os.remove('/dev/shm/' + name)
|
||||
return True
|
||||
except Exception as e:
|
||||
return str(e)
|
||||
|
||||
|
||||
# Split filename
|
||||
def split_file(filename):
|
||||
pass
|
||||
import os
|
||||
|
||||
|
||||
# Return file string and filename
|
||||
def get_file_from_request(request, fieldname):
|
||||
file_l = ''
|
||||
for i in request.FILES[fieldname]:
|
||||
file_l = file_l + i
|
||||
|
||||
return file_l, str(request.FILES[fieldname])
|
||||
|
||||
|
||||
# Write file to /dev/shm and return ar handler
|
||||
def write_to_shm(file, name):
|
||||
f = open('/dev/shm/' + name, 'w')
|
||||
f.write(file)
|
||||
f.close()
|
||||
|
||||
return '/dev/shm/' + name
|
||||
|
||||
|
||||
# Remove file from /dev/shm
|
||||
def rm_from_shm(name):
|
||||
try:
|
||||
os.remove('/dev/shm/' + name)
|
||||
return True
|
||||
except Exception as e:
|
||||
return str(e)
|
||||
|
||||
|
||||
# Split filename
|
||||
def split_file(filename):
|
||||
pass
|
||||
|
|
|
|||
24
ih/images.py
24
ih/images.py
|
|
@ -1,12 +1,12 @@
|
|||
from PIL import Image
|
||||
|
||||
def resize_image(fh, img_prop):
|
||||
im = Image.open(fh)
|
||||
# size = 100, 100
|
||||
im.thumbnail(img_prop['size'])
|
||||
print(img_prop['size'])
|
||||
# im.thumbnail(size)
|
||||
thumb_name = img_prop['dest'] + '/thumb_' + img_prop['name']
|
||||
im.save(thumb_name)
|
||||
|
||||
return thumb_name
|
||||
from PIL import Image
|
||||
|
||||
def resize_image(fh, img_prop):
|
||||
im = Image.open(fh)
|
||||
# size = 100, 100
|
||||
im.thumbnail(img_prop['size'])
|
||||
#print(img_prop['size'])
|
||||
# im.thumbnail(size)
|
||||
thumb_name = img_prop['dest'] + '/thumb_' + img_prop['name']
|
||||
im.save(thumb_name)
|
||||
|
||||
return thumb_name
|
||||
|
|
|
|||
|
|
@ -1,139 +1,150 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
Django settings for mysite project.
|
||||
|
||||
Generated by 'django-admin startproject' using Django 1.9.7.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/1.9/topics/settings/
|
||||
|
||||
For the full list of settings and their values, see
|
||||
https://docs.djangoproject.com/en/1.9/ref/settings/
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = '1a+3jmf#g!q_gj66$^v9_&8uoev=%k49=j(%lp%!kvv$6x3bn^'
|
||||
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = []
|
||||
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'imagehosting',
|
||||
'taggit'
|
||||
]
|
||||
|
||||
MIDDLEWARE_CLASSES = [
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'imagehosting.urls'
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [],
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'context_processors': [
|
||||
'django.template.context_processors.debug',
|
||||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'imagehost.wsgi.application'
|
||||
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': os.path.join(BASE_DIR, '../db.sqlite3'),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.9/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = 'ru-RU'
|
||||
USE_I18N = True
|
||||
|
||||
TIME_ZONE = 'Europe/Moscow'
|
||||
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
USE_L10N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.9/howto/static-files/
|
||||
|
||||
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
|
||||
|
||||
ADMIN_TOOLS_MENU = 'myproject.menu.CustomMenu'
|
||||
ADMIN_TOOLS_INDEX_DASHBOARD = 'myproject.dashboard.CustomIndexDashboard'
|
||||
ADMIN_TOOLS_APP_INDEX_DASHBOARD = 'myproject.dashboard.CustomAppIndexDashboard'
|
||||
|
||||
MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
|
||||
MEDIA_URL = '/media/'
|
||||
|
||||
LOGIN_REDIRECT_URL = '/'
|
||||
LOGOUT_REDIRECT_URL = '/'
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
Django settings for mysite project.
|
||||
|
||||
Generated by 'django-admin startproject' using Django 1.9.7.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/1.9/topics/settings/
|
||||
|
||||
For the full list of settings and their values, see
|
||||
https://docs.djangoproject.com/en/1.9/ref/settings/
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = '1a+3jmf#g!q_gj66$^v9_&8uoev=%k49=j(%lp%!kvv$6x3bn^'
|
||||
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = ["imgcollection.herokuapp.com",]
|
||||
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'imagehosting',
|
||||
#'taggit'
|
||||
]
|
||||
|
||||
MIDDLEWARE_CLASSES = [
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'imagehosting.urls'
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [],
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'context_processors': [
|
||||
'django.template.context_processors.debug',
|
||||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'imagehost.wsgi.application'
|
||||
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
||||
'''
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
'NAME': os.path.join(BASE_DIR, '../db.sqlite3'),
|
||||
}
|
||||
}
|
||||
'''
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'ddg4djbee66kal',
|
||||
'USER': 'jrowflkieuofex',
|
||||
'PASSWORD': 'ec999abac6adefb9876d38458e3aad38c009ebeb78be01783c5a48268e10f04a',
|
||||
'HOST': 'ec2-54-247-82-87.eu-west-1.compute.amazonaws.com',
|
||||
'PORT': '5432',
|
||||
}
|
||||
}
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.9/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = 'ru-RU'
|
||||
USE_I18N = True
|
||||
|
||||
TIME_ZONE = 'Europe/Moscow'
|
||||
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
USE_L10N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.9/howto/static-files/
|
||||
|
||||
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
|
||||
|
||||
ADMIN_TOOLS_MENU = 'myproject.menu.CustomMenu'
|
||||
ADMIN_TOOLS_INDEX_DASHBOARD = 'myproject.dashboard.CustomIndexDashboard'
|
||||
ADMIN_TOOLS_APP_INDEX_DASHBOARD = 'myproject.dashboard.CustomAppIndexDashboard'
|
||||
|
||||
MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
|
||||
MEDIA_URL = '/media/'
|
||||
|
||||
LOGIN_REDIRECT_URL = '/'
|
||||
LOGOUT_REDIRECT_URL = '/'
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
"""mysite URL Configuration
|
||||
|
||||
The `urlpatterns` list routes URLs to views. For more information please see:
|
||||
https://docs.djangoproject.com/en/1.9/topics/http/urls/
|
||||
Examples:
|
||||
Function views
|
||||
1. Add an import: from my_app import views
|
||||
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
|
||||
Class-based views
|
||||
1. Add an import: from other_app.views import Home
|
||||
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
|
||||
Including another URLconf
|
||||
1. Import the include() function: from django.conf.urls import url, include
|
||||
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
|
||||
"""
|
||||
from django.conf.urls import url, include, patterns
|
||||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.views.generic.base import TemplateView
|
||||
urlpatterns = patterns('',
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^$', TemplateView.as_view(template_name='main.html')),
|
||||
url(r'^blog/', include('blog.urls')),
|
||||
url(r'^polls/', include('polls.urls', namespace="polls")),
|
||||
url(r'^imagehost/', include('imagehost.urls')),
|
||||
url(r'^pfm/', include('pfm.urls')),
|
||||
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
"""mysite URL Configuration
|
||||
|
||||
The `urlpatterns` list routes URLs to views. For more information please see:
|
||||
https://docs.djangoproject.com/en/1.9/topics/http/urls/
|
||||
Examples:
|
||||
Function views
|
||||
1. Add an import: from my_app import views
|
||||
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
|
||||
Class-based views
|
||||
1. Add an import: from other_app.views import Home
|
||||
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
|
||||
Including another URLconf
|
||||
1. Import the include() function: from django.conf.urls import url, include
|
||||
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
|
||||
"""
|
||||
from django.conf.urls import url, include
|
||||
from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.views.generic.base import TemplateView
|
||||
urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^$', TemplateView.as_view(template_name='main.html')),
|
||||
url(r'^blog/', include('blog.urls')),
|
||||
url(r'^polls/', include('polls.urls', namespace="polls")),
|
||||
url(r'^imagehost/', include('imagehost.urls')),
|
||||
url(r'^pfm/', include('pfm.urls')),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
WSGI config for mysite project.
|
||||
|
||||
It exposes the WSGI callable as a module-level variable named ``application``.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from django.core.wsgi import get_wsgi_application
|
||||
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "imagehost.settings")
|
||||
|
||||
application = get_wsgi_application()
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
WSGI config for mysite project.
|
||||
|
||||
It exposes the WSGI callable as a module-level variable named ``application``.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from django.core.wsgi import get_wsgi_application
|
||||
|
||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "imagehost.settings")
|
||||
|
||||
application = get_wsgi_application()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from .models import Post
|
||||
|
||||
admin.site.register(Post)
|
||||
|
||||
# Register your models here.
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Post
|
||||
|
||||
admin.site.register(Post)
|
||||
|
||||
# Register your models here.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from __future__ import unicode_literals
|
||||
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ImagehostConfig(AppConfig):
|
||||
name = 'imagehost'
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class ImagehostConfig(AppConfig):
|
||||
name = 'imagehost'
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django import forms
|
||||
from .models import Post
|
||||
|
||||
|
||||
class PostForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Post
|
||||
fields = ('name', 'file')
|
||||
|
||||
|
||||
class DeleteForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Post
|
||||
fields = []
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django import forms
|
||||
from .models import Post
|
||||
|
||||
|
||||
class PostForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Post
|
||||
fields = ('name', 'file')
|
||||
|
||||
|
||||
class DeleteForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = Post
|
||||
fields = []
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
from django.db import models
|
||||
from django.utils import timezone
|
||||
import os
|
||||
|
||||
|
||||
class Post(models.Model):
|
||||
name = models.CharField(max_length=30, blank=True)
|
||||
file = models.FileField(upload_to='images')
|
||||
thumb_name = property(thumb_name)
|
||||
orig_name = property(orig_name)
|
||||
|
||||
def publish(self):
|
||||
self.published_date = timezone.now()
|
||||
self.save()
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
def thumb_name(self):
|
||||
x = os.path.split(self.file.name)[-1]
|
||||
return '/thumb_' + x
|
||||
|
||||
def orig_name(self):
|
||||
x = os.path.split(self.file.name)[-1]
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import unicode_literals
|
||||
from django.db import models
|
||||
from django.utils import timezone
|
||||
import os
|
||||
|
||||
|
||||
class Post(models.Model):
|
||||
name = models.CharField(max_length=30, blank=True)
|
||||
file = models.FileField(upload_to='images')
|
||||
thumb_name = property(thumb_name)
|
||||
orig_name = property(orig_name)
|
||||
|
||||
def publish(self):
|
||||
self.published_date = timezone.now()
|
||||
self.save()
|
||||
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
def thumb_name(self):
|
||||
x = os.path.split(self.file.name)[-1]
|
||||
return '/thumb_' + x
|
||||
|
||||
def orig_name(self):
|
||||
x = os.path.split(self.file.name)[-1]
|
||||
return x
|
||||
|
|
@ -1,35 +1,35 @@
|
|||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% load static %}
|
||||
|
||||
{% block content%}
|
||||
<div class="images">
|
||||
{% for image in all %}<a href="{% url 'image_detail' pk=image.pk %}" ><img src= "/media/images{{image.thumb_name }}"></a>{% endfor %}
|
||||
</div>
|
||||
|
||||
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
|
||||
<script>
|
||||
$(function() {resizer(); })
|
||||
$(window).resize(function() { resizer(); })
|
||||
|
||||
function resizer() {
|
||||
var imgs = $('img');
|
||||
var row_width = $(window).width() - 50;
|
||||
var prev = [];
|
||||
var total_w = 0;
|
||||
imgs.each(function (i, e) {
|
||||
$(this).height(200);
|
||||
prev[prev.length] = $(e);
|
||||
total_w += $(e).width();
|
||||
if (total_w > row_width) {
|
||||
prev = $(prev);
|
||||
prev.each(function (indx, element) {$(element).height(row_width*200/total_w)});
|
||||
prev = [];
|
||||
total_w = 0;
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
{% endblock content %}
|
||||
|
||||
|
||||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% load static %}
|
||||
|
||||
{% block content%}
|
||||
<div class="images">
|
||||
{% for image in all %}<a href="{% url 'image_detail' pk=image.pk %}" ><img src= "/media/images{{image.thumb_name }}"></a>{% endfor %}
|
||||
</div>
|
||||
|
||||
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
|
||||
<script>
|
||||
$(function() {resizer(); })
|
||||
$(window).resize(function() { resizer(); })
|
||||
|
||||
function resizer() {
|
||||
var imgs = $('img');
|
||||
var row_width = $(window).width() - 50;
|
||||
var prev = [];
|
||||
var total_w = 0;
|
||||
imgs.each(function (i, e) {
|
||||
$(this).height(200);
|
||||
prev[prev.length] = $(e);
|
||||
total_w += $(e).width();
|
||||
if (total_w > row_width) {
|
||||
prev = $(prev);
|
||||
prev.each(function (indx, element) {$(element).height(row_width*200/total_w)});
|
||||
prev = [];
|
||||
total_w = 0;
|
||||
}
|
||||
})
|
||||
}
|
||||
</script>
|
||||
{% endblock content %}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,114 +1,114 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:600" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css">
|
||||
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.images {
|
||||
margin-top: 10px;
|
||||
margin-left: 25px;
|
||||
}
|
||||
|
||||
.header {
|
||||
dispaly: block;
|
||||
color: black;
|
||||
background: linear-gradient(#f3f3f3, #e0e0e0);
|
||||
padding: 10px 25px;
|
||||
font-size: 30px
|
||||
}
|
||||
|
||||
ul.menu-icon {
|
||||
display: none;
|
||||
float: right;
|
||||
color: black;
|
||||
padding: 7px 0 20px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.logo {
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
color: #696969;
|
||||
width: 50px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
li {
|
||||
list-style-type: none
|
||||
}
|
||||
|
||||
.menu {
|
||||
position: absolute;
|
||||
font-size: 20px;
|
||||
right: 10px;
|
||||
top: 60px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.menu a {
|
||||
text-align: right;
|
||||
display: inline-block;
|
||||
padding: 10px;
|
||||
background: #e0e0e0;
|
||||
width: 90%;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.menu a:hover {
|
||||
color:#181D2B;
|
||||
}
|
||||
|
||||
i {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.right-menu {
|
||||
float: right;
|
||||
padding: 12px;
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
font-size: 20px;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
a.right-menu {
|
||||
text-decoration: none;
|
||||
color: #4368AD;
|
||||
padding: 9px;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 450px) {
|
||||
|
||||
ul.menu-icon {display: block}
|
||||
a.right-menu {display: none}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class='header'> <a href="{% url 'all_posts' %}" class='logo'>LOGO </a>
|
||||
<a href="{% url 'image_new' %}" class='right-menu'>new image</a>
|
||||
<a href="{% url 'all_posts' %}" class='right-menu'>all images</a>
|
||||
<ul class='menu-icon'>
|
||||
<li><i class="fa fa-bars"></i></li>
|
||||
<ul class="menu">
|
||||
<li class="long"><a href="{% url 'image_new' %}">new image</a></li>
|
||||
<li class="long"><a href="{% url 'all_posts' %}">all images</a></li>
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
{% block content %}
|
||||
{% endblock%}
|
||||
</body>
|
||||
<script>
|
||||
$('.menu-icon').click(function() {if ($('.menu').css('display') == 'block') {
|
||||
$('.menu').css('display', 'none') } else {
|
||||
$('.menu').css('display', 'block')
|
||||
}})
|
||||
</script>
|
||||
</html>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css?family=Josefin+Sans:600" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css">
|
||||
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
|
||||
<style>
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.images {
|
||||
margin-top: 10px;
|
||||
margin-left: 25px;
|
||||
}
|
||||
|
||||
.header {
|
||||
dispaly: block;
|
||||
color: black;
|
||||
background: linear-gradient(#f3f3f3, #e0e0e0);
|
||||
padding: 10px 25px;
|
||||
font-size: 30px
|
||||
}
|
||||
|
||||
ul.menu-icon {
|
||||
display: none;
|
||||
float: right;
|
||||
color: black;
|
||||
padding: 7px 0 20px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.logo {
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
color: #696969;
|
||||
width: 50px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
li {
|
||||
list-style-type: none
|
||||
}
|
||||
|
||||
.menu {
|
||||
position: absolute;
|
||||
font-size: 20px;
|
||||
right: 10px;
|
||||
top: 60px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.menu a {
|
||||
text-align: right;
|
||||
display: inline-block;
|
||||
padding: 10px;
|
||||
background: #e0e0e0;
|
||||
width: 90%;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.menu a:hover {
|
||||
color:#181D2B;
|
||||
}
|
||||
|
||||
i {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.right-menu {
|
||||
float: right;
|
||||
padding: 12px;
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
font-size: 20px;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
a.right-menu {
|
||||
text-decoration: none;
|
||||
color: #4368AD;
|
||||
padding: 9px;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 450px) {
|
||||
|
||||
ul.menu-icon {display: block}
|
||||
a.right-menu {display: none}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class='header'> <a href="{% url 'all_posts' %}" class='logo'>LOGO </a>
|
||||
<a href="{% url 'image_new' %}" class='right-menu'>new image</a>
|
||||
<a href="{% url 'all_posts' %}" class='right-menu'>all images</a>
|
||||
<ul class='menu-icon'>
|
||||
<li><i class="fa fa-bars"></i></li>
|
||||
<ul class="menu">
|
||||
<li class="long"><a href="{% url 'image_new' %}">new image</a></li>
|
||||
<li class="long"><a href="{% url 'all_posts' %}">all images</a></li>
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
{% block content %}
|
||||
{% endblock%}
|
||||
</body>
|
||||
<script>
|
||||
$('.menu-icon').click(function() {if ($('.menu').css('display') == 'block') {
|
||||
$('.menu').css('display', 'none') } else {
|
||||
$('.menu').css('display', 'block')
|
||||
}})
|
||||
</script>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="block" style="position: relative; width: 400px; width: padding: 50px; border: 1px solid #e0e0e0; margin: 100px auto;">
|
||||
<a href="/media/{{post.file}}"><img src="/media/images{{ post.thumb_name }}" style="margin: auto; display: block; padding: 10px"></a>
|
||||
<div style="margin: auto; display: block; padding: 10px 0 20px; width: 140px; text-align: center;">
|
||||
{% if user.is_authenticated %}
|
||||
<a href="{% url 'delete_post' pk=post.pk %}" onclick = "return confirm('Удалить?')" style="padding-right: 30px; color: #888787">удалить</a>
|
||||
{% endif %}
|
||||
<a href="/media/{{post.file}}" download style=" color: #888787; margin: auto; text-align: right"> {{ post.name }} скачать</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="block" style="position: relative; width: 400px; width: padding: 50px; border: 1px solid #e0e0e0; margin: 100px auto;">
|
||||
<a href="/media/{{post.file}}"><img src="/media/images{{ post.thumb_name }}" style="margin: auto; display: block; padding: 10px"></a>
|
||||
<div style="margin: auto; display: block; padding: 10px 0 20px; width: 140px; text-align: center;">
|
||||
{% if user.is_authenticated %}
|
||||
<a href="{% url 'delete_post' pk=post.pk %}" onclick = "return confirm('Удалить?')" style="padding-right: 30px; color: #888787">удалить</a>
|
||||
{% endif %}
|
||||
<a href="/media/{{post.file}}" download style=" color: #888787; margin: auto; text-align: right"> {{ post.name }} скачать</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="block" style="width: 500px; padding: 50px; margin: 100px auto; border: 1px solid #e0e0e0">
|
||||
<form method="POST" class="post-form" enctype="multipart/form-data" action="" >{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" value="send" class="save btn btn-default"></button>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="block" style="width: 500px; padding: 50px; margin: 100px auto; border: 1px solid #e0e0e0">
|
||||
<form method="POST" class="post-form" enctype="multipart/form-data" action="" >{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" value="send" class="save btn btn-default"></button>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<form method="post" action="{% url 'login' %}" class="w3-container" style="padding: 20px">
|
||||
<table>
|
||||
{% csrf_token %}
|
||||
{{form.as_table}}
|
||||
<tr><td></td><td><input id="login" type="submit" class="w3-btn w3-right"value="login" /></td></tr>
|
||||
</table>
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
</form>
|
||||
{% extends 'imagehosting/base.html' %}
|
||||
|
||||
{% block content %}
|
||||
<form method="post" action="{% url 'login' %}" class="w3-container" style="padding: 20px">
|
||||
<table>
|
||||
{% csrf_token %}
|
||||
{{form.as_table}}
|
||||
<tr><td></td><td><input id="login" type="submit" class="w3-btn w3-right"value="login" /></td></tr>
|
||||
</table>
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.conf.urls import url
|
||||
from . import views
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.views import login, logout
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.image_new, name='image_new'),
|
||||
url(r'^post/(?P<pk>[0-9]+)/$', views.image_detail, name='image_detail'),
|
||||
url(r'^all/$', views.all_posts, name='all_posts'),
|
||||
url(r'^delete/(?P<pk>[0-9]+)/$', views.delete_post, name='delete_post'),
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^login$', login, {'template_name':'imagehosting/login.html'}, name='login'),
|
||||
url(r'^logout/$', logout)
|
||||
]
|
||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
urlpatterns += staticfiles_urlpatterns()
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.conf.urls import url
|
||||
from . import views
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.views import login, logout
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.image_new, name='image_new'),
|
||||
url(r'^post/(?P<pk>[0-9]+)/$', views.image_detail, name='image_detail'),
|
||||
url(r'^all/$', views.all_posts, name='all_posts'),
|
||||
url(r'^delete/(?P<pk>[0-9]+)/$', views.delete_post, name='delete_post'),
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^login$', login, {'template_name':'imagehosting/login.html'}, name='login'),
|
||||
url(r'^logout/$', logout)
|
||||
]
|
||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
urlpatterns += staticfiles_urlpatterns()
|
||||
|
|
|
|||
|
|
@ -1,59 +1,59 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.shortcuts import render, get_object_or_404, HttpResponseRedirect
|
||||
from .models import Post
|
||||
from .forms import PostForm, DeleteForm
|
||||
from django.shortcuts import redirect
|
||||
from ih import files, images
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from ih import images
|
||||
from django.views.decorators.csrf import requires_csrf_token
|
||||
|
||||
|
||||
def create_thumb_from_file(filename):
|
||||
orig_file = 'imagehost/media/images/' + filename
|
||||
# Create thumbnail
|
||||
thumb_name = images.resize_image(orig_file, {
|
||||
'name': filename,
|
||||
'size': [300, 300],
|
||||
'dest': 'imagehost/media/images'
|
||||
}
|
||||
)
|
||||
return thumb_name
|
||||
|
||||
|
||||
@login_required(login_url="/login")
|
||||
def image_new(request):
|
||||
if request.method == "POST":
|
||||
form = PostForm(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
post = form.save(commit=False)
|
||||
post.save()
|
||||
create_thumb_from_file(post.orig_name)
|
||||
return redirect('imagehosting.views.image_detail', pk=post.id)
|
||||
else:
|
||||
form = PostForm()
|
||||
return render(request, 'imagehosting/index.html', {'form': form})
|
||||
|
||||
|
||||
def image_detail(request, pk):
|
||||
post = get_object_or_404(Post, pk=pk)
|
||||
return render(request, 'imagehosting/image.html', {'post': post})
|
||||
|
||||
|
||||
def all_posts(request):
|
||||
all = Post.objects.order_by('-pk')
|
||||
return render(request, 'imagehosting/all.html', {'all': all})
|
||||
|
||||
|
||||
@login_required(login_url="/login")
|
||||
def delete_post(request, pk):
|
||||
post_to_delete = get_object_or_404(Post, pk=pk)
|
||||
if request.method == 'GET':
|
||||
form = DeleteForm(request.POST, instance=post_to_delete)
|
||||
if form.is_valid(): # checks CSRF
|
||||
if not request.user.is_authenticated():
|
||||
return HttpResponseRedirect('/admin')
|
||||
post_to_delete.delete()
|
||||
return redirect('imagehosting.views.all_posts')
|
||||
return render(request, 'imagehosting/delete.html', {'form': form})
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.shortcuts import render, get_object_or_404, HttpResponseRedirect
|
||||
from .models import Post
|
||||
from .forms import PostForm, DeleteForm
|
||||
from django.shortcuts import redirect
|
||||
from ih import files, images
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from ih import images
|
||||
from django.views.decorators.csrf import requires_csrf_token
|
||||
|
||||
|
||||
def create_thumb_from_file(filename):
|
||||
orig_file = 'imagehost/media/images/' + filename
|
||||
# Create thumbnail
|
||||
thumb_name = images.resize_image(orig_file, {
|
||||
'name': filename,
|
||||
'size': [300, 300],
|
||||
'dest': 'imagehost/media/images'
|
||||
}
|
||||
)
|
||||
return thumb_name
|
||||
|
||||
|
||||
@login_required(login_url="/login")
|
||||
def image_new(request):
|
||||
if request.method == "POST":
|
||||
form = PostForm(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
post = form.save(commit=False)
|
||||
post.save()
|
||||
create_thumb_from_file(post.orig_name)
|
||||
return redirect('imagehosting.views.image_detail', pk=post.id)
|
||||
else:
|
||||
form = PostForm()
|
||||
return render(request, 'imagehosting/index.html', {'form': form})
|
||||
|
||||
|
||||
def image_detail(request, pk):
|
||||
post = get_object_or_404(Post, pk=pk)
|
||||
return render(request, 'imagehosting/image.html', {'post': post})
|
||||
|
||||
|
||||
def all_posts(request):
|
||||
all_posts = Post.objects.order_by('-pk')
|
||||
return render(request, 'imagehosting/all.html', {'all': all_posts})
|
||||
|
||||
|
||||
@login_required(login_url="/login")
|
||||
def delete_post(request, pk):
|
||||
post_to_delete = get_object_or_404(Post, pk=pk)
|
||||
if request.method == 'GET':
|
||||
form = DeleteForm(request.POST, instance=post_to_delete)
|
||||
if form.is_valid(): # checks CSRF
|
||||
if not request.user.is_authenticated():
|
||||
return HttpResponseRedirect('/admin')
|
||||
post_to_delete.delete()
|
||||
return redirect('imagehosting.views.all_posts')
|
||||
return render(request, 'imagehosting/delete.html', {'form': form})
|
||||
|
|
|
|||
4
requirements.txt
Normal file
4
requirements.txt
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
|
||||
Django==1.11.1
|
||||
psycopg2
|
||||
gunicorn==19.6.0
|
||||
Loading…
Reference in New Issue
Block a user