Skip to content

Commit

Permalink
update deps & update readMe
Browse files Browse the repository at this point in the history
  • Loading branch information
abdessamadpas committed Dec 30, 2023
1 parent daf0478 commit 1261531
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DB_USER = 'root'
DB_PASSWORD = ''
DB_NAME ='django'
DB_HOST = 'localhost'
DB_PORT = '8888'
DB_PORT = '3306'
DB_ENGINE = 'django.db.backends.mysql'
DB_ROOT_PASSWORD = '123456'
SECRET_KEY = 'django-insecure-95#4u(qxgz@!nh$(n*$&!q+7ad&k1@3k+6s7(na^#&11kq)5dx'
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Online-Assignment Pas.
> ### Fll Stack Django Application
###### teams : 4

----
> This site was built using [Online-Assignment ](https://assignment-online.herokuapp.com/dashboard/)
----
Expand All @@ -15,9 +16,16 @@ pip install -r requirements.txt
- [ ] Add delight to the experience when all tasks are complete :tada:


![mobile (26)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/873e2108-bba4-4806-9a16-2ecd65feeb57)
![mobile (25)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/a4e99a44-8162-4b7e-94be-78f4dededcd7)
![mobile (24)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/18c44c67-bf83-44b4-86a3-66b7bd44cd15)
![mobile (23)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/61bf409d-c77e-4fee-852b-2300b2184f18)
![mobile (22)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/c40ffe52-4ad3-430d-947a-a7accaa9bcf5)
![mobile (21)](https://github.com/abdessamadpas/Baby_Setter_FRONTEND/assets/53188247/043c2f43-023d-44a1-85b1-b9a7598257e0)

## **DEPLOYMENT** 📦

![dashboard shot](https://ibb.co/frDsygd)



> You can just create an virtual enviroment with virtualenv env and start it with env/bin/activate.
Expand Down
2 changes: 1 addition & 1 deletion assignment/templates/etudiant/pages/base_etudiant.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link href="{% static 'img/apple-touch-icon.png' %}" rel="apple-touch-icon">

<!-- Google Fonts -->
<link href="https://fonts.gstatic.com' %}" rel="preconnect">
<link href="https://fonts.gstatic.com" rel="preconnect">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script src="your_script.js"></script>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Nunito:300,300i,400,400i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
Expand Down
8 changes: 3 additions & 5 deletions core/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.shortcuts import redirect
from core.views.crud_Student.add_listStudent import add_listStudent
from core.views.crud_Student.put_delete_Student import put_delete_Student
#from auth.views import UserProfile, Signup, PasswordChange, PasswordChangeDone, EditProfile
# from auth.views import UserProfile, Signup, PasswordChange, PasswordChangeDone, EditProfile
from core.views.auth.customLogin import RoleBasedLoginView
from core.views.auth.customChangePsw import ChangePasswordView
from django.views.generic import TemplateView
Expand All @@ -20,10 +20,7 @@
path('login/', RoleBasedLoginView.as_view(), name='login'),
path('logout/', authViews.LogoutView.as_view(), {'next_page' : 'login'}, name='logout'),
path('change_password/<int:pk>/', ChangePasswordView.as_view(), name='auth_change_password'),

path('admin_dasboard/', views.dashboard , name='dashboarde'),

path('access_denied_student/', TemplateView.as_view(template_name="public/access_denied.html"), name='access_denied_student'),
#path('login/', authViews.LoginView.as_view(template_name='admine/pages/login.html'), name='login'),
#path('logout/', authViews.LogoutView.as_view(), {'next_page' : 'login'}, name='logout'),

Expand Down Expand Up @@ -73,7 +70,7 @@
#path('exam/updateexam/', views.updatexam, name='updatexam' ),

#todo edit exam
path('submitExam/<str:exam_id>/', views.SubmitExamen, name='submit_Exam'),
# path('submitExam/<str:exam_id>/', views.SubmitExamen, name='submit_Exam'),

# -------------------- paths etudiant -------------------- #
#path('settings/editSettings/', views.editSettings, name='editSettings' ),
Expand All @@ -91,5 +88,6 @@
path('etudiant/submit_qcm/<str:module_id>/<str:exam_id>',views_etudiant.submit_qcm , name='submit_qcm'),
path('etudiant/resultat_qcm',views_etudiant.resultat_qcm , name='resultat_qcm'),
path('etudiant/profile',views_etudiant.profile , name='profile'),
path('access_denied_student/', TemplateView.as_view(template_name="public/access_denied.html"), name='access_denied_student'),

]
6 changes: 0 additions & 6 deletions core/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,10 @@
from core.views.EditModels import *
from core.views.editStudent import *
from core.views.profile_admin import *
<<<<<<< HEAD
from core.views.submitExam import *


=======
from core.views.update_exam import *
from core.views.delete_answers import *
from core.views.delete_question import *
from core.views.create_answer import *
from core.views.create_question import *
>>>>>>> cd5fc39b2c7e2dfc726b52b9dfbffd2ae9f37748
# -----------------------------views etudiant ----------------------------------- #

8 changes: 4 additions & 4 deletions core/views_etudiant/dashboard_s.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
from core.models import matiere
# Create your views here.


@login_required(login_url='access_denied_student')
def dashboard_s(request):
user_id = request.user
print("dashboard student page user is",user_id)
if user_id.is_staff:
return redirect('access_denied_student')
# if user_id.is_staff:
# return redirect('access_denied_student')

profile = Profile.objects.get(user=user_id)
groupe_id = Student.objects.get(user=user_id).group_id.id
print("ccccccc",groupe_id)
modeles_total = Matiere.objects.filter(groupe=groupe_id).count()
print("matiere totale is",matiere)
examen_total = Exam.objects.filter(group_id=groupe_id).count()

# matiere_user = Matiere.objects.all()
# print("matiere_user",matiere_user)

Expand All @@ -31,4 +31,4 @@ def dashboard_s(request):
'modeles_total': modeles_total,
'examen_total': examen_total,
}
return render(request, 'etudiant/pages/dash_etudiant.html', context)
return render(request, 'etudiant/pages/dash_etudiant.html', context)
Binary file added media/user_2/profile_RJsGdHG.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1261531

Please sign in to comment.