Added some info to server front page

Author: megoth

common/img/.gitkeep

@@ -9,5 +9,10 @@
   "sslKey": "./cert.key",
   "sslCert": "./cert.pem",
   "multiuser": true,
-  "corsProxy": "/proxy"
+  "corsProxy": "/proxy",
+  "server": {
+    "name": "",
+    "description": "",
+    "logo": ""
+  }
 }

config.json-default

@@ -31,12 +31,20 @@ <h1>Welcome to the Solid Prototype</h1>
     If you have not already done so, please create an account.
   </p>
 
-
   <section>
+    {{#if serverLogo}}
+    <img src="{{serverLogo}}" />
+    {{/if}}
     <h2>Server info</h2>
     <dl>
-      <dt>Server name</dt>
+      <dt>Name</dt>
       <dd>{{serverName}}</dd>
+      {{#if serverDescription}}
+      <dt>Description</dt>
+      <dd>{{serverDescription}}</dd>
+      {{/if}}
+      <dt>Details</dt>
+      <dd>Running on {{serverVersion}} of <a href="https://solid.mit.edu/">Solid</a> (<a href="https://solid.inrupt.com/docs">Documentation</a>)</dd>
     </dl>
   </section>
 </div>

default-templates/server/index.html

@@ -36,10 +36,10 @@ function ensureDirCopyExists (fromDir, toDir) {
  * typically has links to account signup and login, and can be overridden by
  * the server operator.
  *
- * @param argv {Function} Express.js app object
+ * @param argv {Object} Express.js app object
  */
 async function ensureWelcomePage (argv) {
-  const { multiuser, templates } = argv
+  const { multiuser, templates, server, host, parent } = argv
   const rootDir = path.resolve(argv.root)
   const serverRootDir = multiuser ? path.join(rootDir, argv.host.hostname) : rootDir
 
@@ -49,11 +49,14 @@ async function ensureWelcomePage (argv) {
   // let existingIndexPageAcl = path.join(serverRootDir, 'index.html.acl')
 
   if (!fs.existsSync(existingIndexPage)) {
+    console.log(argv)
     fs.mkdirp(serverRootDir)
     await utils.copyTemplateDir(templates.server, serverRootDir)
     await utils.processHandlebarFile(existingIndexPage, {
-      serverName: 'Tittentei'
-      // Need to load config from somewhere
+      serverName: server ? server.name : host.hostname,
+      serverDescription: server ? server.description : '',
+      serverLogo: server ? server.logo : '',
+      serverVersion: parent._version
     })
     // fs.copySync(defaultIndexPageAcl, existingIndexPageAcl)
   }