Merge remote-tracking branch 'origin/main' into develope

# Conflicts: # demo/routes.py # demo/templates/index.html # demo/views/frontend.py # entry.py
3 years ago · 738008fd6a
parent bf73203892 2c6dceee3e
commit 738008fd6a
8 changed files with 11 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
+venv
 demo/__pycache__
 demo/views/__pycache__
--- a/demo/init.py
+++ b/demo/init.py
@ -1 +1 @@
-from .app import create_app
+from .app import create_app
--- a/demo/app.py
+++ b/demo/app.py
@ -7,7 +7,7 @@ import aiohttp_jinja2
 async def create_app():
    app = web.Application()
    aiohttp_jinja2.setup(app,
-        loader = jinja2.PackageLoader('demo', 'templates')
-        )
+                         loader=jinja2.PackageLoader('demo', 'templates')
+                         )
    setup_routes(app)
-    return app 
+    return app
--- a/demo/routes.py
+++ b/demo/routes.py
@ -1,6 +1,7 @@
 from .views import frontend
 import aiohttp

+
 def setup_routes(app):
  app.router.add_routes([aiohttp.web.get('/', frontend.index), aiohttp.web.post('/submit', frontend.button_clicked)])
  
--- a/demo/templates/index.html
+++ b/demo/templates/index.html
@ -14,7 +14,7 @@
      }
      h1{
        color: white;
-        
+
      }
      p{
        color:white;
@ -44,7 +44,7 @@
        background-color: grey;
      }

-      
+
    </style>
  </head>
  <body>
--- a/demo/views/init.py
+++ b/demo/views/init.py
@ -1 +1 @@
-from . import frontend
+from . import frontend
--- a/demo/views/frontend.py
+++ b/demo/views/frontend.py
@ -3,7 +3,6 @@ import aiohttp
 from aiohttp_jinja2 import template


-
@template('index.html')
 async def index(request):
    return {}
--- a/entry.py
+++ b/entry.py
@ -1,14 +1,8 @@
 import aiohttp
 from demo import create_app

-
-
-
-
 app = create_app()

-
-
-
 if __name__ == '__main__':
-	aiohttp.web.run_app(app)
+    aiohttp.web.run_app(app)
+