diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 63cdcbc9..53532138 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc index dedfcb25..de2472fa 100644 Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index 6c3ee5f7..e5a8228b 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index cfaa8ab0..19de9950 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc new file mode 100644 index 00000000..ce08cf38 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc differ diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index d4f607f7..ff2b91e5 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -83,6 +83,15 @@ def my_tasks(request, *args, **kwargs): return render(request, 'tasks.html', context) +@login_required +def customers(request, *args, **kwargs): + + context = { + + } + return render(request, 'customers.html', context) + + @login_required def detailed_project(request, project_id): project = get_object_or_404(Project, project_id=project_id) @@ -121,8 +130,6 @@ def create_project(request): 'project_types' : project_types, 'customers' : customers, - - } return render(request, 'create-project.html', context) @@ -152,6 +159,34 @@ def createtask_epic(request): } return render(request, 'createtask-epic.html', context) +@login_required +def add_customer(request): + context = { + + } + return render(request, 'add-customer.html', context) + +@login_required +def customerdetails(request): + context = { + + } + return render(request, 'customer-details.html', context) + +@login_required +def addbusiness(request): + context = { + + } + return render(request, 'add-business.html', context) + +@login_required +def businessdetails(request): + context = { + + } + return render(request, 'business-details.html', context) + diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index c3cb6337..9ac6e985 100644 Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 7ea1fb95..0beaf0d1 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -26,6 +26,11 @@ urlpatterns = [ path('', login_required(views.home), name='home'), path('my-projects/', login_required(views.my_projects), name='my-projects'), path('my-tasks/', login_required(views.my_tasks), name='my-tasks'), + path('customers/', views.customers, name='customers'), + path('addcustomer/', views.add_customer, name='addcustomer'), + path('customerdetails/', views.customerdetails, name='customerdetails'), + path('addbusiness/', views.addbusiness, name='addbusiness'), + path('businessdetails/', views.businessdetails, name='businessdetails'), path('detailedproject//', views.detailed_project, name='detailed-project'), path('createproject/', views.create_project, name='createproject'), path('createepic//', views.create_epic, name='createepic'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index ba3e5c45..7e074e91 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -646,10 +646,18 @@ video { position: relative; } +.right-0 { + right: 0px; +} + .right-10 { right: 2.5rem; } +.right-2 { + right: 0.5rem; +} + .right-3 { right: 0.75rem; } @@ -671,10 +679,18 @@ video { margin-right: auto; } +.mb-0 { + margin-bottom: 0px; +} + .mb-1 { margin-bottom: 0.25rem; } +.mb-14 { + margin-bottom: 3.5rem; +} + .mb-2 { margin-bottom: 0.5rem; } @@ -779,10 +795,6 @@ video { height: 30px; } -.h-\[350px\] { - height: 350px; -} - .h-\[35px\] { height: 35px; } @@ -795,14 +807,6 @@ video { height: 45px; } -.h-\[48px\] { - height: 48px; -} - -.h-\[500px\] { - height: 500px; -} - .h-\[50px\] { height: 50px; } @@ -819,10 +823,6 @@ video { height: 70px; } -.h-\[800px\] { - height: 800px; -} - .h-fit { height: -moz-fit-content; height: fit-content; @@ -844,6 +844,10 @@ video { width: 100%; } +.w-\[100px\] { + width: 100px; +} + .w-\[14\%\] { width: 14%; } @@ -892,6 +896,10 @@ video { width: 25px; } +.w-\[270px\] { + width: 270px; +} + .w-\[3\%\] { width: 3%; } @@ -912,6 +920,10 @@ video { width: 33.33%; } +.w-\[35\%\] { + width: 35%; +} + .w-\[35px\] { width: 35px; } @@ -932,10 +944,6 @@ video { width: 45px; } -.w-\[48px\] { - width: 48px; -} - .w-\[5\%\] { width: 5%; } @@ -968,6 +976,14 @@ video { width: 74.5%; } +.w-\[80\%\] { + width: 80%; +} + +.w-\[90px\] { + width: 90px; +} + .w-\[95\%\] { width: 95%; } @@ -985,6 +1001,10 @@ video { flex: 1 1 0%; } +.flex-grow { + flex-grow: 1; +} + .border-collapse { border-collapse: collapse; } @@ -1029,6 +1049,10 @@ video { align-items: flex-start; } +.items-end { + align-items: flex-end; +} + .items-center { align-items: center; } @@ -1259,6 +1283,11 @@ video { background-color: rgb(156 163 175 / var(--tw-bg-opacity)); } +.bg-gray-500 { + --tw-bg-opacity: 1; + background-color: rgb(107 114 128 / var(--tw-bg-opacity)); +} + .bg-green-200 { --tw-bg-opacity: 1; background-color: rgb(187 247 208 / var(--tw-bg-opacity)); @@ -1299,6 +1328,11 @@ video { background-color: rgb(254 202 202 / var(--tw-bg-opacity)); } +.bg-red-300 { + --tw-bg-opacity: 1; + background-color: rgb(252 165 165 / var(--tw-bg-opacity)); +} + .bg-red-400 { --tw-bg-opacity: 1; background-color: rgb(248 113 113 / var(--tw-bg-opacity)); @@ -1314,6 +1348,16 @@ video { background-color: rgb(203 213 225 / var(--tw-bg-opacity)); } +.bg-slate-400 { + --tw-bg-opacity: 1; + background-color: rgb(148 163 184 / var(--tw-bg-opacity)); +} + +.bg-slate-500 { + --tw-bg-opacity: 1; + background-color: rgb(100 116 139 / var(--tw-bg-opacity)); +} + .bg-slate-600 { --tw-bg-opacity: 1; background-color: rgb(71 85 105 / var(--tw-bg-opacity)); @@ -1450,6 +1494,14 @@ video { padding-left: 1.25rem; } +.pt-3 { + padding-top: 0.75rem; +} + +.pt-9 { + padding-top: 2.25rem; +} + .text-center { text-align: center; } @@ -1469,6 +1521,10 @@ video { line-height: 2.5rem; } +.text-\[15px\] { + font-size: 15px; +} + .text-\[18px\] { font-size: 18px; } @@ -1539,6 +1595,11 @@ video { color: rgb(107 114 128 / var(--tw-text-opacity)); } +.text-gray-600 { + --tw-text-opacity: 1; + color: rgb(75 85 99 / var(--tw-text-opacity)); +} + .text-green-700 { --tw-text-opacity: 1; color: rgb(21 128 61 / var(--tw-text-opacity)); diff --git a/osinaweb/static/images/C2ruP-K3_400x400.jpeg b/osinaweb/static/images/C2ruP-K3_400x400.jpeg new file mode 100644 index 00000000..24ea07c9 Binary files /dev/null and b/osinaweb/static/images/C2ruP-K3_400x400.jpeg differ diff --git a/osinaweb/static/images/footer-logo.png b/osinaweb/static/images/footer-logo.png new file mode 100644 index 00000000..f9280242 Binary files /dev/null and b/osinaweb/static/images/footer-logo.png differ diff --git a/osinaweb/static/images/logo-social.png b/osinaweb/static/images/logo-social.png new file mode 100644 index 00000000..6485aac5 Binary files /dev/null and b/osinaweb/static/images/logo-social.png differ diff --git a/osinaweb/static/js/side-bar.js b/osinaweb/static/js/side-bar.js index e93c80e6..c1fc7cee 100644 --- a/osinaweb/static/js/side-bar.js +++ b/osinaweb/static/js/side-bar.js @@ -43,15 +43,19 @@ document.addEventListener('DOMContentLoaded', function () { // SCRIPT FOR THE SIDEBAR MENU ITEMS -const menuItem = document.querySelector('.menuItem'); -const menuDropdownItems = document.querySelector('.menuDropdownItems'); -const angleDown = document.querySelector('.angleDown'); -const angleUp = document.querySelector('.angleUp'); +const menuContainers = document.querySelectorAll('.menu-container'); -menuItem.addEventListener('click', function () { - menuDropdownItems.classList.toggle('hidden'); +// Add click event listeners to each menu container +menuContainers.forEach((menuContainer) => { + const menuItem = menuContainer.querySelector('.menuItem'); + const menuDropdownItems = menuContainer.querySelector('.menuDropdownItems'); + const angleDown = menuItem.querySelector('.angleDown'); + const angleUp = menuItem.querySelector('.angleUp'); + menuItem.addEventListener('click', function () { + menuDropdownItems.classList.toggle('hidden'); angleDown.style.display = angleDown.style.display === 'none' ? 'inline' : 'none'; angleUp.style.display = angleUp.style.display === 'none' ? 'inline' : 'none'; + }); }); diff --git a/osinaweb/templates/add-business.html b/osinaweb/templates/add-business.html new file mode 100644 index 00000000..10d65a1d --- /dev/null +++ b/osinaweb/templates/add-business.html @@ -0,0 +1,100 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + + +
+
+

+ Add Business +

+
+
+ + +
+
+ + Upload + Business + Logo + + +
+
+ + + + + + + + +
+ + +
+ + + + + + + + + + +
+ +
+
+
+
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/add-customer.html b/osinaweb/templates/add-customer.html new file mode 100644 index 00000000..9f11fd1f --- /dev/null +++ b/osinaweb/templates/add-customer.html @@ -0,0 +1,186 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + + +
+
+

+ Add Customer +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/business-details.html b/osinaweb/templates/business-details.html new file mode 100644 index 00000000..22901635 --- /dev/null +++ b/osinaweb/templates/business-details.html @@ -0,0 +1,249 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Emile Ellye - Ositcom

+
+
+
+ + +
+
+
+
+

Name: Ositcom

+
+ +
+

Email: info@ositcom.com

+
+ +
+

VAT: Checked

+
+ +
+

Commercial Registration: 2022

+
+ +
+

Phone Number: 78987678

+
+ +
+

Website: ositcom.com

+
+ +
+

Business Type: Association

+
+
+
+ +
+

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+
+
+
+ + + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/create-project.html b/osinaweb/templates/create-project.html index cd7218de..0f361959 100644 --- a/osinaweb/templates/create-project.html +++ b/osinaweb/templates/create-project.html @@ -33,7 +33,8 @@ - {%for type in project_types %} diff --git a/osinaweb/templates/customer-details.html b/osinaweb/templates/customer-details.html new file mode 100644 index 00000000..aa435048 --- /dev/null +++ b/osinaweb/templates/customer-details.html @@ -0,0 +1,336 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Emile Elliye

+
+
+
+ + +
+
+
+
+

First Name: Emile

+
+ +
+

Last Name: Ellye

+
+ +
+

Email: emile.e@ositcom.com

+
+ +
+

Personal Website: www.ositcom.com

+
+ +
+

Status: Active

+
+ +
+

Reference: Salim

+
+
+ + + +
+

Business:

+
+
+ +
+
+

Name

+
+
+

Business Type

+
+
+

Financial number

+
+
+

Actions

+
+
+ + +
+ +
+
+

Ositcom

+
+
+

Associations

+
+
+

2567776

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

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+
+
+
+ + + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/customers.html b/osinaweb/templates/customers.html new file mode 100644 index 00000000..3b691365 --- /dev/null +++ b/osinaweb/templates/customers.html @@ -0,0 +1,516 @@ +{% extends "main.html" %} +{%load static%} +{% block title %}My Projects{% endblock %} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

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

Customers

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

First Name

+
+
+

Last Name

+
+
+

User

+
+
+

Status

+
+
+

Business

+
+
+ Actions +
+
+ + +
+ +
+
+

Nataly

+
+
+

Abi Wajeh

+
+
+

nataly.aw

+
+
+

Active

+
+
+

Business

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

Rachel

+
+
+

Hanna

+
+
+

-

+
+
+

Terminated

+
+
+

-

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

Aya

+
+
+

Rifai

+
+
+

aya.rf

+
+
+

Suspended

+
+
+

-

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

Emile

+
+
+

Elliye

+
+
+

salim.e

+
+
+

Active

+
+
+

Business

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

Emilio

+
+
+

Emilio

+
+
+

-

+
+
+

Terminated

+
+
+

Cars and Classics

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

Arze

+
+
+

Elliye

+
+
+

Arze.e

+
+
+

Active

+
+
+

-

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

Reine

+
+
+

Habshy

+
+
+

reine.h

+
+
+

Suspended

+
+
+

-

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

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+
+
+
+ + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html index 91bebd5f..db87be09 100644 --- a/osinaweb/templates/index.html +++ b/osinaweb/templates/index.html @@ -58,8 +58,13 @@ - +
+ + +
diff --git a/osinaweb/templates/login.html b/osinaweb/templates/login.html index a6288493..0c1c4c00 100644 --- a/osinaweb/templates/login.html +++ b/osinaweb/templates/login.html @@ -19,7 +19,7 @@

OSINA

-
+

Login To Dashboard

{% csrf_token %} diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html index 031f4b5e..d2d3e6ab 100644 --- a/osinaweb/templates/main.html +++ b/osinaweb/templates/main.html @@ -9,21 +9,23 @@ - - +
-
-

OSINA

+
-
+
+
+

OSINA

+
+
Home @@ -39,27 +41,33 @@
-
-
- -

Accounts

-
-
- + + -
-
- -

Support

-
- -
+ + @@ -212,23 +239,23 @@

Available

- +
- - -
- {% block content %} - replace me - {% endblock content %} - - - - +
+ + {% block content %} + replace me + {% endblock content %} + + + + + \ No newline at end of file diff --git a/osinaweb/templates/projects.html b/osinaweb/templates/projects.html index d63411c6..ddc264d9 100644 --- a/osinaweb/templates/projects.html +++ b/osinaweb/templates/projects.html @@ -57,14 +57,19 @@
-
+

My Projects

- +
+ + +
+
+ + +