-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3840f43
commit 5018fd1
Showing
22 changed files
with
208 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/components/Loading.tsx → src/components/loading/Loading.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| function LoadingRoutine() { | ||
| return <div className='flex justify-center items-center'> | ||
| <div className="lg:w-[32.5%] md:w-[49.5%] w-full flex-wrap routine flex flex-col p-[1.2rem] rounded-[1.6rem] tap99 bg-routine_bg dark:bg-darkInputBg border-[1px] border-routine_border dark:border-routine_border_dark" key="{randomString(5)}"> | ||
| <div className="top flex flex-row gap-3"> | ||
| <div className="left"> | ||
| <div className="emoji bg-main aspect-square rounded-xl p-2 flex-1 dark:bg-black/40"> | ||
| <div className="animate-pulse bg-gray-300 dark:bg-[#ffffff20] rounded-full h-6 w-6"></div> | ||
| </div> | ||
| </div> | ||
| <div className="right flex-1 flex flex-col justify-between"> | ||
| <div className='w-[100%] h-[1.2rem] bg-gray-200 dark:bg-[#ffffff10] animate-pulse rounded'> | ||
| </div> | ||
| <div className="routine-description w-full mt-2"> | ||
| <div className="w-[90%] animate-pulse bg-gray-200 dark:bg-[#ffffff10] rounded h-3.5 mt-2"></div> | ||
| </div> | ||
| <div className="routine-description w-full"> | ||
| <div className="w-[50%] animate-pulse bg-gray-200 dark:bg-[#ffffff10] rounded h-3.5 mt-2"></div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| } | ||
|
|
||
|
|
||
| export default function LoadingRoutines() { | ||
| return <div className='w-full flex flex-col gap-3'> | ||
| <LoadingRoutine /> | ||
| <LoadingRoutine /> | ||
| <LoadingRoutine /> | ||
| <LoadingRoutine /> | ||
| <LoadingRoutine /> | ||
| <LoadingRoutine /> | ||
| </div> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| const details = { | ||
| name: 'routine', | ||
| version: '3.6.1' | ||
| version: '3.6.2' | ||
| } | ||
| export default details |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import TextEmoji from "../components/TextEmoji"; | |
| import ls from '../lib/storage' | ||
| import { useEffect, useMemo, useState } from "react"; | ||
| import Header from "../components/Header"; | ||
| import Loading from "../components/Loading"; | ||
| import Loading from "../components/loading/Loading"; | ||
| import BottomModal from "../components/BottomModal"; | ||
| import Emoji from "emoji-store"; | ||
|
|
||
|
|
@@ -24,15 +24,21 @@ function deleteRoutineById(routineID: string) { | |
| function EnterValidRoutineIdUI() { | ||
| return <> | ||
| <p className='text-center text-xl font-semibold'>Enter a valid routine ID <TextEmoji emoji="🤨" /></p> | ||
| <div className='animate-bounce-slow mt-10 mb-10'><img src={Emoji.get('🤔')} alt="emoji" className={`mx-auto mt-5 w-24 h-24`} /></div> | ||
| <div className='animate-bounce-slow mt-10 mb-10 grid'> | ||
| <img src={Emoji.get('🤔')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 place-1-1 opacity-50 blur-lg`} /> | ||
| <img src={Emoji.get('🤔')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 z-10 place-1-1`} /> | ||
| </div> | ||
| <p className='text-center text-grey text-xs mt-5 font-[450]'>If you cannot find your routine ID, please contact <a className="text-accent" href="mailto:[email protected]">me</a>.</p> | ||
| </> | ||
| } | ||
|
|
||
| function RoutineAppliedUI({ routineId }: { routineId: string }) { | ||
| return <> | ||
| <p className='text-center text-xl font-semibold'>Routine Applied <TextEmoji emoji="✅" /></p> | ||
| <div className='animate-bounce-slow mt-10 mb-10'><img src={Emoji.get('🤩')} alt="emoji" className={`mx-auto mt-5 w-24 h-24`} /></div> | ||
| <div className='animate-bounce-slow mt-10 mb-10 grid'> | ||
| <img src={Emoji.get('🤩')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 place-1-1 opacity-50 blur-lg`} /> | ||
| <img src={Emoji.get('🤩')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 z-10 place-1-1`} /> | ||
| </div> | ||
| <p className='text-center text-grey text-xs mt-5 font-[450]'> | ||
| Routine id : <span className="text-accent">{routineId}</span>. Go back now? | ||
| </p> | ||
|
|
@@ -42,7 +48,10 @@ function RoutineAppliedUI({ routineId }: { routineId: string }) { | |
| function AlreadySubscribedUI({ routineId }: { routineId: string }) { | ||
| return <> | ||
| <p className='text-center text-xl font-semibold'>Already Subscribed <TextEmoji emoji="😁" /></p> | ||
| <div className='animate-bounce-slow mt-10 mb-10'><img src={Emoji.get('😉')} alt="emoji" className={`mx-auto mt-5 w-24 h-24`} /></div> | ||
| <div className='animate-bounce-slow mt-10 mb-10 grid'> | ||
| <img src={Emoji.get('😉')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 place-1-1 opacity-50 blur-lg`} /> | ||
| <img src={Emoji.get('😉')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 z-10 place-1-1`} /> | ||
| </div> | ||
| <p className='text-center text-grey text-xs mt-5 font-[450]'> | ||
| You are already subscribed to this routine! <br /> | ||
| Routine id : <span className="text-accent">{routineId}</span> | ||
|
|
@@ -53,7 +62,10 @@ function AlreadySubscribedUI({ routineId }: { routineId: string }) { | |
| function SkipUI() { | ||
| return <> | ||
| <p className='text-center text-xl font-semibold'>Skip for now ?</p> | ||
| <div className='animate-bounce-slow mt-10 mb-10'><img src={Emoji.get('👉🏻')} alt="emoji" className={`mx-auto mt-5 w-24 h-24`} /></div> | ||
| <div className='animate-bounce-slow mt-10 mb-10 grid'> | ||
| <img src={Emoji.get('👉🏻')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 place-1-1 opacity-50 blur-lg`} /> | ||
| <img src={Emoji.get('👉🏻')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 z-10 place-1-1`} /> | ||
| </div> | ||
| <p className='text-center text-grey text-xs mt-5 font-[450] px-[7%]'> | ||
| You can skip this step for now. You can add routines later from settings. | ||
| </p> | ||
|
|
@@ -63,7 +75,10 @@ function SkipUI() { | |
| function RoutineNotFoundUI({ routineId }: { routineId: string }) { | ||
| return <> | ||
| <p className='text-center text-xl font-semibold'>Routine Not Found <TextEmoji emoji="😢" /></p> | ||
| <div className='animate-bounce-slow mt-10 mb-10'><img src={Emoji.get('😢')} alt="emoji" className={`mx-auto mt-5 w-24 h-24`} /></div> | ||
| <div className='animate-bounce-slow mt-10 mb-10 grid'> | ||
| <img src={Emoji.get('😢')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 place-1-1 opacity-50 blur-lg`} /> | ||
| <img src={Emoji.get('😢')} alt="emoji" className={`mx-auto mt-5 w-24 h-24 z-10 place-1-1`} /> | ||
| </div> | ||
| <p className='text-center text-grey text-xs mt-5 font-[450] px-[7%]'> | ||
| Cannot find routine <span className="text-accent">{routineId}</span> Maybe the routine you are looking | ||
| for is not available. Please check the routine id again. <br /><br /> | ||
|
|
@@ -107,7 +122,7 @@ export default function ApplyRoutine() { | |
| return ( | ||
| <div className="screen dark:text-white"> | ||
| <BottomModal show={modalShow} btnTxt={modalBtnText} cb={modalCallback}>{modalUi}</BottomModal> | ||
| <Header title={startedUsing ? <>Routine Store <TextEmoji emoji="👜" /></> : <>Select Routine <TextEmoji emoji="🧐"/></>} | ||
| <Header title={startedUsing ? <>Routine Store <TextEmoji emoji="👜" /></> : <>Select Routine <TextEmoji emoji="🧐" /></>} | ||
| notiIcon={false} placeholder="Search Routine" onInput={() => { }} | ||
| /> | ||
| <div className="px-5 py-1 flex flex-col gap-4"> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.