Merge pull request #8 from Swahilipot-Hub-Developers/jilo

updated events management

backend2/events/admin.py → backend/authentication/admin.py

@@ -1,6 +1,3 @@
 from django.contrib import admin
-from .models import Event
 
 # Register your models here.
-
-admin.site.register(Event)

backend2/events/apps.py → backend/authentication/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class EventsConfig(AppConfig):
+class AuthenticationConfig(AppConfig):
  default_auto_field = 'django.db.models.BigAutoField'
- name = 'events'
+ name = 'authentication'

backend/authentication/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

backend/authentication/serializers.py

@@ -0,0 +1,10 @@
+# authentication/serializers.py
+
+from django.contrib.auth.models import User
+from rest_framework import serializers
+
+class UserSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = User
+ fields = ['id', 'username', 'email', 'password']
+ extra_kwargs = {'password': {'write_only': True}}

backend/authentication/urls.py

@@ -0,0 +1,11 @@
+# authentication/urls.py
+
+from django.urls import path
+#from .views import CustomAuthToken, UserInfoView
+from .views import SignupView
+
+urlpatterns = [
+ # path('api-token-auth/', CustomAuthToken.as_view(), name='api_token_auth'),
+ # path('user-info/', UserInfoView.as_view(), name='user_info'),
+ path('SignUp/', SignupView.as_view(), name='SignUp'),
+]

backend/authentication/views.py

@@ -0,0 +1,34 @@
+# from django.shortcuts import render
+
+# # Create your views here.
+# # authentication/views.py
+
+# from rest_framework.authtoken.views import ObtainAuthToken
+# from rest_framework.authtoken.models import Token
+# from rest_framework.response import Response
+# from rest_framework.views import APIView
+# from rest_framework.permissions import IsAuthenticated
+
+# class CustomAuthToken(ObtainAuthToken):
+# def post(self, request, *args, **kwargs):
+# serializer = self.serializer_class(data=request.data, context={'request': request})
+# serializer.is_valid(raise_exception=True)
+# user = serializer.validated_data['user']
+# token, created = Token.objects.get_or_create(user=user)
+# return Response({'token': token.key, 'user_id': user.pk})
+
+
+# class UserInfoView(APIView):
+# permission_classes = [IsAuthenticated]
+
+# def get(self, request):
+# return Response({'user_id': request.user.pk, 'username': request.user.username})
+# authentication/views.py
+
+from rest_framework import generics
+from rest_framework.response import Response
+from rest_framework import status
+from .serializers import UserSerializer
+
+class SignupView(generics.CreateAPIView):
+ serializer_class = UserSerializer

backend2/backend2/asgi.py → backend/backend/asgi.py

@@ -1,16 +1,16 @@
 """
-ASGI config for backend2 project.
+ASGI config for backend project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
+https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/
 """
 
 import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend2.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings')
 
 application = get_asgi_application()

backend2/backend2/settings.py → backend/backend/settings.py

@@ -1,13 +1,13 @@
 """
-Django settings for backend2 project.
+Django settings for backend project.
 
-Generated by 'django-admin startproject' using Django 4.2.7.
+Generated by 'django-admin startproject' using Django 5.0.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.2/topics/settings/
+https://docs.djangoproject.com/en/5.0/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.2/ref/settings/
+https://docs.djangoproject.com/en/5.0/ref/settings/
 """
 
 from pathlib import Path
@@ -17,10 +17,10 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-l3l5v!8z9k@yux=0x-+2r)s&7q8m@=c-_d5d6l&#+w!+(rw7_i'
+SECRET_KEY = 'django-insecure-q*&68x2311m9sjv8uz9ydq5*+w%a8mz+!kj#i(5t96t+u$0bbe'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -37,8 +37,8 @@
  'django.contrib.sessions',
  'django.contrib.messages',
  'django.contrib.staticfiles',
+ 'authentication.apps',
  'rest_framework',
- 'events',
 ]
 
 MIDDLEWARE = [
@@ -50,8 +50,11 @@
  'django.contrib.messages.middleware.MessageMiddleware',
  'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
+AUTHENTICATION_BACKENDS = [
+ 'django.contrib.auth.backends.ModelBackend',
+]
 
-ROOT_URLCONF = 'backend2.urls'
+ROOT_URLCONF = 'backend.urls'
 
 TEMPLATES = [
  {
@@ -69,11 +72,11 @@
  },
 ]
 
-WSGI_APPLICATION = 'backend2.wsgi.application'
+WSGI_APPLICATION = 'backend.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/5.0/ref/settings/#databases
 
 DATABASES = {
  'default': {
@@ -84,7 +87,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
  {
@@ -103,7 +106,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/4.2/topics/i18n/
+# https://docs.djangoproject.com/en/5.0/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -115,11 +118,14 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.2/howto/static-files/
+# https://docs.djangoproject.com/en/5.0/howto/static-files/
 
 STATIC_URL = 'static/'
 
 # Default primary key field type
-# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+LOGIN_REDIRECT_URL='/HOME'
+LOGOUT_REDIRECT_URL='/login'

backend2/backend2/urls.py → backend/backend/urls.py

@@ -1,8 +1,8 @@
 """
-URL configuration for backend2 project.
+URL configuration for backend project.
 
 The `urlpatterns` list routes URLs to views. For more information please see:
- https://docs.djangoproject.com/en/4.2/topics/http/urls/
+ https://docs.djangoproject.com/en/5.0/topics/http/urls/
 Examples:
 Function views
  1. Add an import: from my_app import views
@@ -16,11 +16,12 @@
 """
 from django.contrib import admin
 from django.urls import path,include
-from django.shortcuts import redirect
 
 urlpatterns = [
+ path('auth/', include('authentication.urls')),
  path('admin/', admin.site.urls),
- path('api/', include('events.urls')),
- path('', include('events.urls')),
- path('', lambda request: redirect('api/')), 
+ path('accounts/', include('django.contrib.auth.urls')), # Include authentication URLs
+
+ path('',include('django.contrib.auth.urls'),)
+ # Add your other app URLs here
 ]

backend2/backend2/wsgi.py → backend/backend/wsgi.py

@@ -1,16 +1,16 @@
 """
-WSGI config for backend2 project.
+WSGI config for backend project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/
 """
 
 import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend2.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings')
 
 application = get_wsgi_application()

backend2/manage.py → backend/manage.py

@@ -6,7 +6,7 @@
 
 def main():
  """Run administrative tasks."""
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend2.settings')
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'backend.settings')
  try:
  from django.core.management import execute_from_command_line
  except ImportError as exc: