diff --git a/myworld/dockerfiles/Dockerfile b/Dockerfile similarity index 94% rename from myworld/dockerfiles/Dockerfile rename to Dockerfile index 9517e854..e3f5abb5 100644 --- a/myworld/dockerfiles/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN apk update && \ # Install requirements RUN pip install --upgrade pip RUN pip install Django psycopg2==2.9.3 -# Create directories +# Create directories RUN mkdir -p /root/workspace/src COPY ./ /root/workspace/site # Switch to project directory diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..7b2a90fa --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,30 @@ +version: "3" +services: + web_service: + build: + context: ./ + dockerfile: ./Dockerfile + image: workshop1_web + container_name: workshop_web_container + stdin_open: true # docker attach container_id + tty: true + ports: + - "8000:8000" + volumes: + - .:/root/workspace/site + + psql-db: + image: "postgres:14" + container_name: psql-db + environment: + - PGPASSWORD=123456 + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=123456 + ports: + - "5432:5432" + volumes: + - db:/var/lib/postgresql/data + +volumes: + db: + driver: local diff --git a/myworld/db.sqlite3 b/myworld/db.sqlite3 index bdda49a8..ca74a2b8 100644 Binary files a/myworld/db.sqlite3 and b/myworld/db.sqlite3 differ diff --git a/myworld/docker-compose.yml b/myworld/docker-compose.yml deleted file mode 100644 index 0d37737e..00000000 --- a/myworld/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: "3" -services: - web_service: - build: - context: ./ - dockerfile: ./dockerfiles/Dockerfile - image: workshop1_web - container_name: workshop_web_container - stdin_open: true # docker attach container_id - tty: true - ports: - - "8000:8000" - volumes: - - .:/root/workspace/site - - psql-db: - image: 'postgres:14' - container_name: psql-db - environment: - - PGPASSWORD=123456 - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=123456 - ports: - - '5446:5432' - volumes: - - db:/var/lib/postgresql/data -volumes: - db: - driver: local \ No newline at end of file diff --git a/myworld/members/__pycache__/__init__.cpython-310.pyc b/myworld/members/__pycache__/__init__.cpython-310.pyc index b8594c8c..9b072479 100644 Binary files a/myworld/members/__pycache__/__init__.cpython-310.pyc and b/myworld/members/__pycache__/__init__.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/__init__.cpython-312.pyc b/myworld/members/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 00000000..33e50c49 Binary files /dev/null and b/myworld/members/__pycache__/__init__.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/__init__.cpython-38.pyc b/myworld/members/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 8f91b78c..00000000 Binary files a/myworld/members/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/__pycache__/admin.cpython-310.pyc b/myworld/members/__pycache__/admin.cpython-310.pyc index dc7d7341..ab3a1698 100644 Binary files a/myworld/members/__pycache__/admin.cpython-310.pyc and b/myworld/members/__pycache__/admin.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/admin.cpython-312.pyc b/myworld/members/__pycache__/admin.cpython-312.pyc new file mode 100644 index 00000000..88c0179c Binary files /dev/null and b/myworld/members/__pycache__/admin.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/admin.cpython-38.pyc b/myworld/members/__pycache__/admin.cpython-38.pyc deleted file mode 100644 index f30fa8e9..00000000 Binary files a/myworld/members/__pycache__/admin.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/__pycache__/apps.cpython-310.pyc b/myworld/members/__pycache__/apps.cpython-310.pyc index 22d78967..15467d04 100644 Binary files a/myworld/members/__pycache__/apps.cpython-310.pyc and b/myworld/members/__pycache__/apps.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/apps.cpython-312.pyc b/myworld/members/__pycache__/apps.cpython-312.pyc new file mode 100644 index 00000000..e8f3fa0c Binary files /dev/null and b/myworld/members/__pycache__/apps.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/apps.cpython-38.pyc b/myworld/members/__pycache__/apps.cpython-38.pyc deleted file mode 100644 index 8a4bdbc8..00000000 Binary files a/myworld/members/__pycache__/apps.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/__pycache__/models.cpython-310.pyc b/myworld/members/__pycache__/models.cpython-310.pyc index ec381422..7b866d44 100644 Binary files a/myworld/members/__pycache__/models.cpython-310.pyc and b/myworld/members/__pycache__/models.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/models.cpython-312.pyc b/myworld/members/__pycache__/models.cpython-312.pyc new file mode 100644 index 00000000..6f163938 Binary files /dev/null and b/myworld/members/__pycache__/models.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/models.cpython-38.pyc b/myworld/members/__pycache__/models.cpython-38.pyc deleted file mode 100644 index 229337de..00000000 Binary files a/myworld/members/__pycache__/models.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/__pycache__/urls.cpython-310.pyc b/myworld/members/__pycache__/urls.cpython-310.pyc index 52c2e612..6ff389de 100644 Binary files a/myworld/members/__pycache__/urls.cpython-310.pyc and b/myworld/members/__pycache__/urls.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/urls.cpython-312.pyc b/myworld/members/__pycache__/urls.cpython-312.pyc new file mode 100644 index 00000000..90204769 Binary files /dev/null and b/myworld/members/__pycache__/urls.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/urls.cpython-38.pyc b/myworld/members/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index cad07bfd..00000000 Binary files a/myworld/members/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/__pycache__/views.cpython-310.pyc b/myworld/members/__pycache__/views.cpython-310.pyc index 319f3141..2bf60e43 100644 Binary files a/myworld/members/__pycache__/views.cpython-310.pyc and b/myworld/members/__pycache__/views.cpython-310.pyc differ diff --git a/myworld/members/__pycache__/views.cpython-312.pyc b/myworld/members/__pycache__/views.cpython-312.pyc new file mode 100644 index 00000000..a5262f8f Binary files /dev/null and b/myworld/members/__pycache__/views.cpython-312.pyc differ diff --git a/myworld/members/__pycache__/views.cpython-38.pyc b/myworld/members/__pycache__/views.cpython-38.pyc deleted file mode 100644 index c9551bd5..00000000 Binary files a/myworld/members/__pycache__/views.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/admin.py b/myworld/members/admin.py index 0487b5cb..39aefa4f 100644 --- a/myworld/members/admin.py +++ b/myworld/members/admin.py @@ -1,9 +1,14 @@ from django.contrib import admin -from .models import Students +from .models import Students, Employee class DjStudentAdmin(admin.ModelAdmin): list_display = ("first_name", "last_name", "address", "roll_number", "mobile", "branch") list_filter = ("branch",) +class DjEmployeeAdmin(admin.ModelAdmin): + list_display = ("first_name", "last_name", "address", "mobile", "salary", "department") + list_filter = ("department","id") + # Register your models here. -admin.site.register(Students, DjStudentAdmin) \ No newline at end of file +admin.site.register(Students, DjStudentAdmin) +admin.site.register(Employee, DjEmployeeAdmin) \ No newline at end of file diff --git a/myworld/members/apps.py b/myworld/members/apps.py index f773ade1..c775af84 100644 --- a/myworld/members/apps.py +++ b/myworld/members/apps.py @@ -2,4 +2,5 @@ class MembersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' name = 'members' diff --git a/myworld/members/migrations/0001_initial.py b/myworld/members/migrations/0001_initial.py index b55fc1c4..e105b45e 100644 --- a/myworld/members/migrations/0001_initial.py +++ b/myworld/members/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1 on 2022-09-15 16:33 +# Generated by Django 5.1.1 on 2024-10-04 04:39 from django.db import migrations, models @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Members', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('firstname', models.CharField(max_length=255)), ('lastname', models.CharField(max_length=255)), ], diff --git a/myworld/members/migrations/0002_students_delete_members.py b/myworld/members/migrations/0002_students_delete_members.py index 9b63a672..dc0e42fd 100644 --- a/myworld/members/migrations/0002_students_delete_members.py +++ b/myworld/members/migrations/0002_students_delete_members.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.1 on 2022-09-15 17:56 +# Generated by Django 5.1.1 on 2024-10-04 06:22 from django.db import migrations, models @@ -13,12 +13,13 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Students', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('first_name', models.CharField(max_length=200)), ('last_name', models.CharField(max_length=200)), ('address', models.CharField(max_length=200)), ('roll_number', models.IntegerField()), ('mobile', models.CharField(max_length=10)), + ('branch', models.CharField(choices=[('BA', 'BA'), ('B.COM', 'B.COM'), ('MBA', 'MBA'), ('CA', 'CA')], max_length=10)), ], ), migrations.DeleteModel( diff --git a/myworld/members/migrations/0003_employee.py b/myworld/members/migrations/0003_employee.py new file mode 100644 index 00000000..bd044d06 --- /dev/null +++ b/myworld/members/migrations/0003_employee.py @@ -0,0 +1,25 @@ +# Generated by Django 5.1.1 on 2024-10-04 09:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0002_students_delete_members'), + ] + + operations = [ + migrations.CreateModel( + name='Employee', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=200)), + ('last_name', models.CharField(max_length=200)), + ('address', models.CharField(max_length=200)), + ('mobile', models.CharField(max_length=10)), + ('salary', models.IntegerField()), + ('department', models.CharField(max_length=10)), + ], + ), + ] diff --git a/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc b/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc index 37b9d15e..474c0ac9 100644 Binary files a/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc and b/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/myworld/members/migrations/__pycache__/0001_initial.cpython-312.pyc b/myworld/members/migrations/__pycache__/0001_initial.cpython-312.pyc new file mode 100644 index 00000000..6da107cb Binary files /dev/null and b/myworld/members/migrations/__pycache__/0001_initial.cpython-312.pyc differ diff --git a/myworld/members/migrations/__pycache__/0001_initial.cpython-38.pyc b/myworld/members/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 1c940639..00000000 Binary files a/myworld/members/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/migrations/__pycache__/0002_students_delete_members.cpython-310.pyc b/myworld/members/migrations/__pycache__/0002_students_delete_members.cpython-310.pyc index 20bce558..3779e251 100644 Binary files a/myworld/members/migrations/__pycache__/0002_students_delete_members.cpython-310.pyc and b/myworld/members/migrations/__pycache__/0002_students_delete_members.cpython-310.pyc differ diff --git a/myworld/members/migrations/__pycache__/0003_employee.cpython-310.pyc b/myworld/members/migrations/__pycache__/0003_employee.cpython-310.pyc new file mode 100644 index 00000000..d4d5ad6f Binary files /dev/null and b/myworld/members/migrations/__pycache__/0003_employee.cpython-310.pyc differ diff --git a/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc b/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc index b138c514..d771320c 100644 Binary files a/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc and b/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/myworld/members/migrations/__pycache__/__init__.cpython-312.pyc b/myworld/members/migrations/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 00000000..36a2c143 Binary files /dev/null and b/myworld/members/migrations/__pycache__/__init__.cpython-312.pyc differ diff --git a/myworld/members/migrations/__pycache__/__init__.cpython-38.pyc b/myworld/members/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index a89f2dd2..00000000 Binary files a/myworld/members/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/myworld/members/models.py b/myworld/members/models.py index f81736a8..28c04ff0 100644 --- a/myworld/members/models.py +++ b/myworld/members/models.py @@ -16,5 +16,16 @@ class Students(models.Model): mobile = models.CharField(max_length=10) branch = models.CharField(max_length=10, choices=BRANCH_CHOICES) + def __str__(self): + return self.first_name + " " + self.last_name + +class Employee(models.Model): + first_name = models.CharField(max_length=200) + last_name = models.CharField(max_length=200) + address = models.CharField(max_length=200) + mobile = models.CharField(max_length=10) + salary = models.IntegerField() + department = models.CharField(max_length=10) + def __str__(self): return self.first_name + " " + self.last_name \ No newline at end of file diff --git a/myworld/members/templates/myfirst.html b/myworld/members/templates/myfirst.html index ef1398d2..c6c17754 100644 --- a/myworld/members/templates/myfirst.html +++ b/myworld/members/templates/myfirst.html @@ -6,4 +6,4 @@

Hello World!

Welcome to my first Django project!

- + \ No newline at end of file diff --git a/myworld/members/templates/student_list.html b/myworld/members/templates/student_list.html new file mode 100644 index 00000000..09cd8774 --- /dev/null +++ b/myworld/members/templates/student_list.html @@ -0,0 +1,35 @@ + + + + + + Display Student + + +

Student List

+
+ + + + + + + + + + + {% for student in students %} + + + + + + + + {% endfor %} + + +
Student IDStudent NameStudent EmailStudent PhoneStudent Address
{{ student.student_id }}{{ student.student_name }}{{ student.student_email }}{{ student.student_phone }}{{ student.student_address }}
+
+ + diff --git a/myworld/members/urls.py b/myworld/members/urls.py index 041d4909..8596310f 100644 --- a/myworld/members/urls.py +++ b/myworld/members/urls.py @@ -5,4 +5,6 @@ path('rest/student/', views.StudentView.as_view()), path('rest/student/', views.StudentView.as_view()), path('rest/student/', views.StudentView.as_view()), + path('rest/employee/', views.EmployeeView.as_view()), + path('rest/employee/', views.EmployeeView.as_view()), ] \ No newline at end of file diff --git a/myworld/members/views.py b/myworld/members/views.py index 62ee6e1c..1be705ce 100644 --- a/myworld/members/views.py +++ b/myworld/members/views.py @@ -1,8 +1,10 @@ from django.views import View -from .models import Students +from .models import Students, Employee from django.http import JsonResponse from django.views.decorators.csrf import csrf_exempt from django.utils.decorators import method_decorator +from django.shortcuts import render +import json @method_decorator(csrf_exempt, name='dispatch') @@ -15,20 +17,22 @@ def get(self, request, rolno=None, branch=None): student_model_list = Students.objects.filter(roll_number=rolno) elif branch: student_model_list = Students.objects.filter(branch=branch) + else: + student_model_list = Students.objects.all() except Students.DoesNotExist: return JsonResponse({'status': 'failed', "students": None}, status=400) - students = [] - for student in student_model_list: - data = { - "first_name" : student.first_name, - "last_name": student.last_name, - "address": student.address, - "roll_number": student.roll_number, - "mobile": student.mobile, - "branch": student.branch - } - students.append(data) - return JsonResponse({'status': 'success', "students": students}, status=200) + # students = [] + # for student in student_model_list: + # data = { + # "first_name" : student.first_name, + # "last_name": student.last_name, + # "address": student.address, + # "roll_number": student.roll_number, + # "mobile": student.mobile, + # "branch": student.branch + # } + # students.append(data) + return render(request, 'student_list.html', {'students': student_model_list}) def post(self, request): if not request.POST.get('first_name') or not request.POST.get('last_name') or not request.POST.get('address') or not request.POST.get('roll_number') or not request.POST.get('mobile'): @@ -42,3 +46,66 @@ def post(self, request): mobile= request.POST.get('mobile'), branch= request.POST.get('branch')) return JsonResponse({'status': 'sucess'}, status=200) + + +@method_decorator(csrf_exempt, name='dispatch') +class EmployeeView(View): + + + def get(self, request, id=None): + try: + employee_id = id or request.GET.get('id') + if not employee_id: + return JsonResponse({'status': 'failed', 'message': 'Employee ID is required'}, status=400) + + employee = Employee.objects.get(id=employee_id) + employee_data = { + "first_name": employee.first_name, + "last_name": employee.last_name, + "address": employee.address, + "mobile": employee.mobile, + "salary": employee.salary, + "department": employee.department + } + return JsonResponse({'status': 'sucess', "employee": employee_data}, status=200) + except Employee.DoesNotExist: + return JsonResponse({'status': 'failed', "employee": None}, status=400) + + + def post(self, request): + if not request.POST.get('first_name') or not request.POST.get('last_name') or not request.POST.get('address') or not request.POST.get('mobile'): + return JsonResponse({'status': 'failed', "message" : "all fields required"}, status=500) + + Employee.objects.create( + first_name= request.POST.get('first_name'), + last_name= request.POST.get('last_name'), + address= request.POST.get('address'), + mobile= request.POST.get('mobile'), + salary= request.POST.get('salary'), + department= request.POST.get('department')) + return JsonResponse({'status': 'sucess'}, status=200) + + def delete(self, request, id): + try: + employee = Employee.objects.get(id=id) + employee.delete() + return JsonResponse({'status': 'success'}, status=200) + except Employee.DoesNotExist: + return JsonResponse({'status': 'failed', "employee": None}, status=400) + + + def put(self, request, id): + try: + employee = Employee.objects.get(id=id) + data = json.loads(request.body.decode('utf-8')) + employee.first_name = data.get('first_name', employee.first_name) + employee.last_name = data.get('last_name', employee.last_name) + employee.address = data.get('address', employee.address) + employee.mobile = data.get('mobile', employee.mobile) + employee.salary = data.get('salary', employee.salary) + employee.department = data.get('department', employee.department) + employee.save() + return JsonResponse({'status': 'success'}, status=200) + except Employee.DoesNotExist: + return JsonResponse({'status': 'failed', "employee": None}, status=404) + diff --git a/myworld/myworld/__pycache__/__init__.cpython-310.pyc b/myworld/myworld/__pycache__/__init__.cpython-310.pyc index 7948f38e..9a7f6c5b 100644 Binary files a/myworld/myworld/__pycache__/__init__.cpython-310.pyc and b/myworld/myworld/__pycache__/__init__.cpython-310.pyc differ diff --git a/myworld/myworld/__pycache__/__init__.cpython-312.pyc b/myworld/myworld/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 00000000..0ebd1ee8 Binary files /dev/null and b/myworld/myworld/__pycache__/__init__.cpython-312.pyc differ diff --git a/myworld/myworld/__pycache__/__init__.cpython-38.pyc b/myworld/myworld/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 587013a2..00000000 Binary files a/myworld/myworld/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/myworld/myworld/__pycache__/settings.cpython-310.pyc b/myworld/myworld/__pycache__/settings.cpython-310.pyc index ee472f21..f8a8e9e0 100644 Binary files a/myworld/myworld/__pycache__/settings.cpython-310.pyc and b/myworld/myworld/__pycache__/settings.cpython-310.pyc differ diff --git a/myworld/myworld/__pycache__/settings.cpython-312.pyc b/myworld/myworld/__pycache__/settings.cpython-312.pyc new file mode 100644 index 00000000..9913dd1c Binary files /dev/null and b/myworld/myworld/__pycache__/settings.cpython-312.pyc differ diff --git a/myworld/myworld/__pycache__/settings.cpython-38.pyc b/myworld/myworld/__pycache__/settings.cpython-38.pyc deleted file mode 100644 index 1afd38e8..00000000 Binary files a/myworld/myworld/__pycache__/settings.cpython-38.pyc and /dev/null differ diff --git a/myworld/myworld/__pycache__/urls.cpython-310.pyc b/myworld/myworld/__pycache__/urls.cpython-310.pyc index 7e684df0..e2c21df2 100644 Binary files a/myworld/myworld/__pycache__/urls.cpython-310.pyc and b/myworld/myworld/__pycache__/urls.cpython-310.pyc differ diff --git a/myworld/myworld/__pycache__/urls.cpython-312.pyc b/myworld/myworld/__pycache__/urls.cpython-312.pyc new file mode 100644 index 00000000..6e5533ac Binary files /dev/null and b/myworld/myworld/__pycache__/urls.cpython-312.pyc differ diff --git a/myworld/myworld/__pycache__/urls.cpython-38.pyc b/myworld/myworld/__pycache__/urls.cpython-38.pyc deleted file mode 100644 index 23312f48..00000000 Binary files a/myworld/myworld/__pycache__/urls.cpython-38.pyc and /dev/null differ diff --git a/myworld/myworld/__pycache__/wsgi.cpython-310.pyc b/myworld/myworld/__pycache__/wsgi.cpython-310.pyc index a27814d1..85fbbd84 100644 Binary files a/myworld/myworld/__pycache__/wsgi.cpython-310.pyc and b/myworld/myworld/__pycache__/wsgi.cpython-310.pyc differ diff --git a/myworld/myworld/__pycache__/wsgi.cpython-312.pyc b/myworld/myworld/__pycache__/wsgi.cpython-312.pyc new file mode 100644 index 00000000..66512c39 Binary files /dev/null and b/myworld/myworld/__pycache__/wsgi.cpython-312.pyc differ diff --git a/myworld/myworld/__pycache__/wsgi.cpython-38.pyc b/myworld/myworld/__pycache__/wsgi.cpython-38.pyc deleted file mode 100644 index 021272dc..00000000 Binary files a/myworld/myworld/__pycache__/wsgi.cpython-38.pyc and /dev/null differ diff --git a/myworld/myworld/asgi.py b/myworld/myworld/asgi.py index 0c6c46e8..cbcae016 100644 --- a/myworld/myworld/asgi.py +++ b/myworld/myworld/asgi.py @@ -4,7 +4,7 @@ It exposes the ASGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/3.1/howto/deployment/asgi/ +https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/ """ import os diff --git a/myworld/myworld/settings.py b/myworld/myworld/settings.py index 03a978b1..9c352a85 100644 --- a/myworld/myworld/settings.py +++ b/myworld/myworld/settings.py @@ -1,31 +1,33 @@ """ Django settings for myworld project. -Generated by 'django-admin startproject' using Django 3.1. +Generated by 'django-admin startproject' using Django 4.0.5. For more information on this file, see -https://docs.djangoproject.com/en/3.1/topics/settings/ +https://docs.djangoproject.com/en/4.0/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.1/ref/settings/ +https://docs.djangoproject.com/en/4.0/ref/settings/ """ from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'ncm)mv70*o$lf+yo$sw=tkvz%rfbfw4zu7eex=1dq)+o)kerg$' +SECRET_KEY = 'django-insecure-tx@^mg2-q6kw+a^ae+qb&qi9cxgk4o+s!ty#nwyicu@)dqgs)1' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['0.0.0.0'] +ALLOWED_HOSTS = [ + '0.0.0.0' +] # Application definition @@ -72,7 +74,7 @@ # Database -# https://docs.djangoproject.com/en/3.1/ref/settings/#databases +# https://docs.djangoproject.com/en/4.0/ref/settings/#databases DATABASES = { 'default': { @@ -85,8 +87,9 @@ } } + # Password validation -# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -105,7 +108,7 @@ # Internationalization -# https://docs.djangoproject.com/en/3.1/topics/i18n/ +# https://docs.djangoproject.com/en/4.0/topics/i18n/ LANGUAGE_CODE = 'en-us' @@ -113,12 +116,15 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.1/howto/static-files/ +# https://docs.djangoproject.com/en/4.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field -STATIC_URL = '/static/' +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/myworld/myworld/urls.py b/myworld/myworld/urls.py index dff01bb1..318d6840 100644 --- a/myworld/myworld/urls.py +++ b/myworld/myworld/urls.py @@ -1,7 +1,22 @@ +"""myworld URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.0/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" from django.contrib import admin -from django.urls import include, path +from django.urls import path,include urlpatterns = [ - path('members/', include('members.urls')), - path('admin/', admin.site.urls), -] \ No newline at end of file + path('members/', include('members.urls')), + path('admin/', admin.site.urls), +] diff --git a/myworld/myworld/wsgi.py b/myworld/myworld/wsgi.py index fdadeb6a..c49337a9 100644 --- a/myworld/myworld/wsgi.py +++ b/myworld/myworld/wsgi.py @@ -4,7 +4,7 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/ """ import os