From 1972a89543704b0523c356c48172bfe86105d0c5 Mon Sep 17 00:00:00 2001
From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com>
Date: Fri, 24 Jun 2022 17:53:11 -0500
Subject: [PATCH 1/3] Fixing visuals.
---
src/components/calender/Day.tsx | 64 +++++++++++++++++++++------------
1 file changed, 41 insertions(+), 23 deletions(-)
diff --git a/src/components/calender/Day.tsx b/src/components/calender/Day.tsx
index fae73c9..54fa7d2 100644
--- a/src/components/calender/Day.tsx
+++ b/src/components/calender/Day.tsx
@@ -113,9 +113,15 @@ const Day = ({
alignContent="center"
justifyContent="flex-start"
>
-
+
{`${getDate(currDateObj)}`}
-
+
{isLoading ? (
@@ -139,8 +145,8 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "gray.600"
- : "transparent"
+ ? "gray.600"
+ : "transparent"
: "transparent"
}
border={
@@ -150,8 +156,8 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "1px solid #00ff3c"
- : "1px solid #0068ff"
+ ? "1px solid #00ff3c"
+ : "1px solid #0068ff"
: "1px solid #0068ff"
}
onClick={() => {
@@ -172,27 +178,39 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "gray.600"
- : "transparent"
+ ? "gray.600"
+ : "transparent"
: "transparent",
border: "1px solid #FFF"
}}
>
- 10
- ? "0px 6px 3px 6px"
- : "0px 9px 3px 9px"
- : "auto"
- }
- border={isToday ? "1px solid #0068ff" : "0px"}
- borderRadius={isToday ? "100px" : "0px"}
- >
- {`${getDate(currDateObj)}`}
-
+ {isToday ?
+ (
+
+ {`${getDate(currDateObj)}`}
+
+ )
+ :
+ (
+
+ {`${getDate(currDateObj)}`}
+
+ )
+ }
{isLoading ? (
From f7ec5d01d9afb558681bc7b48e1b2d190daefaf5 Mon Sep 17 00:00:00 2001
From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:05:22 -0500
Subject: [PATCH 2/3] Update version info.
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index f870009..e75f063 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"private": true,
"name": "lucid-creations-media-potty-chart",
"homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/",
- "version": "0.1.0",
+ "version": "0.1.1",
"author": {
"name": "Lucid Creations Media",
"url": "https://lucidcreations.media",
From f8bcb130f2f0057acd6928632517cfa8c27c442e Mon Sep 17 00:00:00 2001
From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:07:06 -0500
Subject: [PATCH 3/3] Remove unused mports.
---
src/components/calender/Day.tsx | 66 +++++++++++++--------------------
1 file changed, 25 insertions(+), 41 deletions(-)
diff --git a/src/components/calender/Day.tsx b/src/components/calender/Day.tsx
index 54fa7d2..2c9c6dd 100644
--- a/src/components/calender/Day.tsx
+++ b/src/components/calender/Day.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { Provider } from "react-redux";
import { store } from "../../app/store";
-import { Box, Skeleton, Text, VStack } from "@chakra-ui/react";
+import { Box, Skeleton, VStack } from "@chakra-ui/react";
import {
add,
getYear,
@@ -113,13 +113,7 @@ const Day = ({
alignContent="center"
justifyContent="flex-start"
>
-
+
{`${getDate(currDateObj)}`}
{isLoading ? (
@@ -145,8 +139,8 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "gray.600"
- : "transparent"
+ ? "gray.600"
+ : "transparent"
: "transparent"
}
border={
@@ -156,8 +150,8 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "1px solid #00ff3c"
- : "1px solid #0068ff"
+ ? "1px solid #00ff3c"
+ : "1px solid #0068ff"
: "1px solid #0068ff"
}
onClick={() => {
@@ -178,39 +172,29 @@ const Day = ({
: tutorial === "edit" &&
!isToday &&
isBefore(currDateObj, endOfDay(currDate))
- ? "gray.600"
- : "transparent"
+ ? "gray.600"
+ : "transparent"
: "transparent",
border: "1px solid #FFF"
}}
>
- {isToday ?
- (
-
- {`${getDate(currDateObj)}`}
-
- )
- :
- (
-
- {`${getDate(currDateObj)}`}
-
- )
- }
+ {isToday ? (
+
+ {`${getDate(currDateObj)}`}
+
+ ) : (
+
+ {`${getDate(currDateObj)}`}
+
+ )}
{isLoading ? (