Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
mpociot committed Aug 28, 2019
2 parents f2812e9 + 3c937a7 commit cc5f9cb
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 13 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/build
/coverage
/docs
/node_modules
/resources/compiled/index.html
/vendor
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
Ignition offers you a beautiful, customizable error screen. It also allows you to share your errors to Flare publicly.
If configured with a valid Flare API key, it will send errors to a project in your Flare account.

![Screenshot of ignition](https://facade.github.io/ignition/screenshot.png)

## Official Documentation

The official documentation for Ignition can be found on the [Flare website](http://flareapp.io.test/docs/ignition-for-facade/installation).
Expand Down
Binary file added docs/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/compiled/ignition.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/js/components/Shared/ErrorCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</a>
<FilePath
pathClass="font-normal text-gray-600"
:file="report.application_path + '/'"
:file="report.application_path + config.directorySeparator"
:relative="false"
/>
</div>
Expand Down Expand Up @@ -57,7 +57,7 @@ import OccurrenceDetails from './OccurrenceDetails';
import FilePath from './FilePath.vue';
export default {
inject: ['report', 'telescopeUrl'],
inject: ['report', 'telescopeUrl', 'config'],
components: {
OccurrenceDetails,
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/Shared/editorUrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ export default function editorUrl(editor, file, lineNumber) {
};

if (!Object.keys(editors).includes(editor)) {
console.error(
`'${editor}' is not supported. Support editors are: ${Object.keys(editors).join(', ')}`,
);

return null;
}

Expand Down
10 changes: 5 additions & 5 deletions resources/views/errorPage.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!doctype html>
<html>
<head>
<!-- Hide dumps asap -->
<style>
pre.sf-dump {
display: none !important;
}
<!-- Hide dumps asap -->
<style>
pre.sf-dump {
display: none !important;
}
</style>

<meta charset="UTF-8">
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/TestCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected function sendTestException()
app('flare.client')->sendTestReport($testException);
$this->info(PHP_EOL);
} catch (Exception $exception) {
$this->warn('❌ We were unable to send an exception to Flare. Make sure that your key is correct and that you have a valid subscription. For more info visit the docs on installing Flare in a Laravel project: http://flareapp.io/docs/flare-for-laravel/installation');
$this->warn('❌ We were unable to send an exception to Flare. Make sure that your key is correct and that you have a valid subscription. ' . PHP_EOL . PHP_EOL . 'For more info visit the docs on installing Flare in a Laravel project: http://flareapp.io/docs/flare-for-laravel/installation');

return;
}
Expand Down
9 changes: 9 additions & 0 deletions src/Facades/Flare.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@

use Illuminate\Support\Facades\Facade;

/**
* Class Flare
*
* @method static void glow(string $name, string $messageLevel = \Facade\FlareClient\Enums\MessageLevels::INFO, array $metaData = [])
* @method static void context($key, $value)
* @method static void group(string $groupName, array $properties)
*
* @see \Facade\FlareClient\Flare
*/
class Flare extends Facade
{
protected static function getFacadeAccessor()
Expand Down
1 change: 1 addition & 0 deletions src/IgnitionConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function toArray(): array
return [
'editor' => $this->getEditor(),
'theme' => $this->getTheme(),
'directorySeparator' => DIRECTORY_SEPARATOR,
];
}

Expand Down
4 changes: 2 additions & 2 deletions src/IgnitionServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,13 @@ protected function bindLogListener()

protected function getConfigFileLocation(): ?string
{
$configFullPath = base_path()."/.ignition";
$configFullPath = base_path().DIRECTORY_SEPARATOR.'.ignition';

if (file_exists($configFullPath)) {
return $configFullPath;
}

$configFullPath = Arr::get($_SERVER, 'HOME', '') ."/.ignition";
$configFullPath = Arr::get($_SERVER, 'HOME', '').DIRECTORY_SEPARATOR.'.ignition';

if (file_exists($configFullPath)) {
return $configFullPath;
Expand Down

0 comments on commit cc5f9cb

Please sign in to comment.