Skip to content

Commit

Permalink
Merge pull request #1782 from airqo-platform/website-deployment-issue
Browse files Browse the repository at this point in the history 
[website] Preview check and DateTime issue
  • Loading branch information
@Baalmart
Baalmart authored Dec 17, 2023
2 parents f1226d4 + ff4dd01 commit f68b34e
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 32 deletions.
2 changes: 1 addition & 1 deletion website/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The AirQo Website.

---
##

- [Prerequisites](#prerequisites)
- [OSX, Linux, Windows](#osx-linux-windows)
Expand Down
92 changes: 61 additions & 31 deletions website/backend/career/migrations/0002_bulletdescription_alter_career_options_and_more.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
from django.utils.timezone import utc
from datetime import timezone
import django.utils.timezone
import django_extensions.db.fields

Expand All @@ -20,12 +20,16 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='BulletDescription',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
('id', models.BigAutoField(auto_created=True,
primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(
auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(
auto_now=True, verbose_name='modified')),
('name', models.CharField(max_length=30)),
('order', models.IntegerField(default=1)),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bulletdescription_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='bulletdescription_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
],
options={
'get_latest_by': 'modified',
Expand Down Expand Up @@ -56,46 +60,58 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='career',
name='apply_url',
field=models.URLField(default=datetime.datetime(2022, 7, 12, 20, 52, 5, 796544, tzinfo=utc), max_length=250),
field=models.URLField(default=datetime.datetime(
2022, 7, 12, 20, 52, 5, 796544, tzinfo=timezone.utc), max_length=250),
preserve_default=False,
),
migrations.AddField(
model_name='career',
name='author',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='career_create', to=settings.AUTH_USER_MODEL, verbose_name='author'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='career_create', to=settings.AUTH_USER_MODEL, verbose_name='author'),
),
migrations.AddField(
model_name='career',
name='created',
field=django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='created'),
field=django_extensions.db.fields.CreationDateTimeField(
auto_now_add=True, default=django.utils.timezone.now, verbose_name='created'),
preserve_default=False,
),
migrations.AddField(
model_name='career',
name='modified',
field=django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified'),
field=django_extensions.db.fields.ModificationDateTimeField(
auto_now=True, verbose_name='modified'),
),
migrations.AddField(
model_name='career',
name='type',
field=models.CharField(choices=[('full-time', 'Full Time'), ('part-time', 'Part Time'), ('contract', 'Contract'), ('temporary', 'Temporary'), ('internship', 'Internship'), ('graduate-training', 'Graduate Training')], default='full-time', max_length=30),
field=models.CharField(choices=[('full-time', 'Full Time'), ('part-time', 'Part Time'), ('contract', 'Contract'), ('temporary',
'Temporary'), ('internship', 'Internship'), ('graduate-training', 'Graduate Training')], default='full-time', max_length=30),
),
migrations.AddField(
model_name='career',
name='updated_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='career_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='career_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by'),
),
migrations.CreateModel(
name='JobDescription',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
('id', models.BigAutoField(auto_created=True,
primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(
auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(
auto_now=True, verbose_name='modified')),
('description', models.TextField()),
('order', models.IntegerField(default=1)),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='jobdescription_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('career', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='descriptions', to='career.career')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='jobdescription_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='jobdescription_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('career', models.ForeignKey(blank=True, null=True,
on_delete=django.db.models.deletion.SET_NULL, related_name='descriptions', to='career.career')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='jobdescription_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
],
options={
'get_latest_by': 'modified',
Expand All @@ -105,12 +121,17 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Department',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
('id', models.BigAutoField(auto_created=True,
primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(
auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(
auto_now=True, verbose_name='modified')),
('name', models.CharField(max_length=30)),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='department_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='department_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='department_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='department_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
],
options={
'get_latest_by': 'modified',
Expand All @@ -120,14 +141,20 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='BulletPoint',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
('id', models.BigAutoField(auto_created=True,
primary_key=True, serialize=False, verbose_name='ID')),
('created', django_extensions.db.fields.CreationDateTimeField(
auto_now_add=True, verbose_name='created')),
('modified', django_extensions.db.fields.ModificationDateTimeField(
auto_now=True, verbose_name='modified')),
('description', models.TextField()),
('order', models.IntegerField(default=1)),
('Bullet', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bullet_points', to='career.bulletdescription')),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bulletpoint_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bulletpoint_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
('Bullet', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='bullet_points', to='career.bulletdescription')),
('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='bulletpoint_create', to=settings.AUTH_USER_MODEL, verbose_name='author')),
('updated_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='bulletpoint_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by')),
],
options={
'get_latest_by': 'modified',
Expand All @@ -137,16 +164,19 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='bulletdescription',
name='career',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bullets', to='career.career'),
field=models.ForeignKey(
blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bullets', to='career.career'),
),
migrations.AddField(
model_name='bulletdescription',
name='updated_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bulletdescription_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='bulletdescription_update', to=settings.AUTH_USER_MODEL, verbose_name='last updated by'),
),
migrations.AddField(
model_name='career',
name='department',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='careers', to='career.department'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL,
related_name='careers', to='career.department'),
),
]

0 comments on commit f68b34e

Please sign in to comment.