Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/components/Login/login.css

This file was deleted.

6 changes: 0 additions & 6 deletions src/components/Register/register.css

This file was deleted.

15 changes: 7 additions & 8 deletions src/components/TaskManager/TaskManager.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@ import { Routes, Route, Navigate, useLocation } from "react-router-dom";
import { getTasksResponse, renderToast, updateTaskStatusApi, handleTaskDeleteResponse } from "../../utils/utils";
import useAppContext from "../../hooks/useAppContext";
import api from "../../api/api";
import Home from "../Home/Home";
import Login from "../Login/Login";
import Register from "../Register/Register";

import Home from "../../pages/Home/Home.jsx";
import Login from "../../pages/Login/Login.jsx";
import Register from "../../pages/Register/Register.jsx";
import Inbox from "../../pages/Inbox/Inbox.jsx";
import Dashboard from "../../pages/Dashboard/Dashboard.jsx";
import Today from "../../pages/Today/Today.jsx";
import MainContent from "../MainContent/MainContent.jsx";
import Inbox from "../Inbox/Inbox.jsx";
import PrivateRoutes from "../PrivateRoutes/PrivateRoutes";
import Dashboard from "../Dashboard/Dashboard.jsx";
import Spinner from "../Spinner/Spinner";
import Sidebar from "../Sidebar/Sidebar.jsx";
import history from "../../history/history.js";
import TaskForm from "../TaskForm/TaskForm.jsx";
import Today from "../Today/Today.jsx";

const TaskManager = () => {
const appPath = "/app";
Expand Down Expand Up @@ -194,8 +195,6 @@ const TaskManager = () => {
path={`${appPath}/today`}
element={
<Today
// pendingTasks={pendingTasks.filter((task) => new Date(task.due_date).toISOString().split("T")[0] === new Date().toISOString().split("T")[0])}
// completedTasks={completedTasks.filter((task) => new Date(task.due_date).toISOString().split("T")[0] === new Date().toISOString().split("T")[0])}
handleTaskDelete={handleTaskDelete}
updateTaskStatus={updateTaskStatus}
isToday={true}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React, { useState, useEffect, useMemo } from "react";
import { handleTaskDeleteResponse } from "../../utils/utils";
import StatCard from "./StatCard/StatCard";
import BreadCrumb from "../BreadCrumb/BreadCrumb";
import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
import TaskContainer from "../TaskContainer/TaskContainer";
import "./dashboard.scss";
import StatCard from "../../components/StatCard/StatCard";
import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
import TaskContainer from "../../components/TaskContainer/TaskContainer";
import useAppContext from "../../hooks/useAppContext";
import Spinner from "../Spinner/Spinner";
import Spinner from "../../components/Spinner/Spinner";
import "./dashboard.scss";

function Dashboard({ tasks, updateTaskStatus, handleTaskDelete }) {
const [stats, setStats] = useState([
Expand Down
16 changes: 8 additions & 8 deletions src/components/Home/Home.jsx → src/pages/Home/Home.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React, { useEffect } from "react";
import { Container } from "react-bootstrap";
import { Link, useNavigate } from "react-router-dom";
import Spinner from "../Spinner/Spinner";
import api from "../../api/api";
import Header from "../Header/Header";
import useAppContext from "../../hooks/useAppContext";
import Spinner from "../../components/Spinner/Spinner.jsx";
import api from "../../api/api.js";
import Header from "../../components/Header/Header.jsx";
import useAppContext from "../../hooks/useAppContext.js";
import { Figure } from "react-bootstrap";
import Features from "../Features/Features.jsx";
import Features from "../../components/Features/Features.jsx";
import "./home.scss";
import Footer from "../Footer/Footer";
import { handleApiResponse, verifyCookie } from "../../utils/utils";
import Hero from "../Hero/Hero.jsx";
import Footer from "../../components/Footer/Footer.jsx";
import { handleApiResponse, verifyCookie } from "../../utils/utils.js";
import Hero from "../../components/Hero/Hero.jsx";

function Home() {
let navigate = useNavigate();
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions src/components/Inbox/Inbox.jsx → src/pages/Inbox/Inbox.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import { useEffect } from "react";
import Spinner from "../Spinner/Spinner";
import Spinner from "../../components/Spinner/Spinner";
import { useLocation } from "react-router-dom";
import { renderToast } from "../../utils/utils";
import useAppContext from "../../hooks/useAppContext";
import BreadCrumb from "../BreadCrumb/BreadCrumb";
import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
import Filters from "../Filters/Filters";
import TaskContainer from "../TaskContainer/TaskContainer";
import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
import Filters from "../../components/Filters/Filters";
import TaskContainer from "../../components/TaskContainer/TaskContainer";
import "./inbox.scss";

function Inbox({ getTasks, loading, updateTaskStatus, handleTaskDelete, tasks, pendingTasks, completedTasks }) {
Expand Down
File renamed without changes.
13 changes: 3 additions & 10 deletions src/components/Login/Login.jsx → src/pages/Login/Login.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import React, { useState } from "react";
import Form from "react-bootstrap/Form";
import Button from "react-bootstrap/Button";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import React, { useState, useEffect } from "react";
import { Link, useNavigate } from "react-router-dom";
import api from "../../api/api";
import Spinner from "../Spinner/Spinner";
import { useEffect } from "react";
import "./login.css";
import Header from "../Header/Header";
import Spinner from "../../components/Spinner/Spinner";
import Header from "../../components/Header/Header";
import useAppContext from "../../hooks/useAppContext";
import { renderToast, verifyCookie } from "../../utils/utils";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import React from "react";
import Form from "react-bootstrap/Form";
import Button from "react-bootstrap/Button";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
import Col from "react-bootstrap/Col";
import { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom";
import Spinner from "../Spinner/Spinner";
import React, { useState, useEffect } from "react";
import { useNavigate, Link } from "react-router-dom";
import Spinner from "../../components/Spinner/Spinner";
import api from "../../api/api";
import "./register.css";
import { Link } from "react-router-dom";
import Header from "../Header/Header";
import Header from "../../components/Header/Header";
import { renderToast } from "../../utils/utils";
import useAppContext from "../../hooks/useAppContext";

Expand Down
6 changes: 3 additions & 3 deletions src/components/Today/Today.jsx → src/pages/Today/Today.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import BreadCrumb from "../BreadCrumb/BreadCrumb";
import Filters from "../Filters/Filters";
import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
import Filters from "../../components/Filters/Filters";
import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
import TodayContent from "./TodayContent";
import "./today.scss";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import Icons from "../Icons/Icons";
import TaskContainer from "../TaskContainer/TaskContainer";
import Icons from "../../components/Icons/Icons";
import TaskContainer from "../../components/TaskContainer/TaskContainer";

const TodayContent = ({ tasks, handleTaskDelete, updateTaskStatus, heading }) => {
const [show, setShow] = useState(true);
Expand Down
File renamed without changes.