Merge pull request #79 from MasoniteFramework/develop

Next Version - v1.3

Author: josephmancuso

.env-example

@@ -23,4 +23,10 @@ DB_USERNAME=root
 DB_PASSWORD=root
 
 STRIPE_PUBLISHABLE=
-STRIPE_SECRET=
+STRIPE_SECRET=
+
+STORAGE_DRIVER=disk
+
+S3_CLIENT=
+S3_SECRET=
+S3_BUCKET=

CODE_OF_CONDUCT.md

@@ -1,7 +1,8 @@
-from orator import DatabaseManager, Model
+''' User Model '''
 from config.database import Model
 
 class User(Model):
+    ''' User Model '''
 
     __fillable__ = ['name', 'email', 'password']
 

CONTRIBUTING.md

@@ -1,12 +1,9 @@
-''' A Module Description '''
-from masonite.view import view
+''' Welcome The User To Masonite '''
+
 from masonite.request import Request
 
 class WelcomeController(object):
-    ''' Controller for welcoming the user '''
-
-    def __init__(self):
-        pass
+    ''' Controller For Welcoming The User '''
 
     def show(self, Application, request: Request):
         ''' Show Welcome Template '''

app/User.py

@@ -1,15 +1,17 @@
-''' Class for the authentication middleware '''
+''' Authentication Middleware '''
 
 class AuthenticationMiddleware(object):
-    ''' Middleware class which loads the current user into the request '''
+    ''' Middleware To Check If The User Is Logged In '''
 
-    def __init__(self, request):
-        self.request = request
+    def __init__(self, Request):
+        ''' Inject Any Dependencies From The Service Container '''
+        self.request = Request
 
     def before(self):
-        ''' Register as a before middleware to be ran before the request '''
+        ''' Run This Middleware Before The Route Executes '''
         if not self.request.user():
             self.request.redirectTo('login')
 
     def after(self):
+        ''' Run This Middleware After The Route Executes '''
         pass

app/http/controllers/WelcomeController.py

@@ -1,20 +1,20 @@
-''' Class for the authentication middleware '''
+''' Load User Middleware'''
 from masonite.facades.Auth import Auth
-from masonite.request import Request
 
 class LoadUserMiddleware(object):
     ''' Middleware class which loads the current user into the request '''
 
-    def __init__(self):
-        pass
+    def __init__(self, Request):
+        ''' Inject Any Dependencies From The Service Container '''
+        self.request = Request
 
-    def before(self, request: Request):
-        ''' Register as a before middleware to be ran before the request '''
-        self.load_user(request)
-        return request
+    def before(self):
+        ''' Run This Middleware Before The Route Executes '''
+        self.load_user(self.request)
+        return self.request
 
     def after(self):
-        ''' Register as an after middleware to be ran after the request '''
+        ''' Run This Middleware After The Route Executes '''
         pass
 
     def load_user(self, request):

app/http/middleware/AuthenticationMiddleware.py

@@ -3,10 +3,12 @@
 from config import middleware
 
 class MiddlewareProvider(ServiceProvider):
+    ''' Adds Middleware To The Service Container '''
 
     wsgi = False
-    
+
     def register(self):
+        ''' Register Middleware Into The Service Container '''
         self.app.bind('HttpMiddleware', middleware.HTTP_MIDDLEWARE)
 
     def boot(self):