salim
/
newosinadjango
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major by improvements

Browse Source
main
emile 2 years ago
parent 57bccb4cf7
commit 12db849a02
34 changed files with 287 additions and 765 deletions
Show Stats Download Patch File Download Diff File

BIN
osinaweb/db.sqlite3
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/models.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/__pycache__/views.cpython-310.pyc
View File

Binary file not shown.

20
osinaweb/osinacore/custom_context.py
Unescape Escape View File

@ -1,12 +1,24 @@
from .models import Task from .models import Task, Status
from django.contrib.auth.models import AnonymousUser
def utilities(request): def utilities(request):
if request.user.is_superuser:
if request.user.is_authenticated and request.user.is_superuser:
open_task_count = Task.objects.filter(status='Open').count() open_task_count = Task.objects.filter(status='Open').count()
working_on_task_count = Task.objects.filter(status='Working On').count() working_on_task_count = Task.objects.filter(status='Working On').count()
else: last_status = Status.objects.filter(staff=request.user.staffprofile).last()
elif request.user.is_authenticated:
open_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Open').count() open_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Open').count()
working_on_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Working On').count() working_on_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Working On').count()
last_status = Status.objects.filter(staff=request.user.staffprofile).last()
else:
# Handle the case when the user is not logged in
open_task_count = 0
working_on_task_count = 0
last_status = None
total_tasks = open_task_count + working_on_task_count total_tasks = open_task_count + working_on_task_count
return {'total_tasks': total_tasks} latest_statuses = Status.objects.all().order_by('-id')[:12]
return {'total_tasks': total_tasks, 'last_status' : last_status, 'latest_statuses' : latest_statuses, }

17
osinaweb/osinacore/migrations/0028_remove_projecttype_color.py
Unescape Escape View File

@ -0,0 +1,17 @@
# Generated by Django 4.2.5 on 2023-09-21 07:02
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('osinacore', '0027_alter_status_staff'),
]
operations = [
migrations.RemoveField(
model_name='projecttype',
name='color',
),
]

18
osinaweb/osinacore/migrations/0029_alter_reference_date.py
Unescape Escape View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.5 on 2023-09-21 07:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('osinacore', '0028_remove_projecttype_color'),
]
operations = [
migrations.AlterField(
model_name='reference',
name='date',
field=models.CharField(max_length=200),
),
]

20
osinaweb/osinacore/migrations/0030_tag.py
Unescape Escape View File

@ -0,0 +1,20 @@
# Generated by Django 4.2.5 on 2023-09-21 07:24
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('osinacore', '0029_alter_reference_date'),
]
operations = [
migrations.CreateModel(
name='Tag',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
],
),
]

BIN
osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc
View File

Binary file not shown.

10
osinaweb/osinacore/models.py
Unescape Escape View File

@ -9,11 +9,17 @@ from django.db.models import Max
class Reference(models.Model): class Reference(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
date = models.DateField(blank=True) date = models.CharField(max_length=200)
def __str__(self): def __str__(self):
return self.name return self.name
def formatted_date(self):
# Assuming start_date is stored as "day-month-year"
parts = self.date.split('-')
return f"{parts[2]}-{parts[1]}-{parts[0]}"
class Tag(models.Model):
name = models.CharField(max_length=50)
class Business(models.Model): class Business(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
@ -102,7 +108,7 @@ class StaffProfile(models.Model):
class ProjectType(models.Model): class ProjectType(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
color = ColorField(default='#FF0000')
class Project(models.Model): class Project(models.Model):

128
osinaweb/osinacore/views.py
Unescape Escape View File

@ -237,6 +237,7 @@ def businesses(request):
} }
return render(request, 'businesses.html', context) return render(request, 'businesses.html', context)
@login_required @login_required
def adduser(request): def adduser(request):
@ -246,6 +247,7 @@ def adduser(request):
} }
return render(request, 'add-user.html', context) return render(request, 'add-user.html', context)
@login_required @login_required
def userdetails(request): def userdetails(request):
@ -277,28 +279,38 @@ def detailed_task(request, task_id):
return render(request, 'task-details.html', context) return render(request, 'task-details.html', context)
@login_required @login_required
def project_types(request): def project_types(request):
projecttypes = ProjectType.objects.all().order_by('-id')
context = { context = {
'projecttypes' : projecttypes,
} }
return render(request, 'project-types.html', context) return render(request, 'project-types.html', context)
@login_required @login_required
def references(request): def references(request):
references = Reference.objects.all().order_by('-id')
context = { context = {
'references' : references,
} }
return render(request, 'references.html', context) return render(request, 'references.html', context)
@login_required @login_required
def tags(request): def tags(request):
tags = Tag.objects.all().order_by('-id')
context = { context = {
'tags' : tags,
} }
@ -405,6 +417,32 @@ def add_business_modal(request, *args, **kwargs):
#Fetch Views
def fetch_related_tasks(request):
# Get the selected epic ID from the request
epic_id = request.GET.get("epic_id")
# Fetch tasks related to the selected epic along with their project
related_tasks = Task.objects.filter(epic_id=epic_id).select_related("project")
task_data = [
{
"name": task.name,
"status": task.status,
"start_date": task.formatted_start_date(),
"end_date": task.formatted_end_date(),
"extra": task.extra,
"task_id": task.task_id,
}
for task in related_tasks
]
return JsonResponse({"tasks": task_data})
#Save Functions #Save Functions
@login_required @login_required
def save_note(request): def save_note(request):
@ -571,27 +609,6 @@ def save_task(request):
return redirect(redirect_url) return redirect(redirect_url)
def fetch_related_tasks(request):
# Get the selected epic ID from the request
epic_id = request.GET.get("epic_id")
# Fetch tasks related to the selected epic along with their project
related_tasks = Task.objects.filter(epic_id=epic_id).select_related("project")
task_data = [
{
"name": task.name,
"status": task.status,
"start_date": task.formatted_start_date(),
"end_date": task.formatted_end_date(),
"extra": task.extra,
"task_id": task.task_id,
}
for task in related_tasks
]
return JsonResponse({"tasks": task_data})
@login_required @login_required
def save_business(request): def save_business(request):
@ -698,7 +715,7 @@ def save_status(request):
text = request.POST.get('text') text = request.POST.get('text')
current_datetime = timezone.now() current_datetime = timezone.now()
date = current_datetime.date() date = current_datetime.date()
time = current_datetime.hour time = current_datetime.strftime("%I:%M %p")
try: try:
staff_profile = StaffProfile.objects.get(user=request.user) staff_profile = StaffProfile.objects.get(user=request.user)
@ -718,3 +735,66 @@ def save_status(request):
return HttpResponse('<script>window.top.location.reload();</script>') return HttpResponse('<script>window.top.location.reload();</script>')
return render(request, 'addstatus-modal.html') 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_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')

BIN
osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
View File

Binary file not shown.

BIN
osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc
View File

Binary file not shown.

10
osinaweb/osinaweb/urls.py
Unescape Escape View File

@ -17,6 +17,8 @@ from django.contrib import admin
from django.urls import path from django.urls import path
from osinacore import views from osinacore import views
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.conf.urls.static import static
from django.conf import settings
urlpatterns = [ urlpatterns = [
# Pages urls # Pages urls
@ -46,6 +48,9 @@ urlpatterns = [
path('references/', views.references, name='references'), path('references/', views.references, name='references'),
path('tags/', views.tags, name='tags'), path('tags/', views.tags, name='tags'),
#Fetch urls
path("fetch_related_tasks/", views.fetch_related_tasks, name="fetch_related_tasks"), path("fetch_related_tasks/", views.fetch_related_tasks, name="fetch_related_tasks"),
@ -75,4 +80,9 @@ urlpatterns = [
path('save_business_modal/', views.save_business_modal, name='save_business_modal'), path('save_business_modal/', views.save_business_modal, name='save_business_modal'),
path('save_customer/', views.save_customer, name='save_customer'), path('save_customer/', views.save_customer, name='save_customer'),
path('save_status/', views.save_status, name='save_status'), path('save_status/', views.save_status, name='save_status'),
path('save_projecttype/', views.save_projecttype, name='save_projecttype'),
path('save_reference/', views.save_reference, name='save_reference'),
path('save_tag/', views.save_tag, name='save_tag'),
] ]
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

BIN
osinaweb/static/images/1669023415919.jpeg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 48 KiB

BIN
osinaweb/static/images/eHcWZi3-_400x400.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

2
osinaweb/static/js/pop-modals.js
Unescape Escape View File

@ -54,7 +54,7 @@ document.addEventListener("DOMContentLoaded", function () {
addButtonClickListener("addFileButton", "500px", "320px"); addButtonClickListener("addFileButton", "500px", "320px");
addButtonClickListener("addCredentialsButton", "500px", "300px"); addButtonClickListener("addCredentialsButton", "500px", "300px");
addButtonClickListener("addProjectTypeButton", "fit-content", "160px"); addButtonClickListener("addProjectTypeButton", "fit-content", "160px");
addButtonClickListener("addReferenceButton", "fit-content", "160px"); addButtonClickListener("addReferenceButton", "fit-content", "230px");
addButtonClickListener("addTagButton", "fit-content", "160px"); addButtonClickListener("addTagButton", "fit-content", "160px");
addButtonClickListener("addBusinessButton", "550px", "500px"); addButtonClickListener("addBusinessButton", "550px", "500px");

2
osinaweb/templates/add-business.html
Unescape Escape View File

@ -7,7 +7,7 @@
<h1 class="text-3xl text-slate-800 text-center font-semibold"> <h1 class="text-3xl text-slate-800 text-center font-semibold">
Add Business Add Business
</h1> </h1>
<form method="POST" action="{% url 'save_business' %}"> <form method="POST" action="{% url 'save_business' %}">
{% csrf_token %} {% csrf_token %}
<input name="name" type="text" placeholder="Name" <input name="name" type="text" placeholder="Name"
class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4"

9
osinaweb/templates/addprojecttype-modal.html
Unescape Escape View File

@ -13,19 +13,20 @@
</head> </head>
<body> <body>
<div id="hiddenContent"> <form id="hiddenContent" method="POST" action="{% url 'save_projecttype' %}">
{% csrf_token %}
<h1 class="text-slate-800 text-2xl font-semibold text-center">Add Project Type</h1> <h1 class="text-slate-800 text-2xl font-semibold text-center">Add Project Type</h1>
<div class="w-full flex justify-center items-center"> <div class="w-full flex justify-center items-center">
<input type="text" placeholder="Project Type Name" <input name="name" type="text" placeholder="Project Type Name"
class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
required> required>
</div> </div>
<div class="w-full flex justify-center items-center mt-4"> <div class="w-full flex justify-center items-center mt-4">
<button <button type="submit"
class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button> class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button>
</div> </div>
</div> </form>
</body> </body>
</html> </html>

12
osinaweb/templates/addreference-modal.html
Unescape Escape View File

@ -13,19 +13,21 @@
</head> </head>
<body> <body>
<div id="hiddenContent"> <form id="hiddenContent" method="POST" action="{% url 'save_reference' %}">
{% csrf_token %}
<h1 class="text-slate-800 text-2xl font-semibold text-center">Add Reference</h1> <h1 class="text-slate-800 text-2xl font-semibold text-center">Add Reference</h1>
<div class="w-full flex justify-center items-center"> <div class="w-full flex flex-col justify-center items-center">
<input type="text" placeholder="Reference Name" <input name="name" type="text" placeholder="Reference Name"
class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
required> required>
<input name="date" type="date" id="date" class="w-full md:w-[300px] p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4">
</div> </div>
<div class="w-full flex justify-center items-center mt-4"> <div class="w-full flex justify-center items-center mt-4">
<button <button type="submit"
class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button> class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button>
</div> </div>
</div> </form>
</body> </body>
</html> </html>

9
osinaweb/templates/addtag-modal.html
Unescape Escape View File

@ -13,19 +13,20 @@
</head> </head>
<body> <body>
<div id="hiddenContent"> <form id="hiddenContent" method="POST" action="{% url 'save_tag' %}">
{% csrf_token %}
<h1 class="text-slate-800 text-2xl font-semibold text-center">Add Tag</h1> <h1 class="text-slate-800 text-2xl font-semibold text-center">Add Tag</h1>
<div class="w-full flex justify-center items-center"> <div class="w-full flex justify-center items-center">
<input type="text" placeholder="Tag Name" <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" class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
required> required>
</div> </div>
<div class="w-full flex justify-center items-center mt-4"> <div class="w-full flex justify-center items-center mt-4">
<button <button type="submit"
class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button> class="w-fit bg-blue-500 border border-blue-500 rounded-md text-white text-xl px-3 py-2 hover:bg-white hover:text-blue-500">Add</button>
</div> </div>
</div> </form>
</body> </body>
</html> </html>

83
osinaweb/templates/businesses.html
Unescape Escape View File

@ -139,18 +139,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -160,7 +161,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -173,77 +174,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
</div> </div>
</div> </div>

82
osinaweb/templates/customers.html
Unescape Escape View File

@ -167,18 +167,19 @@
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1> <h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -188,77 +189,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -271,6 +202,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>

12
osinaweb/templates/index.html
Unescape Escape View File

@ -176,19 +176,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses_by_user %} {% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -198,7 +198,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->

6
osinaweb/templates/main.html
Unescape Escape View File

@ -206,7 +206,7 @@
<div> <div>
<p class="text-sm text-gray-500">Your last update: 2023-08-31 08:13:31, 32 mins ago</p> <p class="text-sm text-gray-500">Your last update: 2023-08-31 08:13:31, 32 mins ago</p>
<p class="text-sm text-gray-500">Recent Status: <span <p class="text-sm text-gray-500">Recent Status: <span
class="text-slate-700 font-semibold">Working on Osina</span></p> class="text-slate-700 font-semibold">{{last_status.text}}</span></p>
</div> </div>
<button <button
class="w-[30px] h-[30px] rounded-full p-2 bg-gray-300 text-white text-[18px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addStatusButton" data-modal-url="{% url 'addstatus' %}"> class="w-[30px] h-[30px] rounded-full p-2 bg-gray-300 text-white text-[18px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addStatusButton" data-modal-url="{% url 'addstatus' %}">
@ -218,12 +218,12 @@
<div> <div>
<div class="w-fit flex justify-between items-center gap-3"> <div class="w-fit flex justify-between items-center gap-3">
<div class="flex justify-center items-center gap-2"> <div class="flex justify-center items-center gap-2">
<p class="text-gray-400">{{ user.get_full_name|default:user.username }}</p> <p class="text-gray-400">{{request.user.staffprofile.first_name}} {{request.user.staffprofile.last_name}}</p>
<i class="fa fa-angle-down" style="color: grey;"></i> <i class="fa fa-angle-down" style="color: grey;"></i>
</div> </div>
<div class="w-[50px] h-[50px] bg-slate-600 rounded-full"> <div class="w-[50px] h-[50px] bg-slate-600 rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user-image" <img src='{{request.user.staffprofile.image.url}}' alt="user-image"
class="w-full h-full object-cover rounded-full"> class="w-full h-full object-cover rounded-full">
</div> </div>
</div> </div>

118
osinaweb/templates/project-details.html
Unescape Escape View File

@ -511,124 +511,19 @@
<h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1> <h1 class="text-2xl text-slate-700 text-center font-semibold">USERS ACTIVITY</h1>
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 4TH ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile"
class="w-full h-full object-cover">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -638,7 +533,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -651,6 +546,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>

86
osinaweb/templates/project-types.html
Unescape Escape View File

@ -93,9 +93,10 @@
<!-- TABLE BODY --> <!-- TABLE BODY -->
<div class="w-full"> <div class="w-full">
<!-- 1st row --> <!-- 1st row -->
{% for type in projecttypes %}
<div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300"> <div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300">
<div class="w-[60%] h-full border-r border-gray-300 flex justify-center items-center"> <div class="w-[60%] h-full border-r border-gray-300 flex justify-center items-center">
<p class="text-gray-500">Development</p> <p class="text-gray-500">{{type.name}}</p>
</div> </div>
<div class="w-[40%] h-full flex justify-center items-center gap-3"> <div class="w-[40%] h-full flex justify-center items-center gap-3">
<div class="text-[15px] text-blue-500 cursor-pointer"> <div class="text-[15px] text-blue-500 cursor-pointer">
@ -106,6 +107,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>
@ -118,18 +120,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -139,77 +142,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -222,6 +155,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>

117
osinaweb/templates/projects.html
Unescape Escape View File

@ -182,18 +182,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -203,112 +204,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 4TH ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -321,6 +217,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>

88
osinaweb/templates/references.html
Unescape Escape View File

@ -96,12 +96,13 @@
<!-- TABLE BODY --> <!-- TABLE BODY -->
<div class="w-full"> <div class="w-full">
<!-- 1st row --> <!-- 1st row -->
{% for reference in references %}
<div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300"> <div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300">
<div class="w-[45%] h-full border-r border-gray-300 flex justify-center items-center"> <div class="w-[45%] h-full border-r border-gray-300 flex justify-center items-center">
<p class="text-gray-500">Nat</p> <p class="text-gray-500">{{reference.name}}</p>
</div> </div>
<div class="w-[35%] h-full border-r border-gray-300 flex justify-center items-center"> <div class="w-[35%] h-full border-r border-gray-300 flex justify-center items-center">
<p class="text-gray-500">28-2-2023</p> <p class="text-gray-500">{{reference.formatted_date}}</p>
</div> </div>
<div class="w-[20%] h-full flex justify-center items-center gap-3"> <div class="w-[20%] h-full flex justify-center items-center gap-3">
<div class="text-[15px] text-blue-500 cursor-pointer"> <div class="text-[15px] text-blue-500 cursor-pointer">
@ -112,6 +113,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>
@ -124,18 +126,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -145,77 +148,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -228,6 +161,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>

4
osinaweb/templates/tags.html
Unescape Escape View File

@ -93,9 +93,10 @@
<!-- TABLE BODY --> <!-- TABLE BODY -->
<div class="w-full"> <div class="w-full">
<!-- 1st row --> <!-- 1st row -->
{% for tag in tags %}
<div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300"> <div class="w-full h-[60px] flex justify-between items-center border-b border-gray-300">
<div class="w-[60%] h-full border-r border-gray-300 flex justify-center items-center"> <div class="w-[60%] h-full border-r border-gray-300 flex justify-center items-center">
<p class="text-gray-500">Web Development</p> <p class="text-gray-500">{{tag.name}}</p>
</div> </div>
<div class="w-[40%] h-full flex justify-center items-center gap-3"> <div class="w-[40%] h-full flex justify-center items-center gap-3">
<div class="text-[15px] text-blue-500 cursor-pointer"> <div class="text-[15px] text-blue-500 cursor-pointer">
@ -106,6 +107,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>

117
osinaweb/templates/tasks.html
Unescape Escape View File

@ -292,18 +292,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -313,112 +314,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 4TH ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -431,6 +327,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>
</div> </div>
</div> </div>

82
osinaweb/templates/users.html
Unescape Escape View File

@ -132,18 +132,19 @@
<div class="w-full h-fit mt-2"> <div class="w-full h-fit mt-2">
{% for latest in latest_statuses %}
<!-- 1ST ROW --> <!-- 1ST ROW -->
<div class="w-full flex flex-col py-3"> <div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2"> <div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2"> <div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2"> <div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full"> <div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar.svg" %}' alt="user profile" <img src='{{latest.staff.image.url}}' alt="user profile"
class="w-full h-full object-cover"> class="w-full h-full object-cover rounded-full">
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Nataly</h1> <h1 class="text-sm text-slate-700 font-semibold">{{latest.staff.first_name}} {{latest.staff.last_name}}</h1>
<p class="text-sm text-gray-500">11:30 AM</p> <p class="text-sm text-gray-500">{{latest.time}}</p>
</div> </div>
</div> </div>
<div class="cursor-pointer"> <div class="cursor-pointer">
@ -153,77 +154,7 @@
<!-- Status --> <!-- Status -->
<div class="w-full"> <div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p> <p class="text-sm text-gray-500">{{latest.text}}</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 2NT ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar2.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Salim</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div>
<!-- Add comment section -->
<div class="w-full h-fit flex justify-between items-center border border-gray-200 mt-2 rounded-md">
<input type="text" placeholder="Add Comment..."
class="outline-none text-gray-500 p-2 w-[100%] text-sm h-[40px] rounded-tl-md rounded-bl-md">
<button class="w-fit px-3 py-2 bg-slate-800 rounded-tr-md rounded-br-md">
<i class="fa fa-send" style="color: white; font-size: 15px;"></i>
</button>
</div>
</div>
</div>
<!-- 3RD ROW -->
<div class="w-full flex flex-col py-3">
<div class="w-full flex flex-col justify-center items-start gap-2">
<div class="w-full flex justify-between items-center gap-2">
<div class="flex justify-start gap-2">
<div class="w-[45px] h-[45px] rounded-full">
<img src='{% static "images/avatar3.png" %}' alt="user profile"
class="w-full h-full object-cover">
</div>
<div class="flex flex-col">
<h1 class="text-sm text-slate-700 font-semibold">Emile</h1>
<p class="text-sm text-gray-500">11:30 AM</p>
</div>
</div>
<div class="cursor-pointer">
<i class="fa fa-thumbs-up" style="color: rgb(184, 184, 184); font-size: 15px;"></i>
</div>
</div>
<!-- Status -->
<div class="w-full">
<p class="text-sm text-gray-500">Closed - Create the Osina home page</p>
</div> </div>
<!-- Add comment section --> <!-- Add comment section -->
@ -236,6 +167,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div> </div>

Write Preview
Loading…
Cancel
Save