internship completed

2020-HelloWorld · Jul 28, 2023 · 49c5363 · 49c5363
1 parent b2e4b62
commit 49c5363
Show file tree

Hide file tree

Showing 37 changed files with 45 additions and 195 deletions.
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -1,5 +1,5 @@
 */__pycache__
-/db.sqlite3
+# /db.sqlite3
 /.venv
 */migrations/__pycache__
 /cert.pem

diff --git a/backend/attendance/migrations/0001_initial.py b/backend/attendance/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-29 09:31
+# Generated by Django 4.2.2 on 2023-07-28 14:09
 
 import django.core.validators
 from django.db import migrations, models
@@ -19,7 +19,8 @@ class Migration(migrations.Migration):
             name='attendaceRequest',
             fields=[
                 ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('signed', models.IntegerField()),
+                ('signed', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(-1), django.core.validators.MaxValueValidator(4)])),
+                ('total', models.IntegerField(default=0)),
                 ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.event')),
                 ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.student')),
             ],

diff --git a/backend/attendance/migrations/0002_attendacerequest_total_alter_attendacerequest_signed.py b/backend/attendance/migrations/0002_attendacerequest_total_alter_attendacerequest_signed.py
diff --git a/backend/blockchain/migrations/0001_initial.py b/backend/blockchain/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-07-05 05:29
+# Generated by Django 4.2.2 on 2023-07-28 14:09
 
 from django.db import migrations, models
 
@@ -19,7 +19,8 @@ class Migration(migrations.Migration):
                 ('prevHash', models.CharField(max_length=50)),
                 ('data', models.CharField(max_length=500)),
                 ('timestamp', models.DateTimeField()),
-                ('usershash', models.CharField(max_length=50)),
+                ('users_hash', models.CharField(max_length=50)),
+                ('current_hash', models.CharField(max_length=50)),
             ],
         ),
     ]
diff --git a/backend/blockchain/migrations/0002_rename_usershash_block_current_hash_block_users_hash.py b/backend/blockchain/migrations/0002_rename_usershash_block_current_hash_block_users_hash.py
diff --git a/backend/config.conf b/backend/config.conf
@@ -1,11 +1,3 @@
-<<<<<<< Updated upstream
-NGROK =  https://b1c3-2401-4900-376e-7dc4-4461-d4cd-f827-2764.ngrok-free.app 
-=======
-# <<<<<<< Updated upstream
-# NGROK =  https://ec58-2406-7400-98-c555-00-104.ngrok-free.app
-# =======
-NGROK = https://1500-117-198-99-29.ngrok-free.app
-# >>>>>>> Stashed changes
->>>>>>> Stashed changes
+NGROK =  https://38dc-2401-4900-61b6-f721-d857-ca53-c049-89b.ngrok-free.app
 FLUTTER_WEB = http://localhost:53916
 REACT_WEB = http://localhost:3000
diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
diff --git a/backend/events/migrations/0001_initial.py b/backend/events/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-29 09:31
+# Generated by Django 4.2.2 on 2023-07-28 14:09
 
 import django.core.validators
 from django.db import migrations, models

diff --git a/backend/events/views.py b/backend/events/views.py
@@ -232,19 +232,18 @@ def organizerList(request):
     req_body = request.body.decode('utf-8')
     message,status = auth(req_body=req_body)
     if status==200:
-        if message['group']=="clubs":
-            req = json.loads(req_body)
-            print(req)
-            eventId = models.event.objects.get(id=req["eventid"])
-            organizers = models.organizer.objects.filter(event=eventId)
-            print(organizers)
-            organizer_list = list()
-            for organizer in  organizers:
-                organizer_list.append({
-                    "srn" : organizer.srn.srn,
-                    "name":organizer.srn.name,
-                    "role" : organizer.role,
-                })
+        organizer_list = list()
+        req = json.loads(req_body)
+        print(req)
+        eventId = models.event.objects.get(id=req["eventid"])
+        organizers = models.organizer.objects.filter(event=eventId)
+        print(organizers)
+        for organizer in  organizers:
+            organizer_list.append({
+                "srn" : organizer.srn.srn,
+                "name":organizer.srn.name,
+                "role" : organizer.role,
+            })
         message["organizers"] = organizer_list
     return JsonResponse(message,status=status)
 

diff --git a/backend/home/migrations/0001_initial.py b/backend/home/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 4.2.2 on 2023-06-29 09:31
+# Generated by Django 4.2.2 on 2023-07-28 14:09
 
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -45,6 +46,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=25)),
                 ('sem', models.IntegerField()),
                 ('cgpa', models.FloatField()),
+                ('crypto', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0)])),
                 ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.department')),
             ],
         ),

diff --git a/backend/home/migrations/0002_student_crypto.py b/backend/home/migrations/0002_student_crypto.py
diff --git a/backend/project/migrations/0001_initial.py b/backend/project/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-07-05 05:29
+# Generated by Django 4.2.2 on 2023-07-28 14:09
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,7 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('home', '0002_student_crypto'),
+        ('events', '0001_initial'),
+        ('home', '0001_initial'),
     ]
 
     operations = [
@@ -19,9 +20,27 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(primary_key=True, serialize=False)),
                 ('title', models.CharField(max_length=25)),
                 ('details', models.CharField(max_length=500)),
+                ('withCollege', models.BooleanField()),
+                ('link', models.URLField(blank=True, default='')),
+                ('category', models.CharField(max_length=15, null=True)),
+                ('completion', models.IntegerField(default=0)),
+                ('approval', models.IntegerField(default=0)),
+                ('department', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='home.department')),
                 ('guide', models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='home.faculty')),
+                ('hackathon', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='events.event')),
             ],
         ),
+        migrations.CreateModel(
+            name='subjectTeacher',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('faculty', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.faculty')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.subject')),
+            ],
+            options={
+                'unique_together': {('faculty', 'subject')},
+            },
+        ),
         migrations.CreateModel(
             name='studentProject',
             fields=[

diff --git a/.../project/migrations/0002_project_approval_project_category_project_completion_and_more.py b/.../project/migrations/0002_project_approval_project_category_project_completion_and_more.py
diff --git a/backend/project/migrations/0003_project_link_alter_project_category.py b/backend/project/migrations/0003_project_link_alter_project_category.py
diff --git a/backend/project/migrations/0004_project_department.py b/backend/project/migrations/0004_project_department.py
diff --git a/backend/static/temp/certificate.pdf b/backend/static/temp/certificate.pdf
diff --git a/backend/static/temp/qr_code.png b/backend/static/temp/qr_code.png
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_0R0w7RG.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_0R0w7RG.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_1TQb6Ir.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_1TQb6Ir.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_3sBsmzX.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_3sBsmzX.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_7uefLkz.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_7uefLkz.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_83Ud6K4.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_83Ud6K4.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_B6uthWS.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_B6uthWS.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_EIK9k1Y.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_EIK9k1Y.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_IwuEBRd.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_IwuEBRd.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_S4BxCO3.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_S4BxCO3.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_W4LDCHZ.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_W4LDCHZ.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_ffomUDV.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_ffomUDV.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_txn6v6F.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_txn6v6F.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_vLXe4Ge.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_vLXe4Ge.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_xi9t9KD.jpeg b/backend/uploads/WhatsApp_Image_2023-06-22_at_11.25.34_AM_xi9t9KD.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-07-28_at_8.02.08_PM_1.jpeg b/backend/uploads/WhatsApp_Image_2023-07-28_at_8.02.08_PM_1.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-07-28_at_8.02.08_PM_1_4O7Ricz.jpeg b/backend/uploads/WhatsApp_Image_2023-07-28_at_8.02.08_PM_1_4O7Ricz.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.47_PM.jpeg b/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.47_PM.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.47_PM_1.jpeg b/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.47_PM_1.jpeg
diff --git a/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.49_PM_1.jpeg b/backend/uploads/WhatsApp_Image_2023-07-28_at_8.04.49_PM_1.jpeg