Skip to content

Commit

Permalink
update administrator interface fonts and sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dilan032
Dilan032 committed Sep 6, 2024
1 parent c4bf911 commit 63cfdbd
Show file tree
Hide file tree
Showing 5 changed files with 143 additions and 140 deletions.
3 changes: 3 additions & 0 deletions public/css/administrator.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
.problemImageMainBG{
border-style: inset;
}
.btnInset{
border-style: inset;
}
.ionHover:hover{
cursor: pointer;
transition: padding 0.3s ease;
Expand Down
112 changes: 58 additions & 54 deletions resources/views/administrator/administratorDashbord.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,105 @@
@extends('layouts.administratorLayout')
@section('administratorContent')

<span class="fs-1 ms-3">Dashbord</span>
<span class="fs-4 ms-4">Dashbord</span>

<hr class="me-3">



<div class="row ps-2">
<div class="col-md-8">
<div class="p-1 border-bottom border-black border-5 rounded">
<p class="fs-4"><b>Bank details</b></p>
<div class="p-1">
<p class="fs-4">| Bank details</p>
<div class="fs-5">
<span class="badge text-bg-light p-2 px-5 border border-primary">{{ $bank->bank_name }}</span>
<span class="badge text-bg-light p-2 px-5 border border-primary">{{ $bank->bank_address }}</span>
<span class="badge text-bg-light m-1 p-2 px-5 btnShado fw-normal">{{ $bank->bank_name }}</span>
<span class="badge text-bg-light m-1 p-2 px-5 btnShado fw-normal">Branch name</span>
<span class="badge text-bg-light m-1 p-2 px-5 btnShado fw-normal">{{ $bank->bank_address }}</span>
<br>
<span class="badge text-bg-light p-2 px-5 border border-primary">{{ $bank->email }}</span>
<span class="badge text-bg-light p-2 px-5 border border-primary">{{ $bank->bank_contact_num }}</span>
<span class="badge text-bg-light m-1 p-2 px-5 btnShado fw-normal">{{ $bank->email }}</span>
<span class="badge text-bg-light m-1 p-2 px-5 btnShado fw-normal">{{ $bank->bank_contact_num }}</span>
<br>
</div>
</div>

{{-- start new row --}}
<div class="row mt-3">
<div class="col-md-6">
<div class="p-2 bg-primary-subtle text-primary-emphasis border-bottom border-black border-5 rounded btnShado">

<p class="fs-4">Administrators <span class="badge text-bg-light px-5 problemImageMainBG">{{ $NumAdministrators }}</span></p>
<div class="fs-5 p-3 bg-white text-dark rounded btnShado">
<div class="d-flex justify-content-between px-4 mt-2">
🙋‍♂️Active
<span class="badge text-bg-primary px-5">{{ $NumActiveAdministrators }}</span>
{{-- new row --}}
<div class="p-3 mb-2 mt-4 bg-white-subtle text-primary-emphasis border-bottom border-black border-5 rounded btnShado">
<p class="fs-4">| All Registered Employees <span class="badge text-bg-primary px-3 btnShado">{{ $NumAdministrators + $NumUsers }}</span></p>
<div class="d-flex flex-column flex-sm-row gap-3">

<div class="p-1 w-100 w-sm-50 bg-white text-dark rounded btnShado rounded">
| Administrators &nbsp;&nbsp;&nbsp;<span class="badge text-bg-light px-3 btnShado">{{ $NumAdministrators }}</span>
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
🙋‍♂️Active
<span class="badge text-bg-warning px-5">{{ $NumActiveAdministrators }}</span>
</div>
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
🙇‍♂️Inactive
<span class="badge text-bg-success px-5">{{ $NumInactiveAdministrators }}</span>
</div>
</div>
<div class="d-flex justify-content-between px-4 mt-2">
🙇‍♂️Inactive
<span class="badge text-bg-secondary px-5">{{ $NumInactiveAdministrators }}</span>

<div class="p-1 w-100 w-sm-50 bg-white text-dark rounded btnShado rounded">
| Users &nbsp;&nbsp;&nbsp;<span class="badge text-bg-light px-3 btnShado">{{ $NumUsers }}</span>
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
🙋‍♂️Active
<span class="badge text-bg-success px-5">{{ $NumActiveUsers }}</span>
</div>
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
🙇‍♂️Inactive
<span class="badge text-bg-warning px-5">{{ $NumInactiveUsers }}</span>
</div>
</div>

</div>

</div>
</div>
<div class="col-md-6">
<div class="p-2 bg-primary-subtle text-primary-emphasis border-bottom border-black border-5 rounded btnShado">

<p class="fs-4">Users <span class="badge text-bg-light px-5 problemImageMainBG">{{ $NumUsers }}</span></p>
<div class="fs-5 p-3 bg-white text-dark rounded btnShado">
<div class="d-flex justify-content-between px-4 mt-2">
🙋‍♂️Active
<span class="badge text-bg-primary px-5">{{ $NumActiveUsers }}</span>
</div>
<div class="d-flex justify-content-between px-4 mt-2">
🙇‍♂️Inactive
<span class="badge text-bg-secondary px-5">{{ $NumInactiveUsers }}</span>
</div>
</div>

</div>
{{-- new row --}}
<div class="p-3 mb-2 mt-4 bg-white-subtle text-danger-emphasis border-bottom border-black border-5 rounded btnShado">
<div class="d-flex justify-content-between">
<p class="fs-4">| Messages <span class="badge text-bg-primary px-3 btnShado">{{ $NumMessages }}</span></p>

<select class="form-select w-25 h-25 border border-primary" aria-label="Default select example">
<option selected>Today</option>
<option value="1">Last Week</option>
<option value="2">Last Month</option>
<option value="3">Last Year</option>
<option value="3">All</option>
</select>
{{-- <i class="bi bi-search"></i> --}}
</div>
</div>
{{-- end new row --}}

{{-- new row --}}
<div class="p-3 mb-2 mt-4 bg-danger-subtle text-danger-emphasis border-bottom border-black border-5 rounded btnShado">
<p class="fs-4">Messages <span class="badge text-bg-light px-5 problemImageMainBG">{{ $NumMessages }}</span></p>
<div class="d-flex flex-column flex-sm-row gap-3">

<div class="p-1 w-100 w-sm-50 bg-white text-dark rounded btnShado rounded">
<b>Administrator Request</b>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
| Administrator Request
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
⏳Pending
<span class="badge text-bg-warning px-5">{{ $NumPendingMsg }}</span>
</div>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
✔Accept
<span class="badge text-bg-success px-5">{{ $NumAcceptMsg }}</span>
</div>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
❌Rejected
<span class="badge text-bg-danger px-5 mb-2">{{ $NumRejectMsg }}</span>
</div>
</div>

<div class="p-1 w-100 w-sm-50 bg-white text-dark rounded btnShado rounded">
<b>Nanosoft Solutions (Pvt)Ltd Status</b>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
| Nanosoft Solutions (Pvt)Ltd Status
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
✔solved
<span class="badge text-bg-success px-5">{{ $NumSolvedMsg }}</span>
</div>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
❌not solved
<span class="badge text-bg-warning px-5">{{ $NumNotSolvedMsg }}</span>
</div>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
⚙ Processing
<span class="badge text-bg-dark px-5">{{ $NumProcessing }}</span>
</div>
<div class="fs-5 d-flex justify-content-between px-4 mt-2">
<div class="fs-6 fw-light d-flex justify-content-between px-4 mt-2">
👁 Viewed
<span class="badge text-bg-info px-5">{{ $NumViewed }}</span>
</div>
Expand All @@ -108,7 +112,7 @@
</div>

<div class="col-md-4">
<div class="p-1 border border-primary rounded problemImageMainBG btnShado">
<div class="p-1 btnShado">
<div class="p-3 mb-2 bg-white text-dark rounded btnShado">
<img src="{{ asset('images/CompanyLogo/nanosoftSolutions Company Logo.png') }}" alt="NanosoftSolutions Logo">
<p class="fs-5 fw-bold">Nanosoft Solutions <small>(Pvt) Ltd</small></p>
Expand Down
33 changes: 13 additions & 20 deletions resources/views/administrator/message.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
@section('administratorContent')


<div class="d-flex justify-content-between">
<div class="fs-1 ms-2">message</div>
</div>


<div class="fs-4 ms-4">message</div>

<hr class="me-3">

Expand Down Expand Up @@ -42,19 +38,16 @@
@include('components.administrator.messageModel')


<div class="alert alert-warning font-monospace text-center" role="alert">
<small>It is the manager's responsibility to confirm or reject messages.
After confirming the message, Nanosoft Solutions will receive the message.</small>
<div class="alert alert-warning text-center" role="alert">
It is the manager's responsibility to confirm or reject messages.
After confirming the message, Nanosoft Solutions will receive the message.
</div>


<section class="mt-3">
<div class="p-2 mb-3 bg-black text-white">
<div class="text-center d-none d-sm-inline">
<div class="row">
{{-- <div class="col-12 col-sm-auto col-md-1">
<span class="">id</span>
</div> --}}
<div class="col-12 col-sm-auto col-md-2">
<span class="">date</span>
</div>
Expand All @@ -77,33 +70,33 @@
@if (!empty($messages))
@foreach ($messages as $oneMessage)
{{-- start message content --}}
<div class="p-3 mb-3 bg-white text-dark messageBG rounded">
<div class="p-1 mb-3 bg-white text-dark messageBG rounded">
<div class="text-center">
<div class="row">
<div class="col-12 col-sm-auto col-md-2">
<span class="font-monospace"><small>{{ \Carbon\Carbon::parse($oneMessage->created_at)->format('d M Y') }}</small></span>
<small>{{ \Carbon\Carbon::parse($oneMessage->created_at)->format('d M Y') }}</small>
</div>
<div class="col-12 col-sm-auto col-md-1">
@if ( $oneMessage->request == 'accept')
<span class="badge text-bg-success py-1 px-3">{{ $oneMessage->request }}</span>
<span class="badge rounded-pill text-bg-success btnInset py-1 px-3">{{ $oneMessage->request }}</span>
@elseif ($oneMessage->request == 'reject')
<span class="badge text-bg-danger py-1 px-3">{{ $oneMessage->request }}</span>
<span class="badge rounded-pill text-bg-danger btnInset py-1 px-3">{{ $oneMessage->request }}</span>
@else
<span class="badge text-bg-warning py-1">{{ $oneMessage->request }}</span>
<span class="badge rounded-pill text-bg-warning btnInset py-1">{{ $oneMessage->request }}</span>
@endif
</div>
<div class="col-12 col-sm-auto col-md-6">
<span class="">{{ $oneMessage->subject }}</span>
</div>
<div class="col-12 col-sm-auto col-md-2">
@if ( $oneMessage->status == 'not resolved')
<span class="badge text-bg-warning py-2">{{$oneMessage->status}}</span>
<span class="badge rounded-pill text-bg-warning btnInset py-1">{{$oneMessage->status}}</span>
@elseif ( $oneMessage->status == 'solved')
<span class="badge text-bg-success py-2 px-4">{{$oneMessage->status}}</span>
<span class="badge rounded-pill text-bg-success btnInset py-1 px-4">{{$oneMessage->status}}</span>
@elseif ($oneMessage->status == 'Processing')
<span class="badge text-bg-dark py-2">{{$oneMessage->status}}</span>
<span class="badge rounded-pill text-bg-dark btnInset py-1">{{$oneMessage->status}}</span>
@else
<span class="badge text-bg-info text-dark py-2 px-3">{{$oneMessage->status}}</span>
<span class="badge rounded-pill text-bg-info btnInset text-dark py-1 px-3">{{$oneMessage->status}}</span>
@endif
</div>
<div class="col-12 col-sm-auto col-md-1">
Expand Down
36 changes: 19 additions & 17 deletions resources/views/administrator/messageOne.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@

<div class="d-grid gap-2 d-md-flex justify-content-md-end mt-3 mb-2">
@if ($oneMessage->request == 'accept')
<p class="p-2 text-success fw-bold border border-success border-start-4 rounded-start">This user's message was sent to Nanosoft Solutions (Pvt)Ltd</p>
{{-- border border-success border-start-4 rounded-start --}}
<p class="p-2 text-success">This user's message was sent to Nanosoft Solutions (Pvt)Ltd</p>
@else
<p class="p-2 text-danger fw-bold border border-danger border-start-4 rounded-start">This user's message has been ignored</p>
{{-- border border-danger border-start-4 rounded-start --}}
<p class="p-2 text-danger">This user's message has been ignored</p>
@endif

</div>
Expand All @@ -68,45 +70,45 @@
<table class="table table-borderless rounded messageBG">
<thead>
<tr>
<th colspan="4" class="fs-2">
<span class="fw-normal">Subject:</span>
{{-- <span class="badge text-bg-secondary">Urgent</span> --}}
<th colspan="4" class="fs-5">
{{$oneMessage->subject}}
</th>
</tr>
</thead>
<tbody class="table-group-divider">
<tr>
<th colspan="4" class="bg-primary-subtle">
<th colspan="4" class="bg-primary-subtle fw-light">
@if ( $oneMessage->status == 'not resolved')
status <span class="badge text-bg-warning py-2">{{$oneMessage->status}}</span> ||
<span>status</span> <span class="badge text-bg-warning btnInset py-2">{{$oneMessage->status}}</span>
@elseif ( $oneMessage->status == 'solved')
status <span class="badge text-bg-success py-2 px-4">{{$oneMessage->status}}</span> ||
status <span class="badge text-bg-success btnInset py-2 px-4">{{$oneMessage->status}}</span>
@elseif ($oneMessage->status == 'Processing')
status <span class="badge text-bg-dark py-2">{{$oneMessage->status}}</span> ||
status <span class="badge text-bg-dark btnInset py-2">{{$oneMessage->status}}</span>
@else
status <span class="badge text-bg-info text-dark py-2 px-3">{{$oneMessage->status}}</span> ||
status <span class="badge text-bg-info text-dark btnInset py-2 px-3">{{$oneMessage->status}}</span>
@endif

@if ($oneMessage->request == 'pending')
request <span class="badge text-bg-warning py-2">{{$oneMessage->request}}</span>
request <span class="badge text-bg-warning btnInset py-2">{{$oneMessage->request}}</span>
@elseif ( $oneMessage->request == 'accept')
request <span class="badge text-bg-success py-2">{{$oneMessage->request}}</span>
request <span class="badge text-bg-success btnInset py-2">{{$oneMessage->request}}</span>
@elseif ( $oneMessage->request == 'reject')
request <span class="badge text-bg-danger py-2">{{$oneMessage->request}}</span>
request <span class="badge text-bg-danger btnInset py-2">{{$oneMessage->request}}</span>
@endif

</th>
</tr>
<tr>
<td colspan="4"><b class="fs-5">message :</b> <br> {{$oneMessage->message}}</td>
<td colspan="4"><span class="fs-5">message :</span> <br>
<span class="fw-light">{{$oneMessage->message}}</span>
</td>
</tr>
</tbody>
</table>

<div class="text-end me-2 fw-bold">
<p>Created_at : <span class="badge text-bg-info"> {{ \Carbon\Carbon::parse($oneMessage->created_at)->format('d M Y ') }}</span>
time : <span class="badge text-bg-info"> {{ \Carbon\Carbon::parse($oneMessage->created_at)->format('h:i A') }}</span></p>
<div class="text-end me-2 fw-light">
<p>Creates the problem : <span class="badge text-bg-info px-5 py-2"> {{ \Carbon\Carbon::parse($oneMessage->created_at)->format('d M Y ') }} ⬜
{{ \Carbon\Carbon::parse($oneMessage->created_at)->format('h:i A') }}</span></p>
</div>
</div>

Expand Down
Loading

0 comments on commit 63cfdbd

Please sign in to comment.