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

# Conflicts:
#	demo/routes.py
#	demo/templates/index.html
#	demo/views/frontend.py
#	entry.py
pull/2/head
kirill 2 years ago
commit 738008fd6a
  1. 1
      .gitignore
  2. 1
      demo/routes.py
  3. 1
      demo/views/frontend.py
  4. 8
      entry.py

1
.gitignore vendored

@ -1,2 +1,3 @@
venv
demo/__pycache__ demo/__pycache__
demo/views/__pycache__ demo/views/__pycache__

@ -1,6 +1,7 @@
from .views import frontend from .views import frontend
import aiohttp import aiohttp
def setup_routes(app): def setup_routes(app):
app.router.add_routes([aiohttp.web.get('/', frontend.index), aiohttp.web.post('/submit', frontend.button_clicked)]) app.router.add_routes([aiohttp.web.get('/', frontend.index), aiohttp.web.post('/submit', frontend.button_clicked)])

@ -3,7 +3,6 @@ import aiohttp
from aiohttp_jinja2 import template from aiohttp_jinja2 import template
@template('index.html') @template('index.html')
async def index(request): async def index(request):
return {} return {}

@ -1,14 +1,8 @@
import aiohttp import aiohttp
from demo import create_app from demo import create_app
app = create_app() app = create_app()
if __name__ == '__main__': if __name__ == '__main__':
aiohttp.web.run_app(app) aiohttp.web.run_app(app)

Loading…
Cancel
Save