Skip to content

Navbar size reduced,card improved, alert position changed #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
saumyasrivastava226 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Navbar size reduced,card improved, alert position changed #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
859328f
Alert position changed,navbar improved, card todo
saumyasrivastava-cloud Oct 18, 2023
5fd04bf
Card improved
saumyasrivastava-cloud Oct 18, 2023
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
59 changes: 36 additions & 23 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,36 @@ function App() {

return (
<div className="overflow-hidden">
<nav className="navbar navbar-dark d-flex justify-content-between align-items-center bg-dark px-3">
<img style={{height: '100px'}} src="/My Notes-logos_white.png" alt="My Notes" />
<div>
<input
className="form-control shadow-none"
name="search"
value={search}
placeholder="Search"
onChange={(e) => setSearch(e.target.value)}
autoComplete="off"
<nav className="navbar navbar-dark bg-dark">
<div className="container">
<img
src="/My Notes-logos_white.png"
alt="My Notes"
className="navbar-brand"
style={{ height: "50px" }}
/>
<div className="d-flex align-items-center">
<input
className="form-control shadow-none "
name="search"
value={search}
placeholder="Search"
onChange={(e) => setSearch(e.target.value)}
autoComplete="off"
/>
</div>
</div>
</nav>

{alert && (
<div
className="alert alert-success position-absolute start-50 translate-middle"
style={{ zIndex: "500", top: "4vh" }}
className="alert alert-success position-absolute bottom-0 end-0 m-4"
style={{ zIndex: "500" }}
>
{alert}
</div>
)}

<CreateTodo todo={todo} setTodo={setTodo} ShowAlert={ShowAlert} />
<UpdateTodo
editText={editText}
Expand All @@ -59,21 +68,24 @@ function App() {
setTodo={setTodo}
ShowAlert={ShowAlert}
/>

<div className="row justify-content-center">
<h1 className="text-center mt-5">
{todo.length === 0 && "No Notes Found"}
<h1
className="text-center mt-5"
style={{ fontSize: "1.5rem" }}
>
{todo.length === 0 && <span>No Notes Found</span>}
</h1>
{todo
.filter((target) => {
if (target.title.toLowerCase().includes(search.toLowerCase())) {
return target;
} else if (
target.tag.toLowerCase().includes(search.toLowerCase())
) {
return target;
} else {
return null;
}
const titleMatch = target.title
.toLowerCase()
.includes(search.toLowerCase());
const tagMatch = target.tag
.toLowerCase()
.includes(search.toLowerCase());

return titleMatch || tagMatch ? target : null;
})
.map((target) => {
return (
Expand All @@ -89,6 +101,7 @@ function App() {
);
})}
</div>

<button
type="button"
className="btn btn-dark rounded-circle shadow-sm p-0"
Expand Down
67 changes: 43 additions & 24 deletions src/Components/TodoItem.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function TodoItem({ target, editText, setEditText, todo, setTodo, ShowAlert }) {
title: target.title,
description: target.description,
tag: target.tag,
date: new Date().toLocaleDateString,
date: new Date().toLocaleDateString(),
id: target.id,
});
};
Expand All @@ -21,54 +21,73 @@ function TodoItem({ target, editText, setEditText, todo, setTodo, ShowAlert }) {
let currentTime = new Date().getTime();
let currentDate = new Date().toJSON().slice(0, 10);


return (
<div
className={`note card ${
isDueDatePassed
? "border-danger card m-2 shadow-sm"
: "card m-2 shadow-sm"
isDueDatePassed ? "border-danger card m-2 shadow" : "card m-2 shadow"
}`}
style={{ width: "20rem" }}
style={{
width: "20rem",
backgroundColor: "white",

boxShadow:
"0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24)",
}}
>
<div className="card-body d-flex flex-column justify-content-between text-center">
<div className="d-flex justify-content-between">
<h6>{target.tag}</h6>
<div className="card-body d-flex flex-column justify-content-between text-left">
<div className="d-flex justify-content-between align-items-center">
<h6 style={{ color: "#F4B400", margin: 0 }}>{target.tag}</h6>
<div>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="currentColor"
className="bi bi-pen-fill me-2"
fill="#F4B400"
className="bi bi-pencil"
viewBox="0 0 16 16"
data-bs-toggle="modal"
data-bs-target="#updateNotes"
data-bs-dismiss="modal"
style={{ cursor: "pointer" }}
style={{ cursor: "pointer", marginRight: "10px" }}
onClick={editHandler}
>
<path d="m13.498.795.149-.149a1.207 1.207 0 1 1 1.707 1.708l-.149.148a1.5 1.5 0 0 1-.059 2.059L4.854 14.854a.5.5 0 0 1-.233.131l-4 1a.5.5 0 0 1-.606-.606l1-4a.5.5 0 0 1 .131-.232l9.642-9.642a.5.5 0 0 0-.642.056L6.854 4.854a.5.5 0 1 1-.708-.708L9.44.854A1.5 1.5 0 0 1 11.5.796a1.5 1.5 0 0 1 1.998-.001z" />
<path d="M0 12.536l2.614-2.616 6.95 6.951-2.616 2.615H0v-6.95z" />
<path
fillRule="evenodd"
d="M11.293 2.293a1 1 0 0 1 1.414 0l1.293 1.293a1 1 0 0 1 0 1.414l-8 8a1 1 0 0 1-.39.242l-3 1a1 1 0 0 1-1.306-1.307l1-3a1 1 0 0 1 .242-.391l8-8z"
/>
</svg>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="currentColor"
className="bi bi-trash-fill ms-2"
fill="#EB5757"
className="bi bi-trash"
viewBox="0 0 16 16"
style={{ cursor: "pointer" }}
onClick={deleteHandler}
>
<path d="M2.5 1a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1H3v9a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V4h.5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1H2.5zm3 4a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zM8 5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7A.5.5 0 0 1 8 5zm3 .5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 1 0z" />
<path
fillRule="evenodd"
d="M5.293 1.293a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414-1.414L9.586 8 5.293 3.707a1 1 0 0 1 0-1.414z"
/>
<path
fillRule="evenodd"
d="M1.293 4.293a1 1 0 0 1 0-1.414l4-4a1 1 0 0 1 1.414 0l4 4a1 1 0 0 1 0 1.414L6.414 8l4.293 4.293a1 1 0 0 1 0 1.414l-4 4a1 1 0 0 1-1.414 0l-4-4a1 1 0 0 1 0-1.414L3.586 8 1.293 5.707a1 1 0 0 1 0-1.414z"
/>
</svg>
</div>
</div>
<h4 className="card-title border-bottom pb-2">{target.title}</h4>
<p className="card-text">{target.description}</p>
<p className="card-text mt-2">Due Date: {target.dueDate}</p>
<small className="text-muted">Last Updated {currentDate} ({new Date(currentTime).toLocaleTimeString()})</small>

<h4 className="card-title border-bottom pb-2" style={{ color: "#333" }}>
{target.title}
</h4>
<p className="card-text" style={{ color: "#333" }}>
{target.description}
</p>
<p className="card-text mt-2" style={{ color: "#F4B400" }}>
Due Date: {target.dueDate}
</p>
<small className="text-muted" style={{ color: "#666" }}>
Last Updated {currentDate} (
{new Date(currentTime).toLocaleTimeString()})
</small>
</div>
</div>
);
Expand Down