Skip to content

Commit

Permalink
feat: add loading component
Browse files Browse the repository at this point in the history
Adds a new `LoadingComponent` that is displayed while the email list is being fetched. The `Home.tsx` file has been updated to use these changes, including adding state for loading status. Additionally, some minor updates have been made to the tailwind config file.

Changes:
- Rename MaskedEmailListPane and MaskedEmailListItem
- Add LoadingComponent
- Update Home.tsx to use new components and add loading state
- Minor updates to tailwind.config.cjs
  • Loading branch information
ajyey committed Jun 20, 2023
1 parent 0b3f8e4 commit a8a72f4
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 5 deletions.
13 changes: 10 additions & 3 deletions src/pages/popup/components/home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
import React, { useState, useEffect, useLayoutEffect } from 'react';
import icon from '@assets/img/icon.svg';
import TopComponent from '@pages/popup/components/home/top/Top';
import MaskedEmailListPane from '@pages/popup/components/home/emails/MaskedEmailListPane';
import MaskedEmailDetailPane from '@pages/popup/components/home/emails/MaskedEmailDetailPane';
import MaskedEmailListPane from '@pages/popup/components/home/emailListPane/MaskedEmailListPane';
import MaskedEmailDetailPane from '@pages/popup/components/home/emailListPane/MaskedEmailDetailPane';
import { list, MaskedEmail } from 'fastmail-masked-email';
import { FASTMAIL_API_TOKEN } from '../../../../../utils/constants';
import PopupProps from '@pages/popup/Popup';
import LoadingComponent from '@pages/popup/components/home/emailListPane/Loading';

interface HomeComponentProps {
maskedEmails: MaskedEmail[];
}

export default function HomeComponent() {
const [maskedEmails, setMaskedEmails] = useState<MaskedEmail[]>([]);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
const fetchMaskedEmails = async () => {
try {
const storageData = await chrome.storage.sync.get('fastmail_session');
const session = storageData.fastmail_session;
const allMaskedEmails: MaskedEmail[] = await list(session);
setMaskedEmails(allMaskedEmails);
setIsLoading(false);
} catch (error) {
console.error('Error fetching masked emails:', error);
}
Expand All @@ -34,7 +37,11 @@ export default function HomeComponent() {
<div className="w-full h-[345px] flex flex-col overflow-y-auto">
<div className="flex flex-1">
<div className="columns-[250px] border-r border-r-big-stone">
<MaskedEmailListPane maskedEmails={maskedEmails} />
{isLoading ? (
<LoadingComponent />
) : (
<MaskedEmailListPane maskedEmails={maskedEmails} />
)}
</div>
<div className="w-7/12 ml-2 mt-2">
<MaskedEmailDetailPane />
Expand Down
27 changes: 27 additions & 0 deletions src/pages/popup/components/home/emailListPane/Loading.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';

const LoadingComponent = () => (
<div className="flex justify-center items-center h-full align-middle">
<div role="loading-status">
<svg
aria-hidden="true"
className="w-8 h-8 text-iron animate-spin-fast fill-mikado-yellow"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"
/>
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"
/>
</svg>
<span className="sr-only">Loading...</span>
</div>
</div>
);

export default LoadingComponent;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { MaskedEmail } from 'fastmail-masked-email';
import MaskedEmailListItem from '@pages/popup/components/home/emails/MaskedEmailListItem';
import MaskedEmailListItem from '@pages/popup/components/home/emailListPane/MaskedEmailListItem';

interface Props {
maskedEmails: MaskedEmail[];
Expand Down
5 changes: 4 additions & 1 deletion tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ module.exports = {
theme: {
extend: {
animation: {
'spin-slow': 'spin 20s linear infinite',
'spin-slow': 'spin 2s linear infinite',
'spin-fast': 'spin 0.5s linear infinite',
'spin-default': 'spin 1s linear infinite',

},
colors: {
'magnesium': '#B3B3B3',
Expand Down

0 comments on commit a8a72f4

Please sign in to comment.