diff --git a/.DS_Store b/.DS_Store
index cb86c58a..952c9f83 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store
index e94e763c..58387e56 100644
Binary files a/osinaweb/.DS_Store and b/osinaweb/.DS_Store differ
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index bc866abc..f41da46d 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/osinacore/.DS_Store b/osinaweb/osinacore/.DS_Store
index 4f60abb2..bf21a061 100644
Binary files a/osinaweb/osinacore/.DS_Store and b/osinaweb/osinacore/.DS_Store differ
diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc
index 9a4b0edc..7fed1287 100644
Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 3ac9db1a..a55176bb 100644
Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc
new file mode 100644
index 00000000..b54f5f17
Binary files /dev/null and b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc
new file mode 100644
index 00000000..8fd7241d
Binary files /dev/null and b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/urls.py b/osinaweb/osinacore/add/urls.py
new file mode 100644
index 00000000..fa822197
--- /dev/null
+++ b/osinaweb/osinacore/add/urls.py
@@ -0,0 +1,32 @@
+from django.urls import path
+from . import views
+
+
+urlpatterns = [  
+
+    path('status/', views.add_status_modal, name='addstatusmodal'),
+
+    path('customer/', views.add_customer, name='addcustomer'),
+    path('business/', views.add_business, name='addbusiness'),
+    path('businessmodal/', views.add_business_modal, name='addbusinessmodal'),
+    path('staff/', views.add_staff, name='adduser'),
+    path('project/', views.add_project, name='addproject'),
+    path('projectnote/<str:project_id>/', views.add_project_note_modal, name='addprojectnotemodal'),
+    path('file/', views.add_file_modal, name='addfilemodal'),
+    path('credential/', views.add_credential_modal, name='addcredentialmodal'),
+    path('task/', views.add_task, name='addtask'),
+    path('task/<str:project_id>/', views.add_task, name='addprojecttask'),
+    path('task/<str:project_id>/<int:requirement_id>/', views.add_task, name='adduserstorytask'),
+    path('point/<str:task_id>/', views.add_point_modal, name='addpointmodal'),
+    path('epic/<str:project_id>/', views.add_epic, name='addepic'),
+    path('note/', views.add_note_modal, name='addnotemodal'),
+    path('dailyreport/', views.add_daily_report, name='adddailyreport'),
+    path('projecttype/', views.add_projecttype_modal, name='addprojecttypemodal'),
+    path('staffposition/', views.add_staffposition_modal, name='addstaffpositionmodal'),
+    path('businesstype/', views.add_businesstype_modal, name='addbusinesstypemodal'),
+    path('reference/', views.add_reference_modal, name='addreferencemodal'),
+    path('tag/', views.add_tag_modal, name='addtagmodal'),
+
+
+
+]
\ No newline at end of file
diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py
new file mode 100644
index 00000000..8cb9a252
--- /dev/null
+++ b/osinaweb/osinacore/add/views.py
@@ -0,0 +1,626 @@
+from django.shortcuts import render, redirect, get_object_or_404
+from osinacore.models import *
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse
+from django.urls import reverse
+from django.http import HttpResponseRedirect
+from datetime import date
+from django.http import JsonResponse
+
+
+
+def add_status_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        text = request.POST.get('text')
+        current_datetime = datetime.now()
+        date = datetime.now().date()
+        time = current_datetime.strftime("%I:%M %p") 
+
+        try:
+            staff_profile = StaffProfile.objects.get(user=request.user)
+        except StaffProfile.DoesNotExist:
+            # Handle the case where a StaffProfile does not exist for the user
+            staff_profile = None
+
+        status = Status(
+            text=text,
+            staff=staff_profile,
+            date=date,
+            time = time,
+        )
+        status.save()
+
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-status-modal.html')
+
+
+
+@login_required
+def add_customer(request):
+    businesses = Business.objects.all().order_by('-id')
+    references = Reference.objects.all().order_by('-id')
+    business_types = BusinessType.objects.all().order_by('-id')
+
+    if request.method == 'POST':
+        email = request.POST.get('email').lower()
+        first_name = request.POST.get('first_name')
+        last_name = request.POST.get('last_name')
+        business_id = request.POST.get('business')
+        business = get_object_or_404(Business, id=business_id)
+        username = f"{first_name.lower()}{last_name.lower()}"
+        original_username = username
+        counter = 1 
+            
+        while User.objects.filter(username=username).exists():
+            username = f"{original_username.lower()}{counter}"
+            counter += 1
+            
+        user = User.objects.create_user(
+            username=username,
+            email=email,
+            password=request.POST.get('password2')
+        )
+        user.first_name = first_name.lower().capitalize()
+        user.last_name = last_name.lower().capitalize()
+        user.save()
+ 
+
+        referenceid = request.POST.get('referenceid')
+        reference = get_object_or_404(Reference, id=referenceid)
+
+        CustomerProfile.objects.create(
+            user=user,
+            mobile_number = request.POST.get('mobile_number'),
+            personal_website = request.POST.get('personal_website'),
+            status = request.POST.get('status'),
+            reference = reference,
+            business = business,
+        )
+        return redirect('customers')
+
+    context = {      
+    'businesses' : businesses, 
+    'references' :references,
+    'business_types' : business_types
+
+    }
+    return render(request, 'add_templates/add-customer.html', context)
+    
+
+
+@login_required
+def add_business(request):
+    business_types = BusinessType.objects.all().order_by('-id')
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        email= request.POST.get('email')
+        financial_number = request.POST.get('financial_number')
+        phone_number = request.POST.get('phone_number')
+        vat = request.POST.get('vat')
+        if vat == 'true':
+            vat = True
+        else:
+            vat = False
+        commercial_registration = request.POST.get('commercial_registration')
+        website = request.POST.get('website')
+        logo = request.FILES.get('logo')
+
+        business_type_id = request.POST.get('type')
+
+        business_type = get_object_or_404(BusinessType, id=business_type_id)
+
+        business = Business(
+        name = name,
+        email = email,
+        financial_number = financial_number,
+        vat = vat,
+        commercial_registration = commercial_registration,
+        website = website,
+        type=business_type,
+        logo = logo,
+        phone_number = phone_number,
+        )
+        business.save()
+    
+        return redirect('businesses')
+
+    context = {
+        'business_types': business_types,
+    }
+
+    return render(request, 'add_templates/add-business.html', context)
+
+
+
+
+
+
+@login_required
+def add_business_modal(request):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        email = request.POST.get('email')
+        financial_number = request.POST.get('financial_number')
+        phone_number = request.POST.get('phone_number')
+        vat = request.POST.get('vat')
+        if vat == 'true':
+            vat = True
+        else:
+            vat = False
+        commercial_registration = request.POST.get('commercial_registration')
+        website = request.POST.get('website')
+        logo = request.FILES.get('logo')
+
+        business_type_id = request.POST.get('type')
+        business_type = get_object_or_404(BusinessType, id=business_type_id)
+
+        business = Business(
+            name=name,
+            email=email,
+            financial_number=financial_number,
+            vat=vat,
+            commercial_registration=commercial_registration,
+            website=website,
+            type=business_type,
+            logo=logo,
+            phone_number=phone_number,
+        )
+        business.save()
+
+        
+        businesses = Business.objects.all()
+
+        updated_options = [{'id': business.id, 'name': business.name} for business in businesses]
+
+        
+        return JsonResponse(updated_options, safe=False)
+
+    
+    return render(request, 'add_templates/addbusiness-modal.html')
+
+
+@login_required
+def add_staff(request):
+    staffpositions = StaffPosition.objects.all().order_by('-id')
+    if request.method == 'POST':
+        email = request.POST.get('email').lower()
+        first_name = request.POST.get('first_name')
+        last_name = request.POST.get('last_name')
+        username = f"{first_name.lower()}{last_name.lower()}"
+        original_username = username
+        counter = 1 
+            
+        while User.objects.filter(username=username).exists():
+            username = f"{original_username.lower()}{counter}"
+            counter += 1
+
+        user = User.objects.create_user(
+            username=username,
+            email=email,
+            password= request.POST.get('password2')
+        )
+        user.first_name = first_name.lower().capitalize()
+        user.last_name = last_name.lower().capitalize()
+        user.save()
+
+        staff_positionid = request.POST.get('staff_position')
+        staff_position = get_object_or_404(StaffPosition, id=staff_positionid)
+
+        StaffProfile.objects.create(
+            user=user,
+            image = request.FILES.get('image'),
+            mobile_number = request.POST.get('mobile_number'),
+            active = request.POST.get('active'),
+            intern = request.POST.get('intern'),
+            staff_position = staff_position,
+            )
+        return redirect('users')
+
+    context = {
+    'staffpositions' : staffpositions,
+    }
+    return render(request, 'add_templates/add-staff.html', context)
+
+
+
+@login_required
+def add_project(request):
+    staffs = StaffProfile.objects.all().order_by('-id')
+    project_types = ProjectType.objects.all()
+    customers = CustomerProfile.objects.all().order_by('-id')
+    if request.method == 'POST':
+        name = request.POST.get('name')
+
+        customerid = request.POST.get('customer')
+        customer = get_object_or_404(CustomerProfile, id=customerid)
+
+        managerid = request.POST.get('manager')
+        manager = get_object_or_404(StaffProfile, id=managerid)
+
+
+        project_type = request.POST.getlist('project_type')
+        details = request.POST.get('details')
+        membersids = request.POST.getlist('members')
+        status = request.POST.get('status')
+        start_date = request.POST.get('start_date')
+        end_date = request.POST.get('end_date') 
+
+
+        project = Project(
+            name=name,
+            customer=customer,
+            manager=manager,
+            details=details,
+            status=status,
+            start_date=start_date,
+            end_date=end_date,
+        )
+        project.save()
+        
+        project.project_type.set(project_type)
+        project.members.set(membersids)
+
+        requirements = request.POST.getlist('requirements') 
+        for requirement_content in requirements:
+            if requirement_content:
+                requirement = ProjectRequirement(content=requirement_content, project=project, added_by=request.user)
+                requirement.save()
+
+        return redirect('my-projects')
+
+
+    context = {       
+    'staffs' : staffs,
+    'project_types' : project_types,
+    'customers' : customers,
+
+    }
+    return render(request, 'add_templates/add-project.html', context)
+
+
+
+
+def add_project_note_modal(request, project_id):
+    project = get_object_or_404(Project, project_id=project_id)
+    if request.method == 'POST':
+        text = request.POST.get('note_text')
+        color = request.POST.get('note_color')
+        user = request.user
+        date = timezone.now()
+
+        note = Note(
+            text=text,
+            color=color,
+            user=user,
+            date=date,
+            project=project,
+        )
+        note.save()
+
+        return HttpResponse('<script>window.top.location.reload();</script>')
+
+    context = {
+        'project' : project
+    }
+
+    return render(request, 'add_templates/add-project-note-modal.html', context)   
+
+
+
+
+def add_file_modal(request, *args, **kwargs):
+
+    context = {
+
+    }
+    return render(request, 'add_templates/add-file-modal.html', context) 
+
+def add_credential_modal(request, *args, **kwargs):
+    context = {
+
+    }
+    return render(request, 'add_templates/add-credentials-modal.html', context) 
+
+
+
+
+@login_required
+def add_task(request, project_id=None, requirement_id=None):
+    project = None
+    requirement = None
+    epics_of_my_project = None
+    projects = None
+
+
+    if project_id: #Case where user wants to add task from project page(Adding a task for a project)
+        project = get_object_or_404(Project, project_id=project_id)
+        epics_of_my_project = Epic.objects.filter(project=project)
+        if requirement_id:
+            requirement = get_object_or_404(ProjectRequirement, id=requirement_id)
+
+
+    else:  #Case where user wants to add task from tasks page(No project specified)
+        projects = Project.objects.all().order_by('-id')
+
+
+    staffs = StaffProfile.objects.all().order_by('-id')
+
+
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        status = request.POST.get('status')
+        extra = request.POST.get('extra') 
+        description = request.POST.get('description')   
+        start_date = request.POST.get('start_date')   
+        end_date = request.POST.get('end_date')   
+
+
+
+        if not project_id:
+            project_id = request.POST.get('project')
+            project = get_object_or_404(Project, id=project_id)
+
+        epic_id = request.POST.get('epic')
+        epic = get_object_or_404(Epic, id=epic_id)
+
+
+        assigned_to_id = request.POST.get('assigned_to')
+        assigned_to = get_object_or_404(StaffProfile, id=assigned_to_id)
+
+        task = Task(
+            name=name,
+            status=status,
+            project=project, 
+            epic=epic,
+            extra=extra,
+            description=description,
+            start_date=start_date,
+            end_date=end_date,
+            assigned_to = assigned_to,
+            requirement = requirement,
+
+        )
+
+        task.save()
+
+
+        task_details_url = reverse('detailed-task', args=[task.task_id])
+        if requirement:
+         return redirect('detailed-project', project_id=project.project_id)
+        else:
+         return HttpResponseRedirect(task_details_url)
+       
+
+    context = {       
+        'project':project,
+        'epics_of_my_project' : epics_of_my_project,
+        'staffs' : staffs,
+        'projects' : projects,
+        'requirement' : requirement
+
+
+    }
+    return render(request, 'add_templates/add-task.html', context)
+
+
+
+
+def add_point_modal(request, task_id):
+    task = get_object_or_404(Task, task_id=task_id)
+    if request.method == 'POST':
+        text = request.POST.get('text')
+        point = Point(
+        text = text,
+        task = task,
+        status='Not Completed'
+        )
+        point.save()
+
+        # Redirect back to the same page
+        return redirect(request.META.get('HTTP_REFERER', ''))
+    
+    context = {
+        'task' : task,
+
+    }
+    return render(request, 'add_templates/add-point-modal.html', context)
+
+
+
+
+
+@login_required
+def add_epic(request, project_id):
+    project = get_object_or_404(Project, project_id=project_id)
+    if request.method == 'POST':
+        title = request.POST.get('title')
+        status = request.POST.get('status')
+        description = request.POST.get('description')
+
+
+        project_id = request.POST.get('project')
+        project = get_object_or_404(Project, id=project_id)
+ 
+
+        start_date = request.POST.get('start_date')
+        end_date = request.POST.get('end_date')
+
+
+        epic = Epic(
+            title=title,
+            status=status,
+            project=project, 
+            description=description,
+            start_date=start_date,
+            end_date=end_date
+        )
+
+
+        epic.save()
+
+        redirect_url = reverse('detailed-project', args=[project.project_id])
+        return redirect(redirect_url)
+    
+    context = {       
+    'project' : project,
+    }
+    return render(request, 'add_templates/add-epic.html', context)
+
+
+
+
+def add_note_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        text = request.POST.get('note_text')
+        color = request.POST.get('note_color')
+        user = request.user
+        date = timezone.now()
+
+        note = Note(
+            text=text,
+            color=color,
+            user=user,
+            date=date,
+        )
+        note.save()
+
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-note-modal.html')
+
+
+
+def add_daily_report(request):
+    user = request.user
+    today = date.today()
+    statuses = Status.objects.filter(staff=user.staffprofile, date=today)
+    if request.method == 'POST':
+        text = request.POST.get('text')
+        current_datetime = datetime.now()
+        date = datetime.now().date()
+        time = current_datetime.strftime("%I:%M %p") 
+        try:
+            staff_profile = StaffProfile.objects.get(user=request.user)
+        except StaffProfile.DoesNotExist:
+            # Handle the case where a StaffProfile does not exist for the user
+            staff_profile = None       
+
+
+        dailyreport = DailyReport(
+        text = text,
+        date = date,
+        time = time,
+        staff = staff_profile
+        )
+        dailyreport.save()
+    
+        
+        return redirect('dailyreports')
+
+    context = {
+        'statuses': statuses,
+
+
+    }
+    return render(request, 'add_templates/add-daily-report.html', context)
+
+
+
+
+def add_projecttype_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        projecttype = ProjectType(
+        name = name,
+        
+        )
+        projecttype.save()
+
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-projecttype-modal.html')
+
+
+
+def add_staffposition_modal(request):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        staffposition = StaffPosition(
+        name = name,
+
+        
+        )
+        staffposition.save()
+    
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-staffposition-modal.html')
+
+
+
+def add_businesstype_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+
+
+        businesstype = BusinessType(
+        name = name,
+        )
+        businesstype.save()
+
+
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    
+    return render(request, 'add_templates/add-businesstype-modal.html')
+
+
+
+
+
+def add_reference_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        date = request.POST.get('date')
+
+
+        reference = Reference(
+        name = name,
+        date = date,
+        )
+        reference.save()
+
+
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-reference-modal.html')
+
+
+
+
+def add_tag_modal(request, *args, **kwargs):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+      
+
+        tag = Tag(
+        name = name,
+        )
+        tag.save()
+    
+        # Reload the parent page
+        return HttpResponse('<script>window.top.location.reload();</script>')
+    return render(request, 'add_templates/add-tag-modal.html')
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/osinaweb/osinacore/templates/.DS_Store b/osinaweb/osinacore/templates/.DS_Store
new file mode 100644
index 00000000..9cd29b59
Binary files /dev/null and b/osinaweb/osinacore/templates/.DS_Store differ
diff --git a/osinaweb/osinacore/templates/add_templates/.DS_Store b/osinaweb/osinacore/templates/add_templates/.DS_Store
new file mode 100644
index 00000000..501a2469
Binary files /dev/null and b/osinaweb/osinacore/templates/add_templates/.DS_Store differ
diff --git a/osinaweb/templates/add_pages/add-business.html b/osinaweb/osinacore/templates/add_templates/add-business.html
similarity index 97%
rename from osinaweb/templates/add_pages/add-business.html
rename to osinaweb/osinacore/templates/add_templates/add-business.html
index 3b27f5b3..63f901eb 100644
--- a/osinaweb/templates/add_pages/add-business.html
+++ b/osinaweb/osinacore/templates/add_templates/add-business.html
@@ -8,7 +8,7 @@
             Add Business
         </h1>
 
-        <form method="POST" action="{% url 'save_business' %}" enctype="multipart/form-data">
+        <form method="POST" action="{% url 'addbusiness' %}" enctype="multipart/form-data">
             {% csrf_token %}
             <div class="w-full flex flex-col gap-5">
                 <div class="w-full">
diff --git a/osinaweb/templates/popup_modals/addbusinesstype-modal.html b/osinaweb/osinacore/templates/add_templates/add-businesstype-modal.html
similarity index 92%
rename from osinaweb/templates/popup_modals/addbusinesstype-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-businesstype-modal.html
index 74bd0939..63c60221 100644
--- a/osinaweb/templates/popup_modals/addbusinesstype-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-businesstype-modal.html
@@ -13,7 +13,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent"  method="POST" action="{% url 'save_businesstype' %}">
+    <form id="hiddenContent"  method="POST" action="{% url 'addbusinesstypemodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Business Type</h1>
     
diff --git a/osinaweb/templates/popup_modals/addcredentials-modal.html b/osinaweb/osinacore/templates/add_templates/add-credentials-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/addcredentials-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-credentials-modal.html
diff --git a/osinaweb/templates/add_pages/add-customer.html b/osinaweb/osinacore/templates/add_templates/add-customer.html
similarity index 98%
rename from osinaweb/templates/add_pages/add-customer.html
rename to osinaweb/osinacore/templates/add_templates/add-customer.html
index b9e32856..c365a370 100644
--- a/osinaweb/templates/add_pages/add-customer.html
+++ b/osinaweb/osinacore/templates/add_templates/add-customer.html
@@ -7,7 +7,7 @@
         <h1 class="text-3xl text-secondosiblue text-center font-semibold">
             Add Customer
         </h1>
-        <form method="POST" action="{% url 'save_customer' %}">
+        <form method="POST" action="{% url 'addcustomer' %}">
             {% csrf_token %}
             <div class="w-full flex flex-col gap-5 justify-center items-center mt-5">
 
@@ -129,7 +129,7 @@
         <!-- THE "ADD BUSINESS" FORM THAT APPEARS WHEN CLICKING ON THE ADD BUSINESS BUTTON -->
         <div class="w-full p-3 rounded-md border border-gray-300 mt-5 hidden" id="addBusinessFormContainer">
             <h1 class="text-3xl text-secondosiblue text-center font-semibold">Add Business</h1>
-            <form method="POST" action="{% url 'save_business_modal' %}" id="addBusinessFormModal"
+            <form method="POST" action="{% url 'addbusinessmodal' %}" id="addBusinessFormModal"
                 enctype="multipart/form-data">
                 {% csrf_token %}
 
@@ -258,7 +258,7 @@
                 const form = this;
                 const formData = new FormData(this);
 
-                fetch("{% url 'save_business_modal' %}", {
+                fetch("{% url 'addbusinessmodal' %}", {
                     method: "POST",
                     body: formData,
                 })
diff --git a/osinaweb/templates/add_pages/add-daily-report.html b/osinaweb/osinacore/templates/add_templates/add-daily-report.html
similarity index 94%
rename from osinaweb/templates/add_pages/add-daily-report.html
rename to osinaweb/osinacore/templates/add_templates/add-daily-report.html
index 22c5a424..b239054a 100644
--- a/osinaweb/templates/add_pages/add-daily-report.html
+++ b/osinaweb/osinacore/templates/add_templates/add-daily-report.html
@@ -7,7 +7,7 @@
         <h1 class="text-3xl text-secondosiblue text-center font-semibold">
             Add Daily Report
         </h1>
-        <form class="mx-auto w-full flex flex-col gap-3 justify-center items-center mt-5" method="POST" action="{% url 'save_dailyreport' %}">
+        <form class="mx-auto w-full flex flex-col gap-3 justify-center items-center mt-5" method="POST" action="{% url 'adddailyreport' %}">
             {% csrf_token %}
             <textarea name="text" required type="text" placeholder="Write Your Report Here" rows="10" cols="5"
             class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none">
diff --git a/osinaweb/templates/add_pages/create-epic.html b/osinaweb/osinacore/templates/add_templates/add-epic.html
similarity index 96%
rename from osinaweb/templates/add_pages/create-epic.html
rename to osinaweb/osinacore/templates/add_templates/add-epic.html
index 7e7e5920..32496894 100644
--- a/osinaweb/templates/add_pages/create-epic.html
+++ b/osinaweb/osinacore/templates/add_templates/add-epic.html
@@ -8,7 +8,7 @@
             Create Epic For {{project.name}}
         </h1>
         <form class="mx-auto w-full flex flex-col gap-5 justify-center items-center mt-5" method="POST"
-            action="{% url 'save_epic' %}">
+            action="{% url 'addepic' %}">
             {% csrf_token %}
             <div class="w-full">
                 <label class="text-gray-500">Epic Name:</label>
@@ -50,7 +50,7 @@
 
             <div class="w-full flex justify-center items-center mt-3">
                 <button type="submit"
-                    class="w-fit py-1 px53 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
+                    class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
             </div>
         </form>
     </div>
diff --git a/osinaweb/templates/popup_modals/addfile-modal.html b/osinaweb/osinacore/templates/add_templates/add-file-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/addfile-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-file-modal.html
diff --git a/osinaweb/templates/popup_modals/addnote-modal.html b/osinaweb/osinacore/templates/add_templates/add-note-modal.html
similarity index 98%
rename from osinaweb/templates/popup_modals/addnote-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-note-modal.html
index 6f2e611b..4c6a107c 100644
--- a/osinaweb/templates/popup_modals/addnote-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-note-modal.html
@@ -14,7 +14,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent" method="POST" action="{% url 'save_note' %}">
+    <form id="hiddenContent" method="POST" action="{% url 'addnotemodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Note</h1>
 
diff --git a/osinaweb/osinacore/templates/add_templates/add-point-modal.html b/osinaweb/osinacore/templates/add_templates/add-point-modal.html
new file mode 100644
index 00000000..d5c91300
--- /dev/null
+++ b/osinaweb/osinacore/templates/add_templates/add-point-modal.html
@@ -0,0 +1,41 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form id="hiddenContent"  method="POST" action="{% url 'addpointmodal' task.task_id %}">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Point</h1>
+        <div class="w-full flex justify-center items-center">
+            <input name="text" type="text" placeholder="Type your point here..."
+                class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" id="pointInput"
+                >
+        </div>
+
+        <!-- THE WARNING MESSAGE THAT APPEARS WHEN THE USER CLICKS ON THE ADD BUTTON WITH AN EMPTY INPUT FIELD -->
+        <p class="text-red-500 font-light mt-2" id="AlertPointMessage">
+
+        </p>
+
+        <div class="w-full flex justify-center items-center mt-4 gap-4">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300"
+                id="addPointsFormButton">Save</button>
+        </div>
+
+
+    </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/add_templates/add-project-note-modal.html b/osinaweb/osinacore/templates/add_templates/add-project-note-modal.html
new file mode 100644
index 00000000..e231a50a
--- /dev/null
+++ b/osinaweb/osinacore/templates/add_templates/add-project-note-modal.html
@@ -0,0 +1,116 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form id="hiddenContent" method="POST" action="{% url 'addprojectnotemodal' project.project_id %}">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Note</h1>
+
+        <div class="w-full flex flex-col gap-3 justify-center items-center">
+            <input required name="note_text" type="text" placeholder="Type your note here..."
+                class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+
+            <select required name="project" id=""
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 hidden">
+                <option value="{{project.id}}">{{project.id}}</option>
+            </select>
+        </div>
+
+        <div class="w-full flex justify-between items-center flex-wrap mt-4">
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-blue-200 cursor-pointer"
+                style="background-color: #BFDBFF;" id="blue">
+
+            </div>
+
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-pink-200 cursor-pointer"
+                style="background-color: #FBCFE8;" id="pink">
+
+            </div>
+
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-yellow-200 cursor-pointer"
+                style="background-color: #FEEF91;" id="yellow">
+
+            </div>
+
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-green-200 cursor-pointer"
+                style="background-color: #B6FAD0;" id="green">
+
+            </div>
+
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-purple-200 cursor-pointer"
+                style="background-color: #EBD6F9;" id="purple">
+
+            </div>
+
+            <div class="color-option w-[40px] h-[40px] rounded-full bg-red-200 cursor-pointer"
+                style="background-color: #FFCACA;" id="red">
+
+            </div>
+        </div>
+
+        <div>
+            <input required name="note_color" type="text"
+                class="w-full border border-gray-300 rounded-md py-1 px-3 outline-none h-[50px] mt-4 hidden"
+                id="hexCodeDisplay">
+        </div>
+
+        <script>
+            // TO GET THE COLOR OF THE DIV
+            const colorOptions = document.querySelectorAll('.color-option');
+            const hexCodeDisplay = document.getElementById('hexCodeDisplay');
+
+            colorOptions.forEach((colorOption) => {
+                colorOption.addEventListener('click', () => {
+                    // Remove borders from all color-options
+                    colorOptions.forEach((option) => {
+                        option.style.border = 'none';
+                    });
+
+                    // Get the id and background color of the clicked color div
+                    const colorId = colorOption.id;
+                    const bgColor = colorOption.style.backgroundColor;
+
+                    // Convert the RGB color to a hex code (if it's in RGB format)
+                    const hexColor = rgbToHex(bgColor);
+
+                    // Display the hex code in the input field
+                    hexCodeDisplay.value = hexColor;
+
+                    // Apply a black border to the selected color-option
+                    colorOption.style.border = '3px solid gray';
+
+                    console.log(`Selected color ID: ${colorId}`);
+                });
+            });
+
+            // Function to convert RGB color to hex code
+            function rgbToHex(rgb) {
+                const rgbaArray = rgb.match(/\d+/g);
+                const hexArray = rgbaArray.map((value) => {
+                    const hex = parseInt(value, 10).toString(16);
+                    return hex.length === 1 ? '0' + hex : hex;
+                });
+                return '#' + hexArray.join('');
+            }
+        </script>
+
+        <div class="w-full flex justify-center items-center mt-6">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
+        </div>
+    </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/templates/add_pages/create-project.html b/osinaweb/osinacore/templates/add_templates/add-project.html
similarity index 89%
rename from osinaweb/templates/add_pages/create-project.html
rename to osinaweb/osinacore/templates/add_templates/add-project.html
index 62922dbb..ea2bf546 100644
--- a/osinaweb/templates/add_pages/create-project.html
+++ b/osinaweb/osinacore/templates/add_templates/add-project.html
@@ -9,7 +9,7 @@
         </h1>
 
         <form class="w-full flex flex-col gap-5 justify-center items-center mt-5" method="POST"
-            action="{% url 'save_project' %}">
+            action="{% url 'addproject' %}">
             {% csrf_token %}
 
             <div class="w-full">
@@ -19,11 +19,12 @@
             </div>
 
             <div class="w-full">
-                <label class="text-gray-500">Clients:</label>
+                <label class="text-gray-500">Client:</label>
                 <select required name="customer"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
                     {% for customer in customers %}
-                    <option value="{{customer.user.username}}">{{customer.user.first_name}} {{customer.user.last_name}}
+                    <option value="" selected disabled>Select Client</option>
+                    <option value="{{customer.id}}">{{customer.user.first_name}} {{customer.user.last_name}}
                     </option>
                     {% endfor %}
                 </select>
@@ -31,10 +32,12 @@
 
             <div class="w-full">
                 <label class="text-gray-500">Project Manager:</label>
+               
                 <select required name="manager" id=""
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                    <option value="" selected disabled>Select Project Manager</option>
                     {% for staff in staffs %}
-                    <option value="{{staff.user.username}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
+                    <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -45,7 +48,7 @@
                     class="w-full h-[100px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1"
                     multiple>
                     {% for staff in staffs %}
-                    <option value="{{staff.user.username}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
+                    <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -54,6 +57,7 @@
                 <label class="text-gray-500">Status:</label>
                 <select required name="status" id=""
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                    <option value="" selected disabled>Select Status</option>
                     <option value="Pending">Pending</option>
                     <option value="Active">Active</option>
                     <option value="Completed">Completed</option>
@@ -62,7 +66,7 @@
             </div>
 
             <div class="w-full">
-                <label class="text-gray-500">Project Type:</label>
+                <label class="text-gray-500">Project Type(s):</label>
                 <select required name="project_type"
                     class="w-full h-[100px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1"
                     multiple>
diff --git a/osinaweb/templates/popup_modals/addprojecttype-modal.html b/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html
similarity index 93%
rename from osinaweb/templates/popup_modals/addprojecttype-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html
index 49060fc8..0ee4df1d 100644
--- a/osinaweb/templates/popup_modals/addprojecttype-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html
@@ -13,7 +13,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent"  method="POST" action="{% url 'save_projecttype' %}">
+    <form id="hiddenContent"  method="POST" action="{% url 'addprojecttypemodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Project Type</h1>
     
diff --git a/osinaweb/templates/popup_modals/addreference-modal.html b/osinaweb/osinacore/templates/add_templates/add-reference-modal.html
similarity index 93%
rename from osinaweb/templates/popup_modals/addreference-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-reference-modal.html
index cc20728d..0e96345e 100644
--- a/osinaweb/templates/popup_modals/addreference-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-reference-modal.html
@@ -13,7 +13,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent" method="POST" action="{% url 'save_reference' %}">
+    <form id="hiddenContent" method="POST" action="{% url 'addreferencemodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Reference</h1>
     
diff --git a/osinaweb/templates/add_pages/add-staff.html b/osinaweb/osinacore/templates/add_templates/add-staff.html
similarity index 98%
rename from osinaweb/templates/add_pages/add-staff.html
rename to osinaweb/osinacore/templates/add_templates/add-staff.html
index 1e9c5fe6..91ee1e22 100644
--- a/osinaweb/templates/add_pages/add-staff.html
+++ b/osinaweb/osinacore/templates/add_templates/add-staff.html
@@ -11,7 +11,7 @@
             </h1>
         </div>
 
-        <form method="POST" action="{% url 'save_staff' %}" enctype="multipart/form-data">
+        <form method="POST" action="{% url 'adduser' %}" enctype="multipart/form-data">
             {% csrf_token %}
             <div class="w-full flex flex-col gap-5 justify-center items-center mt-5">
                 <div class="w-[70px] s:w-[100px] h-[70px] s:h-[100px] rounded-full border border-gray-200"
diff --git a/osinaweb/templates/popup_modals/add-staffposition-modal.html b/osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html
similarity index 92%
rename from osinaweb/templates/popup_modals/add-staffposition-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html
index 8f30bc8a..77e4ebb6 100644
--- a/osinaweb/templates/popup_modals/add-staffposition-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html
@@ -13,7 +13,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent" method="POST" action="{% url 'save_staffposition' %}">
+    <form id="hiddenContent" method="POST" action="{% url 'addstaffpositionmodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Staff Position</h1>
     
diff --git a/osinaweb/templates/popup_modals/addstatus-modal.html b/osinaweb/osinacore/templates/add_templates/add-status-modal.html
similarity index 96%
rename from osinaweb/templates/popup_modals/addstatus-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-status-modal.html
index 239c2c3d..aeb424fd 100644
--- a/osinaweb/templates/popup_modals/addstatus-modal.html
+++ b/osinaweb/osinacore/templates/add_templates/add-status-modal.html
@@ -14,7 +14,7 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form id="hiddenContent" method="POST" action="{% url 'save_status' %}">
+    <form id="hiddenContent" method="POST" action="{% url 'addstatusmodal' %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Status</h1>
 
diff --git a/osinaweb/osinacore/templates/add_templates/add-tag-modal.html b/osinaweb/osinacore/templates/add_templates/add-tag-modal.html
new file mode 100644
index 00000000..bcb0dee5
--- /dev/null
+++ b/osinaweb/osinacore/templates/add_templates/add-tag-modal.html
@@ -0,0 +1,32 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form id="hiddenContent" method="POST" action="{% url 'addtagmodal' %}">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Tag</h1>
+    
+        <div class="w-full flex justify-center items-center">
+            <input name="name" type="text" placeholder="Tag Name"
+            class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
+            required>
+        </div>
+    
+        <div class="w-full flex justify-center items-center mt-4">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
+        </div>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/osinaweb/templates/add_pages/createtask-project.html b/osinaweb/osinacore/templates/add_templates/add-task.html
similarity index 81%
rename from osinaweb/templates/add_pages/createtask-project.html
rename to osinaweb/osinacore/templates/add_templates/add-task.html
index 63a55f4a..bf43416f 100644
--- a/osinaweb/templates/add_pages/createtask-project.html
+++ b/osinaweb/osinacore/templates/add_templates/add-task.html
@@ -7,11 +7,17 @@
 <div class="w-full px-5 s:px-9 mb-5">
     <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
         <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Create Task For {{project.name}}
+            Create Task {% if project %} For {{project.name}} {% endif %}
         </h1>
 
         <form class="w-full flex flex-col gap-5 justify-center items-center mt-5" method="POST"
-            action="{% url 'save_task' %}">
+            {% if project and not requirement %} 
+                action="{% url 'addprojecttask' project.project_id %}" 
+            {% elif project and requirement %} 
+                action="{% url 'adduserstorytask' project.project_id requirement.id %}" 
+            {% else %}
+                action="{% url 'addtask' %}"
+            {% endif %}>
             {% csrf_token %}
             <div class="w-full">
                 <label class="text-gray-500">Task Name:</label>
@@ -19,15 +25,32 @@
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
             </div>
 
+
+            {% if project %}
             <select required name="project" id=""
-                class="hidden w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
+                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 hidden">
                 <option value="{{project.id}}">{{project.name}}</option>
             </select>
+            {% else %}
+                <div class="w-full">
+                    <label class="text-gray-500">Project:</label>
+                    <select required name="epic"
+                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                        {% for project in projects %}
+                        <option value="{{project.id}}">{{project.name}}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            {% endif %}
+
+
+
 
             <div class="w-full">
                 <label class="text-gray-500">Epic:</label>
                 <select required name="epic"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                    <option value="" selected disabled>Select Epic</option>
                     {% for epic in epics_of_my_project %}
                     <option value="{{epic.id}}">{{epic.title}}</option>
                     {% endfor %}
@@ -48,6 +71,7 @@
                 <label class="text-gray-500">Assigned To:</label>
                 <select name="assigned_to" required
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
+                    <option value="" selected disabled>Select Assigned To</option>
                     {% for staff in staffs %}
                     <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
                     {% endfor %}
diff --git a/osinaweb/templates/popup_modals/addtime-modal.html b/osinaweb/osinacore/templates/add_templates/add-time-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/addtime-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-time-modal.html
diff --git a/osinaweb/templates/popup_modals/add-userstory-modal.html b/osinaweb/osinacore/templates/add_templates/add-userstory-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/add-userstory-modal.html
rename to osinaweb/osinacore/templates/add_templates/add-userstory-modal.html
diff --git a/osinaweb/templates/customer_dashboard/customer_index.html b/osinaweb/osinacore/templates/customer_dashboard/customer_index.html
similarity index 100%
rename from osinaweb/templates/customer_dashboard/customer_index.html
rename to osinaweb/osinacore/templates/customer_dashboard/customer_index.html
diff --git a/osinaweb/templates/customer_dashboard/customer_main.html b/osinaweb/osinacore/templates/customer_dashboard/customer_main.html
similarity index 100%
rename from osinaweb/templates/customer_dashboard/customer_main.html
rename to osinaweb/osinacore/templates/customer_dashboard/customer_main.html
diff --git a/osinaweb/templates/customer_dashboard/listing_pages/customer-invoices.html b/osinaweb/osinacore/templates/customer_dashboard/listing_pages/customer-invoices.html
similarity index 100%
rename from osinaweb/templates/customer_dashboard/listing_pages/customer-invoices.html
rename to osinaweb/osinacore/templates/customer_dashboard/listing_pages/customer-invoices.html
diff --git a/osinaweb/templates/delete_modals/delete-business-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-business-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-business-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-business-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-customer-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-customer-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-customer-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-customer-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-note-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-note-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-note-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-note-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-project-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-project-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-project-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-project-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-project-note-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-project-note-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-project-note-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-project-note-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-staff-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-staff-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-staff-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-staff-modal.html
diff --git a/osinaweb/templates/delete_modals/delete-task-modal.html b/osinaweb/osinacore/templates/delete_modals/delete-task-modal.html
similarity index 100%
rename from osinaweb/templates/delete_modals/delete-task-modal.html
rename to osinaweb/osinacore/templates/delete_modals/delete-task-modal.html
diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/osinacore/templates/details_pages/business-details.html
similarity index 99%
rename from osinaweb/templates/details_pages/business-details.html
rename to osinaweb/osinacore/templates/details_pages/business-details.html
index a6545d30..355d5968 100644
--- a/osinaweb/templates/details_pages/business-details.html
+++ b/osinaweb/osinacore/templates/details_pages/business-details.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/details_pages/customer-details.html b/osinaweb/osinacore/templates/details_pages/customer-details.html
similarity index 99%
rename from osinaweb/templates/details_pages/customer-details.html
rename to osinaweb/osinacore/templates/details_pages/customer-details.html
index c1b58aa2..e3878e06 100644
--- a/osinaweb/templates/details_pages/customer-details.html
+++ b/osinaweb/osinacore/templates/details_pages/customer-details.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/osinacore/templates/details_pages/project-details.html
similarity index 98%
rename from osinaweb/templates/details_pages/project-details.html
rename to osinaweb/osinacore/templates/details_pages/project-details.html
index 382297b4..f410ff49 100644
--- a/osinaweb/templates/details_pages/project-details.html
+++ b/osinaweb/osinacore/templates/details_pages/project-details.html
@@ -51,7 +51,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -64,7 +64,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -161,12 +161,12 @@
         <div
             class="w-full h-fit md:h-[70px] flex justify-between items-center bg-gray-100 shadow-md rounded-md px-3 py-3 md:py-1 mt-4">
             <div class="w-full md:w-fit flex flex-col md:flex-row justify-start items-center gap-3">
-                <a href="{% url 'createepic' project.project_id %}" class="w-full md:w-fit">
+                <a href="{% url 'addepic' project.project_id %}" class="w-full md:w-fit">
                     <button
                         class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create
                         Epic</button>
                 </a>
-                <a href="{% url 'createtaskproject' project.project_id  %}" class="w-full md:w-fit">
+                <a href="{% url 'addprojecttask' project.project_id  %}" class="w-full md:w-fit">
                     <button
                         class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create
                         Task</button>
@@ -323,7 +323,7 @@
 
                                 <td class="px-6 py-4 text-center text-sm">
                                     <div class="w-full flex justify-center items-center gap-3">
-                                        <a href="{% url 'createuserstorytask' requirement.id %}">
+                                        <a href="{% url 'adduserstorytask' project.project_id requirement.id %}">
                                             <button
                                                 class="w-fit py-2 px-3 bg-green-700 border border-green-700 text-white rounded-md cursor-pointer hover:bg-white hover:text-green-700">Add
                                                 Task</button>
@@ -365,7 +365,7 @@
 
                     <button
                         class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addCredentialsButton"
-                        data-modal-url="{% url 'addcredentials' %}">
+                        data-modal-url="{% url 'addcredentialmodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -433,7 +433,7 @@
 
                         <button
                             class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addFileButton"
-                            data-modal-url="{% url 'addfile' %}">
+                            data-modal-url="{% url 'addfilemodal' %}">
                             <i class="fa fa-plus"></i>
                         </button>
                     </div>
@@ -499,7 +499,7 @@
 
                         <button
                             class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addProjectNoteButton"
-                            data-modal-url="{% url 'addprojectnote' project.project_id %}">
+                            data-modal-url="{% url 'addprojectnotemodal' project.project_id %}">
                             <i class="fa fa-plus"></i>
                         </button>
                     </div>
diff --git a/osinaweb/templates/details_pages/staff-details.html b/osinaweb/osinacore/templates/details_pages/staff-details.html
similarity index 99%
rename from osinaweb/templates/details_pages/staff-details.html
rename to osinaweb/osinacore/templates/details_pages/staff-details.html
index 855be6ff..8c6fb7cb 100644
--- a/osinaweb/templates/details_pages/staff-details.html
+++ b/osinaweb/osinacore/templates/details_pages/staff-details.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/details_pages/task-details.html b/osinaweb/osinacore/templates/details_pages/task-details.html
similarity index 98%
rename from osinaweb/templates/details_pages/task-details.html
rename to osinaweb/osinacore/templates/details_pages/task-details.html
index ef994944..90b37636 100644
--- a/osinaweb/templates/details_pages/task-details.html
+++ b/osinaweb/osinacore/templates/details_pages/task-details.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -148,12 +148,12 @@
 
             <div>
                 <p class="text-gray-500 text-xl">Start Date: <span
-                        class="text-slate-800 text-xl font-semibold">{{task.formatted_start_date}}</span></p>
+                        class="text-slate-800 text-xl font-semibold">{{task.start_date}}</span></p>
             </div>
 
             <div>
                 <p class="text-gray-500 text-xl">End Date: <span
-                        class="text-slate-800 text-xl font-semibold">{{task.formatted_end_date}}</span></p>
+                        class="text-slate-800 text-xl font-semibold">{{task.end_date}}</span></p>
             </div>
 
             <div>
@@ -203,7 +203,7 @@
 
                     <button
                         class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addPointButton"
-                        data-modal-url="{% url 'addpoint' task.task_id %}">
+                        data-modal-url="{% url 'addpointmodal' task.task_id %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -317,8 +317,8 @@
                         </div>
 
                         <button
-                            class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addTimeButton"
-                            data-modal-url="{% url 'addtime' %}">
+                            class="h-full rounded-tr-md px-4 bg-gray-300 text-osiblue text-[18px] outline-none border-none cursor-pointer flex justify-center items-center"
+                          >
                             <i class="fa fa-plus"></i>
                         </button>
                     </div>
diff --git a/osinaweb/templates/edit_pages/edit-business-type.html b/osinaweb/osinacore/templates/edit_pages/edit-business-type.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-business-type.html
rename to osinaweb/osinacore/templates/edit_pages/edit-business-type.html
diff --git a/osinaweb/templates/edit_pages/edit-business.html b/osinaweb/osinacore/templates/edit_pages/edit-business.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-business.html
rename to osinaweb/osinacore/templates/edit_pages/edit-business.html
diff --git a/osinaweb/templates/edit_pages/edit-customer.html b/osinaweb/osinacore/templates/edit_pages/edit-customer.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-customer.html
rename to osinaweb/osinacore/templates/edit_pages/edit-customer.html
diff --git a/osinaweb/templates/edit_pages/edit-epic.html b/osinaweb/osinacore/templates/edit_pages/edit-epic.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-epic.html
rename to osinaweb/osinacore/templates/edit_pages/edit-epic.html
diff --git a/osinaweb/templates/edit_pages/edit-project-type.html b/osinaweb/osinacore/templates/edit_pages/edit-project-type.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-project-type.html
rename to osinaweb/osinacore/templates/edit_pages/edit-project-type.html
diff --git a/osinaweb/templates/edit_pages/edit-project.html b/osinaweb/osinacore/templates/edit_pages/edit-project.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-project.html
rename to osinaweb/osinacore/templates/edit_pages/edit-project.html
diff --git a/osinaweb/templates/edit_pages/edit-reference.html b/osinaweb/osinacore/templates/edit_pages/edit-reference.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-reference.html
rename to osinaweb/osinacore/templates/edit_pages/edit-reference.html
diff --git a/osinaweb/templates/edit_pages/edit-staff-position.html b/osinaweb/osinacore/templates/edit_pages/edit-staff-position.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-staff-position.html
rename to osinaweb/osinacore/templates/edit_pages/edit-staff-position.html
diff --git a/osinaweb/templates/edit_pages/edit-staff.html b/osinaweb/osinacore/templates/edit_pages/edit-staff.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-staff.html
rename to osinaweb/osinacore/templates/edit_pages/edit-staff.html
diff --git a/osinaweb/templates/edit_pages/edit-tag.html b/osinaweb/osinacore/templates/edit_pages/edit-tag.html
similarity index 100%
rename from osinaweb/templates/edit_pages/edit-tag.html
rename to osinaweb/osinacore/templates/edit_pages/edit-tag.html
diff --git a/osinaweb/templates/edit_pages/edit-task.html b/osinaweb/osinacore/templates/edit_pages/edit-task.html
similarity index 69%
rename from osinaweb/templates/edit_pages/edit-task.html
rename to osinaweb/osinacore/templates/edit_pages/edit-task.html
index 4cf55922..f2ba0008 100644
--- a/osinaweb/templates/edit_pages/edit-task.html
+++ b/osinaweb/osinacore/templates/edit_pages/edit-task.html
@@ -43,9 +43,9 @@
                 <label class="text-gray-500">Status:</label>
                 <select required name="status"
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="Open" selected>Open</option>
-                    <option value="Working On">Working On</option>
-                    <option value="Closed">Closed</option>
+                    <option value="Open" {% if task.status == 'Open' %} selected {% endif %}>Open</option>
+                    <option value="Working On" {% if task.status == 'Working On' %} selected {% endif %}>Working On</option>
+                    <option value="Closed" {% if task.status == 'Closed' %} selected {% endif %} >Closed</option>
                 </select>
             </div>
 
@@ -53,9 +53,8 @@
                 <label class="text-gray-500">Assigned To:</label>
                 <select name="assigned_to" required id=""
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="{{task.staff.id}}" selected>{{task.staff.user.first_name}} {{task.staff.user.last_name}}</option>
                     {% for staff in staffs %}
-                    <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
+                    <option value="{{staff.id}}" {% if task.assigned_to.id == staff.id %} selected {% endif %}>{{staff.user.first_name}} {{staff.user.last_name}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -63,7 +62,7 @@
             <div class="w-full">
                 <label class="text-gray-500">Description:</label>
                 <textarea required name="description" type="text" rows="5" cols="5"
-                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1">Lorem ipsum dolor sit amet consectetur adipisicing elit. Ab laboriosam cum temporibus itaque vel atque, obcaecati voluptates porro dolorem, magnam quidem nemo corrupti ullam dicta excepturi pariatur inventore voluptatem beatae!
+                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1">{{task.description}}
                 </textarea>
             </div>
 
@@ -71,25 +70,46 @@
                 <label class="text-gray-500">Extra:</label>
                 <select required name="extra" id=""
                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="True">Yes</option>
-                    <option value="False" selected>No</option>
+
+                    <option value="True" {% if task.extra == True %} selected {% endif %}>Yes</option>
+                    <option value="False" {% if task.extra == False %} selected {% endif %}>No</option>
                 </select>
             </div>
 
             <div class="w-full">
                 <label class="text-gray-500">Start Date:</label>
-                <input required name="start_date" type="date" id="date" name="date"
-                value="2023-09-22"
+                <input required name="start_date" type="date"  id="startDateDisplay"
+                value='{{task.start_date|date:"Y-m-d"}}'
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
             </div>
 
             <div class="w-full">
                 <label class="text-gray-500">End Date:</label>
-                <input required name="end_date" type="date" id="date" name="date"
-                value="2023-09-22"
+                <input required name="end_date" type="date"  id="closingDateDisplay"
+                value='{{task.end_date|date:"Y-m-d"}}'
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
             </div>
 
+            <script>
+                const startDatePicker = document.getElementById('startDate');
+                const startDateDisplay = document.getElementById('startDateDisplay');
+                const closingDatePicker = document.getElementById('closingDate');
+                const closingDateDisplay = document.getElementById('closingDateDisplay');
+                // Adding an input event listener to the starting date picker input
+                startDatePicker.addEventListener('input', () => {
+                    // When a date is selected, update the value of the starting date display input
+                    startDateDisplay.value = startDatePicker.value;
+                });
+
+                closingDatePicker.addEventListener('input', () => {
+                    closingDateDisplay.value = closingDatePicker.value;
+                });
+
+                drawDatePicker.addEventListener('input', () => {
+                    drawDateDisplay.value = drawDatePicker.value;
+                });
+            </script>
+
             <div class="w-full flex justify-center items-center mt-4">
                 <button type="submit"
                     class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
diff --git a/osinaweb/templates/epic-fetched-tasks.html b/osinaweb/osinacore/templates/epic-fetched-tasks.html
similarity index 100%
rename from osinaweb/templates/epic-fetched-tasks.html
rename to osinaweb/osinacore/templates/epic-fetched-tasks.html
diff --git a/osinaweb/templates/index.html b/osinaweb/osinacore/templates/index.html
similarity index 98%
rename from osinaweb/templates/index.html
rename to osinaweb/osinacore/templates/index.html
index 191fb4e3..0f2ff11e 100644
--- a/osinaweb/templates/index.html
+++ b/osinaweb/osinacore/templates/index.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -262,8 +262,8 @@
                                 Status</button>
 
                             <button
-                                class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 addTimeButton"
-                                data-modal-url="{% url 'addtime' %}">Add
+                                class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500"
+                                 >Add
                                 Time</button>
 
                             <button
@@ -282,7 +282,7 @@
 
                             <button
                                 class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 addPointButton"
-                                data-modal-url="{% url 'addpoint' task.task_id %}">Add
+                                data-modal-url="{% url 'addpointmodal' task.task_id %}">Add
                                 Point</button>
 
                             <a href="{% url 'detailed-task' task.task_id %}">
@@ -409,8 +409,8 @@
                             Status</button>
 
                         <button
-                            class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 addTimeButton"
-                            data-modal-url="{% url 'addtime' %}">Add
+                            class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500"
+                            >Add
                             Time</button>
 
                         <button
@@ -429,7 +429,7 @@
 
                         <button
                             class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 addPointButton"
-                            data-modal-url="{% url 'addpoint' task.task_id %}">Add
+                            data-modal-url="{% url 'addpointmodal' task.task_id %}">Add
                             Point</button>
 
                         <a href="{% url 'detailed-task' task.task_id %}">
diff --git a/osinaweb/templates/listing_pages/business-types.html b/osinaweb/osinacore/templates/listing_pages/business-types.html
similarity index 98%
rename from osinaweb/templates/listing_pages/business-types.html
rename to osinaweb/osinacore/templates/listing_pages/business-types.html
index 624e2615..9434b5f1 100644
--- a/osinaweb/templates/listing_pages/business-types.html
+++ b/osinaweb/osinacore/templates/listing_pages/business-types.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -129,7 +129,7 @@
                 <div class="w-full s:w-fit">
                     <button
                         class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addBusinessTypeButton"
-                        data-modal-url="{% url 'addbusinesstype' %}">Add
+                        data-modal-url="{% url 'addbusinesstypemodal' %}">Add
                         Business Type</button>
                 </div>
             </div>
diff --git a/osinaweb/templates/listing_pages/businesses.html b/osinaweb/osinacore/templates/listing_pages/businesses.html
similarity index 99%
rename from osinaweb/templates/listing_pages/businesses.html
rename to osinaweb/osinacore/templates/listing_pages/businesses.html
index c867d154..85c049f1 100644
--- a/osinaweb/templates/listing_pages/businesses.html
+++ b/osinaweb/osinacore/templates/listing_pages/businesses.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/osinacore/templates/listing_pages/customers.html
similarity index 99%
rename from osinaweb/templates/listing_pages/customers.html
rename to osinaweb/osinacore/templates/listing_pages/customers.html
index f8eb2e10..bb495755 100644
--- a/osinaweb/templates/listing_pages/customers.html
+++ b/osinaweb/osinacore/templates/listing_pages/customers.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/osinacore/templates/listing_pages/daily-reports.html
similarity index 99%
rename from osinaweb/templates/listing_pages/daily-reports.html
rename to osinaweb/osinacore/templates/listing_pages/daily-reports.html
index ff049424..2fe245ca 100644
--- a/osinaweb/templates/listing_pages/daily-reports.html
+++ b/osinaweb/osinacore/templates/listing_pages/daily-reports.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/listing_pages/notes.html b/osinaweb/osinacore/templates/listing_pages/notes.html
similarity index 98%
rename from osinaweb/templates/listing_pages/notes.html
rename to osinaweb/osinacore/templates/listing_pages/notes.html
index ca6c9fa1..79b52794 100644
--- a/osinaweb/templates/listing_pages/notes.html
+++ b/osinaweb/osinacore/templates/listing_pages/notes.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -117,7 +117,7 @@
             <div class="w-full py-3 px-3 bg-gray-200 rounded-md shadow-md mt-4 flex justify-end items-center">
                 <button
                     class="text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addNoteButton"
-                    data-modal-url="{% url 'addnote' %}">Add
+                    data-modal-url="{% url 'addnotemodal' %}">Add
                     Note</button>
             </div>
 
diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/osinacore/templates/listing_pages/project-types.html
similarity index 98%
rename from osinaweb/templates/listing_pages/project-types.html
rename to osinaweb/osinacore/templates/listing_pages/project-types.html
index bd62a585..ed86934c 100644
--- a/osinaweb/templates/listing_pages/project-types.html
+++ b/osinaweb/osinacore/templates/listing_pages/project-types.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -129,7 +129,7 @@
                 <div class="w-full s:w-fit">
                     <button
                         class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addProjectTypeButton"
-                        data-modal-url="{% url 'addprojecttype' %}">Add
+                        data-modal-url="{% url 'addprojecttypemodal' %}">Add
                         Project Type</button>
                 </div>
             </div>
diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html
similarity index 99%
rename from osinaweb/templates/listing_pages/projects.html
rename to osinaweb/osinacore/templates/listing_pages/projects.html
index a0a697bc..c63a81de 100644
--- a/osinaweb/templates/listing_pages/projects.html
+++ b/osinaweb/osinacore/templates/listing_pages/projects.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -136,7 +136,7 @@
                     </select>
                 </div>
                 <div class="w-full md:w-fit">
-                    <a href="{% url 'createproject' %}" class="w-full md:w-fit">
+                    <a href="{% url 'addproject' %}" class="w-full md:w-fit">
                         <button
                             class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Create
                             Project</button>
diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/osinacore/templates/listing_pages/references.html
similarity index 98%
rename from osinaweb/templates/listing_pages/references.html
rename to osinaweb/osinacore/templates/listing_pages/references.html
index 818a96e8..e163c479 100644
--- a/osinaweb/templates/listing_pages/references.html
+++ b/osinaweb/osinacore/templates/listing_pages/references.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -128,7 +128,7 @@
                 <div class="w-full s:w-fit">
                     <button
                         class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addReferenceButton"
-                        data-modal-url="{% url 'addreference' %}">Add
+                        data-modal-url="{% url 'addreferencemodal' %}">Add
                         Reference</button>
                 </div>
             </div>
diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/osinacore/templates/listing_pages/staff-positions.html
similarity index 99%
rename from osinaweb/templates/listing_pages/staff-positions.html
rename to osinaweb/osinacore/templates/listing_pages/staff-positions.html
index 558d568d..20bdc9c7 100644
--- a/osinaweb/templates/listing_pages/staff-positions.html
+++ b/osinaweb/osinacore/templates/listing_pages/staff-positions.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -130,7 +130,7 @@
                 <div class="w-full s:w-fit">
                     <button
                         class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addStaffPositionButton"
-                        data-modal-url="{% url 'addstaffposition' %}">Add
+                        data-modal-url="{% url 'addstaffpositionmodal' %}">Add
                         Staff Position</button>
                 </div>
             </div>
diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/osinacore/templates/listing_pages/staffs.html
similarity index 99%
rename from osinaweb/templates/listing_pages/staffs.html
rename to osinaweb/osinacore/templates/listing_pages/staffs.html
index b293e68b..17034b7e 100644
--- a/osinaweb/templates/listing_pages/staffs.html
+++ b/osinaweb/osinacore/templates/listing_pages/staffs.html
@@ -49,7 +49,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -62,7 +62,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/osinacore/templates/listing_pages/tags.html
similarity index 98%
rename from osinaweb/templates/listing_pages/tags.html
rename to osinaweb/osinacore/templates/listing_pages/tags.html
index bc971fb4..752101ac 100644
--- a/osinaweb/templates/listing_pages/tags.html
+++ b/osinaweb/osinacore/templates/listing_pages/tags.html
@@ -48,7 +48,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -61,7 +61,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -129,7 +129,7 @@
                 <div class="w-full s:w-fit">
                     <button
                         class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300 addTagButton"
-                        data-modal-url="{% url 'addtag' %}">Add
+                        data-modal-url="{% url 'addtagmodal' %}">Add
                         Tag</button>
                 </div>
             </div>
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/osinacore/templates/listing_pages/tasks.html
similarity index 98%
rename from osinaweb/templates/listing_pages/tasks.html
rename to osinaweb/osinacore/templates/listing_pages/tasks.html
index 36824c31..1dc3c70f 100644
--- a/osinaweb/templates/listing_pages/tasks.html
+++ b/osinaweb/osinacore/templates/listing_pages/tasks.html
@@ -47,7 +47,7 @@
 
                     <button
                         class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex s:hidden justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                        data-modal-url="{% url 'addnote' %}">
+                        data-modal-url="{% url 'addnotemodal' %}">
                         <i class="fa fa-plus"></i>
                     </button>
                 </div>
@@ -60,7 +60,7 @@
                     Notes</button>
                 <button
                     class="w-[34px] h-[33px] rounded-md p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addNoteButton hover:bg-osiblue duration-300"
-                    data-modal-url="{% url 'addnote' %}">
+                    data-modal-url="{% url 'addnotemodal' %}">
                     <i class="fa fa-plus"></i>
                 </button>
             </div>
@@ -143,7 +143,7 @@
                     </select>
                 </div>
                 <div class="w-full l:w-fit">
-                    <a href="{% url 'createtask' %}" class="w-full l:w-fit">
+                    <a href="{% url 'addtask' %}" class="w-full l:w-fit">
                         <button
                             class="w-full l:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Create
                             Task</button>
@@ -313,8 +313,8 @@
                         Status</button>
 
                     <button
-                        class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 addTimeButton"
-                        data-modal-url="{% url 'addtime' %}">Add
+                        class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 "
+                       >Add
                         Time</button>
 
                     <button
@@ -333,7 +333,7 @@
 
                     <button
                         class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 addPointButton"
-                        data-modal-url="{% url 'addpoint' task.task_id %}">Add
+                        data-modal-url="{% url 'addpointmodal' task.task_id %}">Add
                         Point</button>
 
                     <a href="{% url 'detailed-task' task.task_id %}">
@@ -483,8 +483,8 @@
                     data-modal-url="{% url 'updatestatus' task.task_id %}">Update
                     Status</button>
 
-                <button class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 addTimeButton"
-                    data-modal-url="{% url 'addtime' %}">Add
+                <button class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500"
+                  >Add
                     Time</button>
 
                 <button class="p-2 border border-gray-200 text-base h-[70px] bg-gray-100 text-gray-500 deleteTaskButton"
@@ -500,7 +500,7 @@
                     Points</button>
 
                 <button class="p-2 border border-gray-200 text-sm h-[70px] bg-gray-100 text-gray-500 addPointButton"
-                    data-modal-url="{% url 'addpoint' task.task_id %}">Add
+                    data-modal-url="{% url 'addpointmodal' task.task_id %}">Add
                     Point</button>
 
                 <a href="{% url 'detailed-task' task.task_id %}">
diff --git a/osinaweb/templates/login.html b/osinaweb/osinacore/templates/login.html
similarity index 100%
rename from osinaweb/templates/login.html
rename to osinaweb/osinacore/templates/login.html
diff --git a/osinaweb/templates/main.html b/osinaweb/osinacore/templates/main.html
similarity index 98%
rename from osinaweb/templates/main.html
rename to osinaweb/osinacore/templates/main.html
index 3f803cc5..73249f7f 100644
--- a/osinaweb/templates/main.html
+++ b/osinaweb/osinacore/templates/main.html
@@ -101,28 +101,28 @@
                             <a href="{% url 'my-projects' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                    <p class="text-white">My Projects</p>
+                                    <p class="text-white">Projects</p>
                                 </div>
                             </a>
 
                             <a href="{% url 'my-tasks' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
-                                    <p class="text-white">My Tasks</p>
+                                    <p class="text-white">Tasks</p>
                                 </div>
                             </a>
 
                             <a>
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
-                                    <p class="text-white">My Tickets</p>
+                                    <p class="text-white">Tickets</p>
                                 </div>
                             </a>
 
                             <a href="{% url 'my-notes' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
-                                    <p class="text-white">My Notes</p>
+                                    <p class="text-white">Notes</p>
                                 </div>
                             </a>
 
@@ -494,7 +494,7 @@
                         </div>
                         <button
                             class="w-[30px] h-[30px] rounded-full p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addStatusButton hover:bg-osiblue duration-300"
-                            data-modal-url="{% url 'addstatus' %}">
+                            data-modal-url="{% url 'addstatusmodal' %}">
                             <i class="fa fa-plus"></i>
                         </button>
                     </div>
diff --git a/osinaweb/templates/.DS_Store b/osinaweb/osinacore/templates/popup_modals/.DS_Store
similarity index 79%
rename from osinaweb/templates/.DS_Store
rename to osinaweb/osinacore/templates/popup_modals/.DS_Store
index 1ee323e7..4a373ee2 100644
Binary files a/osinaweb/templates/.DS_Store and b/osinaweb/osinacore/templates/popup_modals/.DS_Store differ
diff --git a/osinaweb/templates/popup_modals/add-project-note-modal.html b/osinaweb/osinacore/templates/popup_modals/add-project-note-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/add-project-note-modal.html
rename to osinaweb/osinacore/templates/popup_modals/add-project-note-modal.html
diff --git a/osinaweb/osinacore/templates/popup_modals/add-userstory-modal.html b/osinaweb/osinacore/templates/popup_modals/add-userstory-modal.html
new file mode 100644
index 00000000..e0616879
--- /dev/null
+++ b/osinaweb/osinacore/templates/popup_modals/add-userstory-modal.html
@@ -0,0 +1,32 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form id="hiddenContent" method="POST" action="{% url 'adduserstory' project.project_id %}">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add User Story</h1>
+    
+        <div class="w-full flex justify-center items-center">
+            <input name="content" type="text" placeholder="User Story"
+            class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
+            required>
+        </div>
+    
+        <div class="w-full flex justify-center items-center mt-4">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
+        </div>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/popup_modals/addcredentials-modal.html b/osinaweb/osinacore/templates/popup_modals/addcredentials-modal.html
new file mode 100644
index 00000000..0f4bff0f
--- /dev/null
+++ b/osinaweb/osinacore/templates/popup_modals/addcredentials-modal.html
@@ -0,0 +1,39 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <div id="hiddenContent">
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Credential</h1>
+
+        <div class="w-full flex justify-center items-center">
+            <input type="text" placeholder="Account" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+        </div>
+
+        <div class="w-full flex justify-center items-center">
+            <input type="text" placeholder="Password" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+        </div>
+
+        <div class="w-full flex justify-center items-center">
+            <input type="text" placeholder="Used for" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+        </div>
+
+        <div class="w-full flex justify-center items-center mt-6">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
+        </div>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/popup_modals/addfile-modal.html b/osinaweb/osinacore/templates/popup_modals/addfile-modal.html
new file mode 100644
index 00000000..ff6dd06a
--- /dev/null
+++ b/osinaweb/osinacore/templates/popup_modals/addfile-modal.html
@@ -0,0 +1,86 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <div id="hiddenContent">
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add File</h1>
+
+        <form>
+            <div class="w-full flex justify-center items-center">
+                <input type="text" placeholder="File Name"
+                    class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" required>
+            </div>
+
+            <input type="date" id="date" name="date"
+                class="w-full md:w-[300px] p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
+                required>
+
+            <div class="inbox-box border border-gray-300 py-1 px-3 w-full rounded-md mt-3">
+                <div class="flex items-center justify-between">
+                    <input required name="cv" type="file" id="actual-btn" accept=".pdf,.docx" hidden required />
+                    <span id="file-name" class="text-gray-500 text-base focus:outline-none outline-none">Upload
+                        Document(s)</span>
+                    <label for="actual-btn"
+                        class="bg-transparent text-gray-500 border border-white  py-2 h-14 cursor-pointer flex items-center"><i
+                            class="fa fa-upload"></i></label>
+                </div>
+            </div>
+
+            <div class="w-full flex justify-center items-center mt-6">
+                <button type="submit"
+                    class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300"
+                    id="addfileclose">Save</button>
+            </div>
+        </form>
+    </div>
+
+    <!-- <script>
+        const successMessage = document.getElementById('successMessage');
+        const addfileclose = document.getElementById('addfileclose');
+        const form = document.querySelector('form');
+
+        addfileclose.addEventListener("click", () => {
+            if (form.checkValidity()) {
+                successMessage.classList.remove('hidden');
+            }
+        });
+
+        // Add an event listener to prevent the form submission when the Enter key is pressed
+        form.addEventListener("submit", (e) => {
+            e.preventDefault();
+        });
+
+
+    </script> -->
+
+    <!-- WHEN THE USER CHOOSE A FILE THE NAME OF THE FILE WILL APPEAR IN THE SPAN -->
+    <script>
+        const fileInput = document.getElementById('actual-btn');
+        const fileNameSpan = document.getElementById('file-name');
+
+        fileInput.addEventListener('change', (event) => {
+            const selectedFiles = event.target.files;
+            if (selectedFiles.length > 0) {
+                const fileNames = Array.from(selectedFiles).map(file => file.name).join(', ');
+                fileNameSpan.textContent = fileNames;
+            } else {
+                fileNameSpan.textContent = 'Upload Documents (PDF, docx)';
+            }
+        });
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/templates/popup_modals/addtag-modal.html b/osinaweb/osinacore/templates/popup_modals/addtag-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/addtag-modal.html
rename to osinaweb/osinacore/templates/popup_modals/addtag-modal.html
diff --git a/osinaweb/osinacore/templates/popup_modals/addtime-modal.html b/osinaweb/osinacore/templates/popup_modals/addtime-modal.html
new file mode 100644
index 00000000..1e2375de
--- /dev/null
+++ b/osinaweb/osinacore/templates/popup_modals/addtime-modal.html
@@ -0,0 +1,33 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <div id="hiddenContent">
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Timeline</h1>
+    
+        <div class="w-full flex-col justify-center items-center">
+            <input type="date" id="date" name="date" class="w-full md:w-[300px] p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+
+            <input type="text" placeholder="Total Time" class="w-full md:w-[300px] p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
+        </div>
+
+        <p class="text-sm text-gray-500 mt-3">Value in minutes</p>
+    
+        <div class="w-full flex justify-center items-center mt-4">
+            <button
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/osinaweb/templates/popup_modals/showpoints-modal.html b/osinaweb/osinacore/templates/popup_modals/showpoints-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/showpoints-modal.html
rename to osinaweb/osinacore/templates/popup_modals/showpoints-modal.html
diff --git a/osinaweb/templates/popup_modals/status-on-mobile-modal.html b/osinaweb/osinacore/templates/popup_modals/status-on-mobile-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/status-on-mobile-modal.html
rename to osinaweb/osinacore/templates/popup_modals/status-on-mobile-modal.html
diff --git a/osinaweb/templates/popup_modals/timeline-modal.html b/osinaweb/osinacore/templates/popup_modals/timeline-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/timeline-modal.html
rename to osinaweb/osinacore/templates/popup_modals/timeline-modal.html
diff --git a/osinaweb/templates/popup_modals/update-status-modal.html b/osinaweb/osinacore/templates/popup_modals/update-status-modal.html
similarity index 100%
rename from osinaweb/templates/popup_modals/update-status-modal.html
rename to osinaweb/osinacore/templates/popup_modals/update-status-modal.html
diff --git a/osinaweb/templates/project-open-tasks.html b/osinaweb/osinacore/templates/project-open-tasks.html
similarity index 100%
rename from osinaweb/templates/project-open-tasks.html
rename to osinaweb/osinacore/templates/project-open-tasks.html
diff --git a/osinaweb/templates/recent-activities.html b/osinaweb/osinacore/templates/recent-activities.html
similarity index 100%
rename from osinaweb/templates/recent-activities.html
rename to osinaweb/osinacore/templates/recent-activities.html
diff --git a/osinaweb/templates/recent-status.html b/osinaweb/osinacore/templates/recent-status.html
similarity index 100%
rename from osinaweb/templates/recent-status.html
rename to osinaweb/osinacore/templates/recent-status.html
diff --git a/osinaweb/templates/user-recent-activities.html b/osinaweb/osinacore/templates/user-recent-activities.html
similarity index 100%
rename from osinaweb/templates/user-recent-activities.html
rename to osinaweb/osinacore/templates/user-recent-activities.html
diff --git a/osinaweb/osinacore/urls.py b/osinaweb/osinacore/urls.py
index d113a59c..c31367fb 100644
--- a/osinaweb/osinacore/urls.py
+++ b/osinaweb/osinacore/urls.py
@@ -14,12 +14,15 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
-from django.urls import path
+from django.urls import path, include
 from osinacore import views
 from django.conf.urls.static import static
 from django.conf import settings
 
 urlpatterns = [
+    path('add/', include('osinacore.add.urls')),
+
+    
     path('login', views.signin, name='signin'),
     path('logout/', views.signout, name='signout'),
     path('', views.home, name='home'),
@@ -27,25 +30,16 @@ urlpatterns = [
     path('my-tasks/', views.my_tasks, name='my-tasks'),
     path('my-notes/', views.my_notes, name='my-notes'),
     path('customers/', views.customers, name='customers'),
-    path('addcustomer/', views.add_customer, name='addcustomer'),
-    path('add-business/', views.addbusiness, name='addbusiness'),
     path('businesses/<str:business_id>/', views.businessdetails, name='businessdetails'),
     path('businesses/', views.businesses, name='businesses'),
-    path('addstaff/', views.addstaff, name='adduser'),
     path('staffs/', views.staffs, name='users'),
     path('staffpositions/', views.staff_positions, name='staffpositions'),
-    path('createproject/', views.create_project, name='createproject'),
-    path('createepic/<str:project_id>/', views.create_epic, name='createepic'),
-    path('createtask/', views.create_task, name='createtask'),
-    path('createtask/<str:project_id>/', views.createtask_project, name='createtaskproject'),
-    path('createuserstorytask/<int:requirement_id>/', views.create_user_story_task, name='createuserstorytask'),
-    path('createtaskepic/', views.createtask_epic, name='createtaskepic'),
     path('projecttypes/', views.project_types, name='projecttypes'),
     path('businesstypes/', views.business_types, name='businesstypes'),
     path('references/', views.references, name='references'),
     path('tags/', views.tags, name='tags'),
     path('dailyreports/', views.daily_reports, name='dailyreports'),
-    path('add-dailyreport/', views.add_daily_report, name='adddailyreport'),
+
     
 
 
@@ -67,23 +61,12 @@ urlpatterns = [
 
 
     #Modals urls
-    path('add-status/', views.add_status_modal, name='addstatus'),
-    path('add-note/', views.add_note_modal, name='addnote'),
-    path('add-project-note/<str:project_id>/', views.add_project_note_modal, name='addprojectnote'),
-    path('add-file/', views.add_file_modal, name='addfile'),
     path('add-user-story/<str:project_id>/', views.add_user_story_modal, name='adduserstory'),
-    path('add-credentials/', views.add_credentials_modal, name='addcredentials'),
     path('update-status/<str:task_id>/', views.update_status_modal, name='updatestatus'),
-    path('add-point/<str:task_id>/', views.add_point_modal, name='addpoint'),
     path('show-points/<str:task_id>/', views.show_points_modal, name='showpoints'),
-    path('add-time/', views.add_time_modal, name='addtime'),
     path('timeline/', views.timeline_modal, name='timeline'),
-    path('add-projecttype/', views.add_projecttype_modal, name='addprojecttype'),
-    path('add-businesstype/', views.add_businesstype_modal, name='addbusinesstype'),
-    path('add-reference/', views.add_reference_modal, name='addreference'),
-    path('add-tag/', views.add_tag_modal, name='addtag'),
     path('add-businesscustomer/', views.add_business_modal, name='addbusinesscustomer'),
-    path('add-staffposition/', views.staff_position_modal, name='addstaffposition'),
+
     path('statusmobilemodal/', views.status_mobile_modal, name='statusmobilemodal'),
     path('userrecentativities/<int:user_id>', views.user_recent_activities_modal, name='userrecentativities'),
 
@@ -101,24 +84,7 @@ urlpatterns = [
     path('deletetaskpointmodal/<int:point_id>/<str:task_id>/', views.delete_task_point_modal, name='deletetaskpointmodal'),
 
 
-    #Save Urls
-    path('save_note/', views.save_note, name='save_note'),
-    path('save_project_note/', views.save_project_note, name='save_project_note'),
-    path('save_project/', views.save_project, name='save_project'),
-    path('save_epic/', views.save_epic, name='save_epic'),
-    path('save_task/', views.save_task, name='save_task'),
-    path('save_business/', views.save_business, name='save_business'),
-    path('save_business_modal/', views.save_business_modal, name='save_business_modal'),
-    path('save_customer/', views.save_customer, name='save_customer'),
-    path('save_staff/', views.save_staff, name='save_staff'),
-    path('save_status/', views.save_status, name='save_status'),
-    path('save_projecttype/', views.save_projecttype, name='save_projecttype'),
-    path('save_businesstype/', views.save_businesstype, name='save_businesstype'),
-    path('save_reference/', views.save_reference, name='save_reference'),
-    path('save_tag/', views.save_tag, name='save_tag'),
-    path('save_point/', views.save_point, name='save_point'),
-    path('save_staffposition/', views.save_staffposition, name='save_staffposition'),
-    path('save_dailyreport/', views.save_dailyreport, name='save_dailyreport'),
+  
 
 
     #Edit Pages
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 40531d29..08b5b4e4 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -11,7 +11,6 @@ from django.db.models import Q
 from django.http import JsonResponse
 from .models import Task, Epic
 from datetime import date
-from django.http import HttpResponseRedirect
 from django.template.loader import render_to_string
 from .custom_context import calculate_time_ago  
 
@@ -345,184 +344,15 @@ def detailed_task(request, task_id):
 
 
 #Add Pages
-@login_required
-def createtask_project(request, project_id):
-    project = get_object_or_404(Project, project_id=project_id)
-    epics_of_my_project = Epic.objects.filter(project=project)
-    staffs = StaffProfile.objects.all().order_by('-id')
-    context = {  
-
-    'project' : project,
-    'epics_of_my_project' : epics_of_my_project,
-    'staffs' : staffs,
-
-    }
-    return render(request, 'add_pages/createtask-project.html', context)
-
-
-@login_required
-def create_user_story_task(request, requirement_id):
-    requirement = get_object_or_404(ProjectRequirement, id=requirement_id)
-    members_list = list(requirement.project.members.all())
-
-    context = {  
-        'requirement' : requirement,
-        'members_list' : members_list,
-
-
-    }
-    return render(request, 'add_pages/create-user-story-task.html', context)
-
-
-@login_required
-def create_project(request):
-    staffs = StaffProfile.objects.all().order_by('-id')
-    project_types = ProjectType.objects.all()
-    customers = CustomerProfile.objects.all().order_by('-id')
-    context = {       
-    'staffs' : staffs,
-    'project_types' : project_types,
-    'customers' : customers,
-
-    }
-    return render(request, 'add_pages/create-project.html', context)
-
-@login_required
-def create_epic(request, project_id):
-    project = get_object_or_404(Project, project_id=project_id)
-
-    context = {       
-    'project' : project,
- 
-
-    }
-    return render(request, 'add_pages/create-epic.html', context)
-
-@login_required
-def create_task(request):
-    context = {       
-
-    }
-    return render(request, 'add_pages/create-task.html', context)
-
-
-@login_required
-def createtask_epic(request):
-    context = {       
-
-    }
-    return render(request, 'add_pages/createtask-epic.html', context)
-
-@login_required
-def add_customer(request):
-    businesses = Business.objects.all().order_by('-id')
-    references = Reference.objects.all().order_by('-id')
-    business_types = BusinessType.objects.all().order_by('-id')
-
-    context = {      
-    'businesses' : businesses, 
-    'references' :references,
-    'business_types' : business_types
-
-    }
-    return render(request, 'add_pages/add-customer.html', context)
-    
-
-@login_required
-def addbusiness(request):
-    business_types = BusinessType.objects.all().order_by('-id')
-
-    context = {
-        'business_types': business_types,
-    }
-
-    return render(request, 'add_pages/add-business.html', context)
-
-
-
-@login_required
-def addstaff(request):
-
-    staffpositions = StaffPosition.objects.all().order_by('-id')
-
-    context = {
-
-    'staffpositions' : staffpositions,
-
-
-    }
-    return render(request, 'add_pages/add-staff.html', context)
-
-
-
-
-def add_daily_report(request):
-    user = request.user
-    today = date.today()
-    statuses = Status.objects.filter(staff=user.staffprofile, date=today)
-
-    context = {
-        'statuses': statuses,
-
-
-    }
-    return render(request, 'add_pages/add-daily-report.html', context)
-
-
-
-
 
 
 # Modals views
-def add_note_modal(request, *args, **kwargs):
-    context = {
 
-    }
-    return render(request, 'popup_modals/addnote-modal.html', context)   
 
 
-def add_project_note_modal(request, project_id):
-    project = get_object_or_404(Project, project_id=project_id)
 
-    context = {
-        'project' : project
-    }
-
-    return render(request, 'popup_modals/add-project-note-modal.html', context)   
-
-
-def add_status_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addstatus-modal.html', context)
-
-def add_file_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addfile-modal.html', context) 
-
-def add_credentials_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addcredentials-modal.html', context) 
-
-
-def add_point_modal(request, task_id):
-    task = get_object_or_404(Task, task_id=task_id)
-    context = {
-        'task' : task,
-
-    }
-    return render(request, 'popup_modals/addpoint-modal.html', context)
 
-def add_time_modal(request, *args, **kwargs):
-    context = {
 
-    }
-    return render(request, 'popup_modals/addtime-modal.html', context)
 
 
 def show_points_modal(request, task_id):
@@ -561,35 +391,6 @@ def update_status_modal(request, *, task_id):
     return render(request, 'popup_modals/update-status-modal.html', context)
 
 
-def add_projecttype_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addprojecttype-modal.html', context)
-
-
-def add_businesstype_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addbusinesstype-modal.html', context)
-
-
-
-def add_reference_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addreference-modal.html', context)
-
-
-
-def add_tag_modal(request, *args, **kwargs):
-    context = {
-
-    }
-    return render(request, 'popup_modals/addtag-modal.html', context)
-
 
 
 def add_business_modal(request, *args, **kwargs):
@@ -628,13 +429,6 @@ def add_user_story_modal(request, project_id):
 
 
 
-def staff_position_modal(request):
-
-    context = {
-
-
-    }
-    return render(request, 'popup_modals/add-staffposition-modal.html', context)
 
 
 def status_mobile_modal (request, *args, **kwargs):
@@ -674,540 +468,7 @@ def user_recent_activities_modal(request, user_id):
 
 
 
-
-
-
-
-
-
-
-
-#Save Functions
-@login_required
-def save_note(request):
-    if request.method == 'POST':
-        text = request.POST.get('note_text')
-        color = request.POST.get('note_color')
-        user = request.user
-        date = timezone.now()
-
-        note = Note(
-            text=text,
-            color=color,
-            user=user,
-            date=date,
-        )
-        note.save()
-
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-
-    return render(request, 'addnote-modal.html') 
-
-
-def save_project_note(request):
-
-    if request.method == 'POST':
-        text = request.POST.get('note_text')
-        color = request.POST.get('note_color')
-        user = request.user
-        date = timezone.now()
-
-        project_id = request.POST.get('project')
-        project = get_object_or_404(Project, id=project_id)
-
-        note = Note(
-            text=text,
-            color=color,
-            user=user,
-            date=date,
-            project=project,
-        )
-        note.save()
-
-        return HttpResponse('<script>window.top.location.reload();</script>')
-
-    return render(request, 'add-project-note-modal.html')
-
-
-
-@login_required
-def save_project(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-        customer_username = request.POST.get('customer')
-        manager_username = request.POST.get('manager')
-        project_type = request.POST.getlist('project_type')
-        details = request.POST.get('details')
-        members_usernames = request.POST.getlist('members')
-        status = request.POST.get('status')
-        start_date = request.POST.get('start_date')
-        end_date = request.POST.get('end_date') 
-
-        try:
-            customer_profile = CustomerProfile.objects.get(user__username=customer_username)
-            manager_profile = StaffProfile.objects.get(user__username=manager_username)
-            members_profiles = StaffProfile.objects.filter(user__username__in=members_usernames)
-        except (CustomerProfile.DoesNotExist, StaffProfile.DoesNotExist):
-            # Handle the case where customer_profile or manager_profile is not found
-            pass
-
-        # Create and save the project
-        project = Project(
-            name=name,
-            customer=customer_profile,
-            manager=manager_profile,
-            details=details,
-            status=status,
-            start_date=start_date,
-            end_date=end_date,
-        )
-        project.save()
-        
-        project.project_type.set(project_type)
-        project.members.set(members_profiles)
-
-        # Save project requirements
-        requirements = request.POST.getlist('requirements') 
-        for requirement_content in requirements:
-            if requirement_content:
-                requirement = ProjectRequirement(content=requirement_content, project=project, added_by=request.user)
-                requirement.save()
-
-        return redirect('my-projects')
-
-
-
-@login_required
-def save_epic(request):
-    if request.method == 'POST':
-        title = request.POST.get('title')
-        status = request.POST.get('status')
-        description = request.POST.get('description')
-
-
-        project_id = request.POST.get('project')
-        project = get_object_or_404(Project, id=project_id)
- 
-
-        start_date = request.POST.get('start_date')
-        end_date = request.POST.get('end_date')
-
-
-        epic = Epic(
-            title=title,
-            status=status,
-            project=project, 
-            description=description,
-            start_date=start_date,
-            end_date=end_date
-        )
-
-
-        epic.save()
-
-        # Redirect to the detailed project page
-        redirect_url = reverse('detailed-project', args=[project.project_id])
-        return redirect(redirect_url)
-    
-
-
-@login_required
-def save_task(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-        status = request.POST.get('status')
-        extra = request.POST.get('extra') 
-        description = request.POST.get('description')   
-        start_date = request.POST.get('start_date')   
-        end_date = request.POST.get('end_date')   
-        requirement_id = request.POST.get('requirement') 
-
-        if requirement_id:
-            requirement = get_object_or_404(ProjectRequirement, id =requirement_id)
-
-        else: 
-            requirement = None
-
-
-        project_id = request.POST.get('project')
-        project = get_object_or_404(Project, id=project_id)
-
-        epic_id = request.POST.get('epic')
-        epic = get_object_or_404(Epic, id=epic_id)
-
-
-        assigned_to_id = request.POST.get('assigned_to')
-        assigned_to = get_object_or_404(StaffProfile, id=assigned_to_id)
-
-        task = Task(
-            name=name,
-            status=status,
-            project=project, 
-            epic=epic,
-            extra=extra,
-            description=description,
-            start_date=start_date,
-            end_date=end_date,
-            assigned_to = assigned_to,
-            requirement = requirement,
-
-        )
-
-        # Save the Task object to the database
-        task.save()
-
-
-        # Redirect to the task detailed page
-        task_details_url = reverse('detailed-task', args=[task.task_id])
-        if requirement:
-         return redirect('detailed-project', project_id=project.project_id)
-        else:
-         return HttpResponseRedirect(task_details_url)
-
-
-
-
-@login_required
-def save_business(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-        email= request.POST.get('email')
-        financial_number = request.POST.get('financial_number')
-        phone_number = request.POST.get('phone_number')
-        vat = request.POST.get('vat')
-        if vat == 'true':
-            vat = True
-        else:
-            vat = False
-        commercial_registration = request.POST.get('commercial_registration')
-        website = request.POST.get('website')
-        logo = request.FILES.get('logo')
-
-        business_type_id = request.POST.get('type')
-
-        business_type = get_object_or_404(BusinessType, id=business_type_id)
-
-        business = Business(
-        name = name,
-        email = email,
-        financial_number = financial_number,
-        vat = vat,
-        commercial_registration = commercial_registration,
-        website = website,
-        type=business_type,
-        logo = logo,
-        phone_number = phone_number,
-        )
-        business.save()
-    
-    return redirect(businesses)
-
-
-@login_required
-def save_business_modal(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-        email = request.POST.get('email')
-        financial_number = request.POST.get('financial_number')
-        phone_number = request.POST.get('phone_number')
-        vat = request.POST.get('vat')
-        if vat == 'true':
-            vat = True
-        else:
-            vat = False
-        commercial_registration = request.POST.get('commercial_registration')
-        website = request.POST.get('website')
-        logo = request.FILES.get('logo')
-
-        business_type_id = request.POST.get('type')
-        business_type = get_object_or_404(BusinessType, id=business_type_id)
-
-        business = Business(
-            name=name,
-            email=email,
-            financial_number=financial_number,
-            vat=vat,
-            commercial_registration=commercial_registration,
-            website=website,
-            type=business_type,
-            logo=logo,
-            phone_number=phone_number,
-        )
-        business.save()
-
-        
-        businesses = Business.objects.all()
-
-        updated_options = [{'id': business.id, 'name': business.name} for business in businesses]
-
-        
-        return JsonResponse(updated_options, safe=False)
-
     
-    return render(request, 'addbusiness-modal.html')
-
-
-def save_customer(request):
-    if request.method == 'POST':
-            email = request.POST.get('email').lower()
-            first_name = request.POST.get('first_name')
-            last_name = request.POST.get('last_name')
-            business_id = request.POST.get('business')
-            business = get_object_or_404(Business, id=business_id)
-            username = f"{first_name.lower()}{last_name.lower()}"
-            original_username = username
-            counter = 1 
-            
-            while User.objects.filter(username=username).exists():
-                username = f"{original_username.lower()}{counter}"
-                counter += 1
-            
-            user = User.objects.create_user(
-                username=username,
-                email=email,
-                password=request.POST.get('password2')
-            )
-            user.first_name = first_name.lower().capitalize()
-            user.last_name = last_name.lower().capitalize()
-            user.save()
- 
-
-            referenceid = request.POST.get('referenceid')
-            reference = get_object_or_404(Reference, id=referenceid)
-
-            CustomerProfile.objects.create(
-                user=user,
-                mobile_number = request.POST.get('mobile_number'),
-                personal_website = request.POST.get('personal_website'),
-                status = request.POST.get('status'),
-                reference = reference,
-                business = business,
-            )
-    return redirect('customers')
-
-
-
-def save_staff(request):
-    if request.method == 'POST':
-            email = request.POST.get('email').lower()
-            first_name = request.POST.get('first_name')
-            last_name = request.POST.get('last_name')
-            username = f"{first_name.lower()}{last_name.lower()}"
-            original_username = username
-            counter = 1 
-            
-            while User.objects.filter(username=username).exists():
-                username = f"{original_username.lower()}{counter}"
-                counter += 1
-
-            user = User.objects.create_user(
-                username=username,
-                email=email,
-                password= request.POST.get('password2')
-            )
-            user.first_name = first_name.lower().capitalize()
-            user.last_name = last_name.lower().capitalize()
-            user.save()
-
-            staff_positionid = request.POST.get('staff_position')
-            staff_position = get_object_or_404(StaffPosition, id=staff_positionid)
-
-            StaffProfile.objects.create(
-                user=user,
-                image = request.FILES.get('image'),
-                mobile_number = request.POST.get('mobile_number'),
-                active = request.POST.get('active'),
-                intern = request.POST.get('intern'),
-                staff_position = staff_position,
-            )
-    return redirect('users')
-
-
-
-@login_required
-def save_status(request):
-    if request.method == 'POST':
-        text = request.POST.get('text')
-        current_datetime = datetime.now()
-        date = datetime.now().date()
-        time = current_datetime.strftime("%I:%M %p") 
-
-        try:
-            staff_profile = StaffProfile.objects.get(user=request.user)
-        except StaffProfile.DoesNotExist:
-            # Handle the case where a StaffProfile does not exist for the user
-            staff_profile = None
-
-        status = Status(
-            text=text,
-            staff=staff_profile,
-            date=date,
-            time = time,
-        )
-        status.save()
-
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-
-    return render(request, 'addstatus-modal.html') 
-
-
-
-@login_required
-def save_projecttype(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-
-
-        projecttype = ProjectType(
-        name = name,
-        
-        )
-        projecttype.save()
-
-
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-    
-    return redirect('projecttypes') 
-
-
-@login_required
-def save_businesstype(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-
-
-        businesstype = BusinessType(
-        name = name,
-        )
-        businesstype.save()
-
-
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-    
-    return redirect('businesstypes') 
-
-
-@login_required
-def save_reference(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-        date = request.POST.get('date')
-
-
-        reference = Reference(
-        name = name,
-        date = date,
-        
-        )
-        reference.save()
-
-
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-    
-    return redirect('references') 
-
-
-
-@login_required
-def save_tag(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-      
-
-
-        tag = Tag(
-        name = name,
-
-        
-        )
-        tag.save()
-    
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-    
-    return redirect('tags') 
-
-
-@login_required
-def save_staffposition(request):
-    if request.method == 'POST':
-        name = request.POST.get('name')
-      
-
-
-        staffposition = StaffPosition(
-        name = name,
-
-        
-        )
-        staffposition.save()
-    
-        # Reload the parent page
-        return HttpResponse('<script>window.top.location.reload();</script>')
-    
-    return redirect('staffpositions') 
-
-
-
-
-@login_required
-def save_point(request):
-    if request.method == 'POST':
-        text = request.POST.get('text')
-        task = request.POST.get('task')
-
-        taskobj = get_object_or_404(Task, id=task)
-
-
-        point = Point(
-        text = text,
-        task = taskobj,
-        status='Not Completed'
-        )
-        point.save()
-
-        # Redirect back to the same page
-        return redirect(request.META.get('HTTP_REFERER', ''))
-    
-        
-    return render(request, 'addpoint-modal.html')
-    
-
-
-@login_required
-def save_dailyreport(request):
-    if request.method == 'POST':
-        text = request.POST.get('text')
-        current_datetime = datetime.now()
-        date = datetime.now().date()
-        time = current_datetime.strftime("%I:%M %p") 
-        try:
-            staff_profile = StaffProfile.objects.get(user=request.user)
-        except StaffProfile.DoesNotExist:
-            # Handle the case where a StaffProfile does not exist for the user
-            staff_profile = None       
-
-
-        dailyreport = DailyReport(
-        text = text,
-        date = date,
-        time = time,
-        staff = staff_profile
-        )
-        dailyreport.save()
-    
-        
-    return redirect('dailyreports')
-
-
-
-
-
 
 
 # EDIT TEMPLATES
@@ -1294,12 +555,14 @@ def edit_task(request, task_id):
     if request.method == 'POST':
         task.name = request.POST.get('name')
         
-        # Convert project ID to a Project instance
         project_id = request.POST.get('project')
         project = get_object_or_404(Project, id=project_id)
         task.project = project
-        
-        # Convert epic ID to an Epic instance
+
+
+        task.extra = request.POST.get('extra')
+
+
         epic_id = request.POST.get('epic')
         epic = get_object_or_404(Epic, id=epic_id)
         task.epic = epic
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index 2b979d85..3545a689 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/settings.py b/osinaweb/osinaweb/settings.py
index 56de931c..109622dc 100644
--- a/osinaweb/osinaweb/settings.py
+++ b/osinaweb/osinaweb/settings.py
@@ -63,7 +63,7 @@ ROOT_URLCONF = 'osinaweb.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates')],
+        'DIRS': [os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'osinacore', 'templates'),],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
diff --git a/osinaweb/templates/add_pages/create-task.html b/osinaweb/templates/add_pages/create-task.html
deleted file mode 100644
index 1e62e0eb..00000000
--- a/osinaweb/templates/add_pages/create-task.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "main.html" %}
-{%load static%}
-{% block content %}
-
-<!-- IN THIS TASK FORM THE TASK DOESN'T BELONG NEITHER TO APROJECT OR EPIC, WE REAHC THIS FORM FROM THE TASKS.HTML -->
-
-<div class="w-full px-5 s:px-9 mb-5">
-    <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
-        <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Create Task
-        </h1>
-
-        <div class="w-full flex flex-col gap-5 justify-center items-center mt-5">
-            <div class="w-full">
-                <label class="text-gray-500">Task Name:</label>
-                <input type="text"
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Project:</label>
-                <select
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="">Cars & Classics</option>
-                    <option value="">Osina</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Epic:</label>
-                <select
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="" selected disabled>Select Epic</option>
-                    <option value="">Epic 1</option>
-                    <option value="">Epic 2</option>
-                    <option value="">Epic 3</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Status:</label>
-                <select
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="">Open</option>
-                    <option value="">Working On</option>
-                    <option value="">Closed</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Assigned To:</label>
-                <select required
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
-                    <option value="Pending">Nataly</option>
-                    <option value="Active">Salim</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Description:</label>
-                <textarea type="text" placeholder="Description.." rows="5" cols="5"
-                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none"></textarea>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Extra:</label>
-                <select id=""
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="" selected>No</option>
-                    <option value="">Yes</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Start Date:</label>
-                <input type="date" id="date" name="date"
-                    class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">End Date:</label>
-                <input type="date" id="date" name="date"
-                    class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Documents:</label>
-                <div class="inbox-box border border-gray-300 w-full rounded-md px-3 mt-1">
-                    <div class="flex items-center justify-between">
-                        <input name="" required type="file" class="file-input" accept=".pdf,.docx" hidden multiple />
-                        <span class="file-name text-gray-500 text-base focus:outline-none outline-none">Upload
-                            Document(s)</span>
-                        <label
-                            class="file-label bg-transparent text-gray-500 border border-white h-14 cursor-pointer flex items-center">
-                            <i class="fa fa-upload" style="font-size: 25px;"></i>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="w-full flex justify-center items-center mt-3">
-                <button
-                    class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-
-
-<!-- POPUP MODAL -->
-<div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden" id="popUpModal">
-    <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
-        <button class="absolute top-3 right-5 text-slate-800 text-xl cursor-pointer outline-none border-none"
-            id="closeModalButton">
-            <i class="fa fa-close"></i>
-        </button>
-        <iframe id="popupModalFrame" frameborder="0"></iframe>
-    </div>
-</div>
-
-<!-------------- JS SCRIPTS --------------->
-<script type="text/javascript" src='{% static "js/upload-input-tag.js" %}'></script>
-
-<script type="text/javascript" src='{% static "js/pop-modals.js" %}'></script>
-
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/templates/add_pages/create-user-story-task.html b/osinaweb/templates/add_pages/create-user-story-task.html
deleted file mode 100644
index 9fdb0a73..00000000
--- a/osinaweb/templates/add_pages/create-user-story-task.html
+++ /dev/null
@@ -1,140 +0,0 @@
-{% extends "main.html" %}
-{%load static%}
-{% block content %}
-
-<!-- THIS TASK BELONGS TO A USER STORY ADDED FROM PROJECT DETAILS PAGE -->
-
-<div class="w-full px-5 s:px-9 mb-5">
-    <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
-        <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Create Task for {{requirement.content}}
-        </h1>
-
-        <form method="POST" action="{% url 'save_task' %}">
-            {% csrf_token %}
-            <div class="w-full flex flex-col gap-5 justify-center items-center mt-5">
-                <div class="w-full">
-                    <label class="text-gray-500">Task Name:</label>
-                    <input required name="name" type="text" placeholder="Name"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
-                </div>
-
-                <div class="w-full">
-                    <label class="text-gray-500 text-base">User Story:</label>
-                    <select id="" name="requirement"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option value="{{requirement.id}}" selected >{{requirement.content}}</option>
-                    </select>
-                </div>
-
-                <div class="w-full">
-                    <label class="text-gray-500 text-base">Epic:</label>
-                    <select id="" name="epic"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option value="" selected>Select Epic</option>
-                        {% for epic in requirement.project.epic_set.all %}
-                        <option value="{{epic.id}}"selected>{{epic.title}}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-
-                <div class="w-full">
-                    <label class="text-gray-500 text-base">Project:</label>
-                    <select id="" name="project"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option value="{{requirement.project.id}}" selected>{{requirement.project.name}}</option>
-                    </select>
-                </div>
-
-                <div class="w-full">
-                    <label class="text-gray-500">Status:</label>
-                    <select required name="status"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option value="Open">Open</option>
-                        <option value="Working On">Working On</option>
-                        <option value="Closed">Closed</option>
-                    </select>
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">Assigned To:</label>
-                    <select name="assigned_to" required
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        {% for staff in members_list %}
-                        <option value="" selected>Select Staff</option>
-                        <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">Task Description:</label>
-                    <textarea required name="description" type="text" placeholder="Description..." rows="5" cols="5"
-                        class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1"></textarea>
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">Extra:</label>
-                    <select required name="extra" id=""
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option value="True">Yes</option>
-                        <option value="False" selected>No</option>
-                    </select>
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">Start Date:</label>
-                    <input required name="start_date" type="date" id="date" name="date"
-                        class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">End Date:</label>
-                    <input required name="end_date" type="date" id="date" name="date"
-                        class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-                </div>
-    
-                <div class="w-full">
-                    <label class="text-gray-500">Documents:</label>
-                    <div class="inbox-box border border-gray-300 w-full rounded-md px-3 mt-1">
-                        <div class="flex items-center justify-between">
-                            <input name="" type="file" class="file-input" accept=".pdf,.docx" hidden multiple />
-                            <span class="file-name text-gray-500 text-base focus:outline-none outline-none">Upload
-                                Document(s)</span>
-                            <label
-                                class="file-label bg-transparent text-gray-500 border border-white h-14 cursor-pointer flex items-center">
-                                <i class="fa fa-upload" style="font-size: 25px;"></i>
-                            </label>
-                        </div>
-                    </div>
-                </div>
-    
-                <div class="w-full flex justify-center items-center mt-3">
-                    <button type="submit"
-                        class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
-                </div>
-       </form>
-    </div>
-</div>
-</div>
-</div>
-
-
-<!-- POPUP MODAL -->
-<div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden" id="popUpModal">
-    <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
-        <button class="absolute top-3 right-5 text-slate-800 text-xl cursor-pointer outline-none border-none"
-            id="closeModalButton">
-            <i class="fa fa-close"></i>
-        </button>
-        <iframe id="popupModalFrame" frameborder="0"></iframe>
-    </div>
-</div>
-
-<!-------------- JS SCRIPTS --------------->
-<script type="text/javascript" src='{% static "js/upload-input-tag.js" %}'></script>
-
-<script type="text/javascript" src='{% static "js/pop-modals.js" %}'></script>
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/templates/add_pages/createtask-epic.html b/osinaweb/templates/add_pages/createtask-epic.html
deleted file mode 100644
index 036a21d6..00000000
--- a/osinaweb/templates/add_pages/createtask-epic.html
+++ /dev/null
@@ -1,128 +0,0 @@
-{% extends "main.html" %}
-{%load static%}
-{% block content %}
-
-<!-- IN THIS TASK FORM THE TASK ALREADY BELONG TO AN EPIC THAT BELONGS TO A PROJECT -->
-
-<div class="w-full px-5 s:px-9 mb-5">
-    <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
-        <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Create Task
-        </h1>
-
-        <div class="w-full flex flex-col gap-5 justify-center items-center mt-5">
-            <div class="w-full">
-                <label class="text-gray-500">Task Name:</label>
-                <input type="text"
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
-            </div>
-
-
-            <div class="w-full">
-                <label class="text-gray-500">Project Name:</label>
-                <select id=""
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 cursor-not-allowed mt-1"
-                    disabled>
-                    <option value="">Test 1</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Epic:</label>
-                <select id=""
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 cursor-not-allowed mt-1"
-                    disabled>
-                    <option value="">Epic</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Status:</label>
-                <select id=""
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="">Open</option>
-                    <option value="">Working On</option>
-                    <option value="">Closed</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Assigned To:</label>
-                <select required
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="Pending">Nataly</option>
-                    <option value="Active">Salim</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Task Description:</label>
-                <textarea type="text" placeholder="Description..." rows="5" cols="5"
-                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1"></textarea>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Extra:</label>
-                <select id=""
-                    class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                    <option value="" selected>No</option>
-                    <option value="">Yes</option>
-                </select>
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Start Date:</label>
-                <input type="date" id="date" name="date"
-                    class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">End Date:</label>
-                <input type="date" id="date" name="date"
-                    class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
-            </div>
-
-            <div class="w-full">
-                <label class="text-gray-500">Documents:</label>
-                <div class="inbox-box border border-gray-300 w-full rounded-md px-3 mt-1">
-                    <div class="flex items-center justify-between">
-                        <input name="" required type="file" class="file-input" accept=".pdf,.docx" hidden multiple />
-                        <span class="file-name text-gray-500 text-base focus:outline-none outline-none">Upload
-                            Document(s)</span>
-                        <label
-                            class="file-label bg-transparent text-gray-500 border border-white h-14 cursor-pointer flex items-center">
-                            <i class="fa fa-upload" style="font-size: 25px;"></i>
-                        </label>
-                    </div>
-                </div>
-            </div>
-
-            <div class="w-full flex justify-center items-center mt-3">
-                <button
-                    class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-
-
-<!-- POPUP MODAL -->
-<div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden" id="popUpModal">
-    <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
-        <button class="absolute top-3 right-5 text-slate-800 text-xl cursor-pointer outline-none border-none"
-            id="closeModalButton">
-            <i class="fa fa-close"></i>
-        </button>
-        <iframe id="popupModalFrame" frameborder="0"></iframe>
-    </div>
-</div>
-
-<!-------------- JS SCRIPTS --------------->
-<script type="text/javascript" src='{% static "js/upload-input-tag.js" %}'></script>
-
-<script type="text/javascript" src='{% static "js/pop-modals.js" %}'></script>
-
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/templates/popup_modals/addpoint-modal.html b/osinaweb/templates/popup_modals/addpoint-modal.html
deleted file mode 100644
index 7ca87ef5..00000000
--- a/osinaweb/templates/popup_modals/addpoint-modal.html
+++ /dev/null
@@ -1,90 +0,0 @@
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Osina</title>
-
-    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
-</head>
-
-<body class="font-poppinsLight">
-    <form id="hiddenContent"  method="POST" action="{% url 'save_point' %}">
-        {% csrf_token %}
-        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add Point</h1>
-        <select name="task"  required 
-                class="hidden w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
-
-                <option value="{{task.id}}">{{task.name}}</option>
-
-        </select>
-        <div class="w-full flex justify-center items-center">
-            <input name="text" type="text" placeholder="Type your point here..."
-                class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" id="pointInput"
-                >
-        </div>
-
-        <!-- THE WARNING MESSAGE THAT APPEARS WHEN THE USER CLICKS ON THE ADD BUTTON WITH AN EMPTY INPUT FIELD -->
-        <p class="text-red-500 font-light mt-2" id="AlertPointMessage">
-
-        </p>
-
-        <div class="w-full flex justify-center items-center mt-4 gap-4">
-            <button type="submit"
-                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300"
-                id="addPointsFormButton">Save</button>
-        </div>
-
-        <div class="w-full flex flex-col" id="allPointsContainer">
-           <!-- THE ENTERED POINTS BY THE USER CONTAINER -->
-        </div>
-
-
-        <!-- <script>
-            const allPointsContainer = document.getElementById("allPointsContainer");
-            const pointInput = document.getElementById("pointInput");
-            const addButton = document.getElementById("addPointsFormButton");
-            const alertMessage = document.getElementById("AlertPointMessage");
-
-            addButton.addEventListener("click", function () {
-                // Fetch the entered in the input field
-                const pointText = pointInput.value;
-
-                // Check if the input field is empty
-                if (pointText.trim() === "") {
-                    // Show an error message
-                    alertMessage.textContent = "Please enter a point before adding.";
-                    return; // Exit the function without adding if input is empty
-                }
-
-                // Clear the error message
-                alertMessage.textContent = "";
-
-                // Create a new container div for each pair
-                const container = document.createElement("div");
-                container.className = "w-full flex justify-start items-center gap-3 mt-3";
-
-                // Create a new paragraph element
-                const newParagraph = document.createElement("p");
-
-                // Set the text content of the new paragraph to the input text
-                newParagraph.textContent = "- " + pointText;
-
-                container.appendChild(newParagraph);
-
-                allPointsContainer.appendChild(container);
-
-                // Clear the input field
-                pointInput.value = "";
-            });
-        </script> -->
-
-    </form>
-</body>
-
-</html>
\ No newline at end of file