Skip to content

Commit 8f087bc

Browse files
moeenzmoeenz
authored
Merge pull request #8 from Djacket/python-packages-update
Python packages update
2 parents f8c6de7 + 03fe19a commit 8f087bc

13 files changed

Lines changed: 122 additions & 13 deletions

File tree

‎core/backend/djacket/settings.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ def osenv(env_name):
4747
'django.contrib.messages',
4848
'django.contrib.staticfiles',
4949
'easy_pjax',
50-
'user',
51-
'repository',
52-
'filter'
50+
'user.apps.UserAppConfig',
51+
'repository.apps.RepositoryAppConfig',
52+
'filter.apps.FilterAppConfig'
5353
)
5454

5555
MIDDLEWARE_CLASSES = (
@@ -71,12 +71,14 @@ def osenv(env_name):
7171
'DIRS': [os.path.join(FRONTEND_DIR, 'public', 'build', 'views'),],
7272
'APP_DIRS': True,
7373
'OPTIONS': {
74+
'builtins': [
75+
'easy_pjax.templatetags.pjax_tags'
76+
],
7477
'context_processors': [
7578
'django.template.context_processors.debug',
7679
'django.template.context_processors.request',
7780
'django.contrib.auth.context_processors.auth',
7881
'django.contrib.messages.context_processors.messages',
79-
'django.core.context_processors.request',
8082
],
8183
},
8284
},

‎core/backend/djacket/urls.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.conf import settings
22
from django.contrib import admin
3+
from django.views.static import serve
34
from django.conf.urls import include, url
45

56
from user.views import user_deposit
@@ -9,7 +10,6 @@
910
# Djacket main urls will be addressed here.
1011

1112
urlpatterns = [
12-
#url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), # serve static medias on /media/*
1313
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # project docs view.
1414
url(r'^admin/', include(admin.site.urls)), # admin interface.
1515
url(r'^', include('repository.urls')), # import repository app urls with no prefix.
@@ -21,4 +21,4 @@
2121
# serve static medias on /media/* while DEBUG settings are on
2222
if settings.DEBUG:
2323
urlpatterns = urlpatterns + \
24-
[url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),]
24+
[url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),]

‎core/backend/filter/apps.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class FilterAppConfig(AppConfig):
5+
name = 'filter'
6+
verbose_name = 'Filter'

‎core/backend/filter/migrations/__init__.py‎

Whitespace-only changes.

‎core/backend/repository/admin.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from django.contrib import admin
22

3-
from repository.models import Repository, RepositoryStar, RepositoryFork
3+
from repository.models import Repository, RepositoryAccess, RepositoryStar, RepositoryFork
44

55

66
admin.site.register(Repository)
77
admin.site.register(RepositoryStar)
88
admin.site.register(RepositoryFork)
9+
admin.site.register(RepositoryAccess)

‎core/backend/repository/apps.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class RepositoryAppConfig(AppConfig):
5+
name = 'repository'
6+
verbose_name = 'Repository'

‎core/backend/repository/migrations/0001_initial.py‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-11 04:36
3+
from __future__ import unicode_literals
4+
5+
from django.conf import settings
6+
from django.db import migrations, models
7+
import django.db.models.deletion
8+
9+
10+
class Migration(migrations.Migration):
11+
12+
initial = True
13+
14+
dependencies = [
15+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16+
]
17+
18+
operations = [
19+
migrations.CreateModel(
20+
name='Repository',
21+
fields=[
22+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
23+
('name', models.CharField(max_length=64)),
24+
('description', models.CharField(max_length=256)),
25+
('creation_date', models.DateTimeField(auto_now=True)),
26+
('private', models.BooleanField(default=False)),
27+
('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
28+
],
29+
),
30+
migrations.CreateModel(
31+
name='RepositoryAccess',
32+
fields=[
33+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
34+
('repository', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='repository.Repository')),
35+
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
36+
],
37+
),
38+
migrations.CreateModel(
39+
name='RepositoryFork',
40+
fields=[
41+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
42+
('repository', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='repository.Repository')),
43+
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
44+
],
45+
),
46+
migrations.CreateModel(
47+
name='RepositoryStar',
48+
fields=[
49+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
50+
('repository', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='repository.Repository')),
51+
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
52+
],
53+
),
54+
]

‎core/backend/repository/migrations/__init__.py‎

Whitespace-only changes.

‎core/backend/user/apps.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class UserAppConfig(AppConfig):
5+
name = 'user'
6+
verbose_name = 'User'

‎core/backend/user/migrations/0001_initial.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.4 on 2017-08-11 04:36
3+
from __future__ import unicode_literals
4+
5+
import djacket.storage
6+
from django.conf import settings
7+
from django.db import migrations, models
8+
import django.db.models.deletion
9+
import user.models
10+
11+
12+
class Migration(migrations.Migration):
13+
14+
initial = True
15+
16+
dependencies = [
17+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
18+
]
19+
20+
operations = [
21+
migrations.CreateModel(
22+
name='UserProfile',
23+
fields=[
24+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
25+
('name', models.CharField(max_length=32)),
26+
('avatar', models.ImageField(storage=djacket.storage.OverwriteStorage(), upload_to=user.models.user_avatar_path)),
27+
('birthdate', models.DateTimeField(null=True)),
28+
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
29+
],
30+
),
31+
]

0 commit comments

Comments
 (0)