diff --git a/frontend/src/assets/images/loading.gif b/frontend/src/assets/images/loading.gif new file mode 100644 index 0000000..95499e5 Binary files /dev/null and b/frontend/src/assets/images/loading.gif differ diff --git a/frontend/src/assets/images/no_content.jpg b/frontend/src/assets/images/no_content.jpg new file mode 100644 index 0000000..fd58021 Binary files /dev/null and b/frontend/src/assets/images/no_content.jpg differ diff --git a/frontend/src/components/EmptyContent.vue b/frontend/src/components/EmptyContent.vue index 951b5fa..93fb424 100644 --- a/frontend/src/components/EmptyContent.vue +++ b/frontend/src/components/EmptyContent.vue @@ -1,6 +1,8 @@ @@ -8,7 +10,9 @@ export default { name: 'EmptyContent', props: { - autoFit: { type: Boolean, default: false } + autoFit: { type: Boolean, default: false }, + loading: { type: Boolean, default: true }, + empty: { type: Boolean, default: false } } } @@ -19,10 +23,15 @@ export default { display: flex; justify-content: center; align-items: center; + flex-direction: column; &.auto-fit { width: 100%; height: 100%; } + + .loading-big {width: 188px; height: 188px;} + .empty-img {width: 188px; height: 188px; margin-bottom: 15px;} + .empty-text {font-size: 26px; color: #6E7387;} } diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index cebee96..f8b67ae 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -227,6 +227,9 @@ export default { img { width: 56px; + height: 56px; + overflow: hidden; + border-radius: 50%; } } @@ -286,6 +289,12 @@ export default { position: relative; cursor: pointer; + &:hover { + .header-switch-desc { + display: block; + } + } + .header-switch-desc { position: absolute; background-color: white; @@ -295,6 +304,7 @@ export default { color: #3d455f; white-space: nowrap; padding: 2px 5px; + display: none; } } diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue index 6a5dd34..4f7e3b9 100644 --- a/frontend/src/pages/user/account/UserProfile.vue +++ b/frontend/src/pages/user/account/UserProfile.vue @@ -204,15 +204,19 @@
-
+
-
+