main #19

Merged
artem merged 39 commits from main into dev 2023-09-22 14:13:12 +02:00
5 changed files with 18 additions and 4 deletions
Showing only changes of commit 19f221556a - Show all commits

View File

@ -14,6 +14,7 @@ body {
bottom: 16px;
left: -160px;
margin-left: 50%;
z-index: 1200;
}
h1 {

View File

@ -1,7 +1,10 @@
<template>
<div class="popup-control flex-column shadow ma8" :class="{fadeOut: fadeout}">
<div
class="popup-control flex-column shadow ma8"
:class="{ fadeOut: fadeout }"
>
<div class="flex-row" :class="item.type">
<awesome-icon icon="circle-info" size="2x" class="ma" />
<awesome-icon :icon="item.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>

View File

@ -1,6 +1,6 @@
<template>
<DialogBase ref="dialogWindow" title="Shared items" button-text="close">
<div class="flex-column">
<div class="flex-column" id="sharedContent">
<ul v-if="shares.length > 0">
<li
class="flex-row pa4-top pa4-bottom"
@ -21,7 +21,11 @@
<p class="grow ma-off">
{{ share.title }}
</p>
<button class="flat danger faded" @click="shareDisable(share)" title="Disable Sharing">
<button
class="flat danger faded"
@click="shareDisable(share)"
title="Disable Sharing"
>
<awesome-icon icon="trash-alt" />
</button>
</div>
@ -107,4 +111,8 @@ li p {
li .cover {
width: 32px;
}
#sharedContent {
min-width: 320px;
}
</style>

View File

@ -165,6 +165,7 @@ export default {
axios.post(context.rootGetters.server + "/api/albums/" + album._id + "/share", {}, context.rootGetters.headers).then(res => {
album.share = res.data;
resolve();
context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon:"share" }, { root: true });
});
});
},

View File

@ -141,6 +141,7 @@ export default {
axios.post(context.rootGetters.server + "/api/boxes/" + box._id + "/share", {}, context.rootGetters.headers).then(res => {
box.share = res.data;
resolve();
context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon: "share" }, { root: true });
});
});
},