aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--app.json139
-rw-r--r--bower.json3
l---------src/web/static/css/bootstrap-theme.min.css2
l---------src/web/static/css/bootstrap-theme.min.css.map2
l---------src/web/static/css/bootstrap.min.css2
l---------src/web/static/css/bootstrap.min.css.map2
l---------src/web/static/fonts2
m---------submodules/bootstrap0
9 files changed, 82 insertions, 73 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 91931bb4..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "submodules/bootstrap"]
- path = submodules/bootstrap
- url = https://github.com/twbs/bootstrap.git
diff --git a/app.json b/app.json
index e8bb2585..89d39bb5 100644
--- a/app.json
+++ b/app.json
@@ -1,68 +1,79 @@
{
- "name": "Newspipe",
- "description": "A news aggregator that can be deployed on Heroku.",
- "keywords": [
- "aggregator",
- "news",
- "RSS"
- ],
- "website": "https://github.com/newspipe/",
- "repository": "https://github.com/newspipe/newspipe",
- "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png",
- "scripts": {
- "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git"
- },
- "env": {
- "PLATFORM_URL": {
- "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)",
- "required": true,
- "value": ""
+ "name": "Newspipe",
+ "description": "A news aggregator that can be deployed on Heroku.",
+ "keywords": [
+ "aggregator",
+ "news",
+ "RSS"
+ ],
+ "website": "https://github.com/newspipe/",
+ "repository": "https://github.com/newspipe/newspipe",
+ "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png",
+ "scripts": {
+ "postdeploy": "python src/manager.py db_create"
},
- "ADMIN_EMAIL": {
- "description": "Your email address for the authentication to the platform.",
- "required": true,
- "value": ""
- },
- "ADMIN_PASSWORD": {
- "description": "Your password.",
- "required": true,
- "value": ""
- },
- "SECRET_KEY": {
- "description": "A secret token only you know in order to use sessions.",
- "required": true,
- "value": "iYtWRvAl!S7+Gz8kabK3@CBvr"
- },
- "SELF_REGISTRATION": {
- "description": "Users are able to create new account.",
- "required": true,
- "value": "false"
- },
- "SECURITY_PASSWORD_SALT": {
- "description": "A secret to confirm user account with a link in an email.",
- "required": true,
- "value": "^HEpK@L&cP5dMR^kiz8IIZj8q"
- },
- "TOKEN_VALIDITY_PERIOD": {
- "description": "Validity period (in seconds) of the account confirmation link sent by email.",
- "required": true,
- "value": "3600"
- },
- "HEROKU": "1",
- "CDN_ADDRESS": "https://cdn.cedricbonhomme.org/",
- "NOTIFICATION_EMAIL": "newspipe@no-reply.com",
- "POSTMARK_API_KEY": "REDACTED",
- "CRAWLER_RESOLV": {
- "description": "Specify if the crawler should try to resolve link of articles behind proxies.",
- "value": "false"
- },
- "FEED_REFRESH_INTERVAL": {
- "description": "Feeds refresh interval (in minutes) for the crawler.",
- "value": "120"
+ "addons": [
+ "heroku-postgresql:hobby-dev",
+ "scheduler:standard"
+ ],
+ "buildpacks": [
+ {
+ "url": "https://github.com/heroku/heroku-buildpack-nodejs"
+ },
+ {
+ "url": "https://github.com/ejholmes/heroku-buildpack-bower"
+ },
+ {
+ "url": "heroku/python"
+ }
+ ],
+ "env": {
+ "PLATFORM_URL": {
+ "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)",
+ "required": true,
+ "value": ""
+ },
+ "ADMIN_EMAIL": {
+ "description": "Your email address for the authentication to the platform.",
+ "required": true,
+ "value": ""
+ },
+ "ADMIN_PASSWORD": {
+ "description": "Your password.",
+ "required": true,
+ "value": ""
+ },
+ "SECRET_KEY": {
+ "description": "A secret token only you know in order to use sessions.",
+ "required": true,
+ "value": "iYtWRvAl!S7+Gz8kabK3@CBvr"
+ },
+ "SELF_REGISTRATION": {
+ "description": "Users are able to create new account.",
+ "required": true,
+ "value": "false"
+ },
+ "SECURITY_PASSWORD_SALT": {
+ "description": "A secret to confirm user account with a link in an email.",
+ "required": true,
+ "value": "^HEpK@L&cP5dMR^kiz8IIZj8q"
+ },
+ "TOKEN_VALIDITY_PERIOD": {
+ "description": "Validity period (in seconds) of the account confirmation link sent by email.",
+ "required": true,
+ "value": "3600"
+ },
+ "HEROKU": "1",
+ "CDN_ADDRESS": "https://cdn.cedricbonhomme.org/",
+ "NOTIFICATION_EMAIL": "newspipe@no-reply.com",
+ "POSTMARK_API_KEY": "REDACTED",
+ "CRAWLER_RESOLV": {
+ "description": "Specify if the crawler should try to resolve link of articles behind proxies.",
+ "value": "false"
+ },
+ "FEED_REFRESH_INTERVAL": {
+ "description": "Feeds refresh interval (in minutes) for the crawler.",
+ "value": "120"
+ }
}
- },
- "addons": [
- "heroku-postgresql:hobby-dev",
- "scheduler:standard"
- ]
}
diff --git a/bower.json b/bower.json
index cf816f65..56d4ff1d 100644
--- a/bower.json
+++ b/bower.json
@@ -12,6 +12,7 @@
"dependencies": {
"datatables.net": "^1.10.12",
"datatables.net-dt": "^1.10.12",
- "datatables.net-bs": "^1.10.12"
+ "datatables.net-bs": "^1.10.12",
+ "bootstrap": "^3.3.7"
}
}
diff --git a/src/web/static/css/bootstrap-theme.min.css b/src/web/static/css/bootstrap-theme.min.css
index 27d5b351..06469c8d 120000
--- a/src/web/static/css/bootstrap-theme.min.css
+++ b/src/web/static/css/bootstrap-theme.min.css
@@ -1 +1 @@
-../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file
+../bower_components/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file
diff --git a/src/web/static/css/bootstrap-theme.min.css.map b/src/web/static/css/bootstrap-theme.min.css.map
index 8172f381..0448a4a0 120000
--- a/src/web/static/css/bootstrap-theme.min.css.map
+++ b/src/web/static/css/bootstrap-theme.min.css.map
@@ -1 +1 @@
-../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file
+../bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file
diff --git a/src/web/static/css/bootstrap.min.css b/src/web/static/css/bootstrap.min.css
index 9293a126..30c399cb 120000
--- a/src/web/static/css/bootstrap.min.css
+++ b/src/web/static/css/bootstrap.min.css
@@ -1 +1 @@
-../../../../submodules/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file
+../bower_components/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file
diff --git a/src/web/static/css/bootstrap.min.css.map b/src/web/static/css/bootstrap.min.css.map
index 655b0135..146f88dd 120000
--- a/src/web/static/css/bootstrap.min.css.map
+++ b/src/web/static/css/bootstrap.min.css.map
@@ -1 +1 @@
-../../../../submodules/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file
+../bower_components/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file
diff --git a/src/web/static/fonts b/src/web/static/fonts
index 0061ad7b..4097ea8b 120000
--- a/src/web/static/fonts
+++ b/src/web/static/fonts
@@ -1 +1 @@
-../../../submodules/bootstrap/dist/fonts/ \ No newline at end of file
+bower_components/bootstrap/dist/fonts/ \ No newline at end of file
diff --git a/submodules/bootstrap b/submodules/bootstrap
deleted file mode 160000
-Subproject bb5542651d89ba4c26950d349f74845d0d3384a
bgstack15