Merge branch 'develop' into 'feature/gasht_submit'
# Conflicts: # src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
This commit is contained in:
@@ -54,6 +54,7 @@ export const DELETE_BY_SUPERVISOR = api + "/api/v3/road_items/delete";
|
||||
export const RESTORE_BY_SUPERVISOR = api + "/api/v3/road_items/restore";
|
||||
export const GET_CAR_LIST_SEARCH = api + "/api/v3/cmms_machines/search";
|
||||
export const GET_RAHDARANS_LIST_SEARCH = api + "/api/v3/rahdaran/search";
|
||||
export const GET_OBSERVED_GASHT_LIST = api + "/api/v3/observed_items/filter";
|
||||
|
||||
// activity code log
|
||||
export const ACTIVITY_LOG = api + "/api/v3/profile/add_activity";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
"use client";
|
||||
import { createTheme } from "@mui/material";
|
||||
import { grey } from '@mui/material/colors';
|
||||
|
||||
const theme = createTheme({
|
||||
direction: "rtl",
|
||||
@@ -16,6 +17,9 @@ const theme = createTheme({
|
||||
main: "#015688",
|
||||
contrastText: "#fff",
|
||||
},
|
||||
secondary: {
|
||||
main: grey[700],
|
||||
}
|
||||
},
|
||||
components: {
|
||||
MuiBackdrop: {
|
||||
|
||||
Reference in New Issue
Block a user