diff --git a/src/pages/LinktreePage.module.css b/src/pages/LinktreePage.module.css
index 9beec76..b0837c6 100644
--- a/src/pages/LinktreePage.module.css
+++ b/src/pages/LinktreePage.module.css
@@ -1,287 +1,311 @@
/* General container */
.centeredLinktreePage {
- height: 100vh;
- display: flex;
- flex-direction: column;
- justify-content: center;
- background-color: rgb(210, 232, 35);
- }
-
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ background-color: rgb(210, 232, 35);
+}
+
.nonCenteredLinktreePage {
height: 100vh;
display: flex;
flex-direction: column;
justify-content: start;
background-color: rgb(193 201 134);
+ position: relative;
}
- .dashboardLine {
- position: fixed;
- left: 0px;
- height: 100vh;
- width: 30px;
- border-right: 1px solid black;
- z-index: 5;
+.dashboardLine {
+ position: fixed;
+ left: 0px;
+ height: 100vh;
+ width: 30px;
+ border-right: 1px solid black;
+ z-index: 5;
+}
+
+.dashboardContainer {
+ background-color: rgb(210, 232, 35);
+ z-index: 6;
+ padding: 0 1rem;
+ padding-top: 40px;
+}
+
+/* Main Heading */
+.mainHeading {
+ font-weight: 700;
+ font-size: 32px;
+ line-height: 2.25rem;
+ margin-bottom: 1rem;
+ letter-spacing: -1px;
+ color: rgb(37, 79, 26);
+}
+
+.swipeContainer {
+ height: 75px;
+ overflow: hidden;
+ width: 100%;
+ color: rgb(59 130 246);
+}
+
+.swipeContent {
+ animation: swipeUp 12s infinite;
+}
+
+.swipeItem {
+ overflow: hidden;
+ height: 75px;
+ max-width: 300px;
+ text-wrap: balance;
+ line-height: 34px;
+}
+
+/* Swipe Animation */
+@keyframes swipeUp {
+
+ 0%,
+ 15% {
+ transform: translateY(0);
}
-
- .dashboardContainer {
- background-color: rgb(210, 232, 35);
- z-index: 6;
- padding: 0 1rem;
- padding-top: 40px;
+
+ 20%,
+ 35% {
+ transform: translateY(-20%);
}
-
- /* Main Heading */
- .mainHeading {
- font-weight: 700;
- font-size: 32px;
- line-height: 2.25rem;
- margin-bottom: 1rem;
- letter-spacing: -1px;
- color: rgb(37, 79, 26);
+
+ 40%,
+ 55% {
+ transform: translateY(-40%);
}
-
- .swipeContainer {
- height: 75px;
- overflow: hidden;
- width: 100%;
- color: rgb(59 130 246);
+
+ 60%,
+ 75% {
+ transform: translateY(-60%);
}
-
- .swipeContent {
- animation: swipeUp 12s infinite;
+
+ 80%,
+ 95% {
+ transform: translateY(-80%);
}
-
- .swipeItem {
- overflow: hidden;
- height: 75px;
- max-width: 300px;
- text-wrap: balance;
- line-height: 34px;
- }
-
- /* Swipe Animation */
- @keyframes swipeUp {
- 0%, 15% {
- transform: translateY(0);
- }
- 20%, 35% {
- transform: translateY(-20%);
- }
- 40%, 55% {
- transform: translateY(-40%);
- }
- 60%, 75% {
- transform: translateY(-60%);
- }
- 80%, 95% {
- transform: translateY(-80%);
- }
- }
-
- /* Sub Heading */
- .subHeading {
- font-weight: 400;
- line-height: 1.5rem;
- font-size: 14px;
- font-family: 'poppins';
- color: black;
- margin-bottom: 1.5rem;
- }
- .LoginForm {
- display: inline-flex;
- position: relative;
- height: 148px;
- }
-
- /* Form */
- .FormUsername {
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- position: absolute;
+}
+
+/* Sub Heading */
+.subHeading {
+ font-weight: 400;
+ line-height: 1.5rem;
+ font-size: 14px;
+ font-family: 'poppins';
+ color: black;
+ margin-bottom: 1.5rem;
+}
+
+.LoginForm {
+ display: inline-flex;
+ position: relative;
+ height: 148px;
+}
+
+/* Form */
+.FormUsername {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ position: absolute;
+ left: 0vw;
+}
+
+.FormUsername.animateForm {
+ animation: FormUsernameProgress 0.5s forwards;
+ /* Apply the animation when inputtingPassword is true */
+}
+
+.FormUsername.reverseForm {
+ animation: FormUsernameReverse 0.5s forwards;
+ /* Reverse animation when inputtingPassword is false */
+}
+
+@keyframes FormUsernameProgress {
+ 0% {
left: 0vw;
}
-
- .FormUsername.animateForm {
- animation: FormUsernameProgress 0.5s forwards; /* Apply the animation when inputtingPassword is true */
+
+ 100% {
+ left: -100vw;
}
-
- .FormUsername.reverseForm {
- animation: FormUsernameReverse 0.5s forwards; /* Reverse animation when inputtingPassword is false */
+}
+
+@keyframes FormUsernameReverse {
+ 0% {
+ left: -100vw;
}
-
- @keyframes FormUsernameProgress {
- 0% {
- left: 0vw;
- }
- 100% {
- left: -100vw;
- }
+
+ 100% {
+ left: 0vw;
}
-
- @keyframes FormUsernameReverse {
- 0% {
- left: -100vw;
- }
- 100% {
- left: 0vw;
- }
- }
-
- .FormPassword {
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- position: absolute;
+}
+
+.FormPassword {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ position: absolute;
+ left: 100vw;
+}
+
+.FormPassword.animateForm {
+ animation: FormPasswordProgress 0.5s forwards;
+ /* Apply the animation when inputtingPassword is true */
+}
+
+.FormPassword.reverseForm {
+ animation: FormPasswordReverse 0.5s forwards;
+ /* Reverse animation when inputtingPassword is false */
+}
+
+@keyframes FormPasswordProgress {
+ 0% {
left: 100vw;
}
-
- .FormPassword.animateForm {
- animation: FormPasswordProgress 0.5s forwards; /* Apply the animation when inputtingPassword is true */
+
+ 100% {
+ left: 0vw;
}
-
- .FormPassword.reverseForm {
- animation: FormPasswordReverse 0.5s forwards; /* Reverse animation when inputtingPassword is false */
- }
-
- @keyframes FormPasswordProgress {
- 0% {
- left: 100vw;
- }
- 100% {
- left: 0vw;
- }
- }
-
- @keyframes FormPasswordReverse {
- 0% {
- left: 0vw;
- }
- 100% {
- left: 100vw;
- }
- }
-
-
- .usernameLabel {
- font-size: 0.875rem;
- color: #444;
- margin-bottom: 5px;
- position: relative;
- }
-
- .usernameInput {
- width: 250px;
- height: 55px;
- padding-left: 10px;
- font-size: 1rem;
- background-color: #f0f0f0;
- border-radius: 5px;
- border: 1px solid #ccc;
- margin-top: 5px;
- margin-bottom: 15px;
+}
+
+@keyframes FormPasswordReverse {
+ 0% {
+ left: 0vw;
}
- .usernameInputError {
- width: 250px;
- height: 55px;
- padding-left: 10px;
- font-size: 1rem;
- background-color: #f0f0f0;
- border-radius: 5px;
- border: 2px solid red; /* Red border when error is true */
- margin-top: 5px;
- margin-bottom: 15px;
-
- /* Apply keyframe animation for border color transition */
- animation: borderTransition 2s ease-in-out forwards;
+ 100% {
+ left: 100vw;
}
-
- /* Keyframe animation for border color transition */
- @keyframes borderTransition {
- 0% {
- border-color: red; /* Initial red border */
- }
- 100% {
- border-color: transparent; /* Transition to transparent */
- }
+}
+
+
+.usernameLabel {
+ font-size: 0.875rem;
+ color: #444;
+ margin-bottom: 5px;
+ position: relative;
+}
+
+.usernameInput {
+ width: 250px;
+ height: 55px;
+ padding-left: 10px;
+ font-size: 1rem;
+ background-color: #f0f0f0;
+ border-radius: 5px;
+ border: 1px solid #ccc;
+ margin-top: 5px;
+ margin-bottom: 15px;
+}
+
+.usernameInputError {
+ width: 250px;
+ height: 55px;
+ padding-left: 10px;
+ font-size: 1rem;
+ background-color: #f0f0f0;
+ border-radius: 5px;
+ border: 2px solid red;
+ /* Red border when error is true */
+ margin-top: 5px;
+ margin-bottom: 15px;
+
+ /* Apply keyframe animation for border color transition */
+ animation: borderTransition 2s ease-in-out forwards;
+}
+
+/* Keyframe animation for border color transition */
+@keyframes borderTransition {
+ 0% {
+ border-color: red;
+ /* Initial red border */
}
- .claimButton {
- width: 200px;
- height: 45px;
- background-color: #254F1A;
- color: #D2E823;
- text-align: center;
- font-size: 1rem;
- padding: 10px;
- border-radius: 30px;
- border: none;
- cursor: pointer;
+ 100% {
+ border-color: transparent;
+ /* Transition to transparent */
}
-
- .claimButton span {
- font-weight: 600;
- }
-
- /* Footer */
- .footer {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 2rem;
- }
-
- .footerLinks {
- flex: 1;
- display: flex;
- flex-direction: column;
- }
-
- .footerLink {
- font-size: 0.875rem;
- color: #254F1A;
- margin-bottom: 0.5rem;
- text-decoration: underline;
- }
-
- .signupButton {
- background-color: transparent;
- border: 1px solid #254F1A;
- color: #254F1A;
- padding: 12px 30px;
- border-radius: 30px;
- text-align: center;
- font-size: 0.875rem;
- margin-top: 1.5rem;
- cursor: pointer;
- }
-
- .footerImage {
- flex: 1;
- text-align: center;
- }
-
- .footerImage img {
- width: 150px;
- height: 226px;
- margin-top: -50px;
- }
-
- .userInfo {
- width: 100vw;
- background-color: white;
- left: 0;
- position: fixed;
- border-radius: 20px 20px 0 0;
- bottom: 0;
- overflow: hidden;
-
- top: 75vh;
- transition: top 0.5s ease, padding 0.5s ease;
- }
-
+}
+
+.claimButton {
+ width: 200px;
+ height: 45px;
+ background-color: #254F1A;
+ color: #D2E823;
+ text-align: center;
+ font-size: 1rem;
+ padding: 10px;
+ border-radius: 30px;
+ border: none;
+ cursor: pointer;
+}
+
+.claimButton span {
+ font-weight: 600;
+}
+
+/* Footer */
+.footer {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ margin-top: 2rem;
+}
+
+.footerLinks {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+}
+
+.footerLink {
+ font-size: 0.875rem;
+ color: #254F1A;
+ margin-bottom: 0.5rem;
+ text-decoration: underline;
+}
+
+.signupButton {
+ background-color: transparent;
+ border: 1px solid #254F1A;
+ color: #254F1A;
+ padding: 12px 30px;
+ border-radius: 30px;
+ text-align: center;
+ font-size: 0.875rem;
+ margin-top: 1.5rem;
+ cursor: pointer;
+}
+
+.footerImage {
+ flex: 1;
+ text-align: center;
+}
+
+.footerImage img {
+ width: 150px;
+ height: 226px;
+ margin-top: -50px;
+}
+
+.userInfo {
+ width: 100vw;
+ background-color: white;
+ left: 0;
+ position: fixed;
+ border-radius: 20px 20px 0 0;
+ bottom: 0;
+ overflow: hidden;
+
+ top: 75vh;
+ transition: top 0.5s ease, padding 0.5s ease;
+}
+
.userInfoExpanded {
width: 100vw;
background-color: white;
@@ -290,122 +314,105 @@
border-radius: 20px 20px 0 0;
bottom: 0;
overflow: hidden;
-
+
top: 15vh;
transition: top 0.5s ease, padding 0.5s ease;
}
- .userInfoExpandButton {
- width: 100%;
- background-color: #d1ecdf;
- height: 30px;
- position: absolute;
- }
+
+.userInfoExpandButton {
+ width: 100%;
+ background-color: #d1ecdf;
+ height: 30px;
+ position: absolute;
+}
- .ItemContainer {
- height: 100%;
- overflow-y: auto;
- font-size: 10px;
- }
+.ItemContainer {
+ height: 100%;
+ overflow-y: auto;
+ font-size: 10px;
+}
+
+.Item {
+ background-color: #fff2a3;
+ border-radius: 20px;
+ margin: 20px;
+ padding: 10px;
+}
+
+.transactionContainer {
+ margin-left: 20px;
+ margin-top: 10px;
+}
+
+.transaction {
+ padding: 10px;
+ margin-bottom: 5px;
+ border-radius: 10px;
+}
+
+
+.rectangle {
+ height: 50px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+ font-size: 20px;
+ background-color: rgb(114, 114, 114);
+ margin: 5%;
+ position: relative;
+ font-weight: 500;
+ margin-bottom: 20px;
+ /* Add some space below the rectangle */
+}
+
+.rectangleNLine {
+ height: 50px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+ font-size: 20px;
+ background-color: rgb(114, 114, 114);
+ margin: 5%;
+ position: relative;
+ font-weight: 500;
+ margin-bottom: 20px;
+ /* Add some space below the rectangle */
+}
+
+.subRectangle {
+ height: 50px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+ font-size: 20px;
+ background-color: rgb(114, 114, 114);
+ margin: 5%;
+ position: relative;
+ font-weight: 500;
+ margin-top: 10px;
+ /* Move it down a little */
+ margin-left: 50px;
+ /* Move it down a little */
+}
+
+
+
+/* The arrow at the bottom */
+.subRectangle::before {
+ left: -14px;
+ top: 48%;
+ width: 2px;
+ height: 54px;
+ content: "";
+ position: absolute;
+ background-color: rgb(114, 114, 114);
+ transform: translateY(-50%);
+}
- .Item {
- background-color: #fff2a3;
- border-radius: 20px;
- margin: 20px;
- padding: 10px;
- }
- .transactionContainer {
- margin-left: 20px;
- margin-top: 10px;
- }
-
- .transaction {
- padding: 10px;
- margin-bottom: 5px;
- border-radius: 10px;
- }
-
-
- .rectangle {
- height: 50px;
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 10px;
- font-size: 20px;
- background-color: rgb(114, 114, 114);
- margin: 5%;
- position: relative;
- font-weight: 500;
- margin-bottom: 20px; /* Add some space below the rectangle */
- }
- .rectangleNLine {
- height: 50px;
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 10px;
- font-size: 20px;
- background-color: rgb(114, 114, 114);
- margin: 5%;
- position: relative;
- font-weight: 500;
- margin-bottom: 20px; /* Add some space below the rectangle */
- }
-
- .subRectangle {
- height: 50px;
- display: flex;
- justify-content: center;
- align-items: center;
- border-radius: 10px;
- font-size: 20px;
- background-color: rgb(114, 114, 114);
- margin: 5%;
- position: relative;
- font-weight: 500;
- margin-top: 10px; /* Move it down a little */
- margin-left: 50px; /* Move it down a little */
- }
-
- /* Arrow + line connection */
- .rectangleNLine::after {
- content: "";
- position: absolute;
- left: -17px;
- top: 50%;
- width: 18px;
- height: 2px; /* Line thickness */
- background-color: rgb(114, 114, 114); /* Line color */
- transform: translateY(-50%); /* Center the line vertically */
- }
-
- /* Arrow + line connection */
- .subRectangle::after {
- content: "";
- position: absolute;
- left: -45px; /* Position it to the left of the rectangle */
- top: 50%; /* Center vertically */
- width: 45px; /* Length of the horizontal line */
- height: 2px; /* Line thickness */
- background-color: rgb(114, 114, 114); /* Line color */
- transform: translateY(-50%); /* Center the line vertically */
- }
-
- /* The arrow at the bottom */
- .subRectangle::before {
- content: "-";
- position: absolute;
- left: -45px;
- top: -21%;
- width: 2px;
- height: 70px;
- content: "";
- position: absolute;
- background-color: rgb(114, 114, 114);
- transform: translateY(-50%);
- }
-
.header {
@@ -413,58 +420,112 @@
top: 0;
width: 100%;
height: calc(25vh - 25px);
- margin-bottom: 15vh;
padding-top: 25px;
+ margin-bottom: 85px;
}
.headerCardWrapper {
- top: 0;
- position: absolute;
- width: 100%;
- bottom: 50vh;
- justify-content: center;
- display: flex;
- align-items: center;
+ top: 0;
+ position: absolute;
+ width: 100%;
+ bottom: 50vh;
+ justify-content: center;
+ display: flex;
+ align-items: center;
}
+
.headerCard {
- background-color: #947257;
- position: relative;
- width: 90%;
- border-radius: 20px;
- height: 40%;
-}
-.cafeListWrapper{
- background-color: white;
- border-radius: 20px 20px 0 0;
- bottom: 0;
- position: absolute;
- width: 100%;
- max-height: 164.5px;
+ background-color: #779f94;
+ position: relative;
+ width: 90%;
+ border-radius: 20px;
+ height: 35%;
}
-.cafeListHeader{
- background-color: white;
- border-radius: 20px 20px 0 0;
- bottom: 0;
- position: absolute;
- width: 100%;
- height: 100%;
- top: -45px;
- background-color: #b09c72;
- text-align: center;
- padding-top: 10px;
- font-weight: 500;
-}
-.cafeList{
- background-color: white;
- border-radius: 20px 20px 0 0;
- bottom: 0;
- position: absolute;
- width: 100%;
- height: 100%;
+.cardBody {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: center; /* Center the content */
}
-.itemInput{
+.cardImg {
+ border-radius: 20px;
+ font-size: 15px;
+ text-align: center;
+ margin: 10px;
+ padding: 5px;
+ height: 100%;
+ place-content: center;
+
+}
+
+.cardImg img {
+ width: 100%;
+ height: auto;
+ max-width: 85px;
+ object-fit: contain;
+ border-radius: 50%; /* Keep the circular shape */
+}
+
+.cardBody p {
+ margin: 1vh;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+.cardItem{
+ border-radius: 20px;
+ font-size: 15px;
+ text-align: center;
+ margin: 10px;
+ padding: 5px;
+}
+.dashboardBody {
+ padding-left: 5vw;
+ padding-right: 5vw;
+}
+
+.goCafeButton {
+ width: 100%;
+ background-color: rgb(255, 215, 176);
+ border-radius: 20px;
+ position: relative;
+ z-index: 1;
+}
+
+.cafeListWrapper {
+ background-color: white;
+ border-radius: 20px 20px 0 0;
+ top: 83vh;
+ position: absolute;
+ width: 100%;
+}
+
+.cafeListHeader {
+ background-color: white;
+ border-radius: 20px 20px 0 0;
+ bottom: 0;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: -45px;
+ background-color: #b09c72;
+ text-align: center;
+ padding-top: 10px;
+ font-weight: 500;
+}
+
+.cafeList {
+ background-color: white;
+ border-radius: 20px 20px 0 0;
+ bottom: 0;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+}
+
+.itemInput {
width: 50%;
height: 60%;
border-radius: 14px;
diff --git a/src/pages/Reports.js b/src/pages/Reports.js
index eb84117..c6220c9 100644
--- a/src/pages/Reports.js
+++ b/src/pages/Reports.js
@@ -1,9 +1,6 @@
import React, { useEffect, useState } from "react";
-import { ThreeDots } from "react-loader-spinner";
import {
- getFavourite,
getReports,
- getIncome,
} from "../helpers/transactionHelpers.js";
import CircularDiagram from "./CircularDiagram";
import styles from "./Transactions.module.css";
@@ -89,8 +86,8 @@ const RoundedRectangle = ({
{loading ? "Loading..." : value}
{loading ? "" : percentage}
- {percentage != undefined && !loading && "%"}
- {percentage != undefined && !loading && (
+ {percentage !== undefined && !loading && "%"}
+ {percentage !== undefined && !loading && (
{percentage > 0 ? "↗" : percentage === 0 ? "-" : "↘"}
@@ -105,11 +102,9 @@ const RoundedRectangle = ({
const App = ({ cafeId,
handleClose }) => {
- const [favouriteItems, setFavouriteItems] = useState([]);
const [analytics, setAnalytics] = useState({});
const [loading, setLoading] = useState(true);
const [filter, setFilter] = useState("daily");
- const [viewStock, setViewStock] = useState(false);
const fetchData = async (filter) => {
try {
@@ -129,10 +124,8 @@ const App = ({ cafeId,
fetchData(filter); // Fetch data when filter changes
}, [filter]);
- const [sold, percentage] = analytics[filter] || [0, 0];
const filteredItems = analytics.items || [];
- const totalSold = filteredItems.reduce((sum, item) => sum + item.count, 0);
const colors = [
"#FF0000", // Red
"#FF6F00", // Dark Orange
@@ -192,15 +185,15 @@ const App = ({ cafeId,
const filterTexts = ["1", "7", "30", "365"];
const comparisonText =
filterTexts[["daily", "weekly", "monthly", "yearly"].indexOf(filter)];
- const formatDate = (isoDateString) => {
- const date = new Date(isoDateString);
- return date.toLocaleDateString("en-US", {
- year: "numeric",
- month: "long",
- day: "numeric",
- hour: "numeric",
- });
- };
+ // const formatDate = (isoDateString) => {
+ // const date = new Date(isoDateString);
+ // return date.toLocaleDateString("en-US", {
+ // year: "numeric",
+ // month: "long",
+ // day: "numeric",
+ // hour: "numeric",
+ // });
+ // };
return (
Laporan