diff --git a/INSTALL.md b/INSTALL.md
index eb677143..05ee4db4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -12,7 +12,7 @@ and Docker Compose (version 1.6.0 or greater) already installed.
2. Configure the application:
```console
- user@host:szuru$ cp server/config.yaml.dist config.yaml
+ user@host:szuru$ cp server/config.yaml.dist server/config.yaml
user@host:szuru$ edit config.yaml
```
diff --git a/client/app/manifest.json b/client/app/manifest.json
new file mode 100644
index 00000000..067677ab
--- /dev/null
+++ b/client/app/manifest.json
@@ -0,0 +1,19 @@
+{
+ "name": "szurubooru",
+ "icons": [
+ {
+ "src": "/img/android-chrome-192x192.png",
+ "type": "image/png",
+ "sizes": "192x192"
+ },
+ {
+ "src": "/img/android-chrome-512x512.png",
+ "type": "image/png",
+ "sizes": "512x512"
+ }
+ ],
+ "start_url": "/",
+ "theme_color": "#24aadd",
+ "background_color": "#ffffff",
+ "display": "standalone"
+}
diff --git a/client/build.js b/client/build.js
index e5513842..dd725738 100644
--- a/client/build.js
+++ b/client/build.js
@@ -185,9 +185,14 @@ function bundleBinaryAssets() {
});
}
+function bundleWebAppFiles() {
+ copyFile('./app/manifest.json', './public/manifest.json');
+}
+
const config = getConfig();
bundleConfig(config);
bundleBinaryAssets();
+bundleWebAppFiles();
if (!process.argv.includes('--no-html')) {
bundleHtml();
}
diff --git a/client/html/index.htm b/client/html/index.htm
index 5df8e6dd..7d67ae36 100644
--- a/client/html/index.htm
+++ b/client/html/index.htm
@@ -2,11 +2,25 @@
-
+
+
+
+
+
+
Loading...
+
+
+
+
+
+
+
+
+
diff --git a/client/img/android-chrome-192x192.png b/client/img/android-chrome-192x192.png
new file mode 100644
index 00000000..71c594a0
Binary files /dev/null and b/client/img/android-chrome-192x192.png differ
diff --git a/client/img/android-chrome-512x512.png b/client/img/android-chrome-512x512.png
new file mode 100644
index 00000000..0d579f80
Binary files /dev/null and b/client/img/android-chrome-512x512.png differ
diff --git a/client/img/apple-touch-icon.png b/client/img/apple-touch-icon.png
new file mode 100644
index 00000000..58809e58
Binary files /dev/null and b/client/img/apple-touch-icon.png differ
diff --git a/client/img/apple-touch-startup-image-1125x2436.png b/client/img/apple-touch-startup-image-1125x2436.png
new file mode 100644
index 00000000..f8f2dc8c
Binary files /dev/null and b/client/img/apple-touch-startup-image-1125x2436.png differ
diff --git a/client/img/apple-touch-startup-image-1242x2148.png b/client/img/apple-touch-startup-image-1242x2148.png
new file mode 100644
index 00000000..c73d3a2e
Binary files /dev/null and b/client/img/apple-touch-startup-image-1242x2148.png differ
diff --git a/client/img/apple-touch-startup-image-1536x2048.png b/client/img/apple-touch-startup-image-1536x2048.png
new file mode 100644
index 00000000..4c81eb21
Binary files /dev/null and b/client/img/apple-touch-startup-image-1536x2048.png differ
diff --git a/client/img/apple-touch-startup-image-1668x2224.png b/client/img/apple-touch-startup-image-1668x2224.png
new file mode 100644
index 00000000..3a811657
Binary files /dev/null and b/client/img/apple-touch-startup-image-1668x2224.png differ
diff --git a/client/img/apple-touch-startup-image-2048x2732.png b/client/img/apple-touch-startup-image-2048x2732.png
new file mode 100644
index 00000000..ef8dfa64
Binary files /dev/null and b/client/img/apple-touch-startup-image-2048x2732.png differ
diff --git a/client/img/apple-touch-startup-image-640x1136.png b/client/img/apple-touch-startup-image-640x1136.png
new file mode 100644
index 00000000..6268f3cd
Binary files /dev/null and b/client/img/apple-touch-startup-image-640x1136.png differ
diff --git a/client/img/apple-touch-startup-image-750x1294.png b/client/img/apple-touch-startup-image-750x1294.png
new file mode 100644
index 00000000..971faf64
Binary files /dev/null and b/client/img/apple-touch-startup-image-750x1294.png differ
diff --git a/client/img/mstile-150x150.png b/client/img/mstile-150x150.png
new file mode 100644
index 00000000..8c5dbc9f
Binary files /dev/null and b/client/img/mstile-150x150.png differ
diff --git a/client/public/.gitignore b/client/public/.gitignore
index 425d6f86..2e4c0a29 100644
--- a/client/public/.gitignore
+++ b/client/public/.gitignore
@@ -1,2 +1,3 @@
data/
+manifest.json
index.htm
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index b44449f7..ab8ab2ef 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -38,7 +38,7 @@ services:
## If more customizations that are not covered in `config.yaml.dist` are needed
## Comment this line if you are not going
## to supply a YAML file
- - ./config.yaml:/opt/config.yaml
+ - ./server/config.yaml:/opt/app/config.yaml
## HTTP container for frontend
frontend:
diff --git a/server/Dockerfile b/server/Dockerfile
index 3aa5ab31..dd5bd5ad 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -3,7 +3,7 @@ WORKDIR /opt/app
COPY alembic.ini wait-for-es generate-thumb ./
COPY szurubooru/ ./szurubooru/
-COPY config.yaml.dist ../
+COPY config.yaml.dist ./
FROM python:3.6-slim
diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py
index 3ddbea53..b2f593d6 100644
--- a/server/szurubooru/config.py
+++ b/server/szurubooru/config.py
@@ -46,10 +46,10 @@ def docker_config() -> Dict:
def read_config() -> Dict:
- with open('../config.yaml.dist') as handle:
+ with open('config.yaml.dist') as handle:
ret = yaml.load(handle.read())
- if os.path.exists('../config.yaml'):
- with open('../config.yaml') as handle:
+ if os.path.exists('config.yaml'):
+ with open('config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config())