From 57081341b6615714736782b75d96fea1ba7142be Mon Sep 17 00:00:00 2001 From: Yuval Adam <_@yuv.al> Date: Sat, 26 Sep 2020 18:24:43 +0300 Subject: Add jinja2 templates support --- .pre-commit-config.yaml | 1 + Pipfile | 1 + Pipfile.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++----- iss/server.py | 9 +++++--- iss/templates/base.html | 1 + 5 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 iss/templates/base.html diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 72538a9..559e626 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,3 +20,4 @@ repos: language: system entry: pipenv run test types: [python] + pass_filenames: false diff --git a/Pipfile b/Pipfile index bd49e7d..f109a9a 100644 --- a/Pipfile +++ b/Pipfile @@ -14,6 +14,7 @@ pyephem = "*" skyfield = "*" fastapi = "*" uvicorn = "*" +jinja2 = "*" [scripts] format = "black iss" diff --git a/Pipfile.lock b/Pipfile.lock index 874b614..38eaff0 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "41a31f43fdb30b7f18034155e282977eeba8f9a826b49678b13b2f2439357fdf" + "sha256": "d34f546a593d8ae683f9cf9f4b2c5e8e0dbcab35e41f92ba52b3050dc6a7df92" }, "pipfile-spec": 6, "requires": { @@ -112,12 +112,59 @@ "markers": "sys_platform != 'win32' and sys_platform != 'cygwin' and platform_python_implementation != 'PyPy'", "version": "==0.1.1" }, + "jinja2": { + "hashes": [ + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + ], + "index": "pypi", + "version": "==2.11.2" + }, "jplephem": { "hashes": [ "sha256:e0017de1a45015b247faa8d15ebf35d2014abe949135f3703a3252adb96e43b1" ], "version": "==2.15" }, + "markupsafe": { + "hashes": [ + "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", + "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", + "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", + "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", + "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", + "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", + "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", + "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", + "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", + "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", + "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", + "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", + "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", + "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", + "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", + "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", + "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", + "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", + "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", + "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", + "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", + "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", + "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", + "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", + "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", + "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", + "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.1.1" + }, "numpy": { "hashes": [ "sha256:04c7d4ebc5ff93d9822075ddb1751ff392a4375e5885299445fcebf877f179d5", @@ -217,10 +264,10 @@ }, "skyfield": { "hashes": [ - "sha256:0a1b01b4fd18cf6bfa555224ff2e3e357108282151fd132bd929d7f35da8c641" + "sha256:80b67acb8b655305890d80005cd5e53986c459fb01521637e433df751d3bce86" ], "index": "pypi", - "version": "==1.27" + "version": "==1.29" }, "starlette": { "hashes": [ @@ -346,11 +393,11 @@ }, "identify": { "hashes": [ - "sha256:d7da7de6825568daa4449858ce328ecc0e1ada2554d972a6f4f90e736aaf499a", - "sha256:e4db4796b3b0cf4f9cb921da51430abffff2d4ba7d7c521184ed5252bd90d461" + "sha256:7c22c384a2c9b32c5cc891d13f923f6b2653aa83e2d75d8f79be240d6c86c4f4", + "sha256:da683bfb7669fa749fc7731f378229e2dbf29a1d1337cbde04106f02236eb29d" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.5.4" + "version": "==1.5.5" }, "iniconfig": { "hashes": [ diff --git a/iss/server.py b/iss/server.py index ee60be1..eab3e22 100644 --- a/iss/server.py +++ b/iss/server.py @@ -1,8 +1,11 @@ -from fastapi import FastAPI +from fastapi import FastAPI, Request +from fastapi.templating import Jinja2Templates app = FastAPI() +templates = Jinja2Templates(directory="iss/templates") + @app.get("/") -async def root(): - return {"message": "Hello World"} +async def home(request: Request): + return templates.TemplateResponse("base.html", {"request": request}) diff --git a/iss/templates/base.html b/iss/templates/base.html new file mode 100644 index 0000000..6e7c1e6 --- /dev/null +++ b/iss/templates/base.html @@ -0,0 +1 @@ +