Compare commits

..

6 Commits

Author SHA1 Message Date
Jakob Röhrl
f3a8e8e301 overworked
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
2020-08-27 14:05:56 +02:00
Jakob Röhrl
1fe3e30da6 Add a button to the modal to switch back to the sidebar view
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
2020-08-27 14:02:48 +02:00
Jakob Röhrl
56afb75d01 localstorage
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
2020-08-27 14:02:48 +02:00
Julius Härtl
8bb5a76666 Add setting to toggle between the modal and the sidebar
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-27 14:02:47 +02:00
Julius Härtl
5feb8c834b Fix modal toggling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-08-27 14:02:03 +02:00
Jakob Röhrl
4a3e84e5e8 show card details in modal
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
2020-08-27 14:02:01 +02:00
31 changed files with 784 additions and 433 deletions

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Změny v <strong>aplikaci Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Na kartě byl vytvořen <strong>komentář</strong>",
"Upcoming cards" : "Nadcházející karty",
"Personal" : "Osobní",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kartu „%s“ na „%s“ vám přiřadil(a) %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} vám přiřadil(a) kartu „%s“ na „%s“.",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Zítra",
"This week" : "Tento týden",
"No due" : "Žádný termín",
"upcoming cards" : "nadcházející karty",
"No upcoming cards" : "Žádné nadcházející karty",
"Link to a board" : "Propojit s tabulí",
"Link to a card" : "Propojit s kartou",
"Something went wrong" : "Něco se pokazilo",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Změny v <strong>aplikaci Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Na kartě byl vytvořen <strong>komentář</strong>",
"Upcoming cards" : "Nadcházející karty",
"Personal" : "Osobní",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kartu „%s“ na „%s“ vám přiřadil(a) %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} vám přiřadil(a) kartu „%s“ na „%s“.",
@@ -224,8 +223,6 @@
"Tomorrow" : "Zítra",
"This week" : "Tento týden",
"No due" : "Žádný termín",
"upcoming cards" : "nadcházející karty",
"No upcoming cards" : "Žádné nadcházející karty",
"Link to a board" : "Propojit s tabulí",
"Link to a card" : "Propojit s kartou",
"Something went wrong" : "Něco se pokazilo",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Änderungen in der <strong>Deck-App</strong>",
"A <strong>comment</strong> was created on a card" : "Ein <strong>Kommentar</strong> zu einer Karte wurde erstellt",
"Upcoming cards" : "Kommende Karten",
"Personal" : "Persönlich",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Die Karte \"%s\" auf \"%s\" wurde Dir von %s zugewiesen.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} hat Dir die Karte \"%s\" auf \"%s\" zugewiesen.",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Morgen",
"This week" : "Diese Woche",
"No due" : "Kein Fälligkeitsdatum",
"upcoming cards" : "Kommende Karten",
"No upcoming cards" : "Keine kommenden Karten",
"Link to a board" : "Mit einem Board verknüpfen",
"Link to a card" : "Mit einer Karte verknüpfen",
"Something went wrong" : "Etwas ist schiefgelaufen",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Änderungen in der <strong>Deck-App</strong>",
"A <strong>comment</strong> was created on a card" : "Ein <strong>Kommentar</strong> zu einer Karte wurde erstellt",
"Upcoming cards" : "Kommende Karten",
"Personal" : "Persönlich",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Die Karte \"%s\" auf \"%s\" wurde Dir von %s zugewiesen.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} hat Dir die Karte \"%s\" auf \"%s\" zugewiesen.",
@@ -224,8 +223,6 @@
"Tomorrow" : "Morgen",
"This week" : "Diese Woche",
"No due" : "Kein Fälligkeitsdatum",
"upcoming cards" : "Kommende Karten",
"No upcoming cards" : "Keine kommenden Karten",
"Link to a board" : "Mit einem Board verknüpfen",
"Link to a card" : "Mit einer Karte verknüpfen",
"Something went wrong" : "Etwas ist schiefgelaufen",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Änderungen in der <strong>Deck-App</strong>",
"A <strong>comment</strong> was created on a card" : "Ein <strong>Kommentar</strong> zu einer Karte wurde erstellt",
"Upcoming cards" : "Kommende Karten",
"Personal" : "Persönlich",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Die Karte \"%s\" auf \"%s\" wurde Ihnen von %s zugewiesen.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} hat Ihnen die Karte \"%s\" auf \"%s\" zugewiesen.",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Morgen",
"This week" : "Diese Woche",
"No due" : "Kein Fälligkeitsdatum",
"upcoming cards" : "Kommende Karten",
"No upcoming cards" : "Keine kommenden Karten",
"Link to a board" : "Mit einem Board verknüpfen",
"Link to a card" : "Mit einer Karte verknüpfen",
"Something went wrong" : "Etwas ist schiefgelaufen",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Änderungen in der <strong>Deck-App</strong>",
"A <strong>comment</strong> was created on a card" : "Ein <strong>Kommentar</strong> zu einer Karte wurde erstellt",
"Upcoming cards" : "Kommende Karten",
"Personal" : "Persönlich",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Die Karte \"%s\" auf \"%s\" wurde Ihnen von %s zugewiesen.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} hat Ihnen die Karte \"%s\" auf \"%s\" zugewiesen.",
@@ -224,8 +223,6 @@
"Tomorrow" : "Morgen",
"This week" : "Diese Woche",
"No due" : "Kein Fälligkeitsdatum",
"upcoming cards" : "Kommende Karten",
"No upcoming cards" : "Keine kommenden Karten",
"Link to a board" : "Mit einem Board verknüpfen",
"Link to a card" : "Mit einer Karte verknüpfen",
"Something went wrong" : "Etwas ist schiefgelaufen",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "<strong>Deck</strong> aplikazioan aldaketak",
"A <strong>comment</strong> was created on a card" : "<strong>Iruzkin bat</strong> sortu da txartel batean",
"Upcoming cards" : "Hurrengo txartelak",
"Personal" : "Pertsonala",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "\"%s\" txartela \"%s\"-n %sk esleitu zaizu.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user}k \"%s\" txartela \"%s\"-n esleitu zaitu.",
@@ -221,13 +220,9 @@ OC.L10N.register(
"An error occurred" : "Errore bat gertatu da",
"Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Ziur zaude «{title}» mahaia ezabatu nahi duzula? Honek mahai honen datu guztiak ezabatuko ditu.",
"Delete the board?" : "Mahaia ezabatu?",
"Loading filtered view" : "Kargatzen iragazitako ikuspegia",
"Today" : "Gaur",
"Tomorrow" : "Bihar",
"This week" : "Aste honetan",
"No due" : "Epemugarik ez",
"upcoming cards" : "hurrengo txartelak",
"No upcoming cards" : "Ez dago hurrengo txartelik",
"Link to a board" : "Estekatu mahai batera",
"Link to a card" : "Estekatu txartel batera",
"Something went wrong" : "Zerbait gaizki joan da",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "<strong>Deck</strong> aplikazioan aldaketak",
"A <strong>comment</strong> was created on a card" : "<strong>Iruzkin bat</strong> sortu da txartel batean",
"Upcoming cards" : "Hurrengo txartelak",
"Personal" : "Pertsonala",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "\"%s\" txartela \"%s\"-n %sk esleitu zaizu.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user}k \"%s\" txartela \"%s\"-n esleitu zaitu.",
@@ -219,13 +218,9 @@
"An error occurred" : "Errore bat gertatu da",
"Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Ziur zaude «{title}» mahaia ezabatu nahi duzula? Honek mahai honen datu guztiak ezabatuko ditu.",
"Delete the board?" : "Mahaia ezabatu?",
"Loading filtered view" : "Kargatzen iragazitako ikuspegia",
"Today" : "Gaur",
"Tomorrow" : "Bihar",
"This week" : "Aste honetan",
"No due" : "Epemugarik ez",
"upcoming cards" : "hurrengo txartelak",
"No upcoming cards" : "Ez dago hurrengo txartelik",
"Link to a board" : "Estekatu mahai batera",
"Link to a card" : "Estekatu txartel batera",
"Something went wrong" : "Zerbait gaizki joan da",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Cambios na <strong>aplicación Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Creouse un <strong>comentario</strong> nunha tarxeta",
"Upcoming cards" : "Tarxetas próximas",
"Personal" : "Persoal",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "A tarxeta «%s» en «%s» foi asignada a vostede por %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} asignoulle a vostede a tarxeta «%s» en «%s».",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Mañá",
"This week" : "Esta semana",
"No due" : "Sen caducidade",
"upcoming cards" : "tarxetas próximas",
"No upcoming cards" : "Non hai tarxetas próximas",
"Link to a board" : "Ligar a un taboleiro",
"Link to a card" : "Ligar a unha tarxeta",
"Something went wrong" : "Algo foi mal",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Cambios na <strong>aplicación Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Creouse un <strong>comentario</strong> nunha tarxeta",
"Upcoming cards" : "Tarxetas próximas",
"Personal" : "Persoal",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "A tarxeta «%s» en «%s» foi asignada a vostede por %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} asignoulle a vostede a tarxeta «%s» en «%s».",
@@ -224,8 +223,6 @@
"Tomorrow" : "Mañá",
"This week" : "Esta semana",
"No due" : "Sen caducidade",
"upcoming cards" : "tarxetas próximas",
"No upcoming cards" : "Non hai tarxetas próximas",
"Link to a board" : "Ligar a un taboleiro",
"Link to a card" : "Ligar a unha tarxeta",
"Something went wrong" : "Algo foi mal",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Modifiche nell'<strong>applicazione Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Un <strong>commento</strong> è stato creato su una scheda",
"Upcoming cards" : "Prossime schede",
"Personal" : "Personale",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "La scheda \"%s\" in \"%s\" ti è stata assegnata da %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} ti ha assegnato la scheda \"%s\" in \"%s\".",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Domani",
"This week" : "Questa settimana",
"No due" : "Nessuna scadenza",
"upcoming cards" : "prossime schede",
"No upcoming cards" : "Nessuna scheda rimasta",
"Link to a board" : "Collega a una lavagna",
"Link to a card" : " Collega a una scheda",
"Something went wrong" : "Qualcosa non ha funzionato",

View File

@@ -65,7 +65,6 @@
"Deck" : "Deck",
"Changes in the <strong>Deck app</strong>" : "Modifiche nell'<strong>applicazione Deck</strong>",
"A <strong>comment</strong> was created on a card" : "Un <strong>commento</strong> è stato creato su una scheda",
"Upcoming cards" : "Prossime schede",
"Personal" : "Personale",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "La scheda \"%s\" in \"%s\" ti è stata assegnata da %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} ti ha assegnato la scheda \"%s\" in \"%s\".",
@@ -224,8 +223,6 @@
"Tomorrow" : "Domani",
"This week" : "Questa settimana",
"No due" : "Nessuna scadenza",
"upcoming cards" : "prossime schede",
"No upcoming cards" : "Nessuna scheda rimasta",
"Link to a board" : "Collega a una lavagna",
"Link to a card" : " Collega a una scheda",
"Something went wrong" : "Qualcosa non ha funzionato",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Tablica",
"Changes in the <strong>Deck app</strong>" : "Zmiany w <strong>aplikacji Tablica</strong>",
"A <strong>comment</strong> was created on a card" : "Na karcie utworzono <strong>komentarz</strong>",
"Upcoming cards" : "Nadchodzące karty",
"Personal" : "Osobiste",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Karta \"%s\" na \"%s\" została przydzielona Tobie przez %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} przydzielił Tobie kartę \"%s\" na \"%s\".",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Jutro",
"This week" : "W tym tygodniu",
"No due" : "Bez ważności",
"upcoming cards" : "nadchodzące karty",
"No upcoming cards" : "Brak nadchodzących kart",
"Link to a board" : "Link do tablicy",
"Link to a card" : "Link do karty",
"Something went wrong" : "Coś poszło nie tak",

View File

@@ -65,7 +65,6 @@
"Deck" : "Tablica",
"Changes in the <strong>Deck app</strong>" : "Zmiany w <strong>aplikacji Tablica</strong>",
"A <strong>comment</strong> was created on a card" : "Na karcie utworzono <strong>komentarz</strong>",
"Upcoming cards" : "Nadchodzące karty",
"Personal" : "Osobiste",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "Karta \"%s\" na \"%s\" została przydzielona Tobie przez %s.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} przydzielił Tobie kartę \"%s\" na \"%s\".",
@@ -224,8 +223,6 @@
"Tomorrow" : "Jutro",
"This week" : "W tym tygodniu",
"No due" : "Bez ważności",
"upcoming cards" : "nadchodzące karty",
"No upcoming cards" : "Brak nadchodzących kart",
"Link to a board" : "Link do tablicy",
"Link to a card" : "Link do karty",
"Something went wrong" : "Coś poszło nie tak",

View File

@@ -74,7 +74,7 @@ OC.L10N.register(
"%s has mentioned you in a comment on \"%s\"." : "%s vas omeni v opombi na »%s«.",
"{user} has mentioned you in a comment on \"%s\"." : "{user} vas omeni v opombi na »%s«.",
"The board \"%s\" has been shared with you by %s." : "Zborko »%s« vam dodeli %s.",
"{user} has shared the board %s with you." : "{user} vam omogoča souporabo zbirke %s.",
"{user} has shared the board %s with you." : "{user} vam omogoči souporabo zbirke %s.",
"No data was provided to create an attachment." : "Ni podanih podatkov za ustvarjanje priloge.",
"Finished" : "Končano",
"To review" : "Za pregled",

View File

@@ -72,7 +72,7 @@
"%s has mentioned you in a comment on \"%s\"." : "%s vas omeni v opombi na »%s«.",
"{user} has mentioned you in a comment on \"%s\"." : "{user} vas omeni v opombi na »%s«.",
"The board \"%s\" has been shared with you by %s." : "Zborko »%s« vam dodeli %s.",
"{user} has shared the board %s with you." : "{user} vam omogoča souporabo zbirke %s.",
"{user} has shared the board %s with you." : "{user} vam omogoči souporabo zbirke %s.",
"No data was provided to create an attachment." : "Ni podanih podatkov za ustvarjanje priloge.",
"Finished" : "Končano",
"To review" : "Za pregled",

View File

@@ -67,7 +67,6 @@ OC.L10N.register(
"Deck" : "Tahta",
"Changes in the <strong>Deck app</strong>" : "<strong>Tahta uygulamasındaki</strong> değişiklikler",
"A <strong>comment</strong> was created on a card" : "Bir kart için bir <strong>yorum</strong> yapıldı",
"Upcoming cards" : "Yaklaşan kartlar",
"Personal" : "Kişisel",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "\"%s\" kartı \"%s\" zamanında %s tarafından size atandı.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} size \"%s\" kartını \"%s\" zamanında atadı.",
@@ -226,8 +225,6 @@ OC.L10N.register(
"Tomorrow" : "Yarın",
"This week" : "Bu hafta",
"No due" : "Bitiş yok",
"upcoming cards" : "yaklaşan kartlar",
"No upcoming cards" : "Yaklaşan bir kart yok",
"Link to a board" : "Bir pano ile ilişkilendir",
"Link to a card" : "Bir kart ile ilişkilendir",
"Something went wrong" : "Bir şeyler ters gitti",

View File

@@ -65,7 +65,6 @@
"Deck" : "Tahta",
"Changes in the <strong>Deck app</strong>" : "<strong>Tahta uygulamasındaki</strong> değişiklikler",
"A <strong>comment</strong> was created on a card" : "Bir kart için bir <strong>yorum</strong> yapıldı",
"Upcoming cards" : "Yaklaşan kartlar",
"Personal" : "Kişisel",
"The card \"%s\" on \"%s\" has been assigned to you by %s." : "\"%s\" kartı \"%s\" zamanında %s tarafından size atandı.",
"{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} size \"%s\" kartını \"%s\" zamanında atadı.",
@@ -224,8 +223,6 @@
"Tomorrow" : "Yarın",
"This week" : "Bu hafta",
"No due" : "Bitiş yok",
"upcoming cards" : "yaklaşan kartlar",
"No upcoming cards" : "Yaklaşan bir kart yok",
"Link to a board" : "Bir pano ile ilişkilendir",
"Link to a card" : "Bir kart ile ilişkilendir",
"Something went wrong" : "Bir şeyler ters gitti",

View File

@@ -202,14 +202,14 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
$stmt = $this->execute($sql, [$cardId]);
$row = $stmt->fetch();
return $row ? ($row['owner'] === $userId) : false;
return ($row['owner'] === $userId);
}
public function findBoardId($cardId) {
$sql = 'SELECT id FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_stacks` WHERE id IN (SELECT stack_id FROM `*PREFIX*deck_cards` WHERE id = ?))';
$stmt = $this->execute($sql, [$cardId]);
$row = $stmt->fetch();
return $row ? $row['id'] : null;
return $row['id'];
}
public function mapOwner(Card &$card) {

199
package-lock.json generated
View File

@@ -3536,12 +3536,12 @@
}
},
"@juliushaertl/vue-richtext": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-0.3.3.tgz",
"integrity": "sha512-OmAtQfXY5ZkOq6CxE79RVAKTo60fS0HAX2x6MMfHUmTlZgtQQqSxlvIJUZEOo7EiJwD84OVMY0G9holV1iwgTA==",
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-0.3.2.tgz",
"integrity": "sha512-+24A7eYzqDu01tn1JKaw7ydm+3dEB7+hXvwi+1TOje70m8FdaI/+uwdOd6oKQUBk7Uztvy1tDdO6fD+JYh7aEg==",
"requires": {
"core-js": "^3.6.4",
"vue": "^2.6.12"
"vue": "^2.6.11"
},
"dependencies": {
"core-js": {
@@ -3611,16 +3611,23 @@
}
},
"@nextcloud/dialogs": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-2.0.1.tgz",
"integrity": "sha512-Bme8vcs8n4XT5spBgkDEv1z9zNOE23AIbr5jF1WJ1A2XNMNj5Zvy29RosIh0k7H+1lN0PlU38u+eMV1Ets3E4A==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-2.0.0.tgz",
"integrity": "sha512-iPZMKAYs09g+zJXzrkHo71RVXAhtSw4+YSA/2FhUeWBtlJBcFYsxUW6gmgnhGU+3UTptjyPrl4hvIqgLU8p6BA==",
"requires": {
"@nextcloud/l10n": "^1.3.0",
"@nextcloud/typings": "^0.2.2",
"core-js": "^3.6.4",
"toastify-js": "^1.9.1"
"core-js": "^3.6.4"
},
"dependencies": {
"@nextcloud/typings": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@nextcloud/typings/-/typings-0.2.2.tgz",
"integrity": "sha512-LZrv1VV3vyDaKw4UKMcGM9dvLMpdI2tfMexHf/ixVn6OrsRDsRTbxByWMMdRF2ArHD5Q8RsICa72p6BcG9b80Q==",
"requires": {
"@types/jquery": "2.0.54"
}
},
"core-js": {
"version": "3.6.5",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
@@ -3801,9 +3808,9 @@
}
},
"@nextcloud/vue": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.1.tgz",
"integrity": "sha512-8orTDmtilZuFQJ67zqvqzmA20oAOojkfNpq4ERP8rsiAL0eHTUzMQC27dEfDuNq/GuloNsr/RDsimHSCq03DxA==",
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.6.0.tgz",
"integrity": "sha512-SzPXwxtbbc4BIUl4BhC7+8kDzgXG+Adr9W7x+hQdr/TuOhunVwcXOKGhyZgWew17oOCsd2c2ltrojhUiCmWjjg==",
"requires": {
"@nextcloud/auth": "^1.2.3",
"@nextcloud/axios": "^1.3.2",
@@ -3862,9 +3869,9 @@
}
},
"@nextcloud/webpack-vue-config": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-1.3.0.tgz",
"integrity": "sha512-VxHsmfkgtJPt1BFVRStxEQWdAjHcZEo8eZbdbX64W0GKId+LikoxYx4XnKDBTguGJoX6yE8z0WipWQ6+Y1sSkA==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-1.1.0.tgz",
"integrity": "sha512-3eDbH05tlkfM12syuM36QS+xU1r80iX21PZ5tN+/O9Ekto2psmt+vf7Vgs5JX20M97Uy89POQ09A8tQUj83Yuw==",
"dev": true
},
"@nodelib/fs.scandir": {
@@ -6850,23 +6857,24 @@
}
},
"css-loader": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz",
"integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==",
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz",
"integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==",
"dev": true,
"requires": {
"camelcase": "^6.0.0",
"camelcase": "^5.3.1",
"cssesc": "^3.0.0",
"icss-utils": "^4.1.1",
"loader-utils": "^2.0.0",
"loader-utils": "^1.2.3",
"normalize-path": "^3.0.0",
"postcss": "^7.0.32",
"postcss-modules-extract-imports": "^2.0.0",
"postcss-modules-local-by-default": "^3.0.3",
"postcss-modules-local-by-default": "^3.0.2",
"postcss-modules-scope": "^2.2.0",
"postcss-modules-values": "^3.0.0",
"postcss-value-parser": "^4.1.0",
"schema-utils": "^2.7.0",
"semver": "^7.3.2"
"semver": "^6.3.0"
},
"dependencies": {
"big.js": {
@@ -6875,12 +6883,6 @@
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true
},
"camelcase": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
"integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
"dev": true
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -6909,17 +6911,32 @@
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true
},
"json5": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
"json5": "^1.0.1"
}
},
"normalize-path": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true
},
"postcss": {
"version": "7.0.32",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
@@ -6943,9 +6960,9 @@
}
},
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"source-map": {
@@ -7445,9 +7462,9 @@
}
},
"dompurify": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.14.tgz",
"integrity": "sha512-oqcjyCLHLjWugZ6VwK0YfmRND/DFy/CuZhdasmymMfnxbzaaQxBSA1ATZIXWESGDj/nvq1vKLmRa7rTdbGgrmQ=="
"version": "2.0.12",
"resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.12.tgz",
"integrity": "sha512-Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg=="
},
"domutils": {
"version": "1.7.0",
@@ -14903,65 +14920,15 @@
}
},
"postcss-modules-local-by-default": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz",
"integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
"integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
"dev": true,
"requires": {
"icss-utils": "^4.1.1",
"postcss": "^7.0.32",
"postcss": "^7.0.16",
"postcss-selector-parser": "^6.0.2",
"postcss-value-parser": "^4.1.0"
},
"dependencies": {
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
},
"dependencies": {
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"postcss": {
"version": "7.0.32",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
"integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
"source-map": "^0.6.1",
"supports-color": "^6.1.0"
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
},
"supports-color": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
"dev": true,
"requires": {
"has-flag": "^3.0.0"
}
}
"postcss-value-parser": "^4.0.0"
}
},
"postcss-modules-scope": {
@@ -17774,52 +17741,6 @@
"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
"dev": true
},
"style-loader": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz",
"integrity": "sha512-ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
"schema-utils": "^2.6.6"
},
"dependencies": {
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"schema-utils": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.4",
"ajv": "^6.12.2",
"ajv-keywords": "^3.4.1"
}
}
}
},
"style-search": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",

View File

@@ -30,19 +30,19 @@
"dependencies": {
"@babel/polyfill": "^7.10.4",
"@babel/runtime": "^7.11.2",
"@juliushaertl/vue-richtext": "^0.3.3",
"@juliushaertl/vue-richtext": "^0.3.2",
"@nextcloud/auth": "^1.3.0",
"@nextcloud/axios": "^1.3.3",
"@nextcloud/dialogs": "^2.0.1",
"@nextcloud/dialogs": "^2.0.0",
"@nextcloud/files": "^1.1.0",
"@nextcloud/initial-state": "^1.1.2",
"@nextcloud/l10n": "^1.3.0",
"@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^1.1.0",
"@nextcloud/vue": "^2.6.1",
"@nextcloud/vue": "^2.6.0",
"@nextcloud/vue-dashboard": "^0.1.8",
"blueimp-md5": "^2.17.0",
"dompurify": "^2.0.14",
"dompurify": "^2.0.12",
"lodash": "^4.17.20",
"markdown-it": "^11.0.0",
"markdown-it-task-lists": "^2.1.1",
@@ -73,13 +73,13 @@
"@nextcloud/browserslist-config": "^1.0.0",
"@nextcloud/eslint-config": "^2.1.0",
"@nextcloud/eslint-plugin": "^1.4.0",
"@nextcloud/webpack-vue-config": "^1.3.0",
"@nextcloud/webpack-vue-config": "^1.1.0",
"@vue/test-utils": "^1.0.4",
"acorn": "^7.4.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
"babel-loader": "^8.1.0",
"css-loader": "^4.2.2",
"css-loader": "^3.6.0",
"eslint": "^6.8.0",
"eslint-config-standard": "^12.0.0",
"eslint-friendly-formatter": "^4.0.1",
@@ -96,7 +96,6 @@
"node-sass": "^4.14.1",
"raw-loader": "^4.0.1",
"sass-loader": "^10.0.1",
"style-loader": "^1.2.1",
"stylelint": "^13.6.1",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-recommended-scss": "^4.2.0",
@@ -105,6 +104,7 @@
"url-loader": "^4.1.0",
"vue-jest": "^3.0.6",
"vue-loader": "^15.9.3",
"vue-style-loader": "^4.1.1",
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",

View File

@@ -26,7 +26,14 @@
<div id="app-content">
<router-view />
</div>
<router-view name="sidebar" />
<Modal v-if="cardDetailsInModal && $route.params.cardId" :title="t('deck', 'Card details')" @close="hideModal()">
<div class="modal__content">
<router-view name="sidebar" />
</div>
</Modal>
<router-view v-show="!cardDetailsInModal || !$route.params.cardId" name="sidebar" />
</div>
</template>
@@ -34,6 +41,7 @@
import { mapState } from 'vuex'
import AppNavigation from './components/navigation/AppNavigation'
import { Modal } from '@nextcloud/vue'
import { BoardApi } from './services/BoardApi'
const boardApi = new BoardApi()
@@ -42,6 +50,7 @@ export default {
name: 'App',
components: {
AppNavigation,
Modal,
},
data() {
return {
@@ -67,6 +76,7 @@ export default {
navShown: state => state.navShown,
sidebarShownState: state => state.sidebarShown,
currentBoard: state => state.currentBoard,
cardDetailsInModal: state => state.cardDetailsInModal,
}),
// TODO: properly handle sidebar showing for route subview and board sidebar
sidebarRouterView() {
@@ -77,17 +87,21 @@ export default {
return this.sidebarRouterView || this.sidebarShownState
},
},
created() {
this.$store.dispatch('loadBoards')
this.$store.dispatch('loadSharees')
},
methods: {
hideModal() {
this.$router.push({ name: 'board' })
},
},
provide() {
return {
boardApi,
}
},
created() {
this.$store.dispatch('loadBoards')
this.$store.dispatch('loadSharees')
},
}
</script>
<style lang="scss" scoped>
@@ -124,4 +138,13 @@ export default {
.multiselect {
width: 100%;
}
.modal__content {
width: 800px;
height: 600px;
min-width: 450px;
min-height: 450px;
margin: 20px 20px 60px 20px;
padding-bottom: 20px;
}
</style>

View File

@@ -170,22 +170,18 @@
</template>
</Popover>
<Actions :style="archivedOpacity">
<Actions :style="archivedOpacity" :title="t('deck', 'Show archived cards')">
<ActionButton
icon="icon-archive"
@click="toggleShowArchived">
{{ showArchived ? t('deck', 'Hide archived cards') : t('deck', 'Show archived cards') }}
</ActionButton>
@click="toggleShowArchived" />
</Actions>
<Actions :title="t('deck', 'Toggle compact mode')">
<ActionButton v-if="compactMode"
icon="icon-toggle-compact-collapsed"
@click="toggleCompactMode">
{{ t('deck', 'Toggle compact mode') }}
</ActionButton>
@click="toggleCompactMode" />
<ActionButton v-else
icon="icon-toggle-compact-expanded"
@click="toggleCompactMode">
{{ t('deck', 'Toggle compact mode') }}
</ActionButton>
@click="toggleCompactMode" />
</Actions>
<!-- FIXME: ActionRouter currently doesn't work as an inline action -->
<Actions :title="t('deck', 'Details')">

View File

@@ -310,8 +310,7 @@ export default {
margin-top: 0;
margin-bottom: 10px;
box-shadow: 0 0 3px var(--color-box-shadow);
border-radius: var(--border-radius-large);
overflow: hidden;
border-radius: 3px;
}
&.icon-loading-small:after,

View File

@@ -24,142 +24,23 @@
<AppSidebar v-if="currentBoard && currentCard && copiedCard"
:title="currentCard.title"
:subtitle="subtitle"
:title-editable.sync="titleEditable"
@update:title="updateTitle"
:class="{ 'app-sidebar-modal': cardDetailsInModal}"
@close="closeSidebar">
<template #secondary-actions />
<template #secondary-actions>
<ActionButton v-if="cardDetailsInModal" icon="icon-menu-sidebar" @click.stop="showModal()">
{{ t('deck', 'Open in sidebar view') }}
</ActionButton>
<ActionButton v-else icon="icon-external" @click.stop="showModal()">
{{ t('deck', 'Open in bigger view') }}
</ActionButton>
</template>
<AppSidebarTab id="details"
:order="0"
:name="t('deck', 'Details')"
icon="icon-home">
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Tags')" class="section-label icon-tag">
<span class="hidden-visually">{{ t('deck', 'Tags') }}</span>
</div>
<div class="section-details">
<Multiselect v-model="allLabels"
:multiple="true"
:disabled="!canEdit"
:options="currentBoard.labels"
:placeholder="t('deck', 'Assign a tag to this card…')"
:taggable="true"
label="title"
track-by="id"
@select="addLabelToCard"
@remove="removeLabelFromCard">
<template #option="scope">
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
</div>
</template>
<template #tag="scope">
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
</div>
</template>
</Multiselect>
</div>
</div>
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Assign to users')" class="section-label icon-group">
<span class="hidden-visually">{{ t('deck', 'Assign to users/groups/circles') }}</span>
</div>
<div class="section-details">
<Multiselect v-if="canEdit"
v-model="assignedUsers"
:multiple="true"
:options="formatedAssignables"
:user-select="true"
:auto-limit="false"
:placeholder="t('deck', 'Assign a user to this card…')"
label="displayname"
track-by="multiselectKey"
@select="assignUserToCard"
@remove="removeUserFromCard">
<template #tag="scope">
<div class="avatarlist--inline">
<Avatar :user="scope.option.uid"
:display-name="scope.option.displayname"
:size="24"
:is-no-user="scope.option.isNoUser"
:disable-menu="true" />
</div>
</template>
</Multiselect>
<div v-else class="avatar-list--readonly">
<Avatar v-for="option in assignedUsers"
:key="option.primaryKey"
:user="option.uid"
:display-name="option.displayname"
:is-no-user="option.isNoUser"
:size="32" />
</div>
</div>
</div>
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Due date')" class="section-label icon-calendar-dark">
<span class="hidden-visually">{{ t('deck', 'Due date') }}</span>
</div>
<div class="section-details">
<DatetimePicker v-model="duedate"
:placeholder="t('deck', 'Set a due date')"
type="datetime"
:minute-step="5"
:show-second="false"
:format="format"
:disabled="saving || !canEdit"
confirm />
<Actions v-if="canEdit">
<ActionButton v-if="copiedCard.duedate" icon="icon-delete" @click="removeDue()">
{{ t('deck', 'Remove due date') }}
</ActionButton>
</Actions>
</div>
</div>
<div class="section-wrapper">
<CollectionList v-if="currentCard.id"
:id="`${currentCard.id}`"
:name="currentCard.title"
type="deck-card" />
</div>
<h5>
{{ t('deck', 'Description') }}
<span v-if="copiedCard.descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
<span v-if="descriptionSaving">{{ t('deck', '(Saving)') }}</span>
<a v-tooltip="t('deck', 'Formatting help')"
href="https://deck.readthedocs.io/en/latest/Markdown/"
target="_blank"
class="icon icon-info" />
<Actions v-if="canEdit">
<ActionButton v-if="!descriptionEditing" icon="icon-rename" @click="showEditor()">
{{ t('deck', 'Edit description') }}
</ActionButton>
<ActionButton v-else icon="icon-toggle" @click="hideEditor()">
{{ t('deck', 'View description') }}
</ActionButton>
</Actions>
<Actions v-if="canEdit">
<ActionButton v-if="descriptionEditing" icon="icon-attach" @click="showAttachmentModal()">
{{ t('deck', 'Add Attachment') }}
</ActionButton>
</Actions>
</h5>
<div v-if="!descriptionEditing"
id="description-preview"
@click="clickedPreview"
v-html="renderedDescription" />
<VueEasymde v-else
:key="copiedCard.id"
ref="markdownEditor"
v-model="copiedCard.description"
:configs="mdeConfig"
@input="updateDescription"
@blur="saveDescription" />
<CardSidebarTabDetails :id="id" />
</AppSidebarTab>
<AppSidebarTab id="attachments"
@@ -184,23 +65,15 @@
icon="icon-activity">
<CardSidebarTabActivity :card="currentCard" />
</AppSidebarTab>
<Modal v-if="modalShow" :title="t('deck', 'Choose attachment')" @close="modalShow=false">
<div class="modal__content">
<h3>{{ t('deck', 'Choose attachment') }}</h3>
<AttachmentList
:card-id="currentCard.id"
:selectable="true"
@selectAttachment="addAttachment" />
</div>
</Modal>
</AppSidebar>
</template>
<script>
import { Avatar, Actions, ActionButton, Multiselect, AppSidebar, AppSidebarTab, DatetimePicker, Modal } from '@nextcloud/vue'
import { ActionButton, AppSidebar, AppSidebarTab } from '@nextcloud/vue'
import { mapState, mapGetters } from 'vuex'
import Color from '../../mixins/color'
import { CollectionList } from 'nextcloud-vue-collections'
import CardSidebarTabDetails from './CardSidebarTabDetails'
import CardSidebarTabAttachments from './CardSidebarTabAttachments'
import CardSidebarTabComments from './CardSidebarTabComments'
import CardSidebarTabActivity from './CardSidebarTabActivity'
@@ -208,7 +81,7 @@ import MarkdownIt from 'markdown-it'
import MarkdownItTaskLists from 'markdown-it-task-lists'
import { formatFileSize } from '@nextcloud/files'
import relativeDate from '../../mixins/relativeDate'
import AttachmentList from './AttachmentList'
import { generateUrl } from '@nextcloud/router'
import { getLocale } from '@nextcloud/l10n'
import moment from '@nextcloud/moment'
@@ -225,18 +98,11 @@ export default {
components: {
AppSidebar,
AppSidebarTab,
Multiselect,
DatetimePicker,
VueEasymde: () => import('vue-easymde/dist/VueEasyMDE.common'),
Actions,
ActionButton,
Avatar,
CollectionList,
CardSidebarTabDetails,
CardSidebarTabAttachments,
CardSidebarTabComments,
CardSidebarTabActivity,
Modal,
AttachmentList,
},
mixins: [Color, relativeDate],
props: {
@@ -255,7 +121,6 @@ export default {
saving: false,
markdownIt: null,
titleEditable: false,
descriptionEditing: false,
mdeConfig: {
autoDownloadFontAwesome: false,
@@ -268,7 +133,6 @@ export default {
descriptionSaving: false,
hasActivity: capabilities && capabilities.activity,
hasComments: !!OC.appswebroots['comments'],
modalShow: false,
format: {
stringify: this.stringify,
parse: this.parse,
@@ -278,6 +142,7 @@ export default {
computed: {
...mapState({
currentBoard: state => state.currentBoard,
cardDetailsInModal: state => state.cardDetailsInModal,
}),
...mapGetters(['canEdit', 'assignables']),
attachments() {
@@ -386,19 +251,7 @@ export default {
hideEditor() {
this.descriptionEditing = false
},
showAttachmentModal() {
this.modalShow = true
},
addAttachment(attachment) {
const descString = this.$refs.markdownEditor.easymde.value()
let embed = ''
if (attachment.extendedData.mimetype.includes('image')) {
embed = '!'
}
const attachmentString = embed + '[📎 ' + attachment.data + '](' + this.attachmentUrl(attachment) + ')'
this.$refs.markdownEditor.easymde.value(descString + '\n' + attachmentString)
this.modalShow = false
},
clickedPreview(e) {
if (e.target.getAttribute('type') === 'checkbox') {
const clickedIndex = [...document.querySelector('#description-preview').querySelectorAll('input')].findIndex((li) => li.id === e.target.id)
@@ -437,12 +290,6 @@ export default {
delete this.copiedCard.descriptionLastEdit
this.descriptionSaving = false
},
updateTitle(newTitle) {
this.$set(this.copiedCard, 'title', newTitle)
this.$store.dispatch('updateCardTitle', this.copiedCard).then(() => {
this.titleEditable = false
})
},
updateDescription() {
this.copiedCard.descriptionLastEdit = Date.now()
clearTimeout(this.descriptionSaveTimeout)
@@ -505,6 +352,9 @@ export default {
parse(value) {
return moment(value, 'LLL', this.locale).toDate()
},
showModal() {
this.$store.dispatch('setCardDetailsInModal', true)
},
},
}
</script>
@@ -531,6 +381,12 @@ export default {
</style>
<style lang="scss" scoped>
.app-sidebar-modal {
border-left: 0;
width: 800px;
max-width: 780px;
top: 0px;
}
h5 {
border-bottom: 1px solid var(--color-border);

View File

@@ -0,0 +1,615 @@
<!--
- @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
-
- @author Julius Härtl <jus@bitgrid.net>
-
- @license GNU AGPL version 3 or any later version
-
- 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>
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Tags')" class="section-label icon-tag">
<span class="hidden-visually">{{ t('deck', 'Tags') }}</span>
</div>
<div class="section-details">
<Multiselect v-model="allLabels"
:multiple="true"
:disabled="!canEdit"
:options="currentBoard.labels"
:placeholder="t('deck', 'Assign a tag to this card…')"
:taggable="true"
label="title"
track-by="id"
@select="addLabelToCard"
@remove="removeLabelFromCard">
<template #option="scope">
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
</div>
</template>
<template #tag="scope">
<div :style="{ backgroundColor: '#' + scope.option.color, color: textColor(scope.option.color)}" class="tag">
{{ scope.option.title }}
</div>
</template>
</Multiselect>
</div>
</div>
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Assign to users')" class="section-label icon-group">
<span class="hidden-visually">{{ t('deck', 'Assign to users/groups/circles') }}</span>
</div>
<div class="section-details">
<Multiselect v-if="canEdit"
v-model="assignedUsers"
:multiple="true"
:options="formatedAssignables"
:user-select="true"
:auto-limit="false"
:placeholder="t('deck', 'Assign a user to this card…')"
label="displayname"
track-by="multiselectKey"
@select="assignUserToCard"
@remove="removeUserFromCard">
<template #tag="scope">
<div class="avatarlist--inline">
<Avatar :user="scope.option.uid"
:display-name="scope.option.displayname"
:size="24"
:is-no-user="scope.option.isNoUser"
:disable-menu="true" />
</div>
</template>
</Multiselect>
<div v-else class="avatar-list--readonly">
<Avatar v-for="option in assignedUsers"
:key="option.primaryKey"
:user="option.uid"
:display-name="option.displayname"
:is-no-user="option.isNoUser"
:size="32" />
</div>
</div>
</div>
<div class="section-wrapper">
<div v-tooltip="t('deck', 'Due date')" class="section-label icon-calendar-dark">
<span class="hidden-visually">{{ t('deck', 'Due date') }}</span>
</div>
<div class="section-details">
<DatetimePicker v-model="duedate"
:placeholder="t('deck', 'Set a due date')"
type="datetime"
:minute-step="5"
:show-second="false"
:format="format"
:disabled="saving || !canEdit"
confirm />
<Actions v-if="canEdit">
<ActionButton v-if="copiedCard.duedate" icon="icon-delete" @click="removeDue()">
{{ t('deck', 'Remove due date') }}
</ActionButton>
</Actions>
</div>
</div>
<div class="section-wrapper">
<CollectionList v-if="currentCard.id"
:id="`${currentCard.id}`"
:name="currentCard.title"
type="deck-card" />
</div>
<h5>
{{ t('deck', 'Description') }}
<span v-if="copiedCard.descriptionLastEdit && !descriptionSaving">{{ t('deck', '(Unsaved)') }}</span>
<span v-if="descriptionSaving">{{ t('deck', '(Saving)') }}</span>
<a v-tooltip="t('deck', 'Formatting help')"
href="https://deck.readthedocs.io/en/latest/Markdown/"
target="_blank"
class="icon icon-info" />
<Actions v-if="canEdit">
<ActionButton v-if="!descriptionEditing" icon="icon-rename" @click="showEditor()">
{{ t('deck', 'Edit description') }}
</ActionButton>
<ActionButton v-else icon="icon-toggle" @click="hideEditor()">
{{ t('deck', 'View description') }}
</ActionButton>
</Actions>
<Actions v-if="canEdit">
<ActionButton v-if="descriptionEditing" icon="icon-attach" @click="showAttachmentModal()">
{{ t('deck', 'Add Attachment') }}
</ActionButton>
</Actions>
</h5>
<div v-if="!descriptionEditing"
id="description-preview"
@click="clickedPreview"
v-html="renderedDescription" />
<VueEasymde v-else
:key="copiedCard.id"
ref="markdownEditor"
v-model="copiedCard.description"
:configs="mdeConfig"
@input="updateDescription"
@blur="saveDescription" />
<Modal v-if="modalShow" :title="t('deck', 'Choose attachment')" @close="modalShow=false">
<div class="modal__content">
<h3>{{ t('deck', 'Choose attachment') }}</h3>
<AttachmentList
:card-id="currentCard.id"
:selectable="true"
@selectAttachment="addAttachment" />
</div>
</Modal>
</div>
</template>
<script>
import { Avatar, Actions, ActionButton, Multiselect, DatetimePicker, Modal } from '@nextcloud/vue'
import { mapState, mapGetters } from 'vuex'
import Color from '../../mixins/color'
import { CollectionList } from 'nextcloud-vue-collections'
import MarkdownIt from 'markdown-it'
import MarkdownItTaskLists from 'markdown-it-task-lists'
import { formatFileSize } from '@nextcloud/files'
import relativeDate from '../../mixins/relativeDate'
import AttachmentList from './AttachmentList'
import { generateUrl } from '@nextcloud/router'
import { getLocale } from '@nextcloud/l10n'
import moment from '@nextcloud/moment'
const markdownIt = new MarkdownIt({
linkify: true,
})
markdownIt.use(MarkdownItTaskLists, { enabled: true, label: true, labelAfter: true })
const capabilities = window.OC.getCapabilities()
export default {
name: 'CardSidebarTabDetails',
components: {
Multiselect,
DatetimePicker,
VueEasymde: () => import('vue-easymde/dist/VueEasyMDE.common'),
Actions,
ActionButton,
Avatar,
CollectionList,
Modal,
AttachmentList,
},
mixins: [Color, relativeDate],
props: {
id: {
type: Number,
required: true,
},
},
data() {
return {
assignedUsers: null,
addedLabelToCard: null,
copiedCard: null,
allLabels: null,
locale: getLocale(),
saving: false,
markdownIt: null,
descriptionEditing: false,
mdeConfig: {
autoDownloadFontAwesome: false,
spellChecker: false,
autofocus: true,
autosave: { enabled: false, uniqueId: 'unique' },
toolbar: false,
},
lastModifiedRelative: null,
lastCreatedRemative: null,
descriptionSaveTimeout: null,
descriptionSaving: false,
hasActivity: capabilities && capabilities.activity,
hasComments: !!OC.appswebroots['comments'],
modalShow: false,
format: {
stringify: this.stringify,
parse: this.parse,
},
}
},
computed: {
...mapState({
currentBoard: state => state.currentBoard,
}),
...mapGetters(['canEdit', 'assignables']),
attachments() {
return [...this.$store.getters.attachmentsByCard(this.id)].sort((a, b) => b.id - a.id)
},
mimetypeForAttachment() {
return (mimetype) => {
const url = OC.MimeType.getIconUrl(mimetype)
const styles = {
'background-image': `url("${url}")`,
}
return styles
}
},
attachmentUrl() {
return (attachment) => generateUrl(`/apps/deck/cards/${attachment.cardId}/attachment/${attachment.id}`)
},
formattedFileSize() {
return (filesize) => formatFileSize(filesize)
},
currentCard() {
return this.$store.getters.cardById(this.id)
},
subtitle() {
return t('deck', 'Modified') + ': ' + this.lastModifiedRelative + ' ' + t('deck', 'Created') + ': ' + this.lastCreatedRemative
},
formatedAssignables() {
return this.assignables.map(item => {
const assignable = {
...item,
user: item.primaryKey,
displayName: item.displayname,
icon: 'icon-user',
isNoUser: false,
multiselectKey: item.type + ':' + item.uid,
}
if (item.type === 1) {
assignable.icon = 'icon-group'
assignable.isNoUser = true
}
if (item.type === 7) {
assignable.icon = 'icon-circles'
assignable.isNoUser = true
}
return assignable
})
},
duedate: {
get() {
return this.currentCard.duedate ? new Date(this.currentCard.duedate) : null
},
async set(val) {
this.saving = true
await this.$store.dispatch('updateCardDue', {
...this.copiedCard,
duedate: val ? (new Date(val)).toISOString() : null,
})
this.saving = false
},
},
renderedDescription() {
return markdownIt.render(this.copiedCard.description || '')
},
},
watch: {
currentCard() {
this.initialize()
},
},
created() {
setInterval(this.updateRelativeTimestamps, 10000)
},
destroyed() {
clearInterval(this.updateRelativeTimestamps)
},
mounted() {
this.initialize()
},
methods: {
async initialize() {
if (!this.currentCard) {
return
}
if (this.copiedCard) {
await this.saveDescription()
}
this.copiedCard = JSON.parse(JSON.stringify(this.currentCard))
this.allLabels = this.currentCard.labels
if (this.currentCard.assignedUsers && this.currentCard.assignedUsers.length > 0) {
this.assignedUsers = this.currentCard.assignedUsers.map((item) => ({
...item.participant,
isNoUser: item.participant.type !== 0,
multiselectKey: item.participant.type + ':' + item.participant.primaryKey,
}))
} else {
this.assignedUsers = []
}
this.desc = this.currentCard.description
this.updateRelativeTimestamps()
},
showEditor() {
if (!this.canEdit) {
return
}
this.descriptionEditing = true
},
hideEditor() {
this.descriptionEditing = false
},
showAttachmentModal() {
this.modalShow = true
},
addAttachment(attachment) {
const descString = this.$refs.markdownEditor.easymde.value()
let embed = ''
if (attachment.extendedData.mimetype.includes('image')) {
embed = '!'
}
const attachmentString = embed + '[📎 ' + attachment.data + '](' + this.attachmentUrl(attachment) + ')'
this.$refs.markdownEditor.easymde.value(descString + '\n' + attachmentString)
this.modalShow = false
},
clickedPreview(e) {
if (e.target.getAttribute('type') === 'checkbox') {
const clickedIndex = [...document.querySelector('#description-preview').querySelectorAll('input')].findIndex((li) => li.id === e.target.id)
const reg = /\[(X|\s|_|-)\]/ig
let nth = 0
const updatedDescription = this.copiedCard.description.replace(reg, (match, i, original) => {
let result = match
if ('' + nth++ === '' + clickedIndex) {
if (match.match(/^\[\s\]/i)) {
result = match.replace(/\[\s\]/i, '[x]')
}
if (match.match(/^\[x\]/i)) {
result = match.replace(/\[x\]/i, '[ ]')
}
return result
}
return match
})
this.updateDescription(updatedDescription)
}
},
updateRelativeTimestamps() {
this.lastModifiedRelative = OC.Util.relativeModifiedDate(this.currentCard.lastModified * 1000)
this.lastCreatedRemative = OC.Util.relativeModifiedDate(this.currentCard.createdAt * 1000)
},
setDue() {
this.$store.dispatch('updateCardDue', this.copiedCard)
},
removeDue() {
this.copiedCard.duedate = null
this.$store.dispatch('updateCardDue', this.copiedCard)
},
async saveDescription() {
if (!Object.prototype.hasOwnProperty.call(this.copiedCard, 'descriptionLastEdit') || this.descriptionSaving) {
return
}
this.descriptionSaving = true
await this.$store.dispatch('updateCardDesc', this.copiedCard)
delete this.copiedCard.descriptionLastEdit
this.descriptionSaving = false
},
updateDescription(text) {
this.copiedCard.descriptionLastEdit = Date.now()
clearTimeout(this.descriptionSaveTimeout)
this.descriptionSaveTimeout = setTimeout(async() => {
await this.saveDescription()
}, 2500)
},
closeSidebar() {
this.$router.push({ name: 'board' })
},
assignUserToCard(user) {
this.$store.dispatch('assignCardToUser', {
card: this.copiedCard,
assignee: {
userId: user.uid,
type: user.type,
},
})
},
removeUserFromCard(user) {
this.$store.dispatch('removeUserFromCard', {
card: this.copiedCard,
assignee: {
userId: user.uid,
type: user.type,
},
})
},
addLabelToCard(newLabel) {
this.copiedCard.labels.push(newLabel)
const data = {
card: this.copiedCard,
labelId: newLabel.id,
}
this.$store.dispatch('addLabel', data)
},
removeLabelFromCard(removedLabel) {
const removeIndex = this.copiedCard.labels.findIndex((label) => {
return label.id === removedLabel.id
})
if (removeIndex !== -1) {
this.copiedCard.labels.splice(removeIndex, 1)
}
const data = {
card: this.copiedCard,
labelId: removedLabel.id,
}
this.$store.dispatch('removeLabel', data)
},
stringify(date) {
return moment(date).locale(this.locale).format('LLL')
},
parse(value) {
return moment(value, 'LLL', this.locale).toDate()
},
},
}
</script>
<style>
@import '~easymde/dist/easymde.min.css';
.vue-easymde, .CodeMirror {
border: none;
margin: 0;
padding: 0;
}
.editor-preview,
.editor-statusbar {
display: none;
}
#app-sidebar .app-sidebar-header__desc h4 {
font-size: 12px !important;
}
</style>
<style lang="scss" scoped>
h5 {
border-bottom: 1px solid var(--color-border);
margin-top: 20px;
margin-bottom: 5px;
color: var(--color-text-maxcontrast);
.icon-info {
display: inline-block;
width: 32px;
height: 16px;
float: right;
opacity: .7;
}
.icon-attach {
background-size: 16px;
float: right;
margin-top: -14px;
opacity: .7;
}
.icon-toggle, .icon-rename {
float: right;
margin-top: -14px;
}
}
aside::v-deep section {
display: flex;
flex-direction: column;
}
.section-wrapper {
display: flex;
max-width: 100%;
margin-top: 10px;
.section-label {
background-position: 0px center;
width: 28px;
margin-left: 9px;
flex-shrink: 0;
}
.section-details {
flex-grow: 1;
button.action-item--single {
margin-top: -6px;
}
}
}
.tag {
flex-grow: 0;
flex-shrink: 1;
overflow: hidden;
padding: 1px 3px;
border-radius: 3px;
font-size: 85%;
margin-right: 3px;
}
.avatarLabel {
padding: 6px
}
.section-details::v-deep .multiselect__tags-wrap {
flex-wrap: wrap;
}
.avatar-list--readonly .avatardiv {
margin-right: 3px;
}
.avatarlist--inline {
display: flex;
align-items: center;
margin-right: 3px;
.avatarLabel {
padding: 0;
}
}
.multiselect::v-deep .multiselect__tags-wrap {
z-index: 2;
}
.multiselect.multiselect--active::v-deep .multiselect__tags-wrap {
z-index: 0;
}
#description-preview {
min-height: 100px;
&::v-deep {
@import './../../css/markdown';
}
&::v-deep input {
min-height: auto;
}
&::v-deep a {
text-decoration: underline;
}
}
.modal__content {
width: 25vw;
min-width: 250px;
min-height: 120px;
text-align: center;
margin: 20px 20px 60px 20px;
padding-bottom: 20px;
}
</style>

View File

@@ -121,10 +121,6 @@ export default {
}
}
.card:not(.card__editable) .avatars {
margin-right: 10px;
}
.fade-enter-active, .fade-leave-active {
transition: opacity .125s;
}

View File

@@ -26,7 +26,7 @@
<template>
<AttachmentDragAndDrop v-if="card" :card-id="card.id" class="drop-upload--card">
<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing, 'card__editable': canEdit}"
<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing}"
tag="div"
class="card"
@click="openCard">
@@ -43,7 +43,7 @@
class="dragDisabled"
@keyup.esc="cancelEdit"
@submit.prevent="finishedEdit(card)">
<input v-model="copiedCard.title" v-focus type="text">
<input v-model="copiedCard.title" type="text" autofocus>
<input type="button" class="icon-confirm" @click="finishedEdit(card)">
</form>
@@ -57,7 +57,7 @@
class="labels"
@click="openCard">
<li v-for="label in card.labels" :key="label.id" :style="labelStyle(label)">
<span @click="applyLabelFilter(label)">{{ label.title }}</span>
<span>{{ label.title }}</span>
</li>
</transition-group>
<div v-show="!compactMode" class="card-controls compact-item" @click="openCard">
@@ -142,9 +142,6 @@ export default {
cancelEdit() {
this.editing = false
},
applyLabelFilter(label) {
this.$nextTick(() => this.$store.dispatch('toggleFilter', { tags: [label.id] }))
},
},
}
</script>
@@ -178,7 +175,7 @@ export default {
min-height: 44px;
form {
display: flex;
padding: 3px 5px;
padding: 5px 7px;
width: 100%;
input[type=text] {
flex-grow: 1;
@@ -191,14 +188,10 @@ export default {
font-size: 100%;
overflow-x: hidden;
word-wrap: break-word;
padding-left: 4px;
span {
cursor: text;
}
}
input[type=text] {
font-size: 100%;
}
}
@import './../../css/labels';

View File

@@ -25,8 +25,7 @@
<template #list>
<AppNavigationItem
:title="t('deck', 'Upcoming cards')"
icon="icon-calendar-dark"
:exact="true"
icon="icon-desktop"
to="/" />
<AppNavigationBoardCategory
id="deck-navigation-all"
@@ -52,6 +51,13 @@
<template #footer>
<AppNavigationSettings>
<div>
<input id="toggle-modal"
v-model="cardDetailsInModal"
type="checkbox"
class="checkbox">
<label for="toggle-modal">
{{ t('deck', 'Use modal card view') }}
</label>
<Multiselect v-model="groupLimit"
:class="{'icon-loading-small': groupLimitDisabled}"
open-direction="bottom"
@@ -119,6 +125,14 @@ export default {
// eslint-disable-next-line
return OC.isUserAdmin()
},
cardDetailsInModal: {
get() {
return this.$store.getters.cardDetailsInModal
},
set(newValue) {
this.$store.dispatch('setCardDetailsInModal', newValue)
},
},
},
beforeMount() {
if (this.isAdmin) {

View File

@@ -24,7 +24,6 @@
:title="text"
:icon="icon"
:to="to"
:exact="true"
:allow-collapse="collapsible"
:open="opened">
<AppNavigationBoard v-for="board in boardsSorted" :key="board.id" :board="board" />

View File

@@ -59,6 +59,7 @@ export default new Vuex.Store({
showArchived: false,
navShown: true,
compactMode: localStorage.getItem('deck.compactMode') === 'true',
cardDetailsInModal: localStorage.getItem('deck.cardDetailsInModal') === 'true',
sidebarShown: false,
currentBoard: null,
currentCard: null,
@@ -72,6 +73,9 @@ export default new Vuex.Store({
filter: { tags: [], users: [], due: '' },
},
getters: {
cardDetailsInModal: state => {
return state.cardDetailsInModal
},
getSearchQuery: state => {
return state.searchQuery
},
@@ -132,27 +136,9 @@ export default new Vuex.Store({
setSearchQuery(state, searchQuery) {
state.searchQuery = searchQuery
},
SET_FILTER(state, filter) {
setFilter(state, filter) {
Object.assign(state.filter, filter)
},
TOGGLE_FILTER(state, filter) {
Object.keys(filter).forEach((key) => {
switch (key) {
case 'due':
Vue.set(state.filter, key, filter.due)
break
default:
filter[key].forEach((item) => {
if (state.filter[key].indexOf(item) === -1) {
state.filter[key].push(item)
} else {
state.filter[key].splice(state.filter[key].indexOf(item), 1)
}
})
break
}
})
},
toggleShowArchived(state) {
state.showArchived = !state.showArchived
},
@@ -202,6 +188,10 @@ export default new Vuex.Store({
state.compactMode = !state.compactMode
localStorage.setItem('deck.compactMode', state.compactMode)
},
setCardDetailsInModal(state) {
state.cardDetailsInModal = !state.cardDetailsInModal
localStorage.setItem('deck.cardDetailsInModal', state.cardDetailsInModal)
},
setBoards(state, boards) {
state.boards = boards
},
@@ -276,13 +266,11 @@ export default new Vuex.Store({
Vue.delete(state.currentBoard.acl, removeIndex)
}
},
},
actions: {
setFilter({ commit }, filter) {
commit('SET_FILTER', filter)
},
toggleFilter({ commit }, filter) {
commit('TOGGLE_FILTER', filter)
commit('setFilter', filter)
},
async loadBoardById({ commit, dispatch }, boardId) {
const filterReset = { tags: [], users: [], due: '' }
@@ -389,6 +377,9 @@ export default new Vuex.Store({
toggleCompactMode({ commit }) {
commit('toggleCompactMode')
},
setCardDetailsInModal({ commit }, show) {
commit('setCardDetailsInModal', show)
},
setCurrentBoard({ commit }, board) {
commit('setCurrentBoard', board)
},