Merge pull request #122 from nodes-vapor/feature/misc-fixes

Feature/misc fixes

Author: steffendsommer

.circleci/config.yml

@@ -2,12 +2,12 @@ version: 2
 jobs:
   MacOS:
     macos:
-      xcode: "9.3.0"
+      xcode: "10.0.0"
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v3-spm-deps-{{ checksum "Package.swift" }}
+            - v1-spm-deps-{{ checksum "Package.swift" }}
       - run:
           name: Install CMySQL and CTLS
           command: |
@@ -31,12 +31,12 @@ jobs:
             - .build
   Linux:
     docker:
-      - image: nodesvapor/vapor-ci:swift-4.1
+      - image: nodesvapor/vapor-ci:swift-4.2
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v4-spm-deps-{{ checksum "Package.swift" }}
+            - v2-spm-deps-{{ checksum "Package.swift" }}
       - run:
           name: Copy Package file
           command: cp Package.swift res

.swiftlint.yml

@@ -8,5 +8,6 @@ identifier_name:
 line_length: 100
 disabled_rules:
   - opening_brace
+  - nesting
 colon:
   flexible_right_spacing: true

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -17,11 +17,12 @@ let package = Package(
         .package(url: "https://github.com/vapor/leaf.git", from: "3.0.0"),
         .package(url: "https://github.com/vapor/auth.git", from: "2.0.0"),
 
-        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0-beta"),
+        .package(url: "https://github.com/nodes-vapor/sugar.git", from: "3.0.0-rc"),
         .package(url: "https://github.com/nodes-vapor/flash.git", from: "3.0.0"),
         .package(url: "https://github.com/nodes-vapor/bootstrap.git", from: "2.0.0"),
-        .package(url: "https://github.com/nodes-vapor/reset.git", from: "1.0.0-beta"),
+        .package(url: "https://github.com/nodes-vapor/reset.git", from: "1.0.0-rc"),
         .package(url: "https://github.com/nodes-vapor/submissions.git", from: "1.0.0-beta"),
+        .package(url: "https://github.com/nodes-vapor/paginator.git", from: "3.0.0-rc"),
 
         .package(url: "https://github.com/twof/VaporMailgunService.git", from: "1.1.0"),
     ],
@@ -39,7 +40,8 @@ let package = Package(
                 "Bootstrap",
                 "Reset",
                 "Submissions",
-                "Mailgun"
+                "Mailgun",
+                "Paginator"
             ]),
         .testTarget(
             name: "AdminPanelTests",

Resources/Views/AdminPanel/AdminPanelUser/edit.leaf

@@ -41,25 +41,18 @@
         #if(user == nil) {
             <p>If you don't specify a password, then the user will receive an email with instructions on how to set one. If you specify a password, then no email will be sent to the new user.</p>
 
-            <div class="form-group form-check">
-                <input type="checkbox" class="form-check-input" id="shouldSpecifyPassword" name="shouldSpecifyPassword" aria-describedby="shouldSpecifyPasswordHelp" value="1">
-                <label class="form-check-label" for="shouldSpecifyPassword">Specify password</label>
-                <small id="shouldSpecifyPasswordHelp" class="form-text text-muted">Leave this out and the user will have to specify one themselves.</small>
+            #submissions:checkbox("shouldSpecifyPassword", "Specify password", "Leave this out and the user will have to specify one themselves.")
+
+            <div id="specifyPassword" style="display:none;">
+                #submissions:password("password", "Enter password", "Minimum 8 characters and needs to satisfy three of the following: has a lowercase character, has an uppercase character, has a digit or has a special character.")
+                #submissions:password("passwordAgain", "Enter password again")
             </div>
-        }
 
-        <div id="specifyPassword" style="#if(user == nil) { display:none; }">
+            #submissions:checkbox("shouldResetPassword", "Should reset password", "This will require the user to set a new password after logging in the first time.")
+        } else {
             #submissions:password("password", "Enter password", "Minimum 8 characters.")
             #submissions:password("passwordAgain", "Enter password again")
-
-            #if(user == nil) {
-                <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="shouldResetPassword" name="shouldResetPassword" aria-describedby="shouldResetPasswordHelp" value="1">
-                    <label class="form-check-label" for="shouldResetPassword">Should reset password</label>
-                    <small id="shouldResetPasswordHelp" class="form-text text-muted">This will require the user to set a new password after logging in the first time.</small>
-                </div>
-            }
-        </div>
+        }
 
         <button type="submit" class="btn btn-primary">Submit</button>
         <a href="/admin/users" class="btn btn-secondary">Cancel</a>
@@ -85,10 +78,18 @@
 
         // Password toggle
         $(function () {
-            $("#shouldSpecifyPassword").click(function(){
+            $("#specifyPassword").toggle($("#shouldSpecifyPassword").prop("checked"));
+            $("#shouldSpecifyPassword").click(function() {
+                if (!this.checked) {
+                    $("#password").val("");
+                    $("#passwordAgain").val("");
+                \}
+
+                $("#password").prop('required', (this.checked))
+                $("#passwordAgain").prop('required', (this.checked))
+
                 $("#specifyPassword").toggle();
             \});
-
         \});
     </script>
 }

Resources/Views/AdminPanel/AdminPanelUser/index.leaf

@@ -38,6 +38,8 @@
             }        
         </tbody>
     </table>
+
+    #offsetPaginator()
 }
 
 #embed("AdminPanel/Layout/base")

Resources/Views/AdminPanel/Layout/Partials/sitetitle.leaf

@@ -1,4 +1,4 @@
-<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/admin/dashboard">
+<a class="navbar-brand col-sm-3 col-md-2 mr-0" href="/admin">
     #adminPanel:config("name")
     #if(adminPanel:config("environment") != "production") {
         <span class="badge badge-primary">#adminPanel:config("environment")</span>

Resources/Views/AdminPanel/Login/request-reset-password.leaf

@@ -12,10 +12,7 @@
 
         #embed("AdminPanel/Layout/Partials/alerts")
 
-        <div class="form-group">
-            <label for="email">Email address</label>
-            <input type="email" class="form-control" id="email" name="email" placeholder="Enter email" required autofocus>
-        </div>
+        #submissions:email("email", "Enter email")
 
         <div class="form-row">
             <div class="col">
@@ -27,8 +24,6 @@
                 <a href="/admin/login" class="btn btn-lg btn-block btn-secondary">Cancel</a>
             </div>
         </div>
-
-        <p class="mt-5 mb-3 text-muted version">Admin Panel ✍️  by <a href="https://github.com/nodes-vapor/" target="_blank">Vapor at Nodes</a></p>
     </form>
 }
 

Resources/Views/AdminPanel/Login/reset-password.leaf

@@ -11,15 +11,8 @@
 
         #embed("AdminPanel/Layout/Partials/alerts")
 
-        <div class="form-group">
-            <label for="password">New password</label>
-            <input type="password" id="password" name="password" class="form-control" placeholder="Enter password" required autofocus>
-        </div>
-
-        <div class="form-group">
-            <label for="passwordAgain">New password again</label>
-            <input type="password" id="passwordAgain" name="passwordAgain" class="form-control" placeholder="Enter password again" required autofocus>
-        </div>
+        #submissions:password("password", "Enter password", "Minimum 8 characters and needs to satisfy three of the following: has a lowercase character, has an uppercase character, has a digit or has a special character.")
+        #submissions:password("passwordAgain", "Enter password again")
 
         <div class="form-row">
             <div class="col">
@@ -31,8 +24,6 @@
                 <a href="/admin/login" class="btn btn-lg btn-block btn-secondary">Cancel</a>
             </div>
         </div>
-
-        <p class="mt-5 mb-3 text-muted version">Admin Panel ✍️  by <a href="https://github.com/nodes-vapor/" target="_blank">Vapor at Nodes</a></p>
     </form>
 }
 

Sources/AdminPanel/Commands/AdminPanelUser+Seedable.swift

@@ -33,7 +33,7 @@ extension AdminPanelUser: Seedable {
                 short: "n",
                 default: AdminPanelUser.defaultName,
                 help: ["Change name"]
-            ),
+            )
         ]
     }
 

Sources/AdminPanel/Configs/AdminPanelConfig.swift

@@ -34,6 +34,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
     public let controllers: AdminPanelControllers<U>
     public let sidebarMenuPathGenerator: SidebarMenuPathGenerator<U.Role>
     public let resetPasswordEmail: ResetPasswordEmail
+    public let resetPasswordSignerKey: LosslessDataConvertible
     public let specifyPasswordEmail: SpecifyPasswordEmail
     public let newUserSetPasswordSigner: ExpireableJWTSigner
     public let environment: Environment
@@ -45,8 +46,10 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
         endpoints: AdminPanelEndpoints = .default,
         views: AdminPanelViews = .default,
         controllers: AdminPanelControllers<U> = .default,
-        sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role> = U.Role.sidebarMenuPathGenerator,
+        sidebarMenuPathGenerator: @escaping SidebarMenuPathGenerator<U.Role>
+            = U.Role.sidebarMenuPathGenerator,
         resetPasswordEmail: ResetPasswordEmail = .default,
+        resetPasswordSignerKey: LosslessDataConvertible,
         specifyPasswordEmail: SpecifyPasswordEmail = .default,
         newUserSetPasswordSigner: ExpireableJWTSigner,
         environment: Environment,
@@ -59,6 +62,7 @@ public struct AdminPanelConfig<U: AdminPanelUserType>: Service {
         self.controllers = controllers
         self.sidebarMenuPathGenerator = sidebarMenuPathGenerator
         self.resetPasswordEmail = resetPasswordEmail
+        self.resetPasswordSignerKey = resetPasswordSignerKey
         self.specifyPasswordEmail = specifyPasswordEmail
         self.newUserSetPasswordSigner = newUserSetPasswordSigner
         self.environment = environment