diff --git a/.gitignore b/.gitignore index 1e4b858d..78c614d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +#artwork/*.png target/ dev.conf elm-stuff diff --git a/artwork/logo-400.png b/artwork/logo-400.png new file mode 100644 index 00000000..25ff42b9 Binary files /dev/null and b/artwork/logo-400.png differ diff --git a/artwork/logo-48.png b/artwork/logo-48.png new file mode 100644 index 00000000..dc42d595 Binary files /dev/null and b/artwork/logo-48.png differ diff --git a/artwork/logo-96.png b/artwork/logo-96.png new file mode 100644 index 00000000..c7c21fb9 Binary files /dev/null and b/artwork/logo-96.png differ diff --git a/artwork/logo-mc-400.png b/artwork/logo-mc-400.png new file mode 100644 index 00000000..cef5442c Binary files /dev/null and b/artwork/logo-mc-400.png differ diff --git a/artwork/logo-mc-96.png b/artwork/logo-mc-96.png new file mode 100644 index 00000000..ab300dd1 Binary files /dev/null and b/artwork/logo-mc-96.png differ diff --git a/artwork/logo-only-mc.svg b/artwork/logo-only-mc.svg new file mode 100644 index 00000000..61dc53de --- /dev/null +++ b/artwork/logo-only-mc.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/artwork/logo-only.svg b/artwork/logo-only.svg new file mode 100644 index 00000000..3a577dc6 --- /dev/null +++ b/artwork/logo-only.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/artwork/make-png.sh b/artwork/make-png.sh new file mode 100755 index 00000000..d3420d83 --- /dev/null +++ b/artwork/make-png.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +inkscape -z -e logo-96.png -w 96 -h 96 logo-only.svg +inkscape -z -e logo-400.png -w 400 -h 400 logo-only.svg +inkscape -z -e logo-mc-96.png -w 96 -h 96 logo-only-mc.svg +inkscape -z -e logo-mc-400.png -w 400 -h 400 logo-only-mc.svg diff --git a/modules/microsite/src/main/resources/microsite/img/favicon.png b/modules/microsite/src/main/resources/microsite/img/favicon.png index add0937c..713c4fb8 120000 --- a/modules/microsite/src/main/resources/microsite/img/favicon.png +++ b/modules/microsite/src/main/resources/microsite/img/favicon.png @@ -1 +1 @@ -../../../../../../webapp/src/main/webjar/favicon/android-icon-96x96.png \ No newline at end of file +../../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/microsite/src/main/resources/microsite/img/navbar_brand.png b/modules/microsite/src/main/resources/microsite/img/navbar_brand.png deleted file mode 100644 index f41a3178..00000000 Binary files a/modules/microsite/src/main/resources/microsite/img/navbar_brand.png and /dev/null differ diff --git a/modules/microsite/src/main/resources/microsite/img/navbar_brand.png b/modules/microsite/src/main/resources/microsite/img/navbar_brand.png new file mode 120000 index 00000000..713c4fb8 --- /dev/null +++ b/modules/microsite/src/main/resources/microsite/img/navbar_brand.png @@ -0,0 +1 @@ +../../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png b/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png deleted file mode 100644 index f41a3178..00000000 Binary files a/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png and /dev/null differ diff --git a/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png b/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png new file mode 120000 index 00000000..713c4fb8 --- /dev/null +++ b/modules/microsite/src/main/resources/microsite/img/navbar_brand2x.png @@ -0,0 +1 @@ +../../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png b/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png deleted file mode 100644 index f41a3178..00000000 Binary files a/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png and /dev/null differ diff --git a/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png b/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png new file mode 120000 index 00000000..713c4fb8 --- /dev/null +++ b/modules/microsite/src/main/resources/microsite/img/sidebar_brand.png @@ -0,0 +1 @@ +../../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png b/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png deleted file mode 100644 index f41a3178..00000000 Binary files a/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png and /dev/null differ diff --git a/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png b/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png new file mode 120000 index 00000000..713c4fb8 --- /dev/null +++ b/modules/microsite/src/main/resources/microsite/img/sidebar_brand2x.png @@ -0,0 +1 @@ +../../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/microsite/src/main/tut/doc/tools.md b/modules/microsite/src/main/tut/doc/tools.md index 245f5967..1a635231 100644 --- a/modules/microsite/src/main/tut/doc/tools.md +++ b/modules/microsite/src/main/tut/doc/tools.md @@ -10,7 +10,7 @@ for integrating docspell. ## consumedir -The `consumerdir` is a bash script that works in two modes: +The `consumerdir.sh` is a bash script that works in two modes: - Go through all files in given directories (non recursively) and sent each to docspell. @@ -31,15 +31,39 @@ files. For this the `sha256sum` command is required. Example for watching two directories: ``` bash -./tools/consumedir.sh --path ~/Downloads --path ~/pdfs/ -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ +./tools/consumedir.sh --path ~/Downloads --path ~/pdfs -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ ``` The script by default watches the given directories. If the `-o` option is used, it will instead go through these directories and upload all pdf files in there. -Example for uploading all immediatly: +Example for uploading all immediatly (the same as above only with `-o` +added): ``` bash ./tools/consumedir.sh -o --path ~/Downloads --path ~/pdfs/ -m /var/run/consumedir -dv http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ ``` + + +### Systemd + +The script can be used with systemd to run as a service. This is an +example unit file: + +``` +[Unit] +After=networking.target +Description=Docspell Consumedir + +[Service] +Environment="PATH=/set/a/path" + +ExecStartPre=mkdir -p /var/run/consumedir && chown -R someuser /var/run/consumedir +ExecStart=/bin/su -s /bin/bash someuser -c "consumedir.sh --path '/a/path/' -m '/var/run/consumedir' 'http://localhost:7880/api/v1/open/upload/item/5DxhjkvWf9S-CkWqF3Kr892-WgoCspFWDo7-XBykwCyAUxQ'" +``` + +This unit file is just an example, it needs some fiddling. It assumes +an existing user `someuser` that is used to run this service. The url +`http://localhost:7880/api/v1/open/upload/...` is an anonymous upload +url as described [here](./uploading.html). diff --git a/modules/webapp/src/main/elm/App/View.elm b/modules/webapp/src/main/elm/App/View.elm index 03069cc7..4c3136d6 100644 --- a/modules/webapp/src/main/elm/App/View.elm +++ b/modules/webapp/src/main/elm/App/View.elm @@ -59,10 +59,12 @@ defaultLayout model = [ a [class "header item narrow-item" ,Page.href HomePage ] - [i [classList [("umbrella icon", True) - ]] - [] - ,text model.flags.config.appName] + [img [class "image" + ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][] + ,div [class "content"] + [text model.flags.config.appName + ] + ] , (loginInfo model) ] ] @@ -150,7 +152,9 @@ loginInfo model = ] ] [menuEntry model HomePage - [i [class "umbrella icon"][] + [img [class "image icon" + ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-mc-96.png" + ][] ,text "Items" ] ,div [class "divider"][] diff --git a/modules/webapp/src/main/elm/Page/Login/View.elm b/modules/webapp/src/main/elm/Page/Login/View.elm index 90785ccb..0f4117dd 100644 --- a/modules/webapp/src/main/elm/Page/Login/View.elm +++ b/modules/webapp/src/main/elm/Page/Login/View.elm @@ -13,7 +13,9 @@ view model = [div [class "row"] [div [class "six wide column ui segment login-view"] [h1 [class "ui center aligned icon header"] - [i [class "umbrella icon"][] + [img [class "ui image" + ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png" + ][] ,div [class "content"] [text "Sign in to Docspell" ] diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View.elm b/modules/webapp/src/main/elm/Page/NewInvite/View.elm index 28776f24..c868e405 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/View.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/View.elm @@ -15,8 +15,12 @@ view flags model = [div [class "row"] [div [class "eight wide column ui segment newinvite-view"] [h1 [class "ui cener aligned icon header"] - [i [class "umbrella icon"][] - ,text "Create new invitations" + [img [class "ui image" + ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png" + ][] + ,div [class "content"] + [text "Create new invitations" + ] ] ,inviteMessage flags ,Html.form [classList [("ui large form raised segment", True) diff --git a/modules/webapp/src/main/elm/Page/Register/View.elm b/modules/webapp/src/main/elm/Page/Register/View.elm index e7ed1c58..f6894fd2 100644 --- a/modules/webapp/src/main/elm/Page/Register/View.elm +++ b/modules/webapp/src/main/elm/Page/Register/View.elm @@ -14,8 +14,11 @@ view flags model = [div [class "row"] [div [class "six wide column ui segment register-view"] [h1 [class "ui cener aligned icon header"] - [i [class "umbrella icon"][] - ,text "Sign up @ Docspell" + [img [class "ui image" + ,src "assets/docspell-webapp/0.1.0-SNAPSHOT/img/logo-96.png"][] + ,div [class "content"] + [text "Sign up @ Docspell" + ] ] ,Html.form [class "ui large error form raised segment", onSubmit RegisterSubmit] [div [class "required field"] diff --git a/modules/webapp/src/main/webjar/docspell.css b/modules/webapp/src/main/webjar/docspell.css index 31452bc6..45e6ac0d 100644 --- a/modules/webapp/src/main/webjar/docspell.css +++ b/modules/webapp/src/main/webjar/docspell.css @@ -17,6 +17,17 @@ box-shadow: 1px 1px 0px 0px black; } +.default-layout .top-menu a.header.item img { + width: 24px; + height: 24px; +} +.default-layout .top-menu a.header.item .content { + margin-left: 0.5em; +} +.default-layout a.icon.item img.image.icon { + width: 18.75px; +} + .default-layout .ui.multiple.search.dropdown>input.search { width: 3.5em; } diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-144x144.png b/modules/webapp/src/main/webjar/favicon/android-icon-144x144.png index 3e2b85ac..b435b203 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-144x144.png and b/modules/webapp/src/main/webjar/favicon/android-icon-144x144.png differ diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-192x192.png b/modules/webapp/src/main/webjar/favicon/android-icon-192x192.png index 116cdacb..89874520 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-192x192.png and b/modules/webapp/src/main/webjar/favicon/android-icon-192x192.png differ diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-36x36.png b/modules/webapp/src/main/webjar/favicon/android-icon-36x36.png index 839996c1..fd54b4d1 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-36x36.png and b/modules/webapp/src/main/webjar/favicon/android-icon-36x36.png differ diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-48x48.png b/modules/webapp/src/main/webjar/favicon/android-icon-48x48.png index 3df120db..5703dbe0 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-48x48.png and b/modules/webapp/src/main/webjar/favicon/android-icon-48x48.png differ diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-72x72.png b/modules/webapp/src/main/webjar/favicon/android-icon-72x72.png index 695e4c79..a23f0710 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-72x72.png and b/modules/webapp/src/main/webjar/favicon/android-icon-72x72.png differ diff --git a/modules/webapp/src/main/webjar/favicon/android-icon-96x96.png b/modules/webapp/src/main/webjar/favicon/android-icon-96x96.png index 1261adf1..93ad58af 100644 Binary files a/modules/webapp/src/main/webjar/favicon/android-icon-96x96.png and b/modules/webapp/src/main/webjar/favicon/android-icon-96x96.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-114x114.png b/modules/webapp/src/main/webjar/favicon/apple-icon-114x114.png index 27d7e329..3fde7578 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-114x114.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-114x114.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-120x120.png b/modules/webapp/src/main/webjar/favicon/apple-icon-120x120.png index f4e4a248..b7ca66e2 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-120x120.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-120x120.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-144x144.png b/modules/webapp/src/main/webjar/favicon/apple-icon-144x144.png index 3e2b85ac..b435b203 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-144x144.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-144x144.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-152x152.png b/modules/webapp/src/main/webjar/favicon/apple-icon-152x152.png index e6545fa8..313edd31 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-152x152.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-152x152.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-180x180.png b/modules/webapp/src/main/webjar/favicon/apple-icon-180x180.png index 54869a40..1be474e5 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-180x180.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-180x180.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-57x57.png b/modules/webapp/src/main/webjar/favicon/apple-icon-57x57.png index 9c815ed1..0091f38b 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-57x57.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-57x57.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-60x60.png b/modules/webapp/src/main/webjar/favicon/apple-icon-60x60.png index eebea11f..b4ca77c0 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-60x60.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-60x60.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-72x72.png b/modules/webapp/src/main/webjar/favicon/apple-icon-72x72.png index 695e4c79..a23f0710 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-72x72.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-72x72.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-76x76.png b/modules/webapp/src/main/webjar/favicon/apple-icon-76x76.png index 8bec684c..73c3c169 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-76x76.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-76x76.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon-precomposed.png b/modules/webapp/src/main/webjar/favicon/apple-icon-precomposed.png index 0940deec..c4b1d740 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon-precomposed.png and b/modules/webapp/src/main/webjar/favicon/apple-icon-precomposed.png differ diff --git a/modules/webapp/src/main/webjar/favicon/apple-icon.png b/modules/webapp/src/main/webjar/favicon/apple-icon.png index 0940deec..c4b1d740 100644 Binary files a/modules/webapp/src/main/webjar/favicon/apple-icon.png and b/modules/webapp/src/main/webjar/favicon/apple-icon.png differ diff --git a/modules/webapp/src/main/webjar/favicon/favicon-16x16.png b/modules/webapp/src/main/webjar/favicon/favicon-16x16.png index bdf32a64..74aa41b4 100644 Binary files a/modules/webapp/src/main/webjar/favicon/favicon-16x16.png and b/modules/webapp/src/main/webjar/favicon/favicon-16x16.png differ diff --git a/modules/webapp/src/main/webjar/favicon/favicon-32x32.png b/modules/webapp/src/main/webjar/favicon/favicon-32x32.png index ccada452..8d8f964d 100644 Binary files a/modules/webapp/src/main/webjar/favicon/favicon-32x32.png and b/modules/webapp/src/main/webjar/favicon/favicon-32x32.png differ diff --git a/modules/webapp/src/main/webjar/favicon/favicon-96x96.png b/modules/webapp/src/main/webjar/favicon/favicon-96x96.png index 1261adf1..93ad58af 100644 Binary files a/modules/webapp/src/main/webjar/favicon/favicon-96x96.png and b/modules/webapp/src/main/webjar/favicon/favicon-96x96.png differ diff --git a/modules/webapp/src/main/webjar/favicon/favicon.ico b/modules/webapp/src/main/webjar/favicon/favicon.ico index 64ae647c..0d7d2b75 100644 Binary files a/modules/webapp/src/main/webjar/favicon/favicon.ico and b/modules/webapp/src/main/webjar/favicon/favicon.ico differ diff --git a/modules/webapp/src/main/webjar/favicon/ms-icon-144x144.png b/modules/webapp/src/main/webjar/favicon/ms-icon-144x144.png index 3e2b85ac..b435b203 100644 Binary files a/modules/webapp/src/main/webjar/favicon/ms-icon-144x144.png and b/modules/webapp/src/main/webjar/favicon/ms-icon-144x144.png differ diff --git a/modules/webapp/src/main/webjar/favicon/ms-icon-150x150.png b/modules/webapp/src/main/webjar/favicon/ms-icon-150x150.png index dd66a488..ea679d6c 100644 Binary files a/modules/webapp/src/main/webjar/favicon/ms-icon-150x150.png and b/modules/webapp/src/main/webjar/favicon/ms-icon-150x150.png differ diff --git a/modules/webapp/src/main/webjar/favicon/ms-icon-310x310.png b/modules/webapp/src/main/webjar/favicon/ms-icon-310x310.png index be18b359..58a30053 100644 Binary files a/modules/webapp/src/main/webjar/favicon/ms-icon-310x310.png and b/modules/webapp/src/main/webjar/favicon/ms-icon-310x310.png differ diff --git a/modules/webapp/src/main/webjar/favicon/ms-icon-70x70.png b/modules/webapp/src/main/webjar/favicon/ms-icon-70x70.png index 1e3b8340..7abd58b2 100644 Binary files a/modules/webapp/src/main/webjar/favicon/ms-icon-70x70.png and b/modules/webapp/src/main/webjar/favicon/ms-icon-70x70.png differ diff --git a/modules/webapp/src/main/webjar/img/logo-400.png b/modules/webapp/src/main/webjar/img/logo-400.png new file mode 120000 index 00000000..12942e8c --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-400.png @@ -0,0 +1 @@ +../../../../../../artwork/logo-400.png \ No newline at end of file diff --git a/modules/webapp/src/main/webjar/img/logo-96.png b/modules/webapp/src/main/webjar/img/logo-96.png new file mode 120000 index 00000000..ed8e8987 --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-96.png @@ -0,0 +1 @@ +../../../../../../artwork/logo-96.png \ No newline at end of file diff --git a/modules/webapp/src/main/webjar/img/logo-mc-400.png b/modules/webapp/src/main/webjar/img/logo-mc-400.png new file mode 120000 index 00000000..da92fa08 --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-mc-400.png @@ -0,0 +1 @@ +../../../../../../artwork/logo-mc-400.png \ No newline at end of file diff --git a/modules/webapp/src/main/webjar/img/logo-mc-96.png b/modules/webapp/src/main/webjar/img/logo-mc-96.png new file mode 120000 index 00000000..99088b66 --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-mc-96.png @@ -0,0 +1 @@ +../../../../../../artwork/logo-mc-96.png \ No newline at end of file diff --git a/modules/webapp/src/main/webjar/img/logo-only-mc.svg b/modules/webapp/src/main/webjar/img/logo-only-mc.svg new file mode 120000 index 00000000..acb7d3c8 --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-only-mc.svg @@ -0,0 +1 @@ +../../../../../../artwork/logo-only-mc.svg \ No newline at end of file diff --git a/modules/webapp/src/main/webjar/img/logo-only.svg b/modules/webapp/src/main/webjar/img/logo-only.svg new file mode 120000 index 00000000..574fdf9d --- /dev/null +++ b/modules/webapp/src/main/webjar/img/logo-only.svg @@ -0,0 +1 @@ +../../../../../../artwork/logo-only.svg \ No newline at end of file