🎁 Notifications for changes to favorite lists

edmw · Apr 13, 2020 · 56bd1c4 · 56bd1c4
1 parent 5777d00
commit 56bd1c4
Show file tree

Hide file tree

Showing 12 changed files with 13,152 additions and 20,178 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,10 +10,12 @@
 - 🛠️ Refactor event recording
 - 🛠️ Add bootstrap javascript
 - 🛠️ Update bootstrap stylesheet to 4.4.1
+- 🛠️ Add configuration for server host and port
 - 🛠️ Improve logging
 - ☘ Fix functionality to release items for owners
 - ☘ Fix access control to favorite notifications
 - ☘ Fix propagated messaging errors for background notifications
+- ☘ Fix bootstrap btn
 
 ## [1.6.0]
 - 🖌 Add functionality to put items into archive

diff --git a/Resources/Views/User/Favorites-Table.leaf b/Resources/Views/User/Favorites-Table.leaf
@@ -22,20 +22,18 @@
             <td class="wl-owner" data-label="#L10N("list-owner")">#(favorite.list.ownerName)</td>
             <td class="wl-actions wl-actions-right" data-label="">
                 <div class="btn-group" role="group">
-                #if(features.notifyCreateItem.enabled) {
-                #if(favorite.notificationsEnabled) {
-                    #ActionButton("favorite-notify-disable", "bell-off", "/user/#(page.userID)/favorite/notifications#if(location){?p=#(location)}", "DELETE") {
-                        <input type="hidden" name="listID" value="#(favorite.list.id)">
+                    #if(favorite.notificationsEnabled) {
+                        #ActionButton("favorite-notify-disable", "bell-off", "/user/#(page.userID)/favorite/notifications#if(location){?p=#(location)}", "DELETE") {
+                            <input type="hidden" name="listID" value="#(favorite.list.id)">
+                        }
+                        #if(!page.userNotificationsEnabled) {
+                            #IconWarning("favorite-notify-warning")
+                        }
+                    } else {
+                        #ActionButton("favorite-notify-enable", "bell", "/user/#(page.userID)/favorite/notifications#if(location){?p=#(location)}", "POST") {
+                            <input type="hidden" name="listID" value="#(favorite.list.id)">
+                        }
                     }
-                    #if(!page.userNotificationsEnabled) {
-                        #IconWarning("favorite-notify-warning")
-                    }
-                } else {
-                    #ActionButton("favorite-notify-enable", "bell", "/user/#(page.userID)/favorite/notifications#if(location){?p=#(location)}", "POST") {
-                        <input type="hidden" name="listID" value="#(favorite.list.id)">
-                    }
-                }
-                }
                     #ActionButton("favorite-remove", "x-circle", "/user/#(page.userID)/favorites/delete?listid=#(favorite.list.id)#if(location){&p=#(location)}")
                 </div>
             </td>

diff --git a/Resources/Views/User/ItemManagment.leaf b/Resources/Views/User/ItemManagment.leaf
@@ -7,7 +7,7 @@
 </div>
 }
 <h3>#L10N("move-item")</h3>
-#if(features.moveItem.enabled && page.item.movable == true) {
+#if(page.item.movable == true) {
 <form method="POST" action="#(page.actions.move.reference)#if(request.parameter.p){?p=#(request.parameter.p)}" class="wl-form" accept-charset="UTF-8">
 #if(page.actions.form.method != "POST") {<input type="hidden" name="__method" value="#(page.actions.move.method)">}
     <input name="key" type="hidden" value="listID">

diff --git a/Resources/Views/User/Items-Archived.leaf b/Resources/Views/User/Items-Archived.leaf
@@ -44,7 +44,7 @@
             </td>
             <td class="wl-actions wl-actions-left" data-label="">
                 <div class="btn-group" role="group">
-                    #if(features.receiveItem.enabled && item.receivable == true) {
+                    #if(item.receivable == true) {
                         #ActionButton("receive-item-description", "gift", "/user/#(page.userID)/list/#(page.listID)/item/#(item.id)/receive")
                     }
                 </div>

diff --git a/Resources/Views/User/Profile.leaf b/Resources/Views/User/Profile.leaf
@@ -4,9 +4,7 @@
 #set("content") {
 <h2>#(page.userFirstName)</h2>
 #embed("User/Profile-Section")
-#if(features.userSettings.enabled) {
 #embed("User/Settings-Section")
-}
 #if(page.showInvitations) {
 #embed("User/Invitations-Section")
 }

diff --git a/Sources/App/Features.swift b/Sources/App/Features.swift
@@ -68,15 +68,16 @@ struct Features: Encodable, CustomDebugStringConvertible, ServiceType {
     let itemDescription          = Feature(date: "2018-11-06", version: "1.0")
     let itemPreference           = Feature(date: "2019-04-23", version: "1.0")
     let itemPrice                = Feature.inPlanning(.low)
-    let notifyCreateItem         = Feature.inDevelopment(true)
+    let notifyCreateItem         = Feature(date: "2020-04-13", version: "1.7")
     // reservations
     let makeReservation          = Feature(date: "2018-11-19", version: "1.0")
     let undoReservation          = Feature(date: "2018-11-19", version: "1.0")
-    let removeReservationByOwner = Feature.inPlanning(.normal)
+    let removeReservationByOwner = Feature(date: "2020-04-13", version: "1.7")
     let notifyCreateReservation  = Feature(date: "2019-10-15", version: "1.3")
     let notifyDeleteReservation  = Feature(date: "2019-10-15", version: "1.3")
     // presentation
     let showWishlist             = Feature(date: "2018-11-19", version: "1.0")
+    let filterItemsByNotReserved = Feature.inPlanning(.low)
     // technical
     let localization             = Feature(date: "2018-11-28", version: "1.0")
     let preventCSRF              = Feature(date: "2018-11-20", version: "1.0")

diff --git a/Wishlist.xcodeproj/GeneratedModuleMap/CBacktrace/module.modulemap b/Wishlist.xcodeproj/GeneratedModuleMap/CBacktrace/module.modulemap
@@ -1,4 +1,4 @@
 module CBacktrace {
-    umbrella "/Users/Michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/swift-backtrace/Sources/CBacktrace/include"
+    umbrella "/Users/michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/swift-backtrace/Sources/CBacktrace/include"
     export *
 }
diff --git a/Wishlist.xcodeproj/GeneratedModuleMap/CCryptoOpenSSL/module.modulemap b/Wishlist.xcodeproj/GeneratedModuleMap/CCryptoOpenSSL/module.modulemap
@@ -1,4 +1,4 @@
 module CCryptoOpenSSL {
-    umbrella "/Users/Michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/crypto/Sources/CCryptoOpenSSL/include"
+    umbrella "/Users/michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/crypto/Sources/CCryptoOpenSSL/include"
     export *
 }
diff --git a/Wishlist.xcodeproj/GeneratedModuleMap/CNIOOpenSSL/module.modulemap b/Wishlist.xcodeproj/GeneratedModuleMap/CNIOOpenSSL/module.modulemap
@@ -1,4 +1,4 @@
 module CNIOOpenSSL {
-    umbrella "/Users/Michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/swift-nio-ssl/Sources/CNIOOpenSSL/include"
+    umbrella "/Users/michael/Webdaten/Dropbox/MiB Wepapp Wishlist/.build/checkouts/swift-nio-ssl/Sources/CNIOOpenSSL/include"
     export *
 }