From b017aa4dc59ae2ba3d3e1b59c935ca320ec1f0c4 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 15:04:20 +0100
Subject: [PATCH] Work
---
covid19/static/index.js | 0
covid19/static/package.json | 28 ++++++++++++++++++++++++
covid19/templates/page_layout.html | 4 +++-
package.json | 35 ++++++++++++++++++++++++++++++
requirements.txt | 1 +
setup.py | 4 ++++
6 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 covid19/static/index.js
create mode 100644 covid19/static/package.json
create mode 100644 package.json
diff --git a/covid19/static/index.js b/covid19/static/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/covid19/static/package.json b/covid19/static/package.json
new file mode 100644
index 00000000..6f7bf8ac
--- /dev/null
+++ b/covid19/static/package.json
@@ -0,0 +1,28 @@
+{
+ "name": "covid19static",
+ "version": "0.0.13",
+ "description": "Covid19 Data Aggregation - also a Project to learn Python Flask, SQLAlchemy, Celery et al.",
+ "main": "index.js",
+ "scripts": {
+ "test": "test"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/thomaswoehlke/covid19python/covid19/static"
+ },
+ "keywords": [
+ "virus",
+ "pandemic",
+ "covid19",
+ "data",
+ "statistic",
+ "who",
+ "rki",
+ "python",
+ "flask",
+ "sqlalchemy",
+ "postgresql"
+ ],
+ "author": "thomaswoehlke",
+ "license": "GPL-3.0-or-later",
+}
diff --git a/covid19/templates/page_layout.html b/covid19/templates/page_layout.html
index 7bee37ba..4877f124 100644
--- a/covid19/templates/page_layout.html
+++ b/covid19/templates/page_layout.html
@@ -6,11 +6,12 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css"
integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l"
crossorigin="anonymous">
+ <link href="/fontawesome_free/css/all.min.css" rel="stylesheet" type="text/css">
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
<title>{{page_info.title}}</title>
</head>
<body>
-<div class="container-fluid">
+<div class="container">
<header>
<div class="tw_padding">
@@ -66,5 +67,6 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.min.js"
integrity="sha384-+YQ4JLhjyBLPDQt//I+STsc9iw4uQqACwlvpslubQzn4u2UU2UFM80nGisd026JF"
crossorigin="anonymous"></script>
+ <script src="/fontawesome_free/js/all.min.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..bfbfa1eb
--- /dev/null
+++ b/package.json
@@ -0,0 +1,35 @@
+{
+ "name": "covid19python",
+ "version": "0.0.13",
+ "description": "Covid19 Data Aggregation - also a Project to learn Python Flask, SQLAlchemy, Celery et al.",
+ "main": "index.js",
+ "dependencies": {},
+ "devDependencies": {},
+ "scripts": {
+ "test": "test",
+ "postinstall": "cd covid19/static && npm install && ../.."
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/thomaswoehlke/covid19python.git"
+ },
+ "keywords": [
+ "virus",
+ "pandemic",
+ "covid19",
+ "data",
+ "statistic",
+ "who",
+ "rki",
+ "python",
+ "flask",
+ "sqlalchemy",
+ "postgresql"
+ ],
+ "author": "thomaswoehlke",
+ "license": "GPL-3.0-or-later",
+ "bugs": {
+ "url": "https://github.com/thomaswoehlke/covid19python/issues"
+ },
+ "homepage": "https://github.com/thomaswoehlke/covid19python#readme"
+}
diff --git a/requirements.txt b/requirements.txt
index 980dd69c..55db64d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ SQLAlchemy==1.3.22
psycopg2==2.8.6
wget==3.2
celery[redis]==5.0.5
+fontawesome-free==5.15.2
#
# Frontend
#
diff --git a/setup.py b/setup.py
index cb890cd8..ecc1cbe6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,9 @@
from setuptools import setup, find_packages
+INSTALLED_APPS = [
+ 'fontawesome-free'
+]
+
setup(
name='covid19python',
version='0.0.13',
--
GitLab