Skip to content

Commit

Permalink
renamed to task master
Browse files Browse the repository at this point in the history
  • Loading branch information
SDE-ADNAN committed Jan 10, 2024
1 parent 6a88034 commit ef6972d
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions admin-client/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.4e78bcf6.css",
"main.js": "/static/js/main.7fc3fc03.js",
"main.js": "/static/js/main.4aef93a0.js",
"static/media/bgfinallight.jpg": "/static/media/bgfinallight.f4b3d7b46e1bc093a76a.jpg",
"static/media/bgfinaldark.jpg": "/static/media/bgfinaldark.4f35c02c1183787aaea8.jpg",
"static/media/add.png": "/static/media/add.90b950d171bb0b3986d1.png",
Expand All @@ -14,10 +14,10 @@
"static/media/subtask.svg": "/static/media/subtask.0aee0a3293406f3c959e65a1925a9502.svg",
"static/media/rightarrow.svg": "/static/media/rightarrow.87f8be47de5397f44ad09947d6186828.svg",
"main.4e78bcf6.css.map": "/static/css/main.4e78bcf6.css.map",
"main.7fc3fc03.js.map": "/static/js/main.7fc3fc03.js.map"
"main.4aef93a0.js.map": "/static/js/main.4aef93a0.js.map"
},
"entrypoints": [
"static/css/main.4e78bcf6.css",
"static/js/main.7fc3fc03.js"
"static/js/main.4aef93a0.js"
]
}
2 changes: 1 addition & 1 deletion admin-client/build/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Todo App</title><script defer="defer" src="/static/js/main.7fc3fc03.js"></script><link href="/static/css/main.4e78bcf6.css" rel="stylesheet"></head><body><div id="root"></div><div id="modal-root"></div><div id="loader"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="manifest" href="/manifest.json"/><title>Todo App</title><script defer="defer" src="/static/js/main.4aef93a0.js"></script><link href="/static/css/main.4e78bcf6.css" rel="stylesheet"></head><body><div id="root"></div><div id="modal-root"></div><div id="loader"></div></body></html>

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions admin-client/build/static/js/main.4aef93a0.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion admin-client/build/static/js/main.7fc3fc03.js.map

This file was deleted.

10 changes: 5 additions & 5 deletions admin-client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ const App: React.FC = () => {
}>
{/* Nested routes for the dashboard */}
{/* <Route index element={<TodosListContainer fetchAllUserData={fetchAllUserData} todosArray={allTodos} />} /> */}
<Route index path='todos' element={<TodosListContainer fetchAllUserData={fetchAllUserData} todosArray={allTodos} />} />
<Route index path='all-todos' element={<TodosListContainer isAllTodosContainer={true} fetchAllUserData={fetchAllUserData} todosArray={allTodos} />} />
<Route path='todos/:parentTodo_id' element={<TodoDetails />} />
<Route path='todos/:parentTodo_id/subTodo/:childTodo_id' element={<TodoDetails />} />
<Route index path='tasks' element={<TodosListContainer fetchAllUserData={fetchAllUserData} todosArray={allTodos} />} />
<Route index path='all-tasks' element={<TodosListContainer isAllTodosContainer={true} fetchAllUserData={fetchAllUserData} todosArray={allTodos} />} />
<Route path='tasks/:parentTodo_id' element={<TodoDetails />} />
<Route path='tasks/:parentTodo_id/subTask/:childTodo_id' element={<TodoDetails />} />
<Route path='profile' element={<Profile handleLogout={handleLogout} fetchAllUserData={fetchAllUserData} />} />
<Route path='todos' element={<Navigate to='/todos' />} />
<Route path='tasks' element={<Navigate to='/tasks' />} />

{/* Fallback route for any other unmatched paths */}
<Route path="*" element={<NotFound isAuthenticated={isAuthenticated} />} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ const TodoListItem: React.FC<Partial<TodoListItemProps>> = ({ item, fetchAllUser
const handleRedirect = () => {
const id = item._id;
if (!isSubTodo) {
navigate(`/todos/${id}`)
navigate(`/tasks/${id}`)
} else {
navigate(`/todos/${parentTodoId}/subTodo/${id}`)
navigate(`/tasks/${parentTodoId}/subTask/${id}`)
}
}
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ const TodosListContainer: React.FC<Partial<TodoListContainerProps>> = ({ isAllTo

useEffect(() => {
if (isSubTodoContainer) {
dispatch(setCurrentPage('Todo Details'))
dispatch(setCurrentPage('Task Details'))
} else {
dispatch(setCurrentPage('All Todos'))
dispatch(setCurrentPage('All Tasks'))
}
}, [dispatch, isSubTodoContainer])
return (
<div className={includeDarkClass(`todoListItems_container`, darkMode)}>
{
isAllTodosContainer && todosArray ?
<Container title={'All todos'} hideParent={true} className={'Sub-Todos'} todosArray={todosArray} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
<Container title={'All tasks'} hideParent={true} className={'Sub-Todos'} todosArray={todosArray} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
: isSubTodoContainer && todosArray ?
<Container title={'Sub-Todos'} className={'Sub-Todos'} todosArray={todosArray} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
<Container title={'Sub-Tasks'} className={'Sub-Todos'} todosArray={todosArray} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
: <>
{User && User.statusFiltered && User.statusFiltered.__filteredTodos ?
<Container title={'Todo'} className={'Todo'} todosArray={User.statusFiltered.__filteredTodos} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
<Container title={'Task'} className={'Todo'} todosArray={User.statusFiltered.__filteredTodos} isSubTodoContainer={isSubTodoContainer} parentTodoId={parentTodoId} fetchAllUserData={fetchAllUserData} fetchParentTodo={fetchParentTodo} />
: <></>
}
{User && User.statusFiltered && User.statusFiltered.__filteredInProgress ?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const darkModeSvgContent =
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" x="0px" y="0px"><path d="M14 8C14 8.55228 13.5523 9 13 9C12.4477 9 12 8.55228 12 8C12 7.44772 12.4477 7 13 7C13.5523 7 14 7.44772 14 8Z" fill="black"/><path d="M17.5 18C18.3284 18 19 17.3284 19 16.5C19 15.6716 18.3284 15 17.5 15C16.6716 15 16 15.6716 16 16.5C16 17.3284 16.6716 18 17.5 18Z" fill="black"/><path d="M13 19C13 19.5523 12.5523 20 12 20C11.4477 20 11 19.5523 11 19C11 18.4477 11.4477 18 12 18C12.5523 18 13 18.4477 13 19Z" fill="black"/><path d="M19 10C19.5523 10 20 9.55228 20 9C20 8.44772 19.5523 8 19 8C18.4477 8 18 8.44772 18 9C18 9.55228 18.4477 10 19 10Z" fill="black"/><path d="M13 14.5C13 14.7761 12.7761 15 12.5 15C12.2239 15 12 14.7761 12 14.5C12 14.2239 12.2239 14 12.5 14C12.7761 14 13 14.2239 13 14.5Z" fill="black"/><path d="M14.5 13C14.7761 13 15 12.7761 15 12.5C15 12.2239 14.7761 12 14.5 12C14.2239 12 14 12.2239 14 12.5C14 12.7761 14.2239 13 14.5 13Z" fill="black"/><path d="M10 4.5C10 4.77614 9.77614 5 9.5 5C9.22386 5 9 4.77614 9 4.5C9 4.22386 9.22386 4 9.5 4C9.77614 4 10 4.22386 10 4.5Z" fill="black"/><path d="M15.5 6C15.7761 6 16 5.77614 16 5.5C16 5.22386 15.7761 5 15.5 5C15.2239 5 15 5.22386 15 5.5C15 5.77614 15.2239 6 15.5 6Z" fill="black"/><path d="M6 7.5C6 7.77614 5.77614 8 5.5 8C5.22386 8 5 7.77614 5 7.5C5 7.22386 5.22386 7 5.5 7C5.77614 7 6 7.22386 6 7.5Z" fill="black"/><path d="M5.5 16C5.77614 16 6 15.7761 6 15.5C6 15.2239 5.77614 15 5.5 15C5.22386 15 5 15.2239 5 15.5C5 15.7761 5.22386 16 5.5 16Z" fill="black"/><path d="M8 18.5C8 18.7761 7.77614 19 7.5 19C7.22386 19 7 18.7761 7 18.5C7 18.2239 7.22386 18 7.5 18C7.77614 18 8 18.2239 8 18.5Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M10 11.5C10 12.8807 8.88071 14 7.5 14C6.11929 14 5 12.8807 5 11.5C5 10.1193 6.11929 9 7.5 9C8.88071 9 10 10.1193 10 11.5ZM8 11.5C8 11.7761 7.77614 12 7.5 12C7.22386 12 7 11.7761 7 11.5C7 11.2239 7.22386 11 7.5 11C7.77614 11 8 11.2239 8 11.5Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24ZM12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z" fill="black"/></svg>';

const sideBarData = [
{ name: "Todos", url: "/todos" },
{ name: "Tasks", url: "/tasks" },
{ name: null, url: null },
{ name: "All Todos", url: "/all-todos" },
{ name: "All Tasks", url: "/all-tasks" },
{ name: "Profile", url: "/profile" },
];
const navLinks = [
Expand Down Expand Up @@ -146,7 +146,7 @@ const DashboardWrapper: React.FC<DashboardWrapperProps> = ({
<img src={logo} alt="logo"></img>
</div>
<div className={includeDarkClass("navbar_heading", darkMode)}>
Todos
Task Master
</div>
<div className={includeDarkClass("navbar_void", darkMode)}></div>
<div className={includeDarkClass("navbar_navlinks", darkMode)}>
Expand Down Expand Up @@ -247,7 +247,7 @@ const DashboardWrapper: React.FC<DashboardWrapperProps> = ({
<div className={includeDarkClass("button_wrapper", darkMode)}>
<button onClick={() => setIsOpen(!isOpen)}>
<div className={includeDarkClass("btn_text", darkMode)}>
Add todo
Add task
</div>
<AddIcon showToolTip={false} size={20} />
</button>
Expand Down

0 comments on commit ef6972d

Please sign in to comment.