Skip to content

TagSpaces is an offline, open source, document manager with tagging support

feat: added loading animation for object storage

Ilian Sapundshievedecf2991fed
diff --git a/app/assets/loading.css b/app/assets/loading.css
index 9690c2d07..751a41fa4 100644
--- a/app/assets/loading.css
+++ b/app/assets/loading.css
@@ -1,49 +1,55 @@
-/* http://tobiasahlin.com/spinkit/ */
-.spinner {
- margin: 100px auto;
- width: 40px;
- height: 40px;
- position: relative;
- text-align: center;
-
- -webkit-animation: sk-rotate 2.0s infinite linear;
- animation: sk-rotate 2.0s infinite linear;
-}
-
-.dot1, .dot2 {
- width: 60%;
- height: 60%;
+.lds-ellipsis {
display: inline-block;
+ position: relative;
+ width: 80px;
+ height: 80px;
+}
+.lds-ellipsis div {
position: absolute;
- top: 0;
- background-color: #EDEDED;
- border-radius: 100%;
-
- -webkit-animation: sk-bounce 2.0s infinite ease-in-out;
- animation: sk-bounce 2.0s infinite ease-in-out;
-}
-
-.dot2 {
- top: auto;
- bottom: 0;
- -webkit-animation-delay: -1.0s;
- animation-delay: -1.0s;
-}
-
-@-webkit-keyframes sk-rotate { 100% { -webkit-transform: rotate(360deg) }}
-@keyframes sk-rotate { 100% { transform: rotate(360deg); -webkit-transform: rotate(360deg) }}
-
-@-webkit-keyframes sk-bounce {
- 0%, 100% { -webkit-transform: scale(0.0) }
- 50% { -webkit-transform: scale(1.0) }
-}
-
-@keyframes sk-bounce {
- 0%, 100% {
- transform: scale(0.0);
- -webkit-transform: scale(0.0);
- } 50% {
- transform: scale(1.0);
- -webkit-transform: scale(1.0);
+ top: 33px;
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ background: #1dd19f;
+ animation-timing-function: cubic-bezier(0, 1, 1, 0);
+}
+.lds-ellipsis div:nth-child(1) {
+ left: 8px;
+ animation: lds-ellipsis1 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(2) {
+ left: 8px;
+ animation: lds-ellipsis2 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(3) {
+ left: 26px;
+ animation: lds-ellipsis2 0.6s infinite;
+}
+.lds-ellipsis div:nth-child(4) {
+ left: 44px;
+ animation: lds-ellipsis3 0.6s infinite;
+}
+@keyframes lds-ellipsis1 {
+ 0% {
+ transform: scale(0);
+ }
+ 100% {
+ transform: scale(1);
+ }
+}
+@keyframes lds-ellipsis3 {
+ 0% {
+ transform: scale(1);
+ }
+ 100% {
+ transform: scale(0);
+ }
+}
+@keyframes lds-ellipsis2 {
+ 0% {
+ transform: translate(0, 0);
+ }
+ 100% {
+ transform: translate(24px, 0);
}
}
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 9420433a6..7e137b9d6 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -585,10 +585,30 @@ const FolderContainer = (props: Props) => {
zIndex: 1000,
height: '100%',
width: '100%',
- backdropFilter: 'blur(2px)',
- backgroundColor: '#fafafaAA' // red: '#eb585882' '#d9d9d980'
+ display: 'flex',
+ justifyContent: 'center',
+ alignItems: 'center',
+ borderRadius: 10,
+ backdropFilter: 'grayscale(1)'
+ // backdropFilter: 'blur(2px)',
+ // backgroundColor: '#fafafa33' // red: '#eb585882' '#d9d9d980'
}}
- ></div>
+ >
+ <div className="lds-ellipsis">
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ ></div>
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ ></div>
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ ></div>
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ ></div>
+ </div>
+ </div>
)}
{renderPerspective()}
{isRenameEntryDialogOpened && (
diff --git a/app/components/LocationManager.tsx b/app/components/LocationManager.tsx
index d698c3ddc..446f8f7f1 100644
--- a/app/components/LocationManager.tsx
+++ b/app/components/LocationManager.tsx
@@ -138,14 +138,14 @@ const LocationManager = (props: Props) => {
style={{
position: 'absolute',
zIndex: 1000,
- height: '100%',
- width: '100%',
- backdropFilter: 'blur(2px)',
- backgroundColor: '#fafafaAA' // red: '#eb585882' '#d9d9d980'
+ height: 'calc(100% - 180px)',
+ width: 310,
+ backdropFilter: 'grayscale(1)'
+ // backgroundColor: 'red'
+ // backdropFilter: 'blur(2px)',
+ // backgroundColor: '#fafafaAA' // red: '#eb585882' '#d9d9d980'
}}
- >
- Loading...
- </div>
+ ></div>
)}
<LocationManagerMenu
importLocations={() => {
diff --git a/app/package.json b/app/package.json
index f2e683a2c..888664ac1 100644
--- a/app/package.json
+++ b/app/package.json
@@ -13,6 +13,8 @@
"license": "AGPL-3.0",
"scripts": {},
"dependencies": {
- "@tagspaces/extensions": "1.0.15"
+ "@tagspaces/tagspaces-ws": "1.2.1",
+ "@tagspaces/extensions": "1.0.18",
+ "sharp": "^0.29.3"
}
}
diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsx
index 09a6e3a5c..bd9c3276a 100644
--- a/app/perspectives/grid-perspective/components/GridPagination.tsx
+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx
@@ -124,13 +124,6 @@ const GridPagination = (props: Props) => {
{files.map((entry, index, dArray) =>
renderCell(entry, index === dArray.length - 1)
)}
- {isAppLoading && (
- <Typography
- style={{ padding: 15, color: theme.palette.text.primary }}
- >
- {i18n.t('core:loading')}
- </Typography>
- )}
{!isAppLoading && files.length < 1 && directories.length < 1 && (
<div style={{ textAlign: 'center' }}>
<EntryIcon isFile={false} />