Merge remote-tracking branch 'boilerplate/master' into develop

This commit is contained in:
Alice Gaudon 2020-06-27 17:26:08 +02:00
commit 1d47fbc921
4 changed files with 9 additions and 5 deletions

View File

@ -1,4 +1,8 @@
export default Object.assign(require("wms-core/config/default").default, { export default Object.assign(require("wms-core/config/default").default, {
app: {
name: 'ily.li',
contact_email: 'contact@ily.li'
},
domain: 'localhost', domain: 'localhost',
base_url: 'http://localhost:4893', base_url: 'http://localhost:4893',
public_websocket_url: 'ws://localhost:4893', public_websocket_url: 'ws://localhost:4893',

View File

@ -1,6 +1,6 @@
{% extends 'layouts/base.njk' %} {% extends 'layouts/base.njk' %}
{% set title = 'ily.li - About' %} {% set title = app.name + ' - About us' %}
{% block body %} {% block body %}
<h1>Self-hosting files</h1> <h1>Self-hosting files</h1>

View File

@ -7,7 +7,7 @@
{% endblock %} {% endblock %}
{% block _body %} {% block _body %}
<div class="logo"><a href="/">Example app</a></div> <div class="logo"><a href="/">{{ app.name }}</a></div>
<main class="{% block class %}{% endblock %}"> <main class="{% block class %}{% endblock %}">
{% if flash %} {% if flash %}
@ -31,6 +31,6 @@
Error ID: {{ error_id }} Error ID: {{ error_id }}
<br> <br>
If you think this isn't right, please contact us with the above error ID at If you think this isn't right, please contact us with the above error ID at
<a href="mailto:contact@example.net">contact@example.net</a>. <a href="mailto:{{ app.contact_email }}">{{ app.contact_email }}</a>.
</div> </div>
{% endblock %} {% endblock %}

View File

@ -12,7 +12,7 @@
{% endblock %} {% endblock %}
{% block header %} {% block header %}
<a href="/" class="logo"><img src="/img/logo.svg" alt="Logo"> ily.li</a> <a href="/" class="logo"><img src="/img/logo.svg" alt="Logo"> {{ app.name }}</a>
<nav> <nav>
<ul> <ul>
<li><a href="{{ route('about') }}"><i data-feather="info"></i> About</a></li> <li><a href="{{ route('about') }}"><i data-feather="info"></i> About</a></li>
@ -47,4 +47,4 @@
</main> </main>
{% endblock %} {% endblock %}
{% block footer %}ily.li v{{ app_version }} - all rights reserved.{% endblock %} {% block footer %}{{ app.name }} v{{ app_version }} - all rights reserved.{% endblock %}