Merge pull request #488 from LikeLion-at-DGU/dev

🚀 Deploy
LikeLion-at-DGU · Aug 6, 2024 · 0fc8e5f · 0fc8e5f
2 parents f4c6f28 + 6467516
commit 0fc8e5f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/src/components/PrivacyContainer/PrivacyContainer.jsx b/src/components/PrivacyContainer/PrivacyContainer.jsx
@@ -31,8 +31,8 @@ const PrivacyContainer = ({
       <img
         src={
           (index === 0 && firstCheck) || (index === 1 && secondCheck)
-            ? IconChecked
-            : IconUnChecked
+            ? IconUnChecked
+            : IconChecked
         }
         alt="Checkbox Icon"
         className="icon"

diff --git a/src/pages/RandomDice/RandomDice.jsx b/src/pages/RandomDice/RandomDice.jsx
@@ -161,11 +161,16 @@ export const RandomDice = () => {
           <S.ThrowButton onClick={handleRollClick}>주사위 돌리기</S.ThrowButton>
         ) : (
           <div className="buttons">
-            {!clickCalendarButton && (
-              <button className="Add" onClick={handleAddCalendar}>
-                내 캘린더에 추가
-              </button>
-            )}
+            <button
+              className="Add"
+              style={{
+                display: clickCalendarButton ? block : none,
+              }}
+              onClick={handleAddCalendar}
+            >
+              내 캘린더에 추가
+            </button>
+
             <button className="Again" onClick={handleAgainClick}>
               다시 돌리기
             </button>
@@ -179,15 +184,7 @@ export const RandomDice = () => {
       )}
       {isCheckVisible && (
         <Modal onClose={handleCloseModal}>
-          <CheckUp
-            term={term}
-            // onClose={() => {
-            //   setTimeout(() => {
-            //     setClickCalendarButton(true);
-            //     console.log("clickCalendarButton true");
-            //   }, 0);
-            // }}
-          />
+          <CheckUp term={term} />
         </Modal>
       )}
     </S.Layout>

diff --git a/src/pages/StarPage/StarPage.jsx b/src/pages/StarPage/StarPage.jsx
@@ -106,7 +106,10 @@ const StarPage = () => {
             startDay={formatDate(startDay)}
             endDay={formatDate(endDay)}
             term={term}
-            onClose={() => setIsCheckVisible(false)}
+            onClose={() => {
+              setIsCheckVisible(false);
+              window.location.reload();
+            }}
           />
         </Modal>
       )}

diff --git a/src/pages/User/style.js b/src/pages/User/style.js
@@ -133,6 +133,7 @@ export const CategoryWrapper = styled.div`
 export const CategoryView = styled.div`
   display: flex;
   flex-wrap: wrap;
+  width: 270px;
   gap: 1rem;
   justify-content: center;
 `;

diff --git a/src/utils/share.js b/src/utils/share.js
@@ -9,6 +9,7 @@ export const captureScreenshot = async (canvas) => {
     const dataUrl = canvas.toDataURL("image/png");
     const blob = await fetch(dataUrl).then((res) => res.blob());
 
+
     // Use Web Share API if available
     if (navigator.share) {
       await navigator.share({
@@ -26,5 +27,6 @@ export const captureScreenshot = async (canvas) => {
   } finally {
     // Show the share button again after sharing
     if (shareButton) shareButton.style.display = "block";
+
   }
 };