diff --git a/bibrecognition/bibrecognition/__pycache__/settings.cpython-37.pyc b/bibrecognition/bibrecognition/__pycache__/settings.cpython-37.pyc index dea166f..34000a4 100644 Binary files a/bibrecognition/bibrecognition/__pycache__/settings.cpython-37.pyc and b/bibrecognition/bibrecognition/__pycache__/settings.cpython-37.pyc differ diff --git a/bibrecognition/bibrecognition/__pycache__/urls.cpython-37.pyc b/bibrecognition/bibrecognition/__pycache__/urls.cpython-37.pyc index f5d066f..c8066f9 100644 Binary files a/bibrecognition/bibrecognition/__pycache__/urls.cpython-37.pyc and b/bibrecognition/bibrecognition/__pycache__/urls.cpython-37.pyc differ diff --git a/bibrecognition/bibrecognition/settings.py b/bibrecognition/bibrecognition/settings.py index ea1cb18..2450ade 100644 --- a/bibrecognition/bibrecognition/settings.py +++ b/bibrecognition/bibrecognition/settings.py @@ -37,6 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'imguploader.apps.ImguploaderConfig', ] MIDDLEWARE = [ @@ -103,9 +104,9 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/3.0/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'pl' -TIME_ZONE = 'UTC' +TIME_ZONE = 'CET' USE_I18N = True diff --git a/bibrecognition/bibrecognition/urls.py b/bibrecognition/bibrecognition/urls.py index 28f8aed..32f5cb5 100644 --- a/bibrecognition/bibrecognition/urls.py +++ b/bibrecognition/bibrecognition/urls.py @@ -14,8 +14,9 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import include, path urlpatterns = [ + path('', include('imguploader.urls')), path('admin/', admin.site.urls), ] diff --git a/bibrecognition/db.sqlite3 b/bibrecognition/db.sqlite3 index e69de29..cf7bce3 100644 Binary files a/bibrecognition/db.sqlite3 and b/bibrecognition/db.sqlite3 differ diff --git a/bibrecognition/imguploader/__init__.py b/bibrecognition/imguploader/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bibrecognition/imguploader/__pycache__/__init__.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..30327b7 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/__init__.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/admin.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/admin.cpython-37.pyc new file mode 100644 index 0000000..8beaf67 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/admin.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/apps.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/apps.cpython-37.pyc new file mode 100644 index 0000000..5e98db3 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/apps.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/models.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/models.cpython-37.pyc new file mode 100644 index 0000000..5bab716 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/models.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/urls.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/urls.cpython-37.pyc new file mode 100644 index 0000000..02829f5 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/urls.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/__pycache__/views.cpython-37.pyc b/bibrecognition/imguploader/__pycache__/views.cpython-37.pyc new file mode 100644 index 0000000..534a4c8 Binary files /dev/null and b/bibrecognition/imguploader/__pycache__/views.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/admin.py b/bibrecognition/imguploader/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/bibrecognition/imguploader/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/bibrecognition/imguploader/apps.py b/bibrecognition/imguploader/apps.py new file mode 100644 index 0000000..338bbf4 --- /dev/null +++ b/bibrecognition/imguploader/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ImguploaderConfig(AppConfig): + name = 'imguploader' diff --git a/bibrecognition/imguploader/migrations/0001_initial.py b/bibrecognition/imguploader/migrations/0001_initial.py new file mode 100644 index 0000000..3654642 --- /dev/null +++ b/bibrecognition/imguploader/migrations/0001_initial.py @@ -0,0 +1,40 @@ +# Generated by Django 3.0.2 on 2020-02-02 02:41 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Competitions', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('comp_slug', models.CharField(max_length=100)), + ('comp_name', models.CharField(max_length=100)), + ], + ), + migrations.CreateModel( + name='Photo', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('url', models.CharField(max_length=50)), + ('comp_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='imguploader.Competitions')), + ], + ), + migrations.CreateModel( + name='PhotoMeta', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('meta_key', models.CharField(max_length=50)), + ('meta_value', models.CharField(max_length=50)), + ('photo_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='imguploader.Photo')), + ], + ), + ] diff --git a/bibrecognition/imguploader/migrations/__init__.py b/bibrecognition/imguploader/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bibrecognition/imguploader/migrations/__pycache__/0001_initial.cpython-37.pyc b/bibrecognition/imguploader/migrations/__pycache__/0001_initial.cpython-37.pyc new file mode 100644 index 0000000..f40c979 Binary files /dev/null and b/bibrecognition/imguploader/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/migrations/__pycache__/__init__.cpython-37.pyc b/bibrecognition/imguploader/migrations/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..1c54d43 Binary files /dev/null and b/bibrecognition/imguploader/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/bibrecognition/imguploader/models.py b/bibrecognition/imguploader/models.py new file mode 100644 index 0000000..c4b89a5 --- /dev/null +++ b/bibrecognition/imguploader/models.py @@ -0,0 +1,15 @@ +from django.db import models + +# Create your models here. +class Competitions(models.Model): + comp_slug = models.CharField(max_length=100) + comp_name = models.CharField(max_length=100) + +class Photo(models.Model): + comp_id = models.ForeignKey(Competitions, on_delete=models.CASCADE) + url = models.CharField(max_length=50) + +class PhotoMeta(models.Model): + photo_id = models.ForeignKey(Photo, on_delete=models.CASCADE) + meta_key = models.CharField(max_length=50) + meta_value = models.CharField(max_length=50) diff --git a/bibrecognition/imguploader/tests.py b/bibrecognition/imguploader/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/bibrecognition/imguploader/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/bibrecognition/imguploader/urls.py b/bibrecognition/imguploader/urls.py new file mode 100644 index 0000000..192d770 --- /dev/null +++ b/bibrecognition/imguploader/urls.py @@ -0,0 +1,7 @@ +from django.urls import path + +from . import views + +urlpatterns = [ + path('', views.index, name="index"), +] \ No newline at end of file diff --git a/bibrecognition/imguploader/views.py b/bibrecognition/imguploader/views.py new file mode 100644 index 0000000..aafab64 --- /dev/null +++ b/bibrecognition/imguploader/views.py @@ -0,0 +1,7 @@ +from django.shortcuts import render +from django.http import HttpResponse + + +# Create your views here. +def index(request): + return HttpResponse("Hello, world. This is imageUploader")