From 94841f40cb2f55b3ce2c2e08ad0d8c2fed1afa53 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Fri, 11 Aug 2017 09:28:25 +0200
Subject: [PATCH] Add 2 more files originating from laravel
 installation(server.php for local dev web server used by laravel)

---
 Changelog        |  1 +
 build/nntmux.xml |  2 +-
 server.php       | 21 +++++++++++++++++++++
 webpack.mix.js   | 15 +++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 server.php
 create mode 100644 webpack.mix.js

diff --git a/Changelog b/Changelog
index 1e9fca36d..6461097a9 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-08-11 DariusIII
+	* Chg: Add 2 more files originating from laravel installation(server.php for local dev web server used by laravel)
 	* Chg: Increase rsstoken column to varchar(64) to accommodate new api key size
 2017-08-10 DariusIII
 	* Chg: Use Hash facade for password management in Users class
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 3c56ad7e4..89e7a4d63 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,7 +16,7 @@
 			</last>
 		</scripts>
 		<sql>
-			<db>315</db>
+			<db>314</db>
 			<file>315</file>
 		</sql>
 	</versions>
diff --git a/server.php b/server.php
new file mode 100644
index 000000000..5fb6379e7
--- /dev/null
+++ b/server.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Laravel - A PHP Framework For Web Artisans
+ *
+ * @package  Laravel
+ * @author   Taylor Otwell <taylor@laravel.com>
+ */
+
+$uri = urldecode(
+    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
+);
+
+// This file allows us to emulate Apache's "mod_rewrite" functionality from the
+// built-in PHP web server. This provides a convenient way to test a Laravel
+// application without having installed a "real" web server software here.
+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
+    return false;
+}
+
+require_once __DIR__.'/public/index.php';
diff --git a/webpack.mix.js b/webpack.mix.js
new file mode 100644
index 000000000..3e6f5712b
--- /dev/null
+++ b/webpack.mix.js
@@ -0,0 +1,15 @@
+const { mix } = require('laravel-mix');
+
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+
+mix.js('resources/assets/js/app.js', 'public/js')
+   .sass('resources/assets/sass/app.scss', 'public/css');