Write output to public, remove obsolete files from public

.gitignore

@@ -24,5 +24,5 @@ yarn-error.log*
 locales/translations.json
 src/translations
 locales/*/app.po~
-output
+public
 __pycache__

Makefile

@@ -4,7 +4,7 @@ PELICANOPTS=
 
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=$(BASEDIR)/output
+OUTPUTDIR=$(BASEDIR)/public
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 

pelicanconf.py

@@ -3,6 +3,7 @@ SITENAME = "Funkwhale"
 SITEURL = "http://localhost:8000"
 
 PATH = "content"
+OUTPUT_PATH = "public/"
 
 TIMEZONE = "Europe/Berlin"
 
@@ -47,9 +48,9 @@ PLUGIN_PATHS = ["pelican-plugins"]
 PLUGINS = ["i18n_subsites"]
 
 I18N_SUBSITES = {
-    "de": {"OUTPUT_PATH": "output/de_DE", "SITEURL": SITEURL + "/de_DE"},
-    "fr": {"OUTPUT_PATH": "output/fr_FR", "SITEURL": SITEURL + "/fr_FR"},
-    "ru": {"OUTPUT_PATH": "output/ru_RU", "SITEURL": SITEURL + "/ru_RU"},
+    "de": {"OUTPUT_PATH": "public/de_DE", "SITEURL": SITEURL + "/de_DE"},
+    "fr": {"OUTPUT_PATH": "public/fr_FR", "SITEURL": SITEURL + "/fr_FR"},
+    "ru": {"OUTPUT_PATH": "public/ru_RU", "SITEURL": SITEURL + "/ru_RU"},
 }
 I18N_UNTRANSLATED_PAGES = "keep"
 

public/img/logos/icon-monochrome.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Calque_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 252.65424 228.43591"
-   xml:space="preserve"
-   sodipodi:docname="logo-transparent.svg"
-   width="252.65424"
-   height="228.43591"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata25"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs23" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1043"
-   id="namedview21"
-   showgrid="true"
-   inkscape:zoom="1.84375"
-   inkscape:cx="210.72257"
-   inkscape:cy="88.813847"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Calque_1"><inkscape:grid
-     type="xygrid"
-     id="grid4535"
-     originx="-1.1305091"
-     originy="-14.869552" /></sodipodi:namedview>
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#000000;}
-	.st2{fill:#000000;}
-</style>
-
-<g
-   id="g18"
-   transform="matrix(1.3627521,0,0,1.3627521,-48.105149,-68.371499)">
-	<g
-   id="g16">
-		<g
-   id="g12">
-			<path
-   class="st1"
-   d="m 128,157.1 c 17.7,0 32.1,-14.4 32.1,-32.1 0,-0.9 -0.8,-1.7 -1.7,-1.7 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,9.1 -7.4,16.6 -16.6,16.6 -9.1,0 -16.6,-7.4 -16.6,-16.6 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 97.6 c -0.9,0 -1.7,0.8 -1.7,1.7 0,17.8 14.4,32.1 32.1,32.1 z"
-   id="path6"
-   inkscape:connector-curvature="0"
-   style="fill:#000000" />
-			<path
-   class="st1"
-   d="m 128,187.4 c 34.3,0 62.3,-28 62.3,-62.3 0,-0.9 -0.8,-1.7 -1.7,-1.7 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,25.9 -21,46.9 -46.9,46.9 C 102,172 81,151 81,125.1 c 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 67.4 c -0.9,0 -1.7,0.8 -1.7,1.7 -0.2,34.3 27.8,62.3 62.3,62.3 z"
-   id="path8"
-   inkscape:connector-curvature="0"
-   style="fill:#000000" />
-			<path
-   class="st1"
-   d="m 219,123.4 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,42.6 -34.8,77.3 -77.3,77.3 -42.6,0 -77.3,-34.6 -77.3,-77.3 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 37 c -0.9,0 -1.7,0.8 -1.7,1.7 0,51.1 41.6,92.7 92.7,92.7 51.1,0 92.7,-41.6 92.7,-92.7 0,-0.9 -0.8,-1.7 -1.7,-1.7 z"
-   id="path10"
-   inkscape:connector-curvature="0"
-   style="fill:#000000" />
-		</g>
-		<path
-   class="st2"
-   d="m 86.3,83.3 c 6.2,3.2 12.9,3.8 18.9,7.3 3.9,2.3 6.4,4.8 8.8,8.6 3.8,5.7 3.6,12.9 3.6,12.9 l 0.5,7.9 c 0,0 3,7.9 9.7,7.9 7.1,0 9.7,-7.9 9.7,-7.9 l 0.5,-7.9 c 0,0 -0.2,-7.1 3.6,-12.9 2.4,-3.8 4.8,-6.5 8.8,-8.6 6,-3.5 12.7,-4.1 18.9,-7.3 6.2,-3.2 12.2,-7.3 16.3,-13 4.1,-5.7 6,-13.3 3.8,-20 -11.8,-0.6 -25.4,0.8 -35.8,6.4 -14.5,7.7 -23.3,5 -25.9,16.5 h -0.2 c -2.6,-11.6 -11.3,-8.8 -25.9,-16.5 -10.4,-5.6 -24,-7 -35.8,-6.4 -2.3,6.7 -0.3,14.2 3.8,20 4.4,5.8 10.5,9.9 16.7,13 z"
-   id="path14"
-   inkscape:connector-curvature="0"
-   style="fill:#000000" />
-	</g>
-</g>
-</svg>

public/img/logos/icon.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Calque_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 252.65424 228.43591"
-   xml:space="preserve"
-   sodipodi:docname="logo-transparent.svg"
-   width="252.65424"
-   height="228.43591"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata25"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs23" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1043"
-   id="namedview21"
-   showgrid="true"
-   inkscape:zoom="1.84375"
-   inkscape:cx="210.72257"
-   inkscape:cy="88.813847"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Calque_1"><inkscape:grid
-     type="xygrid"
-     id="grid4535"
-     originx="-1.1305091"
-     originy="-14.869552" /></sodipodi:namedview>
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#009FE3;}
-	.st2{fill:#3C3C3B;}
-</style>
-
-<g
-   id="g18"
-   transform="matrix(1.3627521,0,0,1.3627521,-48.105149,-68.371499)">
-	<g
-   id="g16">
-		<g
-   id="g12">
-			<path
-   class="st1"
-   d="m 128,157.1 c 17.7,0 32.1,-14.4 32.1,-32.1 0,-0.9 -0.8,-1.7 -1.7,-1.7 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,9.1 -7.4,16.6 -16.6,16.6 -9.1,0 -16.6,-7.4 -16.6,-16.6 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 97.6 c -0.9,0 -1.7,0.8 -1.7,1.7 0,17.8 14.4,32.1 32.1,32.1 z"
-   id="path6"
-   inkscape:connector-curvature="0"
-   style="fill:#009fe3" />
-			<path
-   class="st1"
-   d="m 128,187.4 c 34.3,0 62.3,-28 62.3,-62.3 0,-0.9 -0.8,-1.7 -1.7,-1.7 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,25.9 -21,46.9 -46.9,46.9 C 102,172 81,151 81,125.1 c 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 67.4 c -0.9,0 -1.7,0.8 -1.7,1.7 -0.2,34.3 27.8,62.3 62.3,62.3 z"
-   id="path8"
-   inkscape:connector-curvature="0"
-   style="fill:#009fe3" />
-			<path
-   class="st1"
-   d="m 219,123.4 h -12.1 c -0.9,0 -1.7,0.8 -1.7,1.7 0,42.6 -34.8,77.3 -77.3,77.3 -42.6,0 -77.3,-34.6 -77.3,-77.3 0,-0.9 -0.8,-1.7 -1.7,-1.7 H 37 c -0.9,0 -1.7,0.8 -1.7,1.7 0,51.1 41.6,92.7 92.7,92.7 51.1,0 92.7,-41.6 92.7,-92.7 0,-0.9 -0.8,-1.7 -1.7,-1.7 z"
-   id="path10"
-   inkscape:connector-curvature="0"
-   style="fill:#009fe3" />
-		</g>
-		<path
-   class="st2"
-   d="m 86.3,83.3 c 6.2,3.2 12.9,3.8 18.9,7.3 3.9,2.3 6.4,4.8 8.8,8.6 3.8,5.7 3.6,12.9 3.6,12.9 l 0.5,7.9 c 0,0 3,7.9 9.7,7.9 7.1,0 9.7,-7.9 9.7,-7.9 l 0.5,-7.9 c 0,0 -0.2,-7.1 3.6,-12.9 2.4,-3.8 4.8,-6.5 8.8,-8.6 6,-3.5 12.7,-4.1 18.9,-7.3 6.2,-3.2 12.2,-7.3 16.3,-13 4.1,-5.7 6,-13.3 3.8,-20 -11.8,-0.6 -25.4,0.8 -35.8,6.4 -14.5,7.7 -23.3,5 -25.9,16.5 h -0.2 c -2.6,-11.6 -11.3,-8.8 -25.9,-16.5 -10.4,-5.6 -24,-7 -35.8,-6.4 -2.3,6.7 -0.3,14.2 3.8,20 4.4,5.8 10.5,9.9 16.7,13 z"
-   id="path14"
-   inkscape:connector-curvature="0"
-   style="fill:#3c3c3b" />
-	</g>
-</g>
-</svg>
\ No newline at end of file

public/img/logos/white-bg.svg

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#009FE3;}
-	.st2{fill:#3C3C3B;}
-</style>
-<circle class="st0" cx="128" cy="128" r="128"/>
-<g>
-	<g>
-		<g>
-			<path class="st1" d="M128,157.1c17.7,0,32.1-14.4,32.1-32.1c0-0.9-0.8-1.7-1.7-1.7h-12.1c-0.9,0-1.7,0.8-1.7,1.7
-				c0,9.1-7.4,16.6-16.6,16.6c-9.1,0-16.6-7.4-16.6-16.6c0-0.9-0.8-1.7-1.7-1.7H97.6c-0.9,0-1.7,0.8-1.7,1.7
-				C95.9,142.8,110.3,157.1,128,157.1z"/>
-			<path class="st1" d="M128,187.4c34.3,0,62.3-28,62.3-62.3c0-0.9-0.8-1.7-1.7-1.7h-12.1c-0.9,0-1.7,0.8-1.7,1.7
-				c0,25.9-21,46.9-46.9,46.9s-46.9-21-46.9-46.9c0-0.9-0.8-1.7-1.7-1.7H67.4c-0.9,0-1.7,0.8-1.7,1.7
-				C65.5,159.4,93.5,187.4,128,187.4z"/>
-			<path class="st1" d="M219,123.4h-12.1c-0.9,0-1.7,0.8-1.7,1.7c0,42.6-34.8,77.3-77.3,77.3c-42.6,0-77.3-34.6-77.3-77.3
-				c0-0.9-0.8-1.7-1.7-1.7H37c-0.9,0-1.7,0.8-1.7,1.7c0,51.1,41.6,92.7,92.7,92.7s92.7-41.6,92.7-92.7
-				C220.7,124.2,219.9,123.4,219,123.4z"/>
-		</g>
-		<path class="st2" d="M86.3,83.3c6.2,3.2,12.9,3.8,18.9,7.3c3.9,2.3,6.4,4.8,8.8,8.6c3.8,5.7,3.6,12.9,3.6,12.9l0.5,7.9
-			c0,0,3,7.9,9.7,7.9c7.1,0,9.7-7.9,9.7-7.9l0.5-7.9c0,0-0.2-7.1,3.6-12.9c2.4-3.8,4.8-6.5,8.8-8.6c6-3.5,12.7-4.1,18.9-7.3
-			c6.2-3.2,12.2-7.3,16.3-13s6-13.3,3.8-20c-11.8-0.6-25.4,0.8-35.8,6.4c-14.5,7.7-23.3,5-25.9,16.5h-0.2
-			c-2.6-11.6-11.3-8.8-25.9-16.5c-10.4-5.6-24-7-35.8-6.4c-2.3,6.7-0.3,14.2,3.8,20C74,76.1,80.1,80.2,86.3,83.3z"/>
-	</g>
-</g>
-</svg>

public/index.html

-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.png">
-    <title>Your free and decentralized audio platform - Funkwhale</title>
-    <meta name="twitter:card" content="summary" />
-    <meta name="description" content="A social platform to enjoy and share music">
-    <meta property="og:type" content="website" />
-    <meta property="og:site_name" content="Funkwhale.audio" />
-    <meta property="og:title" content="Funkwhale - Your free and decentralized audio platform" />
-    <meta property="og:description" content="A social platform to enjoy and share music" />
-    <meta property="og:image" content="<%= BASE_URL %>favicon.png" />
-    <link rel="alternate" type="application/atom+xml" title="Blog - Atom Feed" href="https://blog.funkwhale.audio/~/Announcements/atom.xml">
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but funkwhale.audio doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>