Move to standard format

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

apps/twofactor_backupcodes/Makefile

@@ -0,0 +1,25 @@
+all: dev-setup build-js-production
+
+dev-setup: clean clean-dev npm-init
+
+npm-init:
+	npm install
+
+npm-update:
+	npm update
+
+build-js:
+	npm run dev
+
+build-js-production:
+	npm run build
+
+watch-js:
+	npm run watch
+
+clean:
+	rm -f js/settings.js
+	rm -f js/settings.js.map
+
+clean-dev:
+	rm -rf node_modules

apps/twofactor_backupcodes/package-lock.json

@@ -1739,7 +1739,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1760,12 +1761,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1780,17 +1783,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1907,7 +1913,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1919,6 +1926,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1933,6 +1941,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1940,12 +1949,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -1964,6 +1975,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2044,7 +2056,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2056,6 +2069,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2141,7 +2155,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2177,6 +2192,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2196,6 +2212,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2239,12 +2256,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

apps/twofactor_backupcodes/package.json

@@ -8,8 +8,8 @@
     "test": "tests"
   },
   "scripts": {
-    "build": "webpack --progress --hide-modules --config js/webpack.prod.js",
-    "dev": "webpack --progress --watch --config js/webpack.dev.js",
+    "build": "webpack --progress --hide-modules --config webpack.prod.js",
+    "dev": "webpack --progress --watch --config webpack.dev.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",

apps/twofactor_backupcodes/src/settings.js

@@ -0,0 +1,9 @@
+import Vue from 'vue';
+import PersonalSettings from './views/PersonalSettings';
+
+Vue.prototype.t = t;
+
+export default new Vue({
+	el: '#twofactor-backupcodes-settings',
+	render: h => h(PersonalSettings)
+});

apps/twofactor_backupcodes/templates/personal.php

@@ -1,6 +1,6 @@
 <?php
 
-script('twofactor_backupcodes', 'build/settings');
+script('twofactor_backupcodes', 'settings');
 style('twofactor_backupcodes', 'style');
 
 ?>

apps/twofactor_backupcodes/webpack.common.js

@@ -2,10 +2,10 @@ const path = require('path');
 const { VueLoaderPlugin } = require('vue-loader');
 
 module.exports = {
-	entry: path.join(__dirname, 'settings.js'),
+	entry: path.join(__dirname, 'src', 'settings.js'),
 	output: {
-		path: path.resolve(__dirname, 'build'),
-		publicPath: '/build/',
+		path: path.resolve(__dirname, 'js'),
+		publicPath: '/js',
 		filename: 'settings.js'
 	},
 	module: {
@@ -43,4 +43,4 @@ module.exports = {
 		},
 		extensions: ['*', '.js', '.vue', '.json']
 	}
-};
+};