Switched from Nunjucks to Stone

Author: shnhrrsn

app/Controllers/HelloController.js

@@ -3,7 +3,7 @@ import { Controller } from 'grind-framework'
 export class HelloController extends Controller {
 
 	show(req, res) {
-		res.render('welcome.njk', {
+		res.render('welcome', {
 			name: 'Hello!'
 		})
 	}

app/Errors/ErrorHandler.js

@@ -1,5 +1,7 @@
 import { ErrorHandler as BaseErrorHandler } from 'grind-framework'
+import { FS } from 'grind-support'
 import Ouch from 'ouch'
+import path from 'path'
 
 export class ErrorHandler extends BaseErrorHandler {
 
@@ -18,9 +20,9 @@ export class ErrorHandler extends BaseErrorHandler {
 	}
 
 	renderView(req, res, err, info, code) {
-		const view = `errors/${code}.njk`
+		const view = path.join(this.app.view.viewPath, 'errors', `${code}.stone`)
 
-		return this.app.view.exists(view).then(exists => {
+		return FS.exists(view).then(exists => {
 			if(!exists) {
 				if(code !== '500') {
 					return this.renderView(req, res, err, info, 500)
@@ -29,7 +31,7 @@ export class ErrorHandler extends BaseErrorHandler {
 				}
 			}
 
-			return super.renderView(req, res, err, info, view)
+			return super.renderView(req, res, err, info, `errors.${code}`)
 		}).catch(err => {
 			return this.renderJson(req, res, err, info)
 		})

app/Providers/RoutesProvider.js

@@ -3,7 +3,7 @@ import 'App/Controllers/HelloController'
 export function RoutesProvider(app) {
 
 	app.routes.get('/', (req, res) => {
-		res.render('welcome.njk', {
+		res.render('welcome', {
 			name: 'Grind'
 		})
 	}).as('welcome.show')

config/view.json

@@ -1,5 +1,5 @@
 {
 
-	"engine": "nunjucks"
+	"engine": "stone"
 
 }

package.json

@@ -5,7 +5,6 @@
   "dependencies": {
     "grind-core-frontend": "^0.7.0-beta.2",
     "grind-db": "^0.6.0",
-    "grind-nunjucks": "^0.7.0-beta.2",
     "grind-orm": "^0.6.0",
     "sqlite3": "^3.1.8"
   },

resources/views/errors/404.njk

@@ -0,0 +1,5 @@
+@extends('layout.app')
+
+@section('content')
+	<h1>Page Not Found</h1>
+@endsection

resources/views/errors/404.stone

@@ -0,0 +1,5 @@
+@extends('layout.app')
+
+@section('content')
+	<h1>Internal Server Error</h1>
+@endsection

resources/views/errors/500.njk

@@ -1,16 +1,12 @@
-{% extends 'layout/master.njk' %}
+@extends('layout.master')
 
-{% scss 'app' %}
-{% babel 'app' %}
+@scss('app')
+@babel('app')
 
-{% block contentBefore %}
+@section('content.before')
 	<header class="header">
 		<div class="container header-container">
-			{% if not name %}
-				{% set name = 'Grind' %}
-			{% endif %}
-
-			{{ html.linkRoute('welcome.show', name, null, { class: 'header-logo' }) }}
+			<a href="{{ url.route('welcome.show') }}" class="header-logo">{{ name || 'Grind' }}</a>
 
 			<nav class="header-links">
 				<a href="https://grind.rocks" class="header-link">Docs</a>
@@ -19,12 +15,12 @@
 			</nav>
 		</div>
 	</header>
-{% endblock %}
+@endsection
 
-{% block contentAfter %}
+@section('content.after')
 	<footer class="footer">
 		<div class="container footer-container">
 			<span class="footer-text">Grind was created by <a href="http://github.com/shnhrrsn">Shaun Harrison</a> and is made available under the MIT license.</span>
 		</div>
 	</footer>
-{% endblock %}
+@endsection