Skip to content

Commit 49c5363

Browse files
internship completed
1 parent b2e4b62 commit 49c5363

File tree

37 files changed

+45
-195
lines changed

37 files changed

+45
-195
lines changed

backend/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*/__pycache__
2-
/db.sqlite3
2+
# /db.sqlite3
33
/.venv
44
*/migrations/__pycache__
55
/cert.pem

backend/attendance/migrations/0001_initial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.2 on 2023-06-29 09:31
1+
# Generated by Django 4.2.2 on 2023-07-28 14:09
22

33
import django.core.validators
44
from django.db import migrations, models
@@ -19,7 +19,8 @@ class Migration(migrations.Migration):
1919
name='attendaceRequest',
2020
fields=[
2121
('id', models.AutoField(primary_key=True, serialize=False)),
22-
('signed', models.IntegerField()),
22+
('signed', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(-1), django.core.validators.MaxValueValidator(4)])),
23+
('total', models.IntegerField(default=0)),
2324
('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.event')),
2425
('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.student')),
2526
],

backend/attendance/migrations/0002_attendacerequest_total_alter_attendacerequest_signed.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

backend/blockchain/migrations/0001_initial.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.2 on 2023-07-05 05:29
1+
# Generated by Django 4.2.2 on 2023-07-28 14:09
22

33
from django.db import migrations, models
44

@@ -19,7 +19,8 @@ class Migration(migrations.Migration):
1919
('prevHash', models.CharField(max_length=50)),
2020
('data', models.CharField(max_length=500)),
2121
('timestamp', models.DateTimeField()),
22-
('usershash', models.CharField(max_length=50)),
22+
('users_hash', models.CharField(max_length=50)),
23+
('current_hash', models.CharField(max_length=50)),
2324
],
2425
),
2526
]

backend/blockchain/migrations/0002_rename_usershash_block_current_hash_block_users_hash.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

backend/config.conf

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
<<<<<<< Updated upstream
2-
NGROK = https://b1c3-2401-4900-376e-7dc4-4461-d4cd-f827-2764.ngrok-free.app
3-
=======
4-
# <<<<<<< Updated upstream
5-
# NGROK = https://ec58-2406-7400-98-c555-00-104.ngrok-free.app
6-
# =======
7-
NGROK = https://1500-117-198-99-29.ngrok-free.app
8-
# >>>>>>> Stashed changes
9-
>>>>>>> Stashed changes
1+
NGROK = https://38dc-2401-4900-61b6-f721-d857-ca53-c049-89b.ngrok-free.app
102
FLUTTER_WEB = http://localhost:53916
113
REACT_WEB = http://localhost:3000

backend/db.sqlite3

380 KB
Binary file not shown.

backend/events/migrations/0001_initial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 4.2.2 on 2023-06-29 09:31
1+
# Generated by Django 4.2.2 on 2023-07-28 14:09
22

33
import django.core.validators
44
from django.db import migrations, models

backend/events/views.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,18 @@ def organizerList(request):
232232
req_body = request.body.decode('utf-8')
233233
message,status = auth(req_body=req_body)
234234
if status==200:
235-
if message['group']=="clubs":
236-
req = json.loads(req_body)
237-
print(req)
238-
eventId = models.event.objects.get(id=req["eventid"])
239-
organizers = models.organizer.objects.filter(event=eventId)
240-
print(organizers)
241-
organizer_list = list()
242-
for organizer in organizers:
243-
organizer_list.append({
244-
"srn" : organizer.srn.srn,
245-
"name":organizer.srn.name,
246-
"role" : organizer.role,
247-
})
235+
organizer_list = list()
236+
req = json.loads(req_body)
237+
print(req)
238+
eventId = models.event.objects.get(id=req["eventid"])
239+
organizers = models.organizer.objects.filter(event=eventId)
240+
print(organizers)
241+
for organizer in organizers:
242+
organizer_list.append({
243+
"srn" : organizer.srn.srn,
244+
"name":organizer.srn.name,
245+
"role" : organizer.role,
246+
})
248247
message["organizers"] = organizer_list
249248
return JsonResponse(message,status=status)
250249

backend/home/migrations/0001_initial.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# Generated by Django 4.2.2 on 2023-06-29 09:31
1+
# Generated by Django 4.2.2 on 2023-07-28 14:09
22

3+
import django.core.validators
34
from django.db import migrations, models
45
import django.db.models.deletion
56

@@ -45,6 +46,7 @@ class Migration(migrations.Migration):
4546
('name', models.CharField(max_length=25)),
4647
('sem', models.IntegerField()),
4748
('cgpa', models.FloatField()),
49+
('crypto', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0)])),
4850
('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='home.department')),
4951
],
5052
),

0 commit comments

Comments
 (0)