diff options
| -rw-r--r-- | Pipfile | 52 | ||||
| -rw-r--r-- | Pipfile.lock | 118 | ||||
| -rw-r--r-- | src/web/templates/admin/dashboard.html | 13 |
3 files changed, 85 insertions, 98 deletions
@@ -9,32 +9,32 @@ python_version = "3.6.4" [packages] -aiohttp = "==3.0.2" -requests = "==2.18.4" -chardet = "==3.0.4" -requests-futures = "==0.9.7" -feedparser = "==5.2.1" -"beautifulsoup4" = "==4.6.0" -lxml = "==4.1.1" -opml = "==0.5" -"psycopg2" = "==2.7.4" -SQLAlchemy = "==1.2.4" -alembic = "==0.9.8" -Flask = "==0.12.2" -Flask-SQLAlchemy = "==2.3.2" -Flask-Login = "==0.4.1" -Flask-Principal = "==0.4.0" -Flask-WTF = "==0.14.2" -Flask-RESTful = "==0.3.6" -Flask-Restless = "==0.17.0" -Flask-paginate = "==0.5.1" -Flask-Babel = "==0.11.2" -Flask-SSLify = "==0.1.5" -Flask-Migrate = "==2.1.1" -Flask-Script = "==2.0.6" -WTForms = "==2.1" -sendgrid = "==5.3.0" -python-dateutil = "==2.6.1" +aiohttp = "*" +requests = "*" +chardet = "*" +requests-futures = "*" +feedparser = "*" +"beautifulsoup4" = "*" +lxml = "*" +opml = "*" +"psycopg2" = "*" +SQLAlchemy = "*" +alembic = "*" +Flask = "*" +Flask-SQLAlchemy = "*" +Flask-Login = "*" +Flask-Principal = "*" +Flask-WTF = "*" +Flask-RESTful = "*" +Flask-Restless = "*" +Flask-paginate = "*" +Flask-Babel = "*" +Flask-SSLify = "*" +Flask-Migrate = "*" +Flask-Script = "*" +WTForms = "*" +sendgrid = "*" +python-dateutil = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 0ff4c40e..a8b310f5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cbd98f2b1ab7ad81ba35b3ae51decd3b2dd7f5a4935501f310d0db87616b98f8" + "sha256": "76eb7a2005cd93293d3bd9c91da759ce026c5ceb9b77e4dbd5cae424ead6a89d" }, "pipfile-spec": 6, "requires": { @@ -18,31 +18,31 @@ "default": { "aiohttp": { "hashes": [ - "sha256:06fd26a4c18bafd88505d27dd523036494a33e4908bc13ce9234c95a0d713d36", - "sha256:0d489ec8c08f7687955579099f344cc97d270bfc9715934fea77a1ceef055b83", - "sha256:2458a733a26fbcbbefb1f7df9b20f988f570a790269f7cb5f8aa370d8cb0db18", - "sha256:2d069103fb9ba6a448207a4bf815fdb4c46d2e43443ffc0f10fdaae543c80f7c", - "sha256:37feba955656be58c8fd8ae815329d436aac1d079bb65c1edaa2b0fcb80f9a3d", - "sha256:45e567826a631dde83660e42906ee4b85059f87d273919d1d75854f9f643227f", - "sha256:65c885062805fc2bf223806cf19ebb2e6884abdbdc882eb85746e538cc778bdb", - "sha256:8b98ba729dd2f2f1ba58b5d8fac02c2af8dbecb2a819ada6c422a68e1c7c7d41", - "sha256:98ccab25085e41a7b835e0b7ae4209d33af2ff20c968d6c78a4617e910636f91", - "sha256:9e1eec6dabb1b0e8a14a1a9907b4ca6d65d98bef10e33d6e8ca125f3dfe86d7a", - "sha256:9ff930c2a4121b3fc21d406c8e2c3167dff6f8f57abf8b63e92dc36263b693e7", - "sha256:adb731e5f885038cb9ddb4f9fbaaf62f644785e8fc0abcf71ba879f1cdbf2f7e", - "sha256:bf8716128dd5a87e25428a6a6d0f83352570f6f10643d85f50dd1d2a891d7beb", - "sha256:da70fbe58a38ee713464b24225a2caf0f601b565795d0cb3de0e159c6e2a66b4", - "sha256:e125efcb4de9500b0f82620d8e194aff711b8c8591ded9ed641c7631fe52c92d" + "sha256:0be9782f27f150acc18c20ddb035655625d054ead119eb6e906647eb9a94f6c4", + "sha256:1b95d53f8dac13898f0a3e4af76f6f36d540fbfaefc4f4c9f43e436fa0e53d22", + "sha256:1d62305fca4479b7f0a1254a78fa1e57e0440f5e9547a1d47e5f8dece264d414", + "sha256:294cf24187b8bcf3e9b368f2d67e1a6584b0a27667886612eff02d0cd3be460f", + "sha256:29cbcdf61b094140a10923ededcda6c961032d44518d64fc832cb602a5ff21e8", + "sha256:359d3e7dfe9f0f6d8c6105152d6fbc45027992f40bdf971484dbc5e7dc7c456f", + "sha256:43930d119cae96b1a743c2e542fe93bd8db48d8b0d041933bd0b008a29f286f2", + "sha256:862c5694a192a18cbcf3553fdff121aa9abe1b4edd65af7953b258211808437d", + "sha256:92b3aaa2896109be9a477f8a57314a144c9d56c6b7e16183e43e5fcad5e89da8", + "sha256:9ba1394d3eea2a3e2641e9a93a95b6d8b09478ef1d2ce2845e0ee1511a2937d2", + "sha256:a00d4115ae2f5dcf678f482e2235d89eea495e883297e5fd19db429aa1e64d43", + "sha256:a169c6d5173c7f60e70055a2ab71b93c90f2d693164e93502744b82ff7c0e282", + "sha256:bd2092d2c2cfdd3363e3815d473464b45c79e0794d60e7c4c89c2adc12ef64b4", + "sha256:d51800bdc01d9c1c70fa3ed394a1755f93464354b04039b41d48ce1308517e81", + "sha256:defc2afb61b9fd08b2d07e536a1497a50925f1078e598ebc7eba080d33cdd5f6" ], "index": "pypi", - "version": "==3.0.2" + "version": "==3.2.1" }, "alembic": { "hashes": [ - "sha256:13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56" + "sha256:85bd3ea7633024e4930900bc64fb58f9742dedbc6ebb6ecf25be2ea9a3c1b32e" ], "index": "pypi", - "version": "==0.9.8" + "version": "==0.9.9" }, "aniso8601": { "hashes": [ @@ -53,10 +53,10 @@ }, "async-timeout": { "hashes": [ - "sha256:00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0", - "sha256:9093db5b8ddbe4b8f6885d1a6e0ad84ae3155464cbf6877c387605244c285f3c" + "sha256:474d4bc64cee20603e225eb1ece15e248962958b45a3648a9f5cc29e827a610c", + "sha256:b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287" ], - "version": "==2.0.1" + "version": "==3.0.0" }, "attrs": { "hashes": [ @@ -120,11 +120,11 @@ }, "flask": { "hashes": [ - "sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856", - "sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1" + "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48", + "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05" ], "index": "pypi", - "version": "==0.12.2" + "version": "==1.0.2" }, "flask-babel": { "hashes": [ @@ -236,37 +236,37 @@ }, "lxml": { "hashes": [ - "sha256:0ee07da52d240f1dc3c83eef5cd5f1b7f018226c1121f2a54d446645779a6d17", - "sha256:155521c337acecf8202091cff85bb9f709f238130ebadf04280fb1db11f5ad8b", - "sha256:155c916cf2645b4a8f2bd5d09065e92d1b67b8d464bdc001e0b524af84bedf6f", - "sha256:2190266059fec3c5a55f9d6c30532c64c6d414d3228909c0af573fe4907e78d1", - "sha256:29a36e354c39b2e24bc4ee103de53417ebb80f976a6ab9e8d093d559e2ac03e1", - "sha256:2dedfeeecc2d5a939cf622602f5a1ce443ca82407f386880f739f1a9f08053ad", - "sha256:3b33549fb8f91b38a7500078242b03cca513f3412a2cdae722e89bf83f95971d", - "sha256:4187c4b0cefc3353181db048c51f42c489d9ac51e40b86c4851dc0671372971d", - "sha256:41f59cbdab232f11680d5d4dec9f2e6782fd24d78e37ee833447702e34e675f4", - "sha256:470d7ce41e8047208ba1a376560bad17f1468df1f3097bc83902b26cfafdbb0c", - "sha256:49a655956f8de69e1258bc0fcfc43eb3bd1e038655784d77d1869b4b81444e37", - "sha256:4c12e90886d9c53ab434c8d0cebea122321cce19614c3c6b6d1a7700d7cc6212", - "sha256:6cba398eb37e0631e60e0e080c101cfe91769b2c8267105b64b4625e2581ea21", - "sha256:79322000279cda10b53c374d53ca632ead3bc51c6aebf8e62c8fa93a4d08b750", - "sha256:87a66bcadac270fc010cb029022a93fc722bf1204a8b03e782d4c790f0edf7ca", - "sha256:940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e", - "sha256:950e63387514aa1b881eba5ac6cb2ec51a118b3dafe99dd80ca19d8fb0142f30", - "sha256:af8a5373241d09b8fc53e0490e1719ce5dc90a21b19db89b6596c1adcdd52270", - "sha256:b106d4d2383382399ad82108fd187e92f40b1c90f55c2d36bbcb1c44bcf940fc", - "sha256:ba05732e4bcf59e948f61588851dcf620fd60d5bbd9d704203e5f59bbaa60219", - "sha256:d2c985d2460b81c6ca5feb8b86f1bc594ad59405d0bdf68626b85852b701553c", - "sha256:d5d29663e979e83b3fc361e97200f959cddb3a14797391d15273d84a5a8ae44b", - "sha256:dd291debfaa535d9cb6cee8d7aca2328775e037d02d13f1634e57f49bc302cc4", - "sha256:e37427d5a27eefbcfc48847e0b37f348113fac7280bc857421db39ffc6372570", - "sha256:e608839a5ee2180164424ccf279c8e2d9bbe8816d002c58fd97d6b621ba4aa94", - "sha256:e6b6698415c7e8d227a47a3b1038e1b37c2b438a1b48c2db7ad9e74ddbcd1149", - "sha256:e7e41d383f19bab9d57f5f3b18d158655bcd682e7e723f441b9e183e1e35a6b5", - "sha256:fa7320679ced5e25b20203d157280680fc84eb783b6cc650cb0c98e1858b7dd3" + "sha256:01c45df6d90497c20aa2a07789a41941f9a1029faa30bf725fc7f6d515b1afe9", + "sha256:0c9fef4f8d444e337df96c54544aeb85b7215b2ed7483bb6c35de97ac99f1bcd", + "sha256:0e3cd94c95d30ba9ca3cff40e9b2a14e1a10a4fd8131105b86c6b61648f57e4b", + "sha256:0e7996e9b46b4d8b4ac1c329a00e2d10edcd8380b95d2a676fccabf4c1dd0512", + "sha256:1858b1933d483ec5727549d3fe166eeb54229fbd6a9d3d7ea26d2c8a28048058", + "sha256:1b164bba1320b14905dcff77da10d5ce9c411ac4acc4fb4ed9a2a4d10fae38c9", + "sha256:1b46f37927fa6cd1f3fe34b54f1a23bd5bea1d905657289e08e1297069a1a597", + "sha256:231047b05907315ae9a9b6925751f9fd2c479cf7b100fff62485a25e382ca0d4", + "sha256:28f0c6652c1b130f1e576b60532f84b19379485eb8da6185c29bd8c9c9bc97bf", + "sha256:34d49d0f72dd82b9530322c48b70ac78cca0911275da741c3b1d2f3603c5f295", + "sha256:3682a17fbf72d56d7e46db2e80ca23850b79c28cfe75dcd9b82f58808f730909", + "sha256:3cf2830b9a6ad7f6e965fa53a768d4d2372a7856f20ffa6ce43d2fe9c0d34b19", + "sha256:5b653c9379ce29ce271fbe1010c5396670f018e78b643e21beefbb3dc6d291de", + "sha256:65a272821d5d8194358d6b46f3ca727fa56a6b63981606eac737c86d27309cdd", + "sha256:691f2cd97cf026c611df1ea5055755eec7f878f2d4f4330dc8686583de6fc5fd", + "sha256:6b6379495d3baacf7ed755ac68547c8dff6ce5d37bf370f0b7678888dc1283f9", + "sha256:75322a531504d4f383264391d89993a42e286da8821ddc5ac315e57305cb84f0", + "sha256:7f457cbda964257f443bac861d3a36732dcba8183149e7818ee2fb7c86901b94", + "sha256:7ff1fc76d8804e0f870c343a72007ff587090c218b0f92d8ee784ac2b6eaf5b9", + "sha256:8523fbde9c2216f3f2b950cb01ebe52e785eaa8a07ffeb456dd3576ca1b4fb9b", + "sha256:8f37627f16e026523fca326f1b5c9a43534862fede6c3e99c2ba6a776d75c1ab", + "sha256:a7182ea298cc3555ea56ffbb0748fe0d5e0d81451e2bc16d7f4645cd01b1ca70", + "sha256:abbd2fb4a5a04c11b5e04eb146659a0cf67bb237dd3d7ca3b9994d3a9f826e55", + "sha256:accc9f6b77bed0a6f267b4fae120f6008a951193d548cdbe9b61fc98a08b1cf8", + "sha256:bd88c8ce0d1504fdfd96a35911dd4f3edfb2e560d7cfdb5a3d09aa571ae5fbae", + "sha256:c557ad647facb3c0027a9d0af58853f905e85a0a2f04dcb73f8e665272fcdc3a", + "sha256:defabb7fbb99f9f7b3e0b24b286a46855caef4776495211b066e9e6592d12b04", + "sha256:e2629cdbcad82b83922a3488937632a4983ecc0fed3e5cfbf430d069382eeb9b" ], "index": "pypi", - "version": "==4.1.1" + "version": "==4.2.1" }, "mako": { "hashes": [ @@ -347,11 +347,11 @@ }, "python-dateutil": { "hashes": [ - "sha256:891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca", - "sha256:95511bae634d69bc7329ba55e646499a842bc4ec342ad54a8cdb65645a0aad3c" + "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", + "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" ], "index": "pypi", - "version": "==2.6.1" + "version": "==2.7.3" }, "python-editor": { "hashes": [ @@ -412,10 +412,10 @@ }, "sqlalchemy": { "hashes": [ - "sha256:6997507af46b10630e13b605ac278b78885fd683d038896dbee0e7ec41d809d2" + "sha256:d6cda03b0187d6ed796ff70e87c9a7dce2c2c9650a7bc3c022cd331416853c31" ], "index": "pypi", - "version": "==1.2.4" + "version": "==1.2.7" }, "urllib3": { "hashes": [ diff --git a/src/web/templates/admin/dashboard.html b/src/web/templates/admin/dashboard.html index 7728f586..350a2e47 100644 --- a/src/web/templates/admin/dashboard.html +++ b/src/web/templates/admin/dashboard.html @@ -47,19 +47,6 @@ </tbody> </table> <a href="{{ url_for("admin.user_form") }}" class="btn btn-default">{{ _('Add a new user') }}</a> -<h1>{{ _('Send notification messages') }}</h1> -<form action="" method="post"> - {{ form.hidden_tag() }} - - {{ form.subject.label }} - {{ form.subject(class_="form-control") }} {% for error in form.subject.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %} - - {{ form.message.label }} - {{ form.message(class_="form-control", rows=8) }} {% for error in form.message.errors %} <span style="color: red;">{{ error }}<br /></span>{% endfor %} - - <br /> - {{ form.submit(class_="btn btn-default") }} -</form> </div> <script> $(document).ready(function() { |