removed MISC and changed login page logo url
This commit is contained in:
parent
6a6f0356bc
commit
797ff9b5bc
@ -63,37 +63,26 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
|
|||||||
aria-label="Close"
|
aria-label="Close"
|
||||||
></button>
|
></button>
|
||||||
<div className="container ">
|
<div className="container ">
|
||||||
{comments &&
|
|
||||||
comments.map((data) => (
|
{
|
||||||
<div className="text-start" key={data.id}>
|
comments && comments.map( ( data ) =>
|
||||||
<div
|
(
|
||||||
className={`li-wrapper d-flex justify-content-${
|
<div className="text-start" key={data.id}>
|
||||||
isLoggedUser(data?.employee?.id) ? "end" : "start"
|
<div class={`li-wrapper d-flex justify-content-${isLoggedUser(data?.employee?.id) ? "end":"start"} align-items-start`}>
|
||||||
} align-items-start`}
|
<div class="avatar avatar-xs me-1">
|
||||||
>
|
<span class="avatar-initial rounded-circle bg-label-success">
|
||||||
<div className="avatar avatar-xs me-1">
|
{data?.employee?.firstName.slice(0,1)}
|
||||||
<span className="avatar-initial rounded-circle bg-label-success">
|
</span>
|
||||||
M
|
</div>
|
||||||
</span>
|
<div class="text-start py-0">
|
||||||
</div>
|
<p class="mb-0">
|
||||||
<div className="text-start py-0">
|
<strong>{ `${data?.employee?.firstName} ${data?.employee?.lastName}`}</strong>
|
||||||
<p className="mb-0">
|
</p>
|
||||||
<strong>{`${data?.employee?.firstName} ${data?.employee?.lastName}`}</strong>
|
<small style={{fontSize: "10px"}}>{ moment(data?.commentDate).fromNow()}</small>
|
||||||
</p>
|
</div>
|
||||||
<small style={{ fontSize: "10px" }}>
|
</div>
|
||||||
{moment(data?.commentDate).fromNow()}
|
<p className={`ms-${ isLoggedUser( data?.employee?.id ) ? "0 text-end me-6" : "6 " } mt-1`}>{ data?.comment
|
||||||
</small>
|
}</p>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
className={`ms-${
|
|
||||||
isLoggedUser(data?.employee?.id)
|
|
||||||
? "0 text-end me-6"
|
|
||||||
: "6 "
|
|
||||||
} mt-1`}
|
|
||||||
>
|
|
||||||
{data?.comment}
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
{/* by other users */}
|
{/* by other users */}
|
||||||
|
|||||||
@ -100,7 +100,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"header": "Misc",
|
"header": "",
|
||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"text": "Support",
|
"text": "Support",
|
||||||
|
|||||||
@ -15,7 +15,7 @@ export const AuthWrapper = ({ children }) => {
|
|||||||
className="app-brand-link gap-2"
|
className="app-brand-link gap-2"
|
||||||
>
|
>
|
||||||
<span className="app-brand-logo demo">
|
<span className="app-brand-logo demo">
|
||||||
<img src="/public/img/brand/marco.png" alt="sneat-logo" />
|
<img src="/img/brand/marco.png" alt="sneat-logo" />
|
||||||
</span>
|
</span>
|
||||||
{/* <span className="app-brand-text demo text-body fw-bold">
|
{/* <span className="app-brand-text demo text-body fw-bold">
|
||||||
Sneat
|
Sneat
|
||||||
|
|||||||
@ -4,7 +4,9 @@ import {clearCacheKey} from '../apiDataManager';
|
|||||||
|
|
||||||
export const markCurrentAttendance = createAsyncThunk(
|
export const markCurrentAttendance = createAsyncThunk(
|
||||||
'attendanceCurrentDate/markAttendance',
|
'attendanceCurrentDate/markAttendance',
|
||||||
async (formData, { getState, dispatch, rejectWithValue }) => {
|
async ( formData, {getState, dispatch, rejectWithValue} ) =>
|
||||||
|
{
|
||||||
|
debugger
|
||||||
const { projectId } = getState().localVariables
|
const { projectId } = getState().localVariables
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user