Skip to content

Commit

Permalink
Github Flavored Markdown for Terms enabled (#645)
Browse files Browse the repository at this point in the history
This enabled the GithibFlavoredMarkdownExtention for CommonMark. This includes:
- Autolinks
- Disallowed Raw HTML
- Strikethrough
- Tables
- Task Lists

Co-authored-by: Hergen Dillema <h.dillema@365werk.nl>
  • Loading branch information
HergenD and Hergen Dillema committed Jan 20, 2021
1 parent 2653b5c commit c9913fb
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
7 changes: 6 additions & 1 deletion src/Http/Controllers/Inertia/PrivacyPolicyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use Inertia\Inertia;
use Laravel\Jetstream\Jetstream;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Extension\GithubFlavoredMarkdownExtension;

class PrivacyPolicyController extends Controller
{
Expand All @@ -20,8 +22,11 @@ public function show(Request $request)
{
$policyFile = Jetstream::localizedMarkdownPath('policy.md');

$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new GithubFlavoredMarkdownExtension());

return Inertia::render('PrivacyPolicy', [
'policy' => (new CommonMarkConverter())->convertToHtml(file_get_contents($policyFile)),
'policy' => (new CommonMarkConverter([], $environment))->convertToHtml(file_get_contents($policyFile)),
]);
}
}
7 changes: 6 additions & 1 deletion src/Http/Controllers/Inertia/TermsOfServiceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
use Inertia\Inertia;
use Laravel\Jetstream\Jetstream;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Extension\GithubFlavoredMarkdownExtension;

class TermsOfServiceController extends Controller
{
Expand All @@ -20,8 +22,11 @@ public function show(Request $request)
{
$termsFile = Jetstream::localizedMarkdownPath('terms.md');

$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new GithubFlavoredMarkdownExtension());

return Inertia::render('TermsOfService', [
'terms' => (new CommonMarkConverter())->convertToHtml(file_get_contents($termsFile)),
'terms' => (new CommonMarkConverter([], $environment))->convertToHtml(file_get_contents($termsFile)),
]);
}
}
7 changes: 6 additions & 1 deletion src/Http/Controllers/Livewire/PrivacyPolicyController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use Illuminate\Routing\Controller;
use Laravel\Jetstream\Jetstream;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Extension\GithubFlavoredMarkdownExtension;

class PrivacyPolicyController extends Controller
{
Expand All @@ -19,8 +21,11 @@ public function show(Request $request)
{
$policyFile = Jetstream::localizedMarkdownPath('policy.md');

$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new GithubFlavoredMarkdownExtension());

return view('policy', [
'policy' => (new CommonMarkConverter())->convertToHtml(file_get_contents($policyFile)),
'policy' => (new CommonMarkConverter([], $environment))->convertToHtml(file_get_contents($policyFile)),
]);
}
}
7 changes: 6 additions & 1 deletion src/Http/Controllers/Livewire/TermsOfServiceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use Illuminate\Routing\Controller;
use Laravel\Jetstream\Jetstream;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Extension\GithubFlavoredMarkdownExtension;

class TermsOfServiceController extends Controller
{
Expand All @@ -19,8 +21,11 @@ public function show(Request $request)
{
$termsFile = Jetstream::localizedMarkdownPath('terms.md');

$environment = Environment::createCommonMarkEnvironment();
$environment->addExtension(new GithubFlavoredMarkdownExtension());

return view('terms', [
'terms' => (new CommonMarkConverter())->convertToHtml(file_get_contents($termsFile)),
'terms' => (new CommonMarkConverter([], $environment))->convertToHtml(file_get_contents($termsFile)),
]);
}
}

0 comments on commit c9913fb

Please sign in to comment.