diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
index 5c678946..df427b85 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -1,33 +1,19 @@
- {{ creatureCount }} /
-
- mdi-infinity
-
-
- {{ characterSlots }}
-
+
diff --git a/app/imports/ui/creature/creatureList/CreatureStorageStats.vue b/app/imports/ui/creature/creatureList/CreatureStorageStats.vue
new file mode 100644
index 00000000..6bbcfb66
--- /dev/null
+++ b/app/imports/ui/creature/creatureList/CreatureStorageStats.vue
@@ -0,0 +1,34 @@
+
+
+ {{ creatureCount }} /
+
+ mdi-infinity
+
+
+ {{ characterSlots }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
index 3802253b..ffe5d186 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -5,7 +5,7 @@
- This cannot be undone
+ This can't be undone
Type "{{ name }}" to permanenetly delete.
diff --git a/app/imports/ui/files/FileStorageStats.vue b/app/imports/ui/files/FileStorageStats.vue
new file mode 100644
index 00000000..c4ad854b
--- /dev/null
+++ b/app/imports/ui/files/FileStorageStats.vue
@@ -0,0 +1,66 @@
+
+
+
+ {{ percentFileStorageUsed }}%
+
+
+ {{ prettyBytes(storageUsed) }} / {{ prettyBytes(storageAllowed) }}
+
+ mdi-refresh
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/ui/pages/Account.vue
index bbd25a06..1deea14a 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/ui/pages/Account.vue
@@ -8,6 +8,18 @@
style="flex-basis: 900px"
>
+
+ File storage used
+
+
+
+ Character storage used
+
+
+
+
+
+
Preferences
@@ -221,8 +233,14 @@
import { getUserTier } from '/imports/api/users/patreon/tiers.js';
import addEmail from '/imports/api/users/methods/addEmail.js';
import removeEmail from '/imports/api/users/methods/removeEmail.js';
+ import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
+ import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
export default {
+ components: {
+ CreatureStorageStats,
+ FileStorageStats,
+ },
meteor: {
$subscribe: {
'userPublicProfiles'(){
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/ui/pages/Files.vue
index 376dd53d..a6f7e917 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/ui/pages/Files.vue
@@ -1,32 +1,7 @@
-
-
- {{ percentFileStorageUsed }}%
-
-
- {{ prettyBytes(storageUsed) }} / {{ prettyBytes(storageAllowed) }}
-
- mdi-refresh
-
-
-
+
@@ -51,13 +26,12 @@
import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
import prettyBytes from 'pretty-bytes';
import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
-import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
+import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
export default {
components: {
ArchiveFileCard,
+ FileStorageStats,
},
data(){ return {
updateStorageUsedLoading: false,
@@ -67,15 +41,6 @@ export default {
'archiveCreatureFiles': [],
'characterList': [],
},
- storageUsed(){
- return Meteor.user().fileStorageUsed || 0;
- },
- storageAllowed(){
- return getUserTier(Meteor.userId()).fileStorage * 1000000;
- },
- percentFileStorageUsed(){
- return Math.round((this.storageUsed / this.storageAllowed) * 100);
- },
archiveFiles() {
var userId = Meteor.userId();
return ArchiveCreatureFiles.find(
@@ -91,18 +56,5 @@ export default {
});
},
},
- methods: {
- prettyBytes(input){
- return prettyBytes(input)
- },
- updateStorageUsed(){
- this.updateStorageUsedLoading = true;
- updateFileStorageUsed.call(error => {
- this.updateStorageUsedLoading = false;
- if (!error) return;
- snackbar({text: error.reason});
- });
- },
- },
}