diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 0bff3b41..ae463d46 100644 Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index 47dffaf3..c8309022 100644 Binary files a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc index 90873afc..4239a399 100644 Binary files a/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc and b/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index c33e43b3..4277173d 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/input.css b/osinaweb/input.css index d280e661..9b84d59b 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -58,6 +58,18 @@ } +/* ANIMATE THE NOTIFICATION SIDE BAR WHEN OPENING */ +.slide-in { + right: 0; + transition: right 0.5s ease; +} + +.slide-out { + right: -100%; + transition: right 0.8s ease; +} + + /* TO SHOW AND HIDE MESSAGES SMOOTHLY */ /* Show the message with a fade-in animation */ .show-message { @@ -89,6 +101,35 @@ } +/* UPLOAD FILE PROGRESS BAR */ +.progress { + width: 250px; + height: 15px; + background-color: #f0f0f0; + border-radius: 8px; + overflow: hidden; +} + +.progress-bar { + width: 0; + height: 100%; + background-color: #374a7a; + text-align: center; + color: white; + padding: 5px 5px; + font-size: 12px; + display: flex; + justify-content: center; + align-items: center; +} + +@media screen and (max-width: 650px) { + .progress { + width: 100% + } +} + + /* TO ANIMATE THE BURGER MENU IN THE FIXED HEADER */ /* Default state */ @@ -112,7 +153,8 @@ width: 100%; } - .fixedSideHeader, .topHeader { + .fixedSideHeader, + .topHeader { display: none !important; } @@ -122,7 +164,9 @@ } @media (min-width: 1200px) { - .mobileTopHeader, .mobileFixedSideHeader { + + .mobileTopHeader, + .mobileFixedSideHeader { display: none !important; } @@ -271,7 +315,7 @@ /* TICKETS REPLY DEFAULT STYLES */ .default-css { color: rgb(147, 147, 147) !important; -} +} .default-css h1 { font-size: 2em; diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc index ad1f513e..2cb1798c 100644 Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-312.pyc new file mode 100644 index 00000000..563643b3 Binary files /dev/null and b/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc new file mode 100644 index 00000000..0bddd24c Binary files /dev/null and b/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/osinacore/knowledge_base/urls.py b/osinaweb/osinacore/knowledge_base/urls.py new file mode 100644 index 00000000..cf9fb6c2 --- /dev/null +++ b/osinaweb/osinacore/knowledge_base/urls.py @@ -0,0 +1,10 @@ + +from django.urls import path +from . import views + + +urlpatterns = [ + + path('project_knowledge/', views.project_knowledge, name='project_knowledge'), + +] \ No newline at end of file diff --git a/osinaweb/osinacore/knowledge_base/views.py b/osinaweb/osinacore/knowledge_base/views.py new file mode 100644 index 00000000..9408ae20 --- /dev/null +++ b/osinaweb/osinacore/knowledge_base/views.py @@ -0,0 +1,12 @@ +from django.shortcuts import render, redirect, get_object_or_404 +from osinacore.models import * +from osinacore.decorators import * + +@staff_login_required +def project_knowledge(request): + + context = { + + } + + return render(request, "knowledge_base/project-knowledge-modal.html", context) \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html index b0a23613..4d87ebe3 100644 --- a/osinaweb/osinacore/templates/add-edit-main.html +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -28,6 +28,119 @@ {% endif %} + +
+
+
+
+ + + +

13 New Notifications

+
+ + + +
+ +
+
+
+
+
+ +
+
+
+

Salim Elliye added a reaction on your + status

+
+
+ +
+ + + +
+
+ + +
+
+
+
+ +
+
+
+

Salim Elliye added you into Osimenu + Project

+
+
+ +
+ + + +
+
+ +
+
+
+

You are now offline!

+
+
+ +
+ + + +
+
+ +
+
+
+

Your Osimenu subscription expires in 3 + days. Save on your renewal now.

+
+
+ +
+ + + +
+
+ + + +
+
+
+
@@ -651,35 +764,53 @@
-
-
-
-
- user-image -
+
+ +
+
+

1

- -
-

{{request.user.first_name}} {{request.user.last_name}}

- - +
+ + +
- - @@ -792,6 +923,19 @@ id="closeModalButton"> +
+
+ +
+
@@ -808,6 +952,9 @@ + + + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-ticket.html b/osinaweb/osinacore/templates/add_templates/add-ticket.html index 652567c1..7671435c 100644 --- a/osinaweb/osinacore/templates/add_templates/add-ticket.html +++ b/osinaweb/osinacore/templates/add_templates/add-ticket.html @@ -68,22 +68,31 @@
+ class="w-full py-1 px-3 border border-gray-300 outline-none rounded-md mt-1 resize-none" + rows="8">
-
+
- +
- - - + + + - -
diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index fa7e1cf5..d5fc138a 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -555,6 +555,20 @@ id="closeModalButton"> +
+
+ +
+
+
diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html index b58f8022..d651e7ec 100644 --- a/osinaweb/osinacore/templates/details_templates/project-details.html +++ b/osinaweb/osinacore/templates/details_templates/project-details.html @@ -13,15 +13,17 @@ {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %} {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %} bg-opacity-70">

{{project.name}}

- {% for type in project.project_type.all %} -

- {{type.name}} {% if not forloop.last %} | {% endif %} -

- {% endfor %} +
+ {% for type in project.project_type.all %} +

+ {{type.name}} {% if not forloop.last %} | {% endif %} +

+ {% endfor %} +
- +