main #19

Merged
artem merged 39 commits from main into dev 2023-09-22 14:13:12 +02:00
6 changed files with 86 additions and 2 deletions
Showing only changes of commit 926947e7c9 - Show all commits

View File

@ -7,6 +7,15 @@ body {
overflow-y: overlay; overflow-y: overlay;
} }
#popup-collection {
display: flex;
flex-direction: column;
position: fixed;
bottom: 16px;
left: -160px;
margin-left: 50%;
}
h1 { h1 {
font-weight: 200; font-weight: 200;
font-size: 3rem; font-size: 3rem;

View File

@ -126,6 +126,9 @@
</keep-alive> </keep-alive>
</router-view> </router-view>
</div> </div>
<div id="popup-collection">
<PopUp v-for="(popup, i) in $store.state.popups" :key="i" :item="popup" />
</div>
<Player ref="player" /> <Player ref="player" />
<Users ref="dialogUsers" /> <Users ref="dialogUsers" />
<UserProfile ref="dialogUserProfile" /> <UserProfile ref="dialogUserProfile" />
@ -149,6 +152,7 @@ import ServerSettings from "./components/dialogs/ServerSettings";
import AudioUploadDialog from "./components/dialogs/AudioUpload"; import AudioUploadDialog from "./components/dialogs/AudioUpload";
import VideoUploadDialog from "./components/dialogs/VideoUpload"; import VideoUploadDialog from "./components/dialogs/VideoUpload";
import SharedItems from "./components/dialogs/SharedItems"; import SharedItems from "./components/dialogs/SharedItems";
import PopUp from "./components/base-components/PopUp";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
@ -303,6 +307,7 @@ export default {
VideoScreen, VideoScreen,
VideoUploadDialog, VideoUploadDialog,
SharedItems, SharedItems,
PopUp,
}, },
}; };
</script> </script>

View File

@ -0,0 +1,56 @@
<template>
<div class="popup-control flex-column shadow ma8">
<div class="flex-row" :class="item.type">
<awesome-icon icon="circle-info" size="2x" class="ma" />
<div class="flex-column pa8-top ma8-bottom ma8-right">
<h3 class="ma-off">{{ item.title }}</h3>
<p class="ma-off ma8-top">{{ item.message }}</p>
</div>
</div>
</div>
</template>
<script>
export default {
props: {
item: {
type: Object,
default() {
return {
type: "default",
};
},
},
},
mounted() {
setTimeout(() => {
this.$store.dispatch("removePopUp", this.item);
}, 5000);
},
};
</script>
<style scoped>
.popup-control {
width: 320px;
border-radius: 8px;
background-color: var(--white);
}
.default {
border-radius: 8px;
background-color: var(--white);
}
.danger {
border-radius: 8px;
background-color: var(--danger25);
}
.info {
border-radius: 8px;
background-color: var(--info);
}
.success {
border-radius: 8px;
background-color: var(--success);
}
</style>

View File

@ -87,5 +87,12 @@ export default {
}, },
resetRedisCache(context) { resetRedisCache(context) {
axios.post(context.rootGetters.server + "/api/system/reset/redis", {}, context.rootGetters.headers); axios.post(context.rootGetters.server + "/api/system/reset/redis", {}, context.rootGetters.headers);
context.dispatch("addPoUp", { title: "Cache", message: "Cache was reseted", type: "info" })
},
addPoUp(context, item) {
context.commit("addPopUp", item);
},
removePopUp(context, item) {
context.commit("removePopUp", item);
} }
} }

View File

@ -25,5 +25,12 @@ export default {
}, },
setServerInfo(state, info) { setServerInfo(state, info) {
state.serverInfo = info; state.serverInfo = info;
},
addPopUp(state, item) {
state.popups.push(item);
},
removePopUp(state, item) {
let index = state.popups.indexOf(item);
state.popups.splice(index, 1);
} }
} }

View File

@ -15,6 +15,6 @@ export default {
videos: 0, videos: 0,
users: 0 users: 0
} }
} },
popups: []
} }