Merge pull request #479 from nextcloud/platform/readd-loading-icon

nextcloud · Oct 14, 2020 · 23c8569 · 23c8569
2 parents 5c2f0f2 + fab1171
commit 23c8569
Show file tree

Hide file tree

Showing 8 changed files with 350 additions and 12 deletions.
diff --git a/js/photos-5.js b/js/photos-5.js
diff --git a/js/photos-5.js.map b/js/photos-5.js.map
diff --git a/js/photos-main.js b/js/photos-main.js
@@ -43,7 +43,7 @@
 /******/
 /******/ 	// script path function
 /******/ 	function jsonpScriptSrc(chunkId) {
-/******/ 		return __webpack_require__.p + "photos-" + ({}[chunkId]||chunkId) + ".js?v=" + {"0":"f851824c46ef168a8074","1":"ee67a9dd6a1596f5e14b","2":"93adc2b3775fad33d9d5","3":"55d64d057de391151ae1","4":"4fa47638f772698a0fda","5":"a63c242973f45b36be88","6":"38a8c65bb96fc35410e6","7":"9207e8f25dfdcd66d4be","8":"0d499ff26d5e8adee5e0","9":"df4decb3849a228e34d1","10":"636c794a5eae8126bb03"}[chunkId] + ""
+/******/ 		return __webpack_require__.p + "photos-" + ({}[chunkId]||chunkId) + ".js?v=" + {"0":"f851824c46ef168a8074","1":"ee67a9dd6a1596f5e14b","2":"93adc2b3775fad33d9d5","3":"55d64d057de391151ae1","4":"4fa47638f772698a0fda","5":"6043ee6d583f7778019b","6":"38a8c65bb96fc35410e6","7":"9207e8f25dfdcd66d4be","8":"0d499ff26d5e8adee5e0","9":"df4decb3849a228e34d1","10":"636c794a5eae8126bb03"}[chunkId] + ""
 /******/ 	}
 /******/
 /******/ 	// The require function
@@ -37847,4 +37847,4 @@ var isNumber = function isNumber(num) {
 /***/ })
 
 /******/ });
-//# sourceMappingURL=photos-main.js.map?v=6751183a8a3f63207fb0
+//# sourceMappingURL=photos-main.js.map?v=8af228850638ad69750b
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/src/components/FileVirtualGrid.vue b/src/components/FileVirtualGrid.vue
@@ -1,3 +1,24 @@
+<!--
+ - @copyright Copyright (c) 2020 Corentin Mors
+ -
+ - @license GNU AGPL version 3 or any later version
+ -
+ - @author Corentin Mors <medias@pixelswap.fr>
+ -
+ - This program is free software: you can redistribute it and/or modify
+ - it under the terms of the GNU Affero General Public License as
+ - published by the Free Software Foundation, either version 3 of the
+ - License, or (at your option) any later version.
+ -
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ - GNU Affero General Public License for more details.
+ -
+ - You should have received a copy of the GNU Affero General Public License
+ - along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -
+ -->
 
 <template>
 	<a :class="{'file--clear': !loaded}"

diff --git a/src/components/Loader.vue b/src/components/Loader.vue
@@ -0,0 +1,42 @@
+<!--
+ - @copyright Copyright (c) 2020 Corentin Mors
+ -
+ - @license GNU AGPL version 3 or any later version
+ -
+ - @author Corentin Mors <medias@pixelswap.fr>
+ -
+ - This program is free software: you can redistribute it and/or modify
+ - it under the terms of the GNU Affero General Public License as
+ - published by the Free Software Foundation, either version 3 of the
+ - License, or (at your option) any later version.
+ -
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ - GNU Affero General Public License for more details.
+ -
+ - You should have received a copy of the GNU Affero General Public License
+ - along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -
+ -->
+
+<template>
+	<div class="loader" icon="loading">
+		<slot name="icon">
+			<span :class="['loading']" />
+		</slot>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'Loader',
+}
+</script>
+
+<style lang="scss">
+.loader {
+	display: grid;
+	height: 60px;
+}
+</style>
diff --git a/src/components/SeparatorVirtualGrid.vue b/src/components/SeparatorVirtualGrid.vue
@@ -1,3 +1,25 @@
+<!--
+ - @copyright Copyright (c) 2020 Corentin Mors
+ -
+ - @license GNU AGPL version 3 or any later version
+ -
+ - @author Corentin Mors <medias@pixelswap.fr>
+ -
+ - This program is free software: you can redistribute it and/or modify
+ - it under the terms of the GNU Affero General Public License as
+ - published by the Free Software Foundation, either version 3 of the
+ - License, or (at your option) any later version.
+ -
+ - This program is distributed in the hope that it will be useful,
+ - but WITHOUT ANY WARRANTY; without even the implied warranty of
+ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ - GNU Affero General Public License for more details.
+ -
+ - You should have received a copy of the GNU Affero General Public License
+ - along with this program. If not, see <http://www.gnu.org/licenses/>.
+ -
+ -->
+
 <template>
 	<h2 class="grid-title" :style="{height: item.height + 'px'}">
 		{{ item.injected.month }}

diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
@@ -2,6 +2,7 @@
  - @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
  -
  - @author John Molakvoæ <skjnldsv@protonmail.com>
+ - @author Corentin Mors <medias@pixelswap.fr>
  -
  - @license GNU AGPL version 3 or any later version
  -
@@ -49,7 +50,8 @@
 				:update-function="getContent"
 				:get-column-count="() => gridConfig.count"
 				:get-grid-gap="() => gridConfig.gap"
-				:update-trigger-margin="700" />
+				:update-trigger-margin="700"
+				:loader="loaderComponent" />
 		</div>
 	</div>
 </template>
@@ -65,6 +67,7 @@ import FileVirtualGrid from '../components/FileVirtualGrid'
 import SeparatorVirtualGrid from '../components/SeparatorVirtualGrid'
 import VirtualGrid from 'vue-virtual-grid'
 import Navigation from '../components/Navigation'
+import Loader from '../components/Loader'
 
 import cancelableRequest from '../utils/CancelableRequest'
 import GridConfigMixin from '../mixins/GridConfig'
@@ -103,6 +106,7 @@ export default {
 			error: null,
 			page: 0,
 			lastSection: '',
+			loaderComponent: Loader,
 		}
 	},