Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create new feature to enable creation of new activities (#539) #554

Merged
merged 3 commits into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions zubhub_backend/zubhub/APIS/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
path('creators/', include('creators.urls', namespace="creators")),
path('projects/', include('projects.urls', namespace="projects")),
path('activitylog/', include('activitylog.urls', namespace="activitylog")),
path('activities/', include('activities.urls', namespace="activities")),
path('notifications/', include('notifications.urls', namespace="notifications")),
path('upload-file/', UploadFileAPIView, name="upload_file"),
path('delete-file/', DeleteFileAPIView, name="delete_file"),
Expand Down
Empty file.
3 changes: 3 additions & 0 deletions zubhub_backend/zubhub/activities/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
5 changes: 5 additions & 0 deletions zubhub_backend/zubhub/activities/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class ActivitiesConfig(AppConfig):
name = 'activities'
103 changes: 103 additions & 0 deletions zubhub_backend/zubhub/activities/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# Generated by Django 3.2 on 2022-08-11 11:17

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import uuid


class Migration(migrations.Migration):

initial = True

dependencies = [
('projects', '0007_tag_tag_name_gin_idx'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Activity',
fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
('title', models.CharField(max_length=1000)),
('learning_goals', models.TextField(blank=True, max_length=10000)),
('facilitation_tips', models.TextField(blank=True, max_length=10000)),
('motivation', models.TextField(blank=True, max_length=10000)),
('video', models.URLField(blank=True, max_length=1000, null=True)),
('materials_used', models.CharField(max_length=5000)),
('views_count', models.IntegerField(blank=True, default=0)),
('saved_count', models.IntegerField(blank=True, default=0)),
('created_on', models.DateTimeField(default=django.utils.timezone.now)),
('publish', models.BooleanField(default=False)),
('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='activities', to='projects.category')),
('creators', models.ManyToManyField(related_name='activities_created', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Image',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('image_url', models.URLField(max_length=1000)),
('public_id', models.CharField(blank=True, max_length=1000)),
],
),
migrations.CreateModel(
name='InspiringExamples',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.TextField(blank=True, max_length=10000)),
('credit', models.CharField(blank=True, max_length=1000)),
('activity', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inspiring_examples', to='activities.activity')),
('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='activities.image')),
],
),
migrations.CreateModel(
name='InspiringArtist',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('short_biography', models.TextField(blank=True, max_length=10000)),
('name', models.CharField(max_length=100)),
('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='activities.image')),
],
),
migrations.CreateModel(
name='ActivityMakingSteps',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.TextField(blank=True, max_length=10000)),
('order', models.IntegerField()),
('activity', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='making_steps', to='activities.activity')),
('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='activities.image')),
],
),
migrations.CreateModel(
name='ActivityImages',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('activity', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='activity_images', to='activities.activity')),
('image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='activities.image')),
],
),
migrations.AddField(
model_name='activity',
name='inspiring_artist',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inspiring_artist_activities', to='activities.inspiringartist'),
),
migrations.AddField(
model_name='activity',
name='materials_used_image',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='activities.image'),
),
migrations.AddField(
model_name='activity',
name='saved_by',
field=models.ManyToManyField(blank=True, related_name='activities_saved', to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='activity',
name='views',
field=models.ManyToManyField(blank=True, related_name='activities_viewed', to=settings.AUTH_USER_MODEL),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated by Django 3.2 on 2022-08-14 07:38

from django.db import migrations, models
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
('activities', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='activity',
name='created_on',
field=models.DateTimeField(default=django.utils.timezone.now, null=True),
),
migrations.AlterField(
model_name='activity',
name='materials_used',
field=models.TextField(max_length=5000),
),
migrations.AlterField(
model_name='activity',
name='publish',
field=models.BooleanField(default=False, null=True),
),
migrations.AlterField(
model_name='activity',
name='title',
field=models.CharField(max_length=500),
),
migrations.AlterField(
model_name='image',
name='public_id',
field=models.TextField(blank=True, max_length=1000),
),
migrations.AlterField(
model_name='inspiringexamples',
name='credit',
field=models.TextField(blank=True, max_length=1000),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 3.2 on 2022-08-14 17:03

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('activities', '0002_auto_20220814_0738'),
]

operations = [
migrations.RenameModel(
old_name='ActivityImages',
new_name='ActivityImage',
),
migrations.RenameModel(
old_name='ActivityMakingSteps',
new_name='ActivityMakingStep',
),
migrations.RenameModel(
old_name='InspiringExamples',
new_name='InspiringExample',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2 on 2022-08-14 19:37

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('activities', '0003_auto_20220814_1703'),
]

operations = [
migrations.RenameField(
model_name='activitymakingstep',
old_name='order',
new_name='step_order',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2 on 2022-08-16 09:58

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('activities', '0004_rename_order_activitymakingstep_step_order'),
]

operations = [
migrations.RenameField(
model_name='image',
old_name='image_url',
new_name='file_url',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.2 on 2022-08-16 13:38

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('activities', '0005_rename_image_url_image_file_url'),
]

operations = [
migrations.AddField(
model_name='activity',
name='slug',
field=models.SlugField(default='first_activity_slug', max_length=1000, unique=True),
preserve_default=False,
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 3.2 on 2022-08-19 16:40

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('activities', '0006_activity_slug'),
]

operations = [
migrations.AlterField(
model_name='activity',
name='inspiring_artist',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspiring_artist_activities', to='activities.inspiringartist'),
),
migrations.AlterField(
model_name='activity',
name='materials_used_image',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='activities.image'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.2 on 2022-08-29 15:30

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('activities', '0007_auto_20220819_1640'),
]

operations = [
migrations.AlterField(
model_name='inspiringartist',
name='name',
field=models.CharField(max_length=100, null=True),
),
migrations.AlterField(
model_name='inspiringartist',
name='short_biography',
field=models.TextField(blank=True, max_length=10000, null=True),
),
]
Empty file.
Loading