Compare commits

...

5 Commits

Author SHA1 Message Date
sonali 0dbced87d1 " change in editpage and totalpage " 2024-10-03 18:06:37 +05:30
sonali 544705f96a 'my change ' 2024-10-03 17:44:26 +05:30
sonali 33d5b93a9c " new change" 2024-10-03 17:36:03 +05:30
sonali 56edbb76b5 " mu change" 2024-10-03 17:25:17 +05:30
sonali ea5f145e98 " ui change" 2024-10-02 18:02:18 +05:30
29 changed files with 1234 additions and 903 deletions

View File

@ -1,38 +0,0 @@
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

View File

@ -4,32 +4,36 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100vh; height: 100vh;
overflow: hidden;
position: relative; position: relative;
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
} }
.backIcon { .backIcon {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 20px; margin: 35px;
left: 10px;
} }
.arrow-icon { .arrow-icon {
font-size: 24px; font-size: 18px;
cursor: pointer; cursor: pointer;
} }
.edit-content { .edit-content {
padding: 20px; padding: 30px;
margin-bottom: 30px;
border-radius: 8px; border-radius: 8px;
/* box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3); */ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3);
width: 100%; width: 100%;
max-width: 400px; max-width: 400px;
} }
.edit-titles h1 { .edit-titles h1 {
color: #fff; color: #fff;
margin-bottom: 30px;
font-size: 30px; font-size: 30px;
margin: 0px 0; margin: 0px 0;
text-align: center; text-align: center;
@ -37,6 +41,7 @@
.edit-datetime { .edit-datetime {
color: #fff; color: #fff;
margin-bottom: 30px;
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 10px;
@ -44,6 +49,7 @@
.edit-fields { .edit-fields {
color: #fff; color: #fff;
padding: 10px 10px;
margin-bottom: 15px; margin-bottom: 15px;
width: 93%; width: 93%;
} }
@ -51,14 +57,15 @@
.edit-fields label { .edit-fields label {
display: block; display: block;
margin-bottom: 9px; margin-bottom: 9px;
} }
.edit-fields input { .edit-fields input {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
border: 1px solid #555; /* border: 1px solid #555; */
border-radius: 4px; border-radius: 4px;
background-color: #3A3A3A; /* background-color: #3A3A3A; */
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
} }
@ -68,14 +75,14 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 30px; margin-top: 30px;
gap: 5px;
width: 100%; width: 100%;
} }
.edit-btn { .edit-btn {
position: relative; position: relative;
width: 150px; width: 130px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -90,8 +97,8 @@
.edit-btn-2 { .edit-btn-2 {
position: relative; position: relative;
width: 150px; width: 130px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -106,14 +113,26 @@
@media (max-width: 768px) { @media (max-width: 768px) {
.edit-titles h1 { .edit-titles h1 {
font-size: 24px; font-size: 24px;
} }
.edit-datetime { .edit-datetime {
font-size: 16px; font-size: 16px;
} }
.edit-buttons div { .edit-buttons div {
font-size: 14px; font-size: 14px;
} }
}
}
@media (min-width: 1024px) {
.edit-btn, .edit-btn-2 {
width: 250px;
height: 50px;
font-size: 20px;
}
}

View File

@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom"; import { useLocation, useNavigate } from "react-router-dom";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faArrowLeft } from "@fortawesome/free-solid-svg-icons"; import { faArrowLeft } from "@fortawesome/free-solid-svg-icons";
import "../Common/ExpenseEditPage.css" import "../Common/ExpenseEditPage.css";
function ExpenseEditPage() { function ExpenseEditPage() {
const location = useLocation(); const location = useLocation();
@ -17,14 +17,27 @@ function ExpenseEditPage() {
const now = new Date(); const now = new Date();
const formattedDateTime = now.toLocaleString(); const formattedDateTime = now.toLocaleString();
setCurrentDateTime(formattedDateTime); setCurrentDateTime(formattedDateTime);
}, []);
if (!location.state?.id) {
const storedEntries = JSON.parse(localStorage.getItem("entries")) || [];
const entryToEdit = storedEntries.find(
(entry) => entry.id === location.state?.id
);
if (entryToEdit) {
setAmount(entryToEdit.amount);
setCategory(entryToEdit.category);
}
}
}, [location.state]);
const handleBackClick = () => { const handleBackClick = () => {
navigate("/expense-records"); navigate("/expense-records");
}; };
const handleSave = () => { const handleSave = () => {
setIsLoading(true); setIsLoading(true);
setError(null); setError(null);
const updatedEntry = { const updatedEntry = {
@ -34,16 +47,14 @@ function ExpenseEditPage() {
category: category, category: category,
}; };
const storedEntries = JSON.parse(localStorage.getItem("entries")) || []; const storedEntries = JSON.parse(localStorage.getItem("entries")) || [];
const updatedEntries = storedEntries.map((entry) => const updatedEntries = storedEntries.map((entry) =>
entry.id === updatedEntry.id ? updatedEntry : entry entry.id === updatedEntry.id ? updatedEntry : entry
); );
localStorage.setItem("entries", JSON.stringify(updatedEntries)); localStorage.setItem("entries", JSON.stringify(updatedEntries));
// console.log("Entry updated in local storage:", updatedEntry);
console.log("Entry updated in local storage:", updatedEntry); navigate("/expense-successfully", { state: updatedEntry });
navigate("/expense-successfully");
setIsLoading(false); setIsLoading(false);
}; };

View File

@ -1,7 +1,7 @@
.layout-container { .layout-container {
display: flex; /* display: flex;
flex-direction: column; flex-direction: column;
min-height: 100vh; min-height: 100vh; */
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
} }

View File

@ -5,17 +5,21 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100vh; height: 100vh;
font-family: 'Montserrat', sans-serif;
color: white;
position: relative; position: relative;
} }
.arrows { .arrows {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 20px; margin: 35px;
left: 10px;
} }
.arrow-icon-1 { .arrow-icon-1 {
font-size: 24px; font-size: 18px;
cursor: pointer; cursor: pointer;
} }
@ -30,13 +34,13 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 0px;
} }
.success-title h1 { .success-title h1 {
color: #fff; color: #fff;
font-size: 30px; font-size: 30px;
margin-top: 10px; margin-top: 0px;
text-align: center; text-align: center;
} }
@ -52,14 +56,14 @@
.success-button { .success-button {
display: flex; display: flex;
justify-content: center; justify-content: center;
gap: 20px; gap: 10px;
margin-top: 20px; margin-top: 10px;
} }
.btn-view { .btn-view {
position: relative; position: relative;
width: 120px; width: 100px;
height: 40px; height: 30px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -73,8 +77,8 @@
} }
.btn-back { .btn-back {
position: relative; position: relative;
width: 120px; width: 100px;
height: 40px; height: 30px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -88,24 +92,11 @@
} }
.success-date-time{ .success-date-time{
color: #fff; color: #fff;
} }
/* Mobile responsiveness */
@media (max-width: 768px) {
.btn-view, .btn-back {
padding: 12px 20px;
font-size: 16px;
}
}
/* Mobile responsiveness */
@media (max-width: 768px) { @media (max-width: 768px) {
.success-message h2 { .success-message h2 {
font-size: 20px; font-size: 20px;
@ -114,4 +105,21 @@
.success-title h1 { .success-title h1 {
font-size: 24px; font-size: 24px;
} }
} }
@media (min-width: 1024px) {
.btn-view, .btn-back {
width: 200px;
height: 50px;
font-size: 20px;
}
.success-title h1 {
font-size: 32px;
}
.success-message h2 {
font-size: 26px;
}
}

View File

@ -22,7 +22,7 @@ function TotalExpenseSuccessfully() {
const dataToStore = { const dataToStore = {
incomeRecord: { incomeRecord: {
dateTime: formattedDateTime, dateTime: formattedDateTime,
entryId: entryId || "Not provided", // Fallback in case entryId is undefined entryId: entryId || "Not provided",
}, },
}; };
console.log(JSON.stringify(dataToStore)); console.log(JSON.stringify(dataToStore));
@ -33,7 +33,7 @@ function TotalExpenseSuccessfully() {
}; };
const handleViewRecordsClick = () => { const handleViewRecordsClick = () => {
// Pass entryId to the /records route when navigating
navigate("/expense-records", { state: { entryId } }); navigate("/expense-records", { state: { entryId } });
console.log(entryId); console.log(entryId);
}; };

View File

@ -1,191 +1,233 @@
.amount-container { .amount-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 10px; padding: 10px;
margin: 0 auto; margin: 0 auto;
max-width: 500px; max-width: 90vw;
background-color: #1e1e1e; background-color: #1e1e1e;
border-radius: 10px; border-radius: 10px;
text-align: center; text-align: center;
} }
.backarrow {
/* position: absolute; */
width: 100%;
}
.backarrow {
position: relative;
width: 100%;
text-align: center;
margin-bottom: 50px;
}
.arrowbtn { .arrowbtn {
position: absolute; position: absolute;
left: 0; left: 0;
top: 50%; top: 50%;
margin: 30px 10px; margin: 20px 10px;
/* transform: translateY(-50%); */ font-size: 4vw; /* Responsive font-size */
font-size: 24px; color: #333;
cursor: pointer;
}
.amount-titles {
font-size: 24px;
width: 100%;
color: #fff;
margin: 0 auto;
text-align: center;
flex-grow: 1;
}
.amount-display {
display: flex;
width: 150px;
height: 30px;
align-items: center;
justify-content: center;
background: #1E1E1E;
box-shadow: 0px 0px 22.3px #E335DC, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
padding: 10px;
border-radius: 8px;
margin-bottom: 20px;
}
.total-amount {
font-size: 36px;
color: #fff;
margin-right: 10px;
}
.Rupeesicon {
width: 30px;
height: 30px;
}
.rupess_section {
display: flex;
justify-content: center;
flex-wrap: wrap;
gap: 15px;
margin-top: 20px;
}
.coin {
width: 50px;
height: 50px;
background: #E335DC;
box-shadow: -10px -10px 12px rgba(50, 50, 51, 0.66), 10px 10px 16px #040404, inset -2px -2px 2px rgba(111, 0, 121, 0.64), inset 2px 2px 2px rgba(102, 0, 98, 0.56);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
transition: background-color 0.3s ease;
/* border: 2px solid #fff; */
}
.coin-value {
font-size: 24px;
font-weight: bold;
color: #fff;
}
@media (max-width: 600px) {
.amount-container {
padding: 10px;
max-width: 100%;
}
.backarrow {
justify-content: space-between;
}
.arrowbtn {
position: absolute;
/* left: 3%; */
top: 50%;
margin: 17px 30px;
/* transform: translateX(-20%); */
font-size: 18px;
color: #333; color: #333;
cursor: pointer; cursor: pointer;
} }
.amount-titles { .amount-titles {
font-size: 24px; font-size: 20px;
width: 100px; }
color: #fff;
margin: 0 auto; .rupess_section {
text-align: center; gap: 20px;
flex-grow: 1; }
.coin {
width: 50px;
height: 50px;
padding: 15px;
} }
.amount-display { .coin-value {
display: flex; font-size: 26px;
align-items: center;
justify-content: center;
background: #1E1E1E;
box-shadow: 0px 0px 22.3px #E335DC, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
padding: 10px;
border-radius: 8px;
margin-bottom: 20px;
} }
.Rupeesicon {
width: 33px;
height: 33px;
}
.total-amount { .total-amount {
font-size: 36px; font-size: 28px;
color: #fff; }
margin-right: 10px;
.coin:hover {
background-color: #4caf50;
}
}
@media (min-width: 1024px) {
.amount-container {
max-width: 800px;
padding: 20px;
}
.coin {
width: 100px;
height: 100px;
}
.arrowbtn {
font-size: 18px;
margin: 27px 21px;
}
.coin-value {
font-size: 20px;
} }
.Rupeesicon { .Rupeesicon {
width: 30px; width: 30px;
height: 30px; height: 30px;
padding: 10px;
}
.total-amount {
font-size: 40px;
}
}
@media (max-width: 375px) {
.amount-container {
padding: 0px;
max-width: 90%;
}
.backarrow {
justify-content: space-between;
}
.arrowbtn {
font-size: 18px;
margin: 27px 21px;
}
.amount-titles {
font-size: 18px;
} }
.rupess_section { .rupess_section {
display: flex; gap: 20px;
justify-content: center; margin-top: 10px;
flex-wrap: wrap;
gap: 15px;
margin-top: 20px;
} }
.coin { .coin {
width: 50px; width: 40px;
height: 50px; height: 35px;
background: #E335DC;
box-shadow: -10px -10px 12px rgba(50, 50, 51, 0.66), 10px 10px 16px #040404, inset -2px -2px 2px rgba(111, 0, 121, 0.64), inset 2px 2px 2px rgba(102, 0, 98, 0.56);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
transition: background-color 0.3s ease;
/* border: 2px solid #fff; */
} }
.coin-value { .coin-value {
font-size: 24px; font-size: 20px;
font-weight: bold;
color: #fff;
} }
.Rupeesicon {
width: 25px;
height: 25px;
}
@media (max-width: 600px) { .total-amount {
.amount-container { font-size: 26px;
padding: 10px;
max-width: 100%;
}
.backarrow {
justify-content: space-between;
}
.arrowbtn {
position: absolute;
left: 0;
top: 50%;
margin: 30px 10px;
/* transform: translateX(-20%); */
font-size: 24px;
color: #333;
cursor: pointer;
}
.amount-titles {
font-size: 20px;
}
.rupess_section {
gap: 10px;
}
.coin {
width: 50px;
height: 50px;
padding: 15px;
}
.coin-value {
font-size: 26px;
}
.Rupeesicon {
width: 20px;
height: 20px;
}
.total-amount {
font-size: 28px;
}
.coin:hover {
background-color: #4caf50;
} }
}
}
@media (min-width: 1024px) {
.amount-container {
max-width: 800px;
padding: 20px;
}
.coin {
width: 100px;
height: 100px;
}
.coin-value {
font-size: 20px;
}
.Rupeesicon {
width: 30px;
height: 30px;
padding: 10px;
}
.total-amount {
font-size: 40px;
}
}

View File

@ -1,21 +1,28 @@
body {
margin: 0;
overflow: hidden;
}
.total-amount-container { .total-amount-container {
flex-direction: column; display: flex;
position: absolute; flex-direction: column;
width: 80%; position: fixed;
max-width: 500px; width: 80%;
height: auto; max-width: 500px;
top: 50%; height: 340px;
left: 50%; top: 50%;
transform: translate(-50%, -50%); left: 50%;
color: white; transform: translate(-50%, -50%);
font-family: 'Montserrat', sans-serif; color: white;
background: #1e1e1e; font-family: 'Montserrat', sans-serif;
box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404, background: #1e1e1e;
inset -2px -2px 2px rgba(255, 255, 255, 0.64), box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404,
inset 2px 2px 2px rgba(39, 39, 44, 0.56); inset -2px -2px 2px rgba(255, 255, 255, 0.64),
padding: 20px; inset 2px 2px 2px rgba(39, 39, 44, 0.56);
box-sizing: border-box; padding: 8px;
} box-sizing: border-box;
}
.input-group { .input-group {
display: flex; display: flex;
@ -82,7 +89,7 @@
@media (max-width: 768px) { @media (max-width: 768px) {
.total-amount-container { .total-amount-container {
width: 90%; width: 90%;
top: 60%; top: 65%;
} }
.input-group { .input-group {
@ -110,7 +117,7 @@
@media (max-width: 480px) { @media (max-width: 480px) {
.total-amount-container { .total-amount-container {
/* padding: 15px; */ /* padding: 15px; */
margin: 40px 0px ; margin: 20px 0px 0px 0px ;
} }
.add-entry-1, .add-entry-1,

View File

@ -1,158 +1,233 @@
.category-container { .category-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
background-color: #1e1e1e; background-color: #1e1e1e;
color: white; color: white;
width: 100%; width: 100%;
padding: 10px; padding: 10px;
} }
.arrow {
position: absolute; .arrow {
top: 10px; position: absolute;
left: 30px; top: 10px;
} left: 30px;
}
.arrow-icon {
font-size: 24px; .arrow-icon {
font-size: 24px;
}
}
/* /*
.category-header { .category-header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: 20px 0; margin: 20px 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
} */ } */
.category-display {
margin: 30px;
width: 150px;
height: 30px;
/* left: calc(50% - 207px / 2 - 0.5px); */
top: 90px;
background: #1E1E1E;
box-shadow: 0px 0px 22.3px #00D092, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
display: flex;
align-items: center;
justify-content: center;
padding: 10px;
border-radius: 8px;
}
.category-titles {
font-size: 24px;
margin-right: 4px;
}
.category-icon {
width: 30px;
/* top: 10px; */
justify-content: center;
align-items: center;
/* margin: 2px; */
height: 30px;
}
.category-list { .category-titles {
display: flex; font-size: 20px;
flex-wrap: wrap; margin-right: 4px;
justify-content: center; color: #fff;
width: 100%; margin-bottom: 20px; /* Add 10px space below category titles */
margin-top: 20px; }
}
.category-display {
.cat-item { margin: 35px 0 10px 0; /* 10px space below the display box */
background-color: #2a2a2a; width: 150px;
border-radius: 10px; height: 30px;
padding: 15px; background: #1E1E1E;
margin: 10px; box-shadow: 0px 0px 22.3px #00D092, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
min-width: 120px; border-radius: 24px;
text-align: center;
font-size: 18px; display: flex;
transition: background-color 0.3s ease; align-items: center;
cursor: pointer; justify-content: center;
} padding: 10px;
.cat-item.selected { border-radius: 8px;
background-color: #007BFF; }
color: white;
border-radius: 5px;
.category01 {
width: 30px;
/* top: 10px; */
justify-content: center;
align-items: center;
margin: 2px;
height: 30px;
}
.category-list {
display: flex;
flex-wrap: wrap;
justify-content: center;
width: 100%;
margin-top: 0px;
}
.cat-item {
background-color: #2a2a2a;
border-radius: 10px;
padding: 10px;
margin: 10px;
min-width: 120px;
text-align: center;
font-size: 18px;
transition: background-color 0.3s ease;
cursor: pointer;
}
.cat-item.selected {
background-color: #007BFF;
color: white;
border-radius: 5px;
} }
.cat-item.selected { .cat-item.selected {
background-color: #007bff; background-color: #007bff;
color: #fff; color: #fff;
} }
.texts { .texts {
width: 50%; width: 50%;
padding: 10px; padding: 10px;
margin: 20px 0; margin: 20px 0;
font-size: 16px; font-size: 16px;
border-bottom: 1px solid #fafafa; border-bottom: 1px solid #fafafa;
outline: none; outline: none;
color: #ffffff; color: #ffffff;
border-radius: 8px; border-radius: 8px;
transition: border-color 0.3s ease, background-color 0.3s ease; transition: border-color 0.3s ease, background-color 0.3s ease;
}
.add-category {
display: flex;
align-items: center;
margin-top: 10px;
}
.texts {
flex: 1;
padding: 5px;
margin-right: 10px;
}
.add-button {
padding: 10px 14px;
margin: 15px;
background-color: #2a2a2a;
color: white;
border: none;
border-radius: 3px;
cursor: pointer;
}
.add-button:hover {
background-color: #2a2a2a;
} }
@media (max-width: 768px) {
@media (max-width: 768px) { .category-titles {
.category-titles { font-size: 20px;
font-size: 20px;
}
.category-icon {
width: 35px;
margin: 10px;
height: 35px;
}
.cat-item {
min-width: 100px;
font-size: 16px;
}
} }
@media (max-width: 480px) {
.arrow {
top: 40px;
left: 40px;
}
.category-titles {
font-size: 18px;
}
.category01 {
.category-icon { width: 35px;
width: 30px; margin: 10px;
margin: 7px; height: 3px;
height: 30px;
}
.cat-item {
min-width: 80px;
font-size: 14px;
padding: 10px;
margin: 8px;
}
.category-container {
padding: 0px;
}
} }
.cat-item {
min-width: 100px;
font-size: 16px;
}
}
@media (max-width: 480px) {
.arrow {
top: 40px;
left: 40px;
}
.category-titles {
font-size: 18px;
color: #fff;
}
.category01 {
width: 30px;
margin: 7px;
height: 30px;
}
.cat-item {
min-width: 80px;
font-size: 14px;
padding: 10px;
margin: 8px;
}
.category-container {
padding: 0px;
}
}
@media (max-width: 375px) {
.category-container {
padding: 0;
}
.arrow-icon {
font-size: 18px;
margin: 27px 21px;
}
.arrow {
top: 30px;
left: 30px;
}
.category-display {
width: 120px;
height: 25px;
margin: 35px auto;
font-size: 14px;
}
.category-titles {
font-size: 14px;
margin-right: 2px;
}
.category01 {
width: 25px;
height: 25px;
margin: 5px;
}
.cat-item {
min-width: 50px;
font-size: 10px;
padding: 8px;
margin: 6px;
}
.texts {
width: 50%;
font-size: 10px;
padding: 8px;
margin: 15px 0;
}
}

View File

@ -8,21 +8,18 @@ import '../ExpenseCategory/ExpenseCategory.css';
function ExpenseCategory() { function ExpenseCategory() {
const navigate = useNavigate(); const navigate = useNavigate();
const [totalAmount, setTotalAmount, category, setCategory] = useOutletContext(); const [totalAmount, setTotalAmount, category, setCategory] = useOutletContext();
const [categories, setCategories] = useState(["Hair", "Clothing", "Food", "Books", "Electronics", "Other"]); const [categories, setCategories] = useState(["Hair", "Clothing", "Food", "Books", "Electronics", "Other"]);
const [selectedCategories, setSelectedCategories] = useState([]); const [selectedCategories, setSelectedCategories] = useState([]);
const [customCategoryCount, setCustomCategoryCount] = useState(0); const [customCategoryCount, setCustomCategoryCount] = useState(0);
const [newCategory, setNewCategory] = useState('');
const location = useLocation(); const location = useLocation();
const entryType = location.state?.entryType; const entryType = location.state?.entryType;
const handleBackClick = () => { const handleBackClick = () => {
navigate("/income", { state: { entryType } });
navigate("/expense", { state: { entryType } });
console.log(entryType); console.log(entryType);
} }
@ -38,7 +35,8 @@ function ExpenseCategory() {
} }
}; };
const handleAddCategory = (newCategory) => { const handleAddCategory = () => {
if (newCategory.trim() === '') return;
if (!categories.includes(newCategory)) { if (!categories.includes(newCategory)) {
if (customCategoryCount < 3) { if (customCategoryCount < 3) {
const updatedCategories = [...categories, newCategory]; const updatedCategories = [...categories, newCategory];
@ -46,6 +44,7 @@ function ExpenseCategory() {
setCustomCategoryCount(customCategoryCount + 1); setCustomCategoryCount(customCategoryCount + 1);
localStorage.setItem('categories', JSON.stringify(updatedCategories)); localStorage.setItem('categories', JSON.stringify(updatedCategories));
alert(`Category "${newCategory}" added!`); alert(`Category "${newCategory}" added!`);
setNewCategory(''); // Clear input field after adding
} else { } else {
alert('You can only add up to three custom categories!'); alert('You can only add up to three custom categories!');
} }
@ -75,9 +74,9 @@ function ExpenseCategory() {
<div className='category-display'> <div className='category-display'>
<h3 className="category-titles">Categories</h3> <h3 className="category-titles">Categories</h3>
<img src={categoryImage} alt="categoryIcon" className="category-icon" /> <img src={categoryImage} alt="categoryIcon" className="category01" />
</div> </div>
<section className='category-list'> <section className='category-list'>
{categories.map((cat, index) => ( {categories.map((cat, index) => (
<div <div
@ -90,20 +89,25 @@ function ExpenseCategory() {
))} ))}
</section> </section>
{/* Input and button for adding new category */}
{customCategoryCount < 3 && ( {customCategoryCount < 3 && (
<input className='texts' <div className="add-category">
type="text" <input
placeholder="Add New Category" className='texts'
onKeyDown={(e) => { type="text"
if (e.key === 'Enter') { placeholder="Add New Category"
handleAddCategory(e.target.value); value={newCategory}
e.target.value = ''; onChange={(e) => setNewCategory(e.target.value)}
} />
}} <button
/> className="add-button"
onClick={handleAddCategory}
>
Add
</button>
</div>
)} )}
</div> </div>
); );
} }
export default ExpenseCategory; export default ExpenseCategory;

View File

@ -1,6 +1,6 @@
.expense-container { .expense-container {
max-width: 800px; max-width: 100%;
margin: 0 auto; margin: 0 auto;
padding: 20px; padding: 20px;
justify-content: center; justify-content: center;
@ -140,7 +140,7 @@
padding: 10px; padding: 10px;
} }
.amount-icon, .category-icon { .amount-icon, .category{
width: 40px; width: 40px;
height: 40px; height: 40px;
margin: 2px; margin: 2px;
@ -157,4 +157,36 @@
font-size: 18px; font-size: 18px;
} }
} }
/* Styles for screens with a width of 375px */
@media (max-width: 375px) {
.arrow-icon {
font-size: 12px;
}
.expense-title {
font-size: 18px;
}
.expense-date {
font-size: 12px;
}
.button-container {
flex-direction: row;
align-items: center;
}
.amount-btn, .category-btn {
width: 90%;
font-size: 14px;
padding: 12px;
}
.category{
width: 25px;
height: 25px;
margin-bottom: 5px;
}
}

View File

@ -1,23 +1,23 @@
.container { .container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
height: 100vh; height: 100vh;
color: white;
position: relative; position: relative;
} }
.back_arrows { .back_arrows {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 20px; margin: 35px;
left: 10px;;
} }
.arrow-icon { .arrow-icon {
font-size: 24px; font-size: 18px;
margin: 9px 0px 0px 0px;
cursor: pointer; cursor: pointer;
} }
@ -29,9 +29,9 @@
} }
.success-titles h1 { .success-titles h1 {
color: #fff; color: #4CAF50;
font-size: 30px; font-size: 30px;
margin: 10px 0; margin: 0 0;
text-align: center; text-align: center;
} }
@ -45,35 +45,37 @@
text-align: center; text-align: center;
font-size: 24px; font-size: 24px;
color: #4CAF50; color: #4CAF50;
margin: 10px 0; margin: 0px 0;
padding: 30px;
} }
.categories {
margin-top: 10px; .categories {
margin-top: 0px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.categories h3 { .categories h3 {
font-size: 15px; font-size: 15px;
color: #9e9696; color: #9e9696;
/* margin: 0px 0px 0px 0px; */
/* padding: 5px; */
} }
.categories ul { .categories ul {
list-style-type: none; list-style-type: none;
padding: 5px; padding: 5px;
} }
.categories li { .categories li {
font-size: 16px; font-size: 16px;
color: #deb1b1; color: #deb1b1;
border-bottom: 1px solid #e0e0e0; border-bottom: 1px solid #e0e0e0;
padding: 8px 0; padding: 8px 0;
} }
/* Mobile responsiveness */ /* Mobile responsiveness */
@media (max-width: 768px) { @media (max-width: 768px) {
@ -84,47 +86,32 @@
.success-datetime { .success-datetime {
font-size: 16px; font-size: 16px;
} }
}
.total-amount { .total-amount {
color: #fff; color: #4CAF50;
font-size: 12px; font-size: 12px;
margin: 20px 0; margin: 0px 0;
} }
.categories { .categories {
color: #fff; color: #fff;
font-size: 10px; font-size: 10px;
margin: 10px 0; margin: 10px 0;
}
} }
.success-buttons { .success-buttons {
display: flex; display: flex;
justify-content: center; justify-content: center;
gap: 20px; gap: 10px;
margin-top: 20px; margin-top: 0px;
} }
.btn-home { .btn-home,
position: relative;
width: 150px;
height: 60px;
color: #fff;
justify-content: center;
align-items: center;
background: #1E1E1E;
box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 10px;
}
.btn-edit { .btn-edit {
position: relative; position: relative;
width: 150px; width: 140px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -135,7 +122,82 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-right: 10px; margin-right: 10px;
}
@media (min-width: 1024px) {
.btn-edit, .btn-home {
width: 200px;
height: 50px;
font-size: 20px;
}
.total-amount {
color: #4CAF50;
font-size: 12px;
margin: 0px 0;
}
}
/* Screen size 375px */
@media screen and (max-width: 375px) {
.success-titles h1 {
font-size: 20px;
}
.success-datetime {
font-size: 14px;
}
.total-amount {
font-size: 18px;
/* padding: 20px; */
}
.categories li {
font-size: 14px;
}
} }
/* Screen size 687px */
@media screen and (max-width: 687px) {
.success-titles h1 {
font-size: 22px;
}
.success-datetime {
font-size: 16px;
}
.total-amount {
font-size: 20px;
padding: 25px;
}
.categories li {
font-size: 15px;
}
}
/* Screen size 745px */
@media screen and (max-width: 745px) {
.success-titles h1 {
font-size: 24px;
}
.success-datetime {
font-size: 16px;
}
.total-amount {
font-size: 12px;
}
.categories li {
font-size: 16px;
}
}

View File

@ -45,9 +45,11 @@ function ExpenseRecords() {
}, [entry, lastEntry]); }, [entry, lastEntry]);
const handleBackClick = () => { const handleBackClick = () => {
navigate("/"); navigate("/expense-totalsuccessfully");
}; };
const handleBackHomeClick = () => {
navigate("/")
}
const handleEditClick = () => { const handleEditClick = () => {
const idToEdit = entryId || (lastEntry ? lastEntry.id : null); const idToEdit = entryId || (lastEntry ? lastEntry.id : null);
@ -94,7 +96,7 @@ function ExpenseRecords() {
</div> </div>
<div className="success-buttons"> <div className="success-buttons">
<div className="btn-home" onClick={handleBackClick}>Home</div> <div className="btn-home" onClick={handleBackHomeClick}>Home</div>
<div className="btn-edit" onClick={handleEditClick}>Edit</div> <div className="btn-edit" onClick={handleEditClick}>Edit</div>
</div> </div>
</div> </div>

View File

@ -1,10 +1,3 @@
body {
background-color: #1E1E1E;
margin: 20px;
padding: 0;
font-family: Arial, sans-serif;
}
.Payment-container { .Payment-container {
display: flex; display: flex;
@ -16,40 +9,35 @@ body {
} }
.arrow { .arrow {
font-size: 24px; font-size: 18px;
cursor: pointer; cursor: pointer;
} }
.arr { .arr {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 20px; left: 0px;
} }
.expense-date {
.income-date {
color: #fff; color: #fff;
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 0px;
} }
.payment-title { .payment-title {
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 30px;
} }
.payment-title h1 { .payment-title h1 {
color: #fff; color: #fff;
font-size: 30px; font-size: 30px;
margin: 10px 0; margin: 0px 0;
text-align: center; text-align: center;
} }
.payment-content { .payment-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -57,7 +45,6 @@ body {
justify-content: center; justify-content: center;
} }
.payment-animation { .payment-animation {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -65,15 +52,13 @@ body {
margin-bottom: 10px; margin-bottom: 10px;
} }
.payment-message h2 { .payment-message h2 {
color: #fff; color: #fff;
font-size: 24px; font-size: 24px;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.payment-buttons { .payment-buttons {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -81,11 +66,10 @@ body {
margin-top: 20px; margin-top: 20px;
} }
.btn1, .bt_11 {
.btn1 {
position: relative; position: relative;
width: 150px; width: 130px;
height: 60px; height: 40px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -98,82 +82,64 @@ body {
margin-right: 10px; margin-right: 10px;
} }
/* Small screens (up to 600px) */
.bt_11 {
position: relative;
width: 150px;
height: 60px;
color: #fff;
justify-content: center;
align-items: center;
background: #1E1E1E;
box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 10px;
}
@media (max-width: 600px) { @media (max-width: 600px) {
.payment-title h1 { .payment-title h1 {
font-size: 24px; font-size: 16px;
} }
.income-date { .expense-date {
font-size: 16px; font-size: 12px;
} }
.payment-message h2 { .payment-message h2 {
font-size: 20px; font-size: 14px;
} }
.btn1, .bt_11 { .btn1, .bt_11 {
width: 120px; width: 120px;
height: 50px; height: 40px;
font-size: 16px; font-size: 14px;
} }
.arr { .arr {
top: 10px; top: 0px;
left: 10px; left: 0px;
} }
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
.payment-title h1 { .payment-title h1 {
font-size: 28px; font-size: 22px;
} }
.income-date { .expense-date {
font-size: 16px; font-size: 14px;
} }
.payment-message h2 { .payment-message h2 {
font-size: 22px; font-size: 18px;
} }
.btn1, .bt_11 { .btn1, .bt_11 {
width: 140px; width: 140px;
height: 55px; height: 50px;
font-size: 18px; font-size: 16px;
} }
.arr { .arr {
top: 15px; top: 0;
left: 15px; left: 0px;
margin: 5px;
} }
} }
/* Large screens (1025px and up) */
@media (min-width: 1025px) { @media (min-width: 1025px) {
.btn1, .bt_11 { .btn1, .bt_11 {
width: 160px; width: 190px;
height: 60px; height: 50px;
font-size: 18px; font-size: 18px;
} }

View File

@ -1,14 +1,16 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faArrowLeft } from "@fortawesome/free-solid-svg-icons"; import { faArrowLeft } from "@fortawesome/free-solid-svg-icons";
import { useNavigate } from "react-router-dom"; import { useNavigate, useLocation } from "react-router-dom";
import { Player } from "@lottiefiles/react-lottie-player"; import { Player } from "@lottiefiles/react-lottie-player";
import successAnimation from "../Common/Animation - 1727464749500.json"; import successAnimation from "../Common/Animation - 1727464749500.json";
import "../ExpenseSuccessfully/ExpenseSuccessfully.css" import "../ExpenseSuccessfully/ExpenseSuccessfully.css";
function ExpenseSuccessfully() { function ExpenseSuccessfully() {
const [currentDate, setCurrentDate] = useState(new Date()); const [currentDate, setCurrentDate] = useState(new Date());
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation();
const entryType = location.state?.entryType;
useEffect(() => { useEffect(() => {
const timer = setInterval(() => { const timer = setInterval(() => {
@ -19,28 +21,32 @@ function ExpenseSuccessfully() {
}, []); }, []);
const handleBackClick = () => { const handleBackClick = () => {
navigate("/expense-edit"); const updatedEntry = {
id: location.state?.id,
amount: location.state?.amount,
category: location.state?.category,
dateTime: location.state?.dateTime,
};
navigate("/expense-editPage", { state: updatedEntry });
}; };
const handleBackToHome = () => { const handleBackToHome = () => {
navigate("/"); navigate("/", { state: { entryType } });
}; };
const handleBackToRecord = () => { const handleBackToRecord = () => {
navigate("/expense-records") navigate("/expense-records", { state: { entryType } });
} };
const options = { hour: "2-digit", minute: "2-digit", hour12: true }; const options = { hour: "2-digit", minute: "2-digit", hour12: true };
const formattedDate = `on ${currentDate.toLocaleDateString()} - ${currentDate.toLocaleTimeString( const formattedDate = `on ${currentDate.toLocaleDateString()} - ${currentDate.toLocaleTimeString([], options)}`;
[],
options
)}`;
return ( return (
<div className="Payment-container"> <div className="Payment-container">
<div className="payment-title"> <div className="payment-title">
<h1>Expense</h1> <h1>Expense</h1>
<p className="income-date">{formattedDate}</p> <p className="expense-date">{formattedDate}</p>
<div className="arr"> <div className="arr">
<FontAwesomeIcon <FontAwesomeIcon
icon={faArrowLeft} icon={faArrowLeft}

View File

@ -18,7 +18,7 @@
position: relative; position: relative;
width: 100%; width: 100%;
text-align: center; text-align: center;
margin-bottom: 50px; margin-bottom: 30px;
} }
@ -27,7 +27,7 @@
left: 0; left: 0;
top: 50%; top: 50%;
margin: 30px 10px; margin: 30px 10px;
/* transform: translateY(-50%); */ transform: translateY(90%);
font-size: 24px; font-size: 24px;
color: #333; color: #333;
cursor: pointer; cursor: pointer;

View File

@ -51,7 +51,7 @@ function EntriesList() {
id: new Date().getTime(), id: new Date().getTime(),
amount: repeatEntry.amount, amount: repeatEntry.amount,
category: repeatEntry.category, category: repeatEntry.category,
type: repeatEntry.type, // Ensure type is included type: repeatEntry.type,
}; };
const updatedEntries = [...entries, newEntry]; const updatedEntries = [...entries, newEntry];

View File

@ -1,20 +1,26 @@
body {
margin: 0;
overflow: hidden;
}
.total-amount-container { .total-amount-container {
display: flex;
flex-direction: column; flex-direction: column;
position: absolute; position: relative;
width: 80%; width: 80%;
max-width: 500px; max-width: 500px;
height: auto; height: auto;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
color: white; color: white;
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
background: #1e1e1e; background: #1e1e1e;
box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404, box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404,
inset -2px -2px 2px rgba(255, 255, 255, 0.64), inset -2px -2px 2px rgba(255, 255, 255, 0.64),
inset 2px 2px 2px rgba(39, 39, 44, 0.56); inset 2px 2px 2px rgba(39, 39, 44, 0.56);
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.input-group { .input-group {
@ -75,14 +81,14 @@ input:focus {
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
} }
.error-message{ .error-message {
color: red; color: red;
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.total-amount-container { .total-amount-container {
width: 90%; width: 90%;
top: 60%; top: auto;
} }
.input-group { .input-group {
@ -119,3 +125,24 @@ input:focus {
height: 40px; height: 40px;
} }
} }
@media (max-width: 375px) {
.total-amount-container {
padding: 15px;
margin: 20px;
width: 95%;
}
.amount-input,
.category-input {
min-width: 150px;
}
.add-entry-1,
.add-entry-2 {
font-size: 12px;
height: 35px;
}
}

View File

@ -1,166 +1,233 @@
.category-container { .category-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
background-color: #1e1e1e; background-color: #1e1e1e;
color: white; color: white;
width: 100%; width: 100%;
font-family: 'Montserrat', sans-serif;
padding: 10px; padding: 10px;
} }
.arrow {
position: absolute; .arrow {
top: 10px; position: absolute;
left: 30px; top: 10px;
} left: 30px;
}
.arrow-icon {
font-size: 24px; .arrow-icon {
right: 85px; font-size: 24px;
bottom: 40px;
}
}
/* /*
.category-header { .category-header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: 20px 0; margin: 20px 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
} */ } */
.category-display {
margin: 40px;
width: 10px;
height: 30px;
/* left: calc(50% - 207px / 2 - 0.5px); */
top: 90px;
background: #1E1E1E;
box-shadow: 0px 0px 22.3px #00D092, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
display: flex;
align-items: center;
justify-content: center;
padding: 10px;
border-radius: 8px;
}
.category-titles {
font-size: 24px;
color: #fff;
margin-right: 4px;
}
.category-icon {
width: 30px;
/* top: 10px; */
justify-content: center;
align-items: center;
/* margin: 2px; */
height: 30px;
}
.category-list { .category-titles {
display: flex; font-size: 20px;
flex-wrap: wrap; margin-right: 4px;
justify-content: center; color: #fff;
width: 100%; margin-bottom: 20px; /* Add 10px space below category titles */
margin-top: 20px; }
}
.category-display {
.cat-item { margin: 35px 0 10px 0; /* 10px space below the display box */
background-color: #2a2a2a; width: 150px;
border-radius: 10px; height: 30px;
padding: 15px; background: #1E1E1E;
margin: 10px; box-shadow: 0px 0px 22.3px #00D092, 0px 0px 2.9px #FFFFFF, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
min-width: 120px; border-radius: 24px;
text-align: center;
font-size: 18px; display: flex;
transition: background-color 0.3s ease; align-items: center;
cursor: pointer; justify-content: center;
} padding: 10px;
.cat-item.selected { border-radius: 8px;
background-color: #007BFF; }
color: white;
border-radius: 5px;
.category-icon {
width: 30px;
/* top: 10px; */
justify-content: center;
align-items: center;
margin: 2px;
height: 30px;
}
.category-list {
display: flex;
flex-wrap: wrap;
justify-content: center;
width: 100%;
margin-top: 0px;
}
.cat-item {
background-color: #2a2a2a;
border-radius: 10px;
padding: 10px;
margin: 10px;
min-width: 120px;
text-align: center;
font-size: 18px;
transition: background-color 0.3s ease;
cursor: pointer;
}
.cat-item.selected {
background-color: #007BFF;
color: white;
border-radius: 5px;
} }
.cat-item.selected { .cat-item.selected {
background-color: #007bff; background-color: #007bff;
color: #fff; color: #fff;
} }
.texts { .texts {
width: 50%; width: 50%;
padding: 10px; padding: 10px;
margin: 20px 0; margin: 20px 0;
font-size: 16px; font-size: 16px;
border-bottom: 1px solid #fafafa; border-bottom: 1px solid #fafafa;
outline: none; outline: none;
color: #ffffff; color: #ffffff;
border-radius: 8px; border-radius: 8px;
transition: border-color 0.3s ease, background-color 0.3s ease; transition: border-color 0.3s ease, background-color 0.3s ease;
}
.add-category {
display: flex;
align-items: center;
margin-top: 10px;
}
.texts {
flex: 1;
padding: 5px;
margin-right: 10px;
}
.add-button {
padding: 10px 14px;
margin: 15px;
background-color: #2a2a2a;
color: white;
border: none;
border-radius: 3px;
cursor: pointer;
}
.add-button:hover {
background-color: #2a2a2a;
} }
@media (max-width: 768px) {
/* Mobile responsiveness */ .category-titles {
@media (max-width: 768px) { font-size: 20px;
.category-titles {
font-size: 20px;
}
.category-container {
margin: 10px;
}
.category-icon {
width: 35px;
margin: 10px;
height: 35px;
}
.cat-item {
min-width: 100px;
font-size: 16px;
}
} }
@media (max-width: 480px) { .category01 {
.arrow { width: 28px;
top: 30px; height: 28px;
left: 10px; margin: 5px;
}
.category-titles {
font-size: 18px;
}
.category-icon {
width: 30px;
margin: 7px;
height: 30px;
}
.cat-item {
min-width: 80px;
font-size: 14px;
padding: 10px;
margin: 8px;
}
.category-container {
padding: 0px;
}
} }
.category-icon {
width: 35px;
margin: 10px;
height: 3px;
}
.cat-item {
min-width: 100px;
font-size: 16px;
}
}
@media (max-width: 480px) {
.arrow {
top: 40px;
left: 40px;
}
.category-titles {
font-size: 18px;
color: #fff;
}
.category-icon {
width: 30px;
margin: 7px;
height: 30px;
}
.cat-item {
min-width: 80px;
font-size: 14px;
padding: 10px;
margin: 8px;
}
.category-container {
padding: 0px;
}
}
@media (max-width: 375px) {
.category-container {
padding: 0
}
.arrow {
top: 30px;
left: 20px;
}
.category-display {
width: 120px;
height: 25px;
margin: 15px auto;
font-size: 14px;
}
.category-titles {
font-size: 16px;
margin-right: 2px;
}
.category-icon {
width: 25px;
height: 25px;
margin: 5px;
}
.cat-item {
min-width: 70px;
font-size: 12px;
padding: 8px;
margin: 6px;
}
.texts {
width: 80%;
font-size: 14px;
padding: 8px;
margin: 15px 0;
}
}

View File

@ -11,13 +11,12 @@ function Category() {
const [categories, setCategories] = useState(["Hair", "Clothing", "Food", "Books", "Electronics", "Other"]); const [categories, setCategories] = useState(["Hair", "Clothing", "Food", "Books", "Electronics", "Other"]);
const [selectedCategories, setSelectedCategories] = useState([]); const [selectedCategories, setSelectedCategories] = useState([]);
const [customCategoryCount, setCustomCategoryCount] = useState(0); const [customCategoryCount, setCustomCategoryCount] = useState(0);
const [newCategory, setNewCategory] = useState('');
const location = useLocation(); const location = useLocation();
const entryType = location.state?.entryType; const entryType = location.state?.entryType;
const handleBackClick = () => { const handleBackClick = () => {
navigate("/income", { state: { entryType } }); navigate("/income", { state: { entryType } });
console.log(entryType); console.log(entryType);
} }
@ -34,7 +33,8 @@ function Category() {
} }
}; };
const handleAddCategory = (newCategory) => { const handleAddCategory = () => {
if (newCategory.trim() === '') return;
if (!categories.includes(newCategory)) { if (!categories.includes(newCategory)) {
if (customCategoryCount < 3) { if (customCategoryCount < 3) {
const updatedCategories = [...categories, newCategory]; const updatedCategories = [...categories, newCategory];
@ -42,6 +42,7 @@ function Category() {
setCustomCategoryCount(customCategoryCount + 1); setCustomCategoryCount(customCategoryCount + 1);
localStorage.setItem('categories', JSON.stringify(updatedCategories)); localStorage.setItem('categories', JSON.stringify(updatedCategories));
alert(`Category "${newCategory}" added!`); alert(`Category "${newCategory}" added!`);
setNewCategory(''); // Clear input field after adding
} else { } else {
alert('You can only add up to three custom categories!'); alert('You can only add up to three custom categories!');
} }
@ -71,9 +72,9 @@ function Category() {
<div className='category-display'> <div className='category-display'>
<h3 className="category-titles">Categories</h3> <h3 className="category-titles">Categories</h3>
<img src={categoryImage} alt="categoryIcon" className="category-icon" /> <img src={categoryImage} alt="categoryIcon" className="category01" />
</div> </div>
<section className='category-list'> <section className='category-list'>
{categories.map((cat, index) => ( {categories.map((cat, index) => (
<div <div
@ -86,17 +87,23 @@ function Category() {
))} ))}
</section> </section>
{/* Input and button for adding new category */}
{customCategoryCount < 3 && ( {customCategoryCount < 3 && (
<input className='texts' <div className="add-category">
type="text" <input
placeholder="Add New Category" className='texts'
onKeyDown={(e) => { type="text"
if (e.key === 'Enter') { placeholder="Add New Category"
handleAddCategory(e.target.value); value={newCategory}
e.target.value = ''; onChange={(e) => setNewCategory(e.target.value)}
} />
}} <button
/> className="add-button"
onClick={handleAddCategory}
>
Add
</button>
</div>
)} )}
</div> </div>
); );

View File

@ -1,5 +1,3 @@
.incomeedit-containers { .incomeedit-containers {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -12,8 +10,8 @@
.backIcon { .backIcon {
position: absolute; position: absolute;
top: 20px; top: 0px;
left: 20px; left: 0px;
} }
.arrow-icon { .arrow-icon {
@ -22,62 +20,67 @@
} }
.edit-content { .edit-content {
padding: 20px; padding: 10px;
margin-bottom: 30px;
border-radius: 8px; border-radius: 8px;
/* box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3); */ /* box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3); */
width: 100%; width: 100%;
max-width: 400px; max-width: 400px;
} }
.edit-titles h1 { .edit-titles h1 {
color: #fff; color: #fff;
margin-bottom: 30px;
font-size: 30px; font-size: 30px;
margin: 0px 0; margin: 0px 0;
text-align: center; text-align: center;
} }
.edit-datetime { .edit-datetime {
color: #fff; color: #fff;
font-size: 18px; margin-bottom: 30px;
font-size: 18px;
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.edit-fields { .edit-fields {
color: #fff; color: #fff;
margin-bottom: 15px; margin-bottom: 15px;
width: 93%; width: 93%;
} }
.edit-fields label { .edit-fields label {
display: block; display: block;
margin-bottom: 9px; margin-bottom: 9px;
} }
.edit-fields input { .edit-fields input {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
border: 1px solid #555; /* border: 1px solid #555; */
border-radius: 4px; border-radius: 4px;
background-color: #3A3A3A; /* background-color: #3A3A3A; */
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
} }
/* Button styling */
.edit-buttons { .edit-buttons {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 30px; margin-top: 30px;
width: 100%; gap: 5px;
width: 100%;
} }
.edit-btn { .edit-btn {
/* item */
position: relative; position: relative;
width: 150px; width: 130px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -91,9 +94,9 @@
} }
.edit-btn-2 { .edit-btn-2 {
position: relative; position: relative;
width: 150px; width: 130px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -108,17 +111,26 @@
@media (max-width: 768px) { @media (max-width: 768px) {
.edit-titles h1 { .edit-titles h1 {
font-size: 24px;
font-size: 24px;
} }
.edit-datetime { .edit-datetime {
font-size: 16px;
font-size: 16px;
} }
.edit-buttons div { .edit-buttons div {
font-size: 14px; font-size: 14px;
} }
}
@media (min-width: 1024px) {
.edit-btn, .edit-btn-2 {
width: 250px;
height: 50px;
font-size: 20px;
}
} }

View File

@ -7,44 +7,50 @@ import "../Common/IncomeEdit.css";
function IncomeEdit() { function IncomeEdit() {
const location = useLocation(); const location = useLocation();
const navigate = useNavigate(); const navigate = useNavigate();
const [currentDateTime, setCurrentDateTime] = useState("");
const [amount, setAmount] = useState(location.state?.amount || ""); // Destructure state values passed from previous page
const [category, setCategory] = useState(location.state?.category || ""); const { id, amount: initialAmount, category: initialCategory, dateTime: initialDateTime } = location.state || {};
const [amount, setAmount] = useState(initialAmount || "");
const [category, setCategory] = useState(initialCategory || "");
const [currentDateTime, setCurrentDateTime] = useState(initialDateTime || "");
const [error, setError] = useState(null); const [error, setError] = useState(null);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
useEffect(() => { useEffect(() => {
const now = new Date(); if (!initialDateTime) {
const formattedDateTime = now.toLocaleString(); const now = new Date();
setCurrentDateTime(formattedDateTime); const formattedDateTime = now.toLocaleString();
}, []); setCurrentDateTime(formattedDateTime);
}
}, [initialDateTime]);
const handleBackClick = () => { const handleBackClick = () => {
navigate("/records"); navigate("/records"); // Navigate back to records
}; };
const handleSave = () => { const handleSave = () => {
setIsLoading(true); setIsLoading(true);
setError(null); setError(null);
const updatedEntry = { const updatedEntry = {
id: location.state?.id, id: id,
amount: amount, amount: amount,
dateTime: currentDateTime, dateTime: currentDateTime,
category: category, category: category,
}; };
// Save updated entry to localStorage (or backend API if needed)
const storedEntries = JSON.parse(localStorage.getItem("entries")) || []; const storedEntries = JSON.parse(localStorage.getItem("entries")) || [];
const updatedEntries = storedEntries.map((entry) => const updatedEntries = storedEntries.map((entry) =>
entry.id === updatedEntry.id ? updatedEntry : entry entry.id === updatedEntry.id ? updatedEntry : entry
); );
localStorage.setItem("entries", JSON.stringify(updatedEntries)); localStorage.setItem("entries", JSON.stringify(updatedEntries));
// Optionally, you can navigate to a success page or display a message here // Navigate to success page
console.log("Entry updated in local storage:", updatedEntry); navigate("/successPage", { state: updatedEntry });
navigate("/successPage"); setIsLoading(false);
setIsLoading(false); // End loading
}; };
return ( return (

View File

@ -123,7 +123,7 @@
} }
.buttons { .buttons {
max-width: 100%; max-width: 80%;
} }
.expense-btn, .income-btn { .expense-btn, .income-btn {

View File

@ -1,9 +1,8 @@
/* IncomePage.css */
/* Main container */
.income-container { .income-container {
max-width: 800px; max-width: 800px;
margin: 0 auto; margin: 0 auto;
font-family: 'Montserrat', sans-serif;
padding: 20px; padding: 20px;
justify-content: center; justify-content: center;
border-radius: 10px; border-radius: 10px;
@ -14,14 +13,15 @@
.arrow-container { .arrow-container {
position: relative; position: relative;
width: 100%; width: 100%;
text-align: center; /* Center the title and date */ margin: 10px;
text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
/* Arrow icon */
.arrow-icon { .arrow-icon {
position: absolute; position: absolute;
left: 0; /* Place the arrow on the left */ left: 0;
top: 50%; top: 50%;
margin: 40px 5px; margin: 40px 5px;
transform: translateY(-50%); transform: translateY(-50%);
@ -30,7 +30,7 @@
cursor: pointer; cursor: pointer;
} }
/* Title */
.income-title { .income-title {
font-size: 24px; font-size: 24px;
color: #fff; color: #fff;
@ -40,16 +40,16 @@
margin-top: 10px; margin-top: 10px;
} }
/* Date and time */
.income-date { .income-date {
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
text-align: center; /* Center the date */ text-align: center;
margin: 10px; margin: 10px;
} }
/* Button container */
.button-container { .button-container {
display: flex; display: flex;
font-family: 'Montserrat', sans-serif; font-family: 'Montserrat', sans-serif;
@ -111,21 +111,21 @@
/* Icons in buttons */
.category-icon { .category-icon {
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-bottom: 10px; margin-bottom: 10px;
} }
/* Responsive styling */
/* Mobile-specific styles */
@media (max-width: 600px) { @media (max-width: 600px) {
.arrow-container{
margin: 20px;
}
.arrow-icon { .arrow-icon {
font-size: 15px; font-size: 15px;
} }
.expense-title { .expense-title {
@ -166,3 +166,37 @@
font-size: 18px; font-size: 18px;
} }
} }
/* Styles for screens with a width of 375px */
@media (max-width: 375px) {
.arrow-container {
font-size: 12px;
}
.income-title {
font-size: 18px;
}
.income-date {
font-size: 12px;
}
.button-container {
flex-direction: row;
align-items: center;
}
.amount-btn, .category-btn {
width: 90%;
font-size: 14px;
padding: 12px;
}
.category-icon {
width: 25px;
height: 25px;
margin-bottom: 5px;
}
}

View File

@ -1,11 +1,10 @@
body { body {
background-color: #1E1E1E; background-color: #1E1E1E;
margin: 20px; margin: 20px;
font-family: 'Montserrat', sans-serif;
padding: 0; padding: 0;
font-family: Arial, sans-serif;
} }
.Payment-container { .Payment-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -20,36 +19,31 @@ body {
cursor: pointer; cursor: pointer;
} }
.arr { .arr {
position: absolute; position: absolute;
top: 20px; top: 10px;
left: 20px; left: 10px;
} }
.expense-date {
.income-date {
color: #fff; color: #fff;
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 0px;
} }
.payment-title { .payment-title {
text-align: center; text-align: center;
margin-bottom: 10px; margin-bottom: 30px;
} }
.payment-title h1 { .payment-title h1 {
color: #fff; color: #fff;
font-size: 30px; font-size: 30px; /* Default font size */
margin: 10px 0; margin: 0px 0;
text-align: center; text-align: center;
} }
.payment-content { .payment-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -57,7 +51,6 @@ body {
justify-content: center; justify-content: center;
} }
.payment-animation { .payment-animation {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -65,15 +58,13 @@ body {
margin-bottom: 10px; margin-bottom: 10px;
} }
.payment-message h2 { .payment-message h2 {
color: #fff; color: #fff;
font-size: 24px; font-size: 24px; /* Default font size */
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.payment-buttons { .payment-buttons {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -81,11 +72,10 @@ body {
margin-top: 20px; margin-top: 20px;
} }
.btn1, .bt_11 {
.btn1 {
position: relative; position: relative;
width: 150px; width: 130px; /* Default width */
height: 60px; height: 40px; /* Default height */
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -98,69 +88,50 @@ body {
margin-right: 10px; margin-right: 10px;
} }
/* Small screens (up to 600px) */
.bt_11 {
position: relative;
width: 150px;
height: 60px;
color: #fff;
justify-content: center;
align-items: center;
background: #1E1E1E;
box-shadow: -8px -8px 12px rgba(50, 50, 51, 0.66), 8px 8px 16px #040404, inset -2px -2px 2px rgba(4, 4, 4, 0.64), inset 2px 2px 2px rgba(39, 39, 44, 0.56);
border-radius: 24px;
display: flex;
justify-content: center;
align-items: center;
margin-right: 10px;
}
@media (max-width: 600px) { @media (max-width: 600px) {
.payment-title h1 { .payment-title h1 {
font-size: 24px; font-size: 16px; /* Smaller font size */
} }
.income-date { .expense-date {
font-size: 16px; font-size: 12px; /* Smaller font size */
} }
.payment-message h2 { .payment-message h2 {
font-size: 20px; font-size: 14px; /* Smaller font size */
} }
.btn1, .bt_11 { .btn1, .bt_11 {
width: 120px; width: 120px;
height: 50px; height: 40px;
font-size: 16px; font-size: 14px;
} }
.arr { .arr {
top: 10px; top: 0px;
left: 10px; left: 0px;
} }
} }
/* Medium screens (601px to 1024px) */
@media (max-width: 1024px) { @media (max-width: 1024px) {
.payment-title h1 { .payment-title h1 {
font-size: 28px; font-size: 22px;
} }
.income-date { .expense-date {
font-size: 16px; font-size: 14px;
} }
.payment-message h2 { .payment-message h2 {
font-size: 22px; font-size: 18px;
} }
.btn1, .bt_11 { .btn1, .bt_11 {
width: 140px; width: 140px;
height: 55px; height: 50px;
font-size: 18px; font-size: 16px;
} }
.arr { .arr {
@ -169,11 +140,11 @@ body {
} }
} }
/* Large screens (1025px and up) */
@media (min-width: 1025px) { @media (min-width: 1025px) {
.btn1, .bt_11 { .btn1, .bt_11 {
width: 160px; width: 190px;
height: 60px; height: 50px;
font-size: 18px; font-size: 18px;
} }

View File

@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faArrowLeft } from "@fortawesome/free-solid-svg-icons"; import { faArrowLeft } from "@fortawesome/free-solid-svg-icons";
import { useNavigate } from "react-router-dom"; import { useNavigate, useLocation } from "react-router-dom";
import { Player } from "@lottiefiles/react-lottie-player"; import { Player } from "@lottiefiles/react-lottie-player";
import successAnimation from "../Common/Animation - 1727464749500.json"; import successAnimation from "../Common/Animation - 1727464749500.json";
import "../Income/IncomeSuccessfully.css"; import "../Income/IncomeSuccessfully.css";
@ -9,6 +9,8 @@ import "../Income/IncomeSuccessfully.css";
function IncomeSuccessfully() { function IncomeSuccessfully() {
const [currentDate, setCurrentDate] = useState(new Date()); const [currentDate, setCurrentDate] = useState(new Date());
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation();
const entryType = location.state?.entryType;
useEffect(() => { useEffect(() => {
const timer = setInterval(() => { const timer = setInterval(() => {
@ -19,21 +21,26 @@ function IncomeSuccessfully() {
}, []); }, []);
const handleBackClick = () => { const handleBackClick = () => {
navigate("/editPage"); const updatedEntry = {
id: location.state?.id,
amount: location.state?.amount,
category: location.state?.category,
dateTime: location.state?.dateTime,
};
navigate("/editPage", { state: { ...updatedEntry } });
}; };
const handleBackToHome = () => { const handleBackToHome = () => {
navigate("/"); navigate("/", { state: { entryType } });
}; };
const handleBackToRecord = () => { const handleBackToRecord = () => {
navigate("/records") navigate("/records", { state: { entryType } });
} };
const options = { hour: "2-digit", minute: "2-digit", hour12: true }; const options = { hour: "2-digit", minute: "2-digit", hour12: true };
const formattedDate = `on ${currentDate.toLocaleDateString()} - ${currentDate.toLocaleTimeString( const formattedDate = `on ${currentDate.toLocaleDateString()} - ${currentDate.toLocaleTimeString(
[], [], options
options
)}`; )}`;
return ( return (
@ -66,10 +73,10 @@ function IncomeSuccessfully() {
<div className="payment-buttons"> <div className="payment-buttons">
<div className="btn1" onClick={handleBackToHome}> <div className="btn1" onClick={handleBackToHome}>
Home Home
</div> </div>
<div className="bt_11" onClick={handleBackToRecord}> <div className="bt_11" onClick={handleBackToRecord}>
Records Records
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,11 +1,9 @@
.container { .container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-family: 'Montserrat', sans-serif;
height: 100vh; height: 100vh;
color: white; color: white;
position: relative; position: relative;
@ -13,12 +11,13 @@
.back_arrows { .back_arrows {
position: absolute; position: absolute;
top: 20px; top: 0px;
left: 20px; left: 0px;
} }
.arrow-icon { .arrow-icon {
font-size: 24px; font-size: 24px;
margin: 22px 10px 0px 10px;
cursor: pointer; cursor: pointer;
} }
@ -42,11 +41,12 @@
text-align: center; text-align: center;
} }
.total-amount h2 { .total-amount {
text-align: center;
font-size: 24px; font-size: 24px;
color: #4CAF50; color: #4CAF50;
margin: 10px 0; margin: 10px 0;
} }
.categories { .categories {
margin-top: 10px; margin-top: 10px;
@ -63,7 +63,7 @@
} }
.categories ul { .categories ul {
list-style-type: none; list-style-type: none;
padding: 5px; padding: 5px;
} }
@ -72,10 +72,10 @@
font-size: 16px; font-size: 16px;
color: #deb1b1; color: #deb1b1;
border-bottom: 1px solid #e0e0e0; border-bottom: 1px solid #e0e0e0;
padding: 8px 0; padding: 8px 0;
} }
/* Mobile responsiveness */
@media (max-width: 768px) { @media (max-width: 768px) {
.success-titles h1 { .success-titles h1 {
font-size: 24px; font-size: 24px;
@ -87,13 +87,11 @@
} }
.total-amount { .total-amount {
text-align: center; color: #fff;
font-size: 24px; font-size: 12px;
color: #4CAF50; margin: 20px 0;
margin: 10px 0;
} }
.categories { .categories {
color: #fff; color: #fff;
font-size: 10px; font-size: 10px;
@ -103,14 +101,14 @@
.success-buttons { .success-buttons {
display: flex; display: flex;
justify-content: center; justify-content: center;
gap: 20px; gap: 10px;
margin-top: 20px; margin-top: 0px;
} }
.btn-home { .btn-home {
position: relative; position: relative;
width: 150px; width: 140px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -125,8 +123,8 @@
} }
.btn-edit { .btn-edit {
position: relative; position: relative;
width: 150px; width: 140px;
height: 60px; height: 50px;
color: #fff; color: #fff;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -140,4 +138,18 @@
} }
@media (min-width: 1024px) {
.btn-edit, .btn-home {
width: 200px;
height: 50px;
font-size: 20px;
}
.success-title h1 {
font-size: 32px;
}
.success-message h2 {
font-size: 26px;
}
}

View File

@ -48,6 +48,10 @@ function Records() {
navigate("/totalsuccessfully"); navigate("/totalsuccessfully");
}; };
const handleBackHomeClick = () => {
navigate("/")
}
const handleEditClick = () => { const handleEditClick = () => {
const idToEdit = entryId || (lastEntry ? lastEntry.id : null); const idToEdit = entryId || (lastEntry ? lastEntry.id : null);
@ -65,6 +69,7 @@ function Records() {
}; };
return ( return (
<div className="container"> <div className="container">
<div className="back_arrows"> <div className="back_arrows">
<FontAwesomeIcon <FontAwesomeIcon
@ -95,7 +100,7 @@ function Records() {
</div> </div>
<div className="success-buttons"> <div className="success-buttons">
<div className="btn-home" onClick={handleBackClick}>Home</div> <div className="btn-home" onClick={handleBackHomeClick}>Home</div>
<div className="btn-edit" onClick={handleEditClick}>Edit</div> <div className="btn-edit" onClick={handleEditClick}>Edit</div>
</div> </div>
</div> </div>

View File

@ -1,13 +0,0 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}