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

# Conflicts:
#	demo/routes.py
#	demo/views/frontend.py
#	entry.py
kirill 2 years ago
commit 1b2592ed32
  1. 1
      .gitignore
  2. 2
      demo/routes.py
  3. 5
      demo/templates/index.html
  4. 6
      demo/views/frontend.py
  5. 2
      requirements.txt

1
.gitignore vendored

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

@ -2,5 +2,5 @@ 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('/button-clicked', frontend.button_clicked)])

@ -62,6 +62,7 @@
-moz-box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.5);
box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.5); box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.5);
} }
#myResult { #myResult {
text-align: center; text-align: center;
color: white; color: white;
@ -75,7 +76,9 @@
<h1>Знакомство с aiohttp</h1> <h1>Знакомство с aiohttp</h1>
<div id="root"> <div id="root">
<div class="form"> <div class="form">
<div class="form__button"><button id='myButton'>Отправить</button></div> <div class="form__button">
<button id='myButton'>Отправить</button>
</div>
<p id="myResult"></p> <p id="myResult"></p>
</div> </div>
</div> </div>

@ -10,8 +10,4 @@ async def index(request):
async def button_clicked(request): async def button_clicked(request):
data = await request.post() return aiohttp.web.json_response({'result':'Button was clicked'})
text = data.get('text')
response_text = f'Вы ввели: {text}'
print(response_text)
return aiohttp.web.Response(text=response_text)

@ -0,0 +1,2 @@
aiohttp~=3.8.4
Jinja2~=3.1.2
Loading…
Cancel
Save