Skip to content

GitLab

allgo
allgo
Commit e076627c authored by BERJON Matthieu's avatar BERJON Matthieu
1 Browse files
Options

Reorganize the application tree 

In order to follow good practices for a Django app development I
reorganized the tree.
Signed-off-by: BERJON Matthieu's avatarMatthieu Berjon <matthieu.berjon@inria.fr>
parent 447562b2
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 165 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

django/allgo/__init__.py deleted 100644 → 0
View file @ 447562b2
# -*- coding: utf-8 -*-
""" Top-level package for Allgo. """
__version__ = '0.1.0'
django/poc/migrations/0001_initial.py → django/allgo/poc/migrations/0001_initial.py
View file @ e076627c
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-03-23 16:42
# Generated by Django 1.11 on 2018-03-27 13:29
from __future__ import unicode_literals
from django.conf import settings
......@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='allgouser', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'allgo_user',
'db_table': 'dj_users',
},
),
migrations.CreateModel(
......@@ -38,7 +38,7 @@ class Migration(migrations.Migration):
('docker_name', models.CharField(blank=True, max_length=255)),
],
options={
'db_table': 'docker_os',
'db_table': 'dj_docker_os',
},
),
migrations.CreateModel(
......@@ -54,10 +54,10 @@ class Migration(migrations.Migration):
('access_token', models.CharField(blank=True, max_length=255, null=True)),
('state', models.IntegerField()),
('result', models.IntegerField()),
('container_id', models.IntegerField(blank=True, null=True)),
('dj_container_id', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'jobs',
'db_table': 'dj_jobs',
},
),
migrations.CreateModel(
......@@ -71,7 +71,7 @@ class Migration(migrations.Migration):
('is_default', models.IntegerField()),
],
options={
'db_table': 'job_queues',
'db_table': 'dj_job_queues',
},
),
migrations.CreateModel(
......@@ -84,10 +84,10 @@ class Migration(migrations.Migration):
('job_file_content_type', models.CharField(blank=True, max_length=255)),
('job_file_file_size', models.IntegerField(blank=True, null=True)),
('job_file_updated_at', models.DateTimeField(auto_now_add=True, null=True)),
('job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobuploadjob', to='poc.Job')),
('dj_job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobuploadjob', to='poc.Job')),
],
options={
'db_table': 'job_uploads',
'db_table': 'dj_job_uploads',
},
),
migrations.CreateModel(
......@@ -97,10 +97,10 @@ class Migration(migrations.Migration):
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now_add=True)),
('quantity', models.BigIntegerField(blank=True, null=True)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quotauser', to=settings.AUTH_USER_MODEL)),
('dj_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quotauser', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'quotas',
'db_table': 'dj_quotas',
},
),
migrations.CreateModel(
......@@ -116,7 +116,6 @@ class Migration(migrations.Migration):
('logo_content_type', models.CharField(blank=True, max_length=255, null=True)),
('logo_file_size', models.IntegerField(blank=True, null=True)),
('logo_updated_at', models.DateTimeField(blank=True, null=True)),
('user_other', models.IntegerField(blank=True, null=True)),
('default_quota', models.IntegerField(blank=True, null=True)),
('docker_name', models.CharField(blank=True, max_length=255)),
('readme', models.IntegerField(blank=True, null=True)),
......@@ -126,12 +125,12 @@ class Migration(migrations.Migration):
('access_token', models.CharField(blank=True, max_length=255, null=True)),
('sandbox_state', models.IntegerField(null=True)),
('memory_limit', models.BigIntegerField(blank=True, null=True)),
('dj_job_queue', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='webappjobqueue', to='poc.JobQueue')),
('docker_os', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='webappdockeros', to='poc.DockerOs')),
('job_queue', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='webappjobqueue', to='poc.JobQueue')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='webappuser', to=settings.AUTH_USER_MODEL)),
],
options={
'db_table': 'webapps',
'db_table': 'dj_webapps',
},
),
migrations.CreateModel(
......@@ -146,7 +145,7 @@ class Migration(migrations.Migration):
('webapp', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='webappparameters', to='poc.Webapp')),
],
options={
'db_table': 'webapp_parameters',
'db_table': 'dj_webapp_parameters',
},
),
migrations.CreateModel(
......@@ -160,30 +159,30 @@ class Migration(migrations.Migration):
('docker_image_size', models.FloatField(blank=True, null=True)),
('state', models.IntegerField(null=True)),
('published', models.IntegerField()),
('webapp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='webappversion', to='poc.Webapp')),
('dj_webapp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='webappversion', to='poc.Webapp')),
],
options={
'db_table': 'webapp_versions',
'db_table': 'dj_webapp_versions',
},
),
migrations.AddField(
model_name='quota',
name='webapp',
name='dj_webapp',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='quotawebapp', to='poc.Webapp'),
),
migrations.AddField(
model_name='job',
name='queue',
name='dj_queue',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobqueue', to='poc.JobQueue'),
),
migrations.AddField(
model_name='job',
name='user',
name='dj_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobuser', to='poc.AllgoUser'),
),
migrations.AddField(
model_name='job',
name='webapp',
name='dj_webapp',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobwebapp', to='poc.Webapp'),
),
]