-
{% trans "Webcam" %}
-
-
-
- 📸 {% trans "Snap" %}
-
+
+
+
+
+
+
+ {{ form.full_name }}
+ {% trans "Full Name" %}
+
+
+
+ {{ form.username }}
+ {% trans "Username" %}
+
+
+
+ {{ form.email }}
+ {% trans "Email Address" %}
+
+
+
+
+
+ {{ form.password }}
+ {% trans "Password" %}
+
+
+
+
+ {{ form.password_confirm }}
+ {% trans "Confirm Password" %}
+
-
-
{% trans "Preview" %}
-
-
- {% trans "No photo taken" %}
-
-
-
-
- {% trans "Or upload file:" %}
- {{ form.avatar }}
+
+
+
+
+
+
+
+
+
+ {{ form.mobile_number }}
+ {% trans "Mobile Number" %}
+
+
+
+
+ {{ form.governorate }}
+ {% trans "Governorate" %}
+
+
+
+
+ {{ form.city }}
+ {% trans "City" %}
+
+
+
-
{% trans "Register Now" %}
+
+
+
+
+
+ {% trans "Select Classroom" %}
+ {{ form.classroom }}
+
+
+
+
{% trans "Select Subjects" %}
+
+
+
+
+
+
+
{% trans "Total Amount:" %}
+ 0.00
+
+
+
+
+
+
+
+
+
+
{% trans "Webcam Capture" %}
+
+
+
+
+
+
+
{% trans "Preview" %}
+
+
+ {% trans "No photo" %}
+
+
+
+
+
+ {% trans "Or upload file:" %}
+ {{ form.avatar }}
+
+
+
+
+
+ {% trans "Complete Registration" %}
@@ -121,19 +161,7 @@
{% block extra_js %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/core/templates/core/student_dashboard.html b/core/templates/core/student_dashboard.html
new file mode 100644
index 0000000..a93be93
--- /dev/null
+++ b/core/templates/core/student_dashboard.html
@@ -0,0 +1,182 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}{% trans "Student Dashboard" %} - EduPlatform{% endblock %}
+
+{% block content %}
+
+
+
+
+
{% trans "Welcome back," %} {{ user.first_name|default:user.username }} ! 👋
+
{% trans "Here is an overview of your learning journey." %}
+
+
+
+
+
+
+
+
+ {% if student_profile.avatar %}
+
+ {% else %}
+
+ {{ user.first_name|first|upper }}
+
+ {% endif %}
+
+ {% if student_profile.is_mobile_verified and student_profile.is_email_verified %}
+
+ Verified
+
+ {% endif %}
+
+
+
{{ user.get_full_name|default:user.username }}
+
{% trans "Student" %} {% if student_profile.classroom %} • {{ student_profile.classroom.name_en }}{% endif %}
+
+
+
+
+
+ {% trans "Email" %}
+ {{ user.email }}
+ {% if student_profile.is_email_verified %}
+ {% trans "Verified" %}
+ {% else %}
+ {% trans "Unverified" %}
+ {% endif %}
+
+
+ {% trans "Phone" %}
+ {{ student_profile.mobile_number|default:"-" }}
+ {% if student_profile.is_mobile_verified %}
+ {% trans "Verified" %}
+ {% else %}
+ {% trans "Unverified" %}
+ {% endif %}
+
+
+ {% trans "City" %}
+ {{ student_profile.city.name|default:"-" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{% trans "Enrolled Subjects" %}
+ {{ subscribed_subjects.count }}
+
+
+
+
+
+
+
+
{% trans "Classroom" %}
+ {{ student_profile.classroom.name_en|default:"Not assigned" }}
+
+
+
+
+
+
+
+
+
{% trans "My Subjects" %}
+ {% if subscribed_subjects %}
+
+ {% for subject in subscribed_subjects %}
+
+
+ {% if subject.image %}
+
+
+
+ {% else %}
+
+ {% trans "No Image" %}
+
+ {% endif %}
+
+
{{ subject.name_en }}
+
{{ subject.description_en }}
+
+
+ {{ subject.teacher.user.get_full_name|default:"No Teacher" }}
+
+
{% trans "Go to Class" %}
+
+
+
+
+ {% endfor %}
+
+ {% else %}
+
+
{% trans "You haven't enrolled in any subjects yet." %}
+
+ {% endif %}
+
+
+
+
+
{% trans "Available Subjects" %}
+ {% if available_subjects %}
+
+ {% for subject in available_subjects %}
+
+
+ {% if subject.image %}
+
+
+
+ {% else %}
+
+ {% trans "No Image" %}
+
+ {% endif %}
+
+
+
+ {% endfor %}
+
+ {% else %}
+
+
{% trans "No new subjects available." %}
+
+ {% endif %}
+
+
+
+
+
+{% endblock %}
diff --git a/core/templates/core/teacher_dashboard.html b/core/templates/core/teacher_dashboard.html
new file mode 100644
index 0000000..b2ca55f
--- /dev/null
+++ b/core/templates/core/teacher_dashboard.html
@@ -0,0 +1,129 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}{% trans "Teacher Dashboard" %} - EduPlatform{% endblock %}
+
+{% block content %}
+
+
+
+
+
{% trans "Welcome, Teacher" %} {{ user.last_name|default:user.username }} ! 👨🏫
+
{% trans "Manage your classes and students here." %}
+
+
+
+
+
+
+
+
+ {% if teacher_profile.avatar %}
+
+ {% else %}
+
+ {{ user.first_name|first|upper }}
+
+ {% endif %}
+
+
+
{{ user.get_full_name|default:user.username }}
+
{{ teacher_profile.specialization|default:"Teacher" }}
+
+
+
+
+
{% trans "Bio" %}
+
+ {{ teacher_profile.bio|default:"No bio provided yet." }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{% trans "Subjects Taught" %}
+ {{ subjects.count }}
+
+
+
+
+
+
+
+
+
{% trans "Status" %}
+ Active
+
+
+
+
+
+
+
+
+
{% trans "My Classes" %}
+ {% if subjects %}
+
+ {% for subject in subjects %}
+
+
+ {% if subject.image %}
+
+
+
+ {% else %}
+
+ {% trans "No Image" %}
+
+ {% endif %}
+
+
{{ subject.name_en }}
+
{{ subject.description_en }}
+
+
+ {{ subject.classroom.name_en }}
+
+
+ {{ subject.subscribers.count }} {% trans "Students" %}
+
+
+
+
+
+
+ {% endfor %}
+
+ {% else %}
+
+
{% trans "You are not assigned to any subjects yet." %}
+
{% trans "Contact the administrator to assign classes." %}
+
+ {% endif %}
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/core/templates/core/verify_otp.html b/core/templates/core/verify_otp.html
new file mode 100644
index 0000000..6d62f06
--- /dev/null
+++ b/core/templates/core/verify_otp.html
@@ -0,0 +1,52 @@
+{% extends 'base.html' %}
+{% load i18n static %}
+
+{% block title %}{% trans "Verify Account" %}{% endblock %}
+
+{% block content %}
+
+
+
+
+
{% trans "Account Verification" %}
+
+ {% if error %}
+
+ {{ error }}
+
+ {% endif %}
+
+
+ {% trans "We have sent verification codes to your mobile number and email address. Please enter them below." %}
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/core/thawani.py b/core/thawani.py
new file mode 100644
index 0000000..6c0f16e
--- /dev/null
+++ b/core/thawani.py
@@ -0,0 +1,69 @@
+import httpx
+from core.models import ThawaniConfiguration
+from django.conf import settings
+
+class ThawaniClient:
+ def __init__(self):
+ config = ThawaniConfiguration.objects.first()
+ if not config:
+ # Fallback or error if not configured
+ self.api_key = None
+ self.publishable_key = None
+ self.is_sandbox = True
+ else:
+ self.api_key = config.api_key
+ self.publishable_key = config.publishable_key
+ self.is_sandbox = config.is_sandbox
+
+ if self.is_sandbox:
+ self.base_url = "https://uat-checkout.thawani.om/api/v1"
+ else:
+ self.base_url = "https://checkout.thawani.om/api/v1"
+
+ def create_checkout_session(self, subject, user, success_url, cancel_url):
+ if not self.api_key:
+ raise Exception("Thawani API Key is not configured.")
+
+ url = f"{self.base_url}/checkout/session"
+ headers = {
+ "thawani-api-key": self.api_key,
+ "Content-Type": "application/json"
+ }
+
+ # Thawani expects amount in Baisa (1 OMR = 1000 Baisa)
+ amount_baisa = int(subject.price * 1000)
+
+ payload = {
+ "client_reference_id": str(user.id),
+ "mode": "payment",
+ "products": [
+ {
+ "name": subject.name_en,
+ "quantity": 1,
+ "unit_amount": amount_baisa
+ }
+ ],
+ "success_url": success_url,
+ "cancel_url": cancel_url,
+ "metadata": {
+ "subject_id": str(subject.id),
+ "user_id": str(user.id)
+ }
+ }
+
+ response = httpx.post(url, json=payload, headers=headers)
+ response.raise_for_status()
+ return response.json()
+
+ def get_checkout_session(self, session_id):
+ if not self.api_key:
+ raise Exception("Thawani API Key is not configured.")
+
+ url = f"{self.base_url}/checkout/session/{session_id}"
+ headers = {
+ "thawani-api-key": self.api_key
+ }
+
+ response = httpx.get(url, headers=headers)
+ response.raise_for_status()
+ return response.json()
diff --git a/core/urls.py b/core/urls.py
index defe932..ed37225 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -1,4 +1,5 @@
from django.urls import path
+from django.contrib.auth import views as auth_views
from . import views
urlpatterns = [
@@ -6,8 +7,14 @@ urlpatterns = [
path('set-language/
/', views.set_language, name='set_language'),
path('subject//', views.subject_detail, name='subject_detail'),
path('ajax/get-subjects-by-level/', views.get_subjects_by_level, name='get_subjects_by_level'),
+ path('ajax/get-cities-by-governorate/', views.get_cities_by_governorate, name='get_cities_by_governorate'),
path('register/', views.register_student, name='register_student'),
+ path('login/', auth_views.LoginView.as_view(template_name='core/login.html'), name='login'),
+ path('verify-otp/', views.verify_otp, name='verify_otp'),
path('ajax/get-classroom-subjects/', views.get_classroom_subjects, name='get_classroom_subjects'),
path('profile/', views.profile, name='profile'),
path('logout/', views.custom_logout, name='logout'),
+ path('subscribe//', views.subscribe_subject, name='subscribe_subject'),
+ path('payment/success/', views.payment_success, name='payment_success'),
+ path('payment/cancel/', views.payment_cancel, name='payment_cancel'),
]
\ No newline at end of file
diff --git a/core/views.py b/core/views.py
index 665968d..b1f44dc 100644
--- a/core/views.py
+++ b/core/views.py
@@ -4,29 +4,28 @@ from django.conf import settings
from django.http import JsonResponse
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
-from django.contrib.auth import logout
-from .models import Classroom, Subject, Teacher, Student
+from django.contrib.auth import logout, login
+from django.urls import reverse
+from .models import Classroom, Subject, Teacher, Student, City
from .forms import StudentRegistrationForm
+from .wablas import send_whatsapp_message
+from .thawani import ThawaniClient
+import random
+import string
def index(request):
- # Fetch levels with their related subjects using prefetch_related for efficiency
levels = Classroom.objects.prefetch_related('subjects').all()
-
- context = {
- 'levels': levels,
- }
+ context = {'levels': levels}
return render(request, 'core/index.html', context)
def set_language(request, lang_code):
next_url = request.GET.get('next', '/')
response = redirect(next_url)
-
if lang_code in [lang[0] for lang in settings.LANGUAGES]:
translation.activate(lang_code)
if hasattr(request, 'session'):
request.session['_language'] = lang_code
response.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang_code)
-
return response
def subject_detail(request, pk):
@@ -42,34 +41,206 @@ def get_subjects_by_level(request):
return JsonResponse(list(subjects), safe=False)
def get_classroom_subjects(request):
- """Public endpoint for registration form"""
classroom_id = request.GET.get('classroom_id')
if not classroom_id:
return JsonResponse([], safe=False)
subjects = Subject.objects.filter(classroom_id=classroom_id).values('id', 'name_en', 'price')
return JsonResponse(list(subjects), safe=False)
+def get_cities_by_governorate(request):
+ governorate_id = request.GET.get('governorate_id')
+ if not governorate_id:
+ return JsonResponse([], safe=False)
+ cities = City.objects.filter(governorate_id=governorate_id).values('id', 'name_en', 'name_ar')
+ return JsonResponse(list(cities), safe=False)
+
+def generate_otp():
+ return ''.join(random.choices(string.digits, k=6))
+
def register_student(request):
if request.method == 'POST':
form = StudentRegistrationForm(request.POST, request.FILES)
if form.is_valid():
student = form.save()
- # Redirect to success page or login
- return redirect('index') # Placeholder
+
+ # Generate OTPs
+ mobile_otp = generate_otp()
+ email_otp = generate_otp()
+
+ student.mobile_otp_code = mobile_otp
+ student.email_otp_code = email_otp
+ student.save()
+
+ # Send OTP via WhatsApp
+ if student.mobile_number:
+ # Attempt to send WhatsApp message
+ # Note: This will only work if Wablas is configured in Admin
+ send_whatsapp_message(
+ student.mobile_number,
+ f"Your Verification Code is: {mobile_otp}"
+ )
+
+ # Simulate sending OTPs (Log to console)
+ print(f"========================================")
+ print(f"SIMULATED OTP SENDING:")
+ print(f"User: {student.user.username}")
+ print(f"Mobile OTP for {student.mobile_number}: {mobile_otp}")
+ print(f"Email OTP for {student.user.email}: {email_otp}")
+ print(f"========================================")
+
+ # Log the user in
+ login(request, student.user)
+
+ # Redirect to verification page
+ return redirect('verify_otp')
else:
form = StudentRegistrationForm()
return render(request, 'core/registration.html', {'form': form})
@login_required
-def profile(request):
+def verify_otp(request):
try:
- student_profile = request.user.student_profile
+ student = request.user.student_profile
except Student.DoesNotExist:
- student_profile = None
+ return redirect('index')
+
+ if student.is_mobile_verified and student.is_email_verified:
+ return redirect('profile')
+
+ error = None
+ if request.method == 'POST':
+ entered_mobile_otp = request.POST.get('mobile_otp')
+ entered_email_otp = request.POST.get('email_otp')
+
+ mobile_ok = student.is_mobile_verified
+ email_ok = student.is_email_verified
+
+ if not mobile_ok:
+ if entered_mobile_otp == student.mobile_otp_code:
+ student.is_mobile_verified = True
+ mobile_ok = True
+ else:
+ error = "Invalid Mobile OTP"
+
+ if not email_ok and (error is None or "Mobile" not in error):
+ if entered_email_otp == student.email_otp_code:
+ student.is_email_verified = True
+ email_ok = True
+ else:
+ error = "Invalid Email OTP"
+
+ if mobile_ok and email_ok:
+ student.mobile_otp_code = "" # Clear codes
+ student.email_otp_code = ""
+ student.save()
+ return redirect('profile')
+ else:
+ student.save() # Save partial verification if any
+
+ return render(request, 'core/verify_otp.html', {'error': error, 'student': student})
+
+@login_required
+def profile(request):
+ user = request.user
- return render(request, 'core/profile.html', {'student_profile': student_profile})
+ # Check for Teacher
+ if hasattr(user, 'teacher_profile'):
+ teacher_profile = user.teacher_profile
+ subjects = teacher_profile.subjects.all()
+ return render(request, 'core/teacher_dashboard.html', {
+ 'teacher_profile': teacher_profile,
+ 'subjects': subjects
+ })
+
+ # Check for Student
+ elif hasattr(user, 'student_profile'):
+ student_profile = user.student_profile
+ subscribed_subjects = student_profile.subscribed_subjects.all()
+
+ # Get available subjects (in same classroom, not yet subscribed)
+ available_subjects = []
+ if student_profile.classroom:
+ available_subjects = Subject.objects.filter(
+ classroom=student_profile.classroom
+ ).exclude(
+ id__in=subscribed_subjects.values_list('id', flat=True)
+ )
+
+ return render(request, 'core/student_dashboard.html', {
+ 'student_profile': student_profile,
+ 'subscribed_subjects': subscribed_subjects,
+ 'available_subjects': available_subjects
+ })
+
+ # Fallback (Superuser or Admin without profile)
+ else:
+ student_profile = None
+ return render(request, 'core/profile.html', {'student_profile': student_profile})
def custom_logout(request):
logout(request)
return redirect('index')
+
+@login_required
+def subscribe_subject(request, subject_id):
+ try:
+ student = request.user.student_profile
+ except Student.DoesNotExist:
+ return redirect('index')
+
+ subject = get_object_or_404(Subject, pk=subject_id)
+
+ # Check if already subscribed
+ if subject in student.subscribed_subjects.all():
+ return redirect('profile')
+
+ try:
+ thawani = ThawaniClient()
+ success_url = request.build_absolute_uri(reverse('payment_success')) + '?session_id={session_id}'
+ cancel_url = request.build_absolute_uri(reverse('payment_cancel'))
+
+ session = thawani.create_checkout_session(subject, request.user, success_url, cancel_url)
+
+ session_id = session.get('data', {}).get('session_id')
+ if not session_id:
+ return render(request, 'core/error.html', {'message': 'Could not create payment session.'})
+
+ return redirect(f"{thawani.checkout_base_url}/{session_id}")
+
+ except Exception as e:
+ print(f"Payment Error: {e}")
+ return render(request, 'core/error.html', {'message': f'Payment initialization failed: {str(e)}'})
+
+@login_required
+def payment_success(request):
+ session_id = request.GET.get('session_id')
+ if not session_id:
+ return redirect('profile')
+
+ try:
+ thawani = ThawaniClient()
+ response = thawani.get_checkout_session(session_id)
+ data = response.get('data', {})
+ payment_status = data.get('payment_status')
+ metadata = data.get('metadata', {})
+ subject_id = metadata.get('subject_id')
+
+ if payment_status == 'paid' and subject_id:
+ try:
+ student = request.user.student_profile
+ subject = get_object_or_404(Subject, pk=subject_id)
+ student.subscribed_subjects.add(subject)
+ except Exception:
+ pass # Already handled or user mismatch?
+ return redirect('profile')
+ else:
+ return render(request, 'core/error.html', {'message': f'Payment was not successful. Status: {payment_status}'})
+
+ except Exception as e:
+ print(f"Payment Verification Error: {e}")
+ return render(request, 'core/error.html', {'message': f'Payment verification failed: {str(e)}'})
+
+@login_required
+def payment_cancel(request):
+ return redirect('profile')
\ No newline at end of file
diff --git a/core/wablas.py b/core/wablas.py
new file mode 100644
index 0000000..c530bd7
--- /dev/null
+++ b/core/wablas.py
@@ -0,0 +1,44 @@
+import httpx
+from .models import WablasConfiguration
+
+def send_whatsapp_message(phone_number, message):
+ """
+ Sends a WhatsApp message using the Wablas API.
+ """
+ try:
+ settings = WablasConfiguration.objects.first()
+ if not settings or not settings.api_token:
+ print("Wablas settings not configured.")
+ return False
+
+ # Wablas API usually takes: phone, message
+ # And Authorization header.
+
+ headers = {
+ "Authorization": settings.api_token,
+ }
+
+ # Depending on the specific Wablas endpoint version, payload might differ.
+ # Common v2/v3 payload:
+ payload = {
+ "phone": phone_number,
+ "message": message,
+ }
+
+ # If secret is used, sometimes it's passed in body
+ if settings.secret_key:
+ payload["secret"] = settings.secret_key
+
+ # Using a timeout to prevent hanging
+ response = httpx.post(settings.api_url, data=payload, headers=headers, timeout=10)
+
+ if response.status_code >= 200 and response.status_code < 300:
+ print(f"WhatsApp message sent to {phone_number}: {response.json()}")
+ return True
+ else:
+ print(f"Failed to send WhatsApp message. Status: {response.status_code}, Body: {response.text}")
+ return False
+
+ except Exception as e:
+ print(f"Error sending WhatsApp message: {e}")
+ return False
diff --git a/requirements.txt b/requirements.txt
index 7ce7d6c..45b378b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ Django==5.2.7
mysqlclient==2.2.7
python-dotenv==1.1.1
django-jazzmin
+httpx