Skip to content
This repository has been archived by the owner on Feb 27, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthenning
matthenning committed Jun 16, 2017
2 parents d3a1463 + f616aa6 commit f380597
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 15 deletions.
24 changes: 23 additions & 1 deletion app/Http/Controllers/Web/SystemController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
use App\Http\Controllers\Controller;
use App\System;
use Gate;
use GuzzleHttp\Client;
use Composer\Semver\Comparator;

class SystemController extends Controller
{
Expand All @@ -17,9 +19,29 @@ public function index()
return view('errors.401');
}

$client = new Client();
$send = [
'headers' => [
'Content-Type' => 'application/json;charset=utf-8'
]
];

try {
$response = $client->get('https://github.com/gitapi/repos/matthenning/ciliatus/releases/latest', $send);
$version = json_decode($response->getBody(),true);
}
catch (\GuzzleHttp\Exception\ClientException $ex) {
\Log::error($ex->getMessage() . PHP_EOL . $ex->getResponse()->getBody());
$version = false;
}

return view('system.status', [
'influx_db_status' => System::influxDbConfigurationStatus(),
'api_ai_status' => System::apiAiConfigurationStatus()
'api_ai_status' => System::apiAiConfigurationStatus(),
'version' => [
'data' => $version,
'current' => $version !== false && Comparator::greaterThanOrEqualTo(config('app.version'), $version['tag_name'])
]
]);

}
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"iboldurev/api-ai-php": "^0.2.5",
"predis/predis": "^1.1",
"rap2hpoutre/laravel-log-viewer": "^0.10.0",
"influxdb/influxdb-php": "^1.14"
"influxdb/influxdb-php": "^1.14",
"composer/semver": "^1.4"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
Expand Down
4 changes: 3 additions & 1 deletion resources/lang/de/tooltips.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
'add' => 'Neu',
'edit' => 'Bearbeiten',
'delete' => 'Löschen'
]
],
'ciliatus_up_to_date' => 'Aktuell',
'ciliatus_not_up_to_date' => 'Update verfügbar: <a href=":url">GitHub</a>'
];
4 changes: 3 additions & 1 deletion resources/lang/en/tooltips.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
'add' => 'New',
'edit' => 'Edit',
'delete' => 'Delete'
]
],
'ciliatus_up_to_date' => 'Up to date',
'ciliatus_not_up_to_date' => 'Update available: <a href=":url">GitHub</a>'
];
26 changes: 21 additions & 5 deletions resources/views/master.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ class="main-loader loader-icon" id="loader-icon"
<li class="no-padding">
<ul class="collapsible collapsible-accordion">
<li>
<a class="collapsible-header">@lang('menu.monitoring')<i class="material-icons">alarm_on</i></a>
<a class="collapsible-header">
@lang('menu.monitoring')
<i class="material-icons">alarm_on</i>
<i class="material-icons right" style="margin-right: 10px;">keyboard_arrow_down</i>
</a>
<div class="collapsible-body">
<ul>
<!--
Expand Down Expand Up @@ -153,7 +157,11 @@ class="main-loader loader-icon" id="loader-icon"
<li class="no-padding">
<ul class="collapsible collapsible-accordion">
<li>
<a class="collapsible-header">@lang('menu.automation')<i class="material-icons">autorenew</i></a>
<a class="collapsible-header">
@lang('menu.automation')
<i class="material-icons">autorenew</i>
<i class="material-icons right" style="margin-right: 10px;">keyboard_arrow_down</i>
</a>
<div class="collapsible-body">
<ul>
<li @if(Request::is('pumps', 'pumps/*')) class="active" @endif>
Expand Down Expand Up @@ -196,7 +204,11 @@ class="main-loader loader-icon" id="loader-icon"
<li class="no-padding">
<ul class="collapsible collapsible-accordion">
<li>
<a class="collapsible-header">@lang('menu.administration')<i class="material-icons">build</i></a>
<a class="collapsible-header">
@lang('menu.administration')
<i class="material-icons">build</i>
<i class="material-icons right" style="margin-right: 10px;">keyboard_arrow_down</i>
</a>
<div class="collapsible-body">
<ul>
<li @if(Request::is('users', 'users/*')) class="active" @endif>
Expand Down Expand Up @@ -229,6 +241,12 @@ class="main-loader loader-icon" id="loader-icon"
@lang('menu.system_status')
</a>
</li>
<li>
<a href="https://github.com/matthenning/ciliatus/issues" class="waves-effect waves-orange">
<i class="material-icons">bug_report</i>
@lang('labels.bugtracker')</a>
</a>
</li>
</ul>
</div>
</li>
Expand All @@ -237,9 +255,7 @@ class="main-loader loader-icon" id="loader-icon"

<li><div class="divider"></div></li>

<li><a href="https://github.com/matthenning/ciliatus/issues" class="waves-effect waves-orange"><i class="material-icons">bug_report</i>@lang('labels.bugtracker')</a></li>
<li><a href="https://ciliatus.io/docs/{{ config('app.version') }}" class="waves-effect waves-orange"><i class="material-icons">help</i>@lang('labels.doku')</a></li>
<li><a href="https://github.com/matthenning/ciliatus/releases/tag/{{ config('app.version') }}" class="waves-effect waves-orange"><i class="material-icons">linear_scale</i>Version {{ config('app.version') }}</a></li>
@endif

<li><a @if(!App\ActionSequence::stopped())href="/action_sequences/stop_all" @else href="/action_sequences/resume_all" @endif class="waves-effect waves-red red-text"><i class="material-icons red-text">power_settings_new</i>@lang('buttons.emergency_stop')</a></li>
Expand Down
47 changes: 41 additions & 6 deletions resources/views/system/status.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,60 @@
@section('content')
<div class="container">
<div class="row">

<div class="col s12 m6 l6">
<div class="card">
<div class="card-header">
@lang('labels.features')
@lang('labels.software_version')
</div>

<div class="card-content">
@if ($influx_db_status === true)
<h5><i class="material-icons green-text">check</i> InfluxDB</h5>
@if ($version == false)
<h5><i class="material-icons red-text">close</i> Ciliatus</h5>
<p>
<strong>Database connection:</strong> <i class="material-icons green-text">check</i>
<strong>{{ config('app.version') }}:</strong> <i class="material-icons green-text">close</i>
</p>
@elseif ($version['current'] == true)
<h5><i class="material-icons green-text">check</i> Ciliatus</h5>
<p>
<strong>{{ config('app.version') }}:</strong> <i class="material-icons green-text">check</i>
<span>@lang('tooltips.ciliatus_up_to_date')</span>
</p>
@else
<h5><i class="material-icons red-text">close</i>InfluxDB</h5>
<h5><i class="material-icons orange-text">close</i> Ciliatus</h5>
<p>
<strong>Database connection:</strong> <i class="material-icons red-text">close</i> {{ $influx_db_status }}
<strong>{{ config('app.version') }}:</strong> <i class="material-icons orange-text">close</i>
<span>@lang('tooltips.ciliatus_not_up_to_date', [
'url' => 'https://github.com/matthenning/ciliatus/releases/tag/v1.7-beta'
])</span>
</p>
@endif
</div>

</div>
</div>

<div class="col s12 m6 l6">
<div class="card">

<div class="card-header">
@lang('labels.features')
</div>

<div class="card-content">
@if ($influx_db_status === true)
<h5><i class="material-icons green-text">check</i> InfluxDB</h5>
<p>
<strong>Database connection:</strong> <i class="material-icons green-text">check</i>
</p>
@else
<h5><i class="material-icons red-text">close</i>InfluxDB</h5>
<p>
<strong>Database connection:</strong> <i class="material-icons red-text">close</i> {{ $influx_db_status }}
</p>
@endif
</div>

<div class="card-content">
<h5>
@if($api_ai_status['you'] && $api_ai_status['default'] && $api_ai_status['attempt'] === true)
Expand Down Expand Up @@ -58,6 +92,7 @@
@endif
</p>
</div>

</div>
</div>
</div>
Expand Down

0 comments on commit f380597

Please sign in to comment.