iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More .editorconfig improvements

This commit is contained in:
Igor Scheller 2020-06-01 15:13:21 +02:00 committed by msquare
parent 85d9e01489
commit d79d2c87bc
9 changed files with 93 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.editorconfig
View File

@ -8,17 +8,34 @@ root = true
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120
[{.babelrc,package.json}]
indent_size = 2
[docker/**.conf]
indent_size = 2
[*.{htm,html,twig}]
indent_size = 4
[*.{js,css,less,sass,scss}]
indent_size = 2
[{LICENSE,db/*.sql}]
indent_size = unset
[*.md]
trim_trailing_whitespace = false
indent_size = 2
[*.php]
indent_size = 4
[*.{js,css,less,sass,scss}]
[*.sh]
indent_size = 2
[*.{yml,yaml}]

44
DEVELOPMENT.md
View File

@ -11,28 +11,28 @@ Please also read the [CONTRIBUTING.md](CONTRIBUTING.md).
## Local build
The following instructions explain how to get, build and run the latest Engelsystem version directly from the git master branch (may be unstable!).
* Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
* Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
* Install project dependencies:
```bash
composer install
yarn
```
On production systems it is recommended to use
```bash
composer install --no-dev
composer dump-autoload --optimize
```
to install the Engelsystem
* Build the frontend assets
```bash
yarn build
```
* Optionally (for better performance)
* Generate translation files
```bash
find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
```
* Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
* Install [Composer](https://getcomposer.org/download/) and [Yarn](https://yarnpkg.com/en/docs/install) (which requires [Node.js](https://nodejs.org/en/download/package-manager/))
* Install project dependencies:
```bash
composer install
yarn
```
On production systems it is recommended to use
```bash
composer install --no-dev
composer dump-autoload --optimize
```
to install the Engelsystem
* Build the frontend assets
```bash
yarn build
```
* Optionally (for better performance)
* Generate translation files
```bash
find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
```
## Testing
To run the unit tests use

9
phpunit.xml
View File

@ -1,7 +1,8 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
bootstrap="./includes/autoload.php"
colors="true"
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
bootstrap="./includes/autoload.php"
colors="true"
>
<testsuites>
<testsuite name="Feature">

2
resources/views/layouts/parts/footer.twig
View File

@ -31,7 +31,7 @@
{{ __(name) }}
</a> ·
{% endfor %}
<a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
<a href="https://github.com/engelsystem/engelsystem/issues">{{ __('Bugs / Features') }}</a>
· <a href="https://github.com/engelsystem/engelsystem/">{{ __('Development Platform') }}</a>
· <a href="{{ url('credits') }}">{{ __('Credits') }}</a>
</div>

46
resources/views/macros/form.twig
View File

@ -3,18 +3,19 @@
{% if label -%}
<label for="{{ name }}"{% if opt.hide_label|default(false) %} class="sr-only"{% endif %}>{{ label }}</label>
{%- endif %}
<input type="{{ type|default('text') }}" class="form-control"
id="{{ name }}" name="{{ name }}"
value="{{ opt.value|default('')|escape('html_attr') }}"
{%- if opt.required|default(false) %}
required
{%- endif -%}
{%- if opt.disabled|default(false) %}
disabled
{%- endif -%}
{%- if opt.readonly|default(false) %}
readonly
{%- endif -%}
<input
type="{{ type|default('text') }}" class="form-control"
id="{{ name }}" name="{{ name }}"
value="{{ opt.value|default('')|escape('html_attr') }}"
{%- if opt.required|default(false) %}
required
{%- endif -%}
{%- if opt.disabled|default(false) %}
disabled
{%- endif -%}
{%- if opt.readonly|default(false) %}
readonly
{%- endif -%}
>
</div>
{%- endmacro %}
@ -25,12 +26,12 @@
<label for="{{ name }}">{{ label }}</label>
{%- endif %}
<textarea class="form-control" id="{{ name }}" name="{{ name }}"
{%- if opt.required|default(false) %}
required
{%- endif -%}
{%- if opt.rows|default(0) %}
rows="{{ opt.rows }}"
{%- endif -%}
{%- if opt.required|default(false) %}
required
{%- endif -%}
{%- if opt.rows|default(0) %}
rows="{{ opt.rows }}"
{%- endif -%}
>{{ opt.value|default('') }}</textarea>
</div>
{%- endmacro %}
@ -52,7 +53,8 @@
<div class="checkbox">
<label>
<input type="checkbox" id="{{ name }}" name="{{ name }}" value="{{ value|default('1') }}"
{%- if checked|default(false) %} checked{% endif %}>
{%- if checked|default(false) %} checked{% endif %}
>
{{ label }}
</label>
</div>
@ -64,9 +66,9 @@
{% macro button(label, opt) %}
<button class="btn btn-{{ opt.btn_type|default('primary') }}"
{%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
{%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
{%- if opt.value is defined or opt.name is defined %} value="{{ opt.value|default('1') }}"{% endif -%}
{%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
{%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
{%- if opt.value is defined or opt.name is defined %} value="{{ opt.value|default('1') }}"{% endif -%}
>
{{ label }}
</button>

20
resources/views/pages/login.twig
View File

@ -40,21 +40,23 @@
<div class="input-group">
<span class="input-group-addon input-lg">{{ m.angel }}</span>
<input
class="form-control input-lg"
id="form_nick"
type="text"
name="login"
value=""
placeholder="{{ __('Nick') }}"
autofocus>
class="form-control input-lg"
id="form_nick"
type="text"
name="login"
value=""
placeholder="{{ __('Nick') }}"
autofocus>
</div>
</div>
<div class="form-group">
<div class="input-group">
<span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span>
<input class="form-control input-lg" id="form_password"
type="password" name="password" value="" placeholder="{{ __('Password') }}">
<input
class="form-control input-lg" id="form_password"
type="password" name="password" value="" placeholder="{{ __('Password') }}"
>
</div>
</div>

12
resources/views/pages/user-shifts.html
View File

@ -6,8 +6,10 @@
<div class="form-group">%start_select%</div>
<div class="form-group">
<div class="input-group time">
<input type="time" class="form-control" id="start_time" name="start_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%">
<input
type="time" class="form-control" id="start_time" name="start_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%start_time%"
>
<div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span>
@ -19,8 +21,10 @@
<div class="form-group">%end_select%</div>
<div class="form-group">
<div class="input-group time">
<input type="time" class="form-control" id="end_time" name="end_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%">
<input
type="time" class="form-control" id="end_time" name="end_time" size="5"
pattern="^\d{1,2}:\d{2}$" placeholder="HH:MM" maxlength="5" value="%end_time%"
>
<div class="input-group-btn">
<button class="btn btn-default" title="Now" type="button">
<span class="glyphicon glyphicon-time"></span>

4
tests/Unit/Helpers/Schedule/Assets/schedule-basic.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<schedule
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/basic.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/basic.xsd"
>
<version>dolor</version>
<conference>

4
tests/Unit/Helpers/Schedule/Assets/schedule-extended.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<schedule
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/extended.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/voc/voctosched/master/schema/extended.xsd"
>
<version>Some version string</version>
<conference>