summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-04-24 09:40:05 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-05-16 09:50:22 +0200
commitf4cec587d972b751a5a3cea44e11804e100ff329 (patch)
treee9e5ccd991c6397244f1f9d371ee6b1d9a29c85d
parentf0586b2eb15651e358b6ebf47b230bc7965dde35 (diff)
downloadnextcloud-server-f4cec587d972b751a5a3cea44e11804e100ff329.tar.gz
nextcloud-server-f4cec587d972b751a5a3cea44e11804e100ff329.zip
Bump makefile, readme, fix typo and cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat
-rw-r--r--settings/.editorconfig7
-rw-r--r--settings/Makefile15
-rw-r--r--settings/README.md19
-rw-r--r--settings/index.html11
-rw-r--r--settings/js/main.js2
-rw-r--r--settings/main.php24
-rw-r--r--settings/src/components/appNavigation/navigationItem.vue2
7 files changed, 27 insertions, 53 deletions
diff --git a/settings/.editorconfig b/settings/.editorconfig
index 9d08a1a828a..a6e3eaf55e2 100644
--- a/settings/.editorconfig
+++ b/settings/.editorconfig
@@ -2,8 +2,11 @@ root = true
[*]
charset = utf-8
-indent_style = space
-indent_size = 2
+indent_style = tab
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
+
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2 \ No newline at end of file
diff --git a/settings/Makefile b/settings/Makefile
index 5fa7fa5650b..98e1f89b384 100644
--- a/settings/Makefile
+++ b/settings/Makefile
@@ -1,9 +1,11 @@
-all: clean npm-update build-js-production
+all: dev-setup build-js-production
-dev-setup: clean npm-update build-js
+dev-setup: clean clean-dev npm-init
+
+npm-init:
+ npm install
npm-update:
- rm -rf node_modules
npm update
build-js:
@@ -16,6 +18,9 @@ watch-js:
npm run watch
clean:
- rm js/main.js
- rm js/main.js.map
+ rm -f js/main.js
+ rm -f js/main.js.map
+
+clean-dev:
+ rm -rf node_modules
diff --git a/settings/README.md b/settings/README.md
index 39c335ea7d8..6774ec1886c 100644
--- a/settings/README.md
+++ b/settings/README.md
@@ -1,18 +1,19 @@
-# settings
+# Settings section
-> A Vue.js project
+> Nextcloud settings with Vue
## Build Setup
``` bash
# install dependencies
-npm install
+make dev-setup
-# serve with hot reload at localhost:8080
-npm run dev
+# build for development
+make build-js
-# build for production with minification
-npm run build
-```
+# build for development and watch edits
+make watch-js
-For detailed explanation on how things work, consult the [docs for vue-loader](http://vuejs.github.io/vue-loader).
+# build for production with minification
+make build-js-production
+``` \ No newline at end of file
diff --git a/settings/index.html b/settings/index.html
deleted file mode 100644
index 9e57405785d..00000000000
--- a/settings/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>settings</title>
- </head>
- <body>
- <div id="app"></div>
- <script src="/dist/build.js"></script>
- </body>
-</html>
diff --git a/settings/js/main.js b/settings/js/main.js
index 556df8b92be..bcc17d1cbb8 100644
--- a/settings/js/main.js
+++ b/settings/js/main.js
@@ -141,7 +141,7 @@ eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__appNavigation_naviga
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
-eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__popoverMenu__ = __webpack_require__(12);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_click_outside__ = __webpack_require__(15);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_click_outside___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_click_outside__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_vue__ = __webpack_require__(3);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\n\n/* harmony default export */ __webpack_exports__[\"a\"] = ({\n\tname: 'navigationItem',\n\tprops: ['item'],\n\tcomponents: {\n\t\tpopoverMenu: __WEBPACK_IMPORTED_MODULE_0__popoverMenu__[\"a\" /* default */]\n\t},\n\tdirectives: {\n\t\tClickOutside: __WEBPACK_IMPORTED_MODULE_1_vue_click_outside___default.a\n\t},\n\tdata: function data() {\n\t\treturn {\n\t\t\topenedMenu: false\n\t\t};\n\t},\n\n\tmethods: {\n\t\tshowMen: function showMen() {\n\t\t\tthis.openedMenu = true;\n\t\t},\n\t\thideMenu: function hideMenu() {\n\t\t\tthis.openedMenu = false;\n\t\t},\n\t\ttoggleCollapse: function toggleCollapse() {\n\t\t\t// if item.opened isn't set, Vue won't trigger view updates https://vuejs.org/v2/api/#Vue-set\n\t\t\t// ternary is here to detect the undefined state of item.opened\n\t\t\t__WEBPACK_IMPORTED_MODULE_2_vue__[\"a\" /* default */].set(this.item, 'opened', this.item.opened ? !this.item.opened : true);\n\t\t},\n\t\tcancelEdit: function cancelEdit() {\n\t\t\t// remove the editing class\n\t\t\tif (Array.isArray(this.item.classes)) this.item.classes = this.item.classes.filter(function (item) {\n\t\t\t\treturn item !== 'editing';\n\t\t\t});\n\t\t}\n\t},\n\tmounted: function mounted() {\n\t\t// prevent click outside event with popupItem.\n\t\tthis.popupItem = this.$el;\n\t}\n});\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vc3JjL2NvbXBvbmVudHMvYXBwTmF2aWdhdGlvbi9uYXZpZ2F0aW9uSXRlbS52dWU/OWVmZiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBMkVBO0FBQ0E7QUFDQTs7QUFFQTtPQUVBO1NBQ0E7O0FBR0E7QUFGQTs7QUFLQTtBQUZBO3VCQUdBOztlQUdBO0FBRkE7QUFHQTs7OzhCQUVBO3FCQUNBO0FBQ0E7Z0NBQ0E7cUJBQ0E7QUFDQTs0Q0FDQTtBQUNBO0FBQ0E7d0hBQ0E7QUFDQTtvQ0FDQTtBQUNBOytCQUNBO29CQUNBOztBQUVBO0FBakJBOzZCQWtCQTtBQUNBO3dCQUNBO0FBQ0E7QUFuQ0EiLCJmaWxlIjoiMTEuanMiLCJzb3VyY2VzQ29udGVudCI6WyI8dGVtcGxhdGU+XG5cdDxsaSA6aWQ9XCJpdGVtLmlkXCIgOmNsYXNzPVwiW3snaWNvbi1sb2FkaW5nLXNtYWxsJzogaXRlbS5sb2FkaW5nLCAnb3Blbic6IGl0ZW0ub3BlbmVkLCAnY29sbGFwc2libGUnOiBpdGVtLmNvbGxhcHNpYmxlJiZpdGVtLmNoaWxkcmVuJiZpdGVtLmNoaWxkcmVuLmxlbmd0aD4wIH0sIGl0ZW0uY2xhc3Nlc11cIj5cblxuXHRcdDwhLS0gQnVsbGV0IC0tPlxuXHRcdDxkaXYgdi1pZj1cIml0ZW0uYnVsbGV0XCIgY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1idWxsZXRcIiA6c3R5bGU9XCJ7IGJhY2tncm91bmRDb2xvcjogaXRlbS5idWxsZXQgfVwiPjwvZGl2PlxuXG5cdFx0PCEtLSBNYWluIGxpbmsgLS0+XG5cdFx0PGEgdi1pZj1cIml0ZW0uaHJlZlwiIDpocmVmPVwiKGl0ZW0uaHJlZikgPyBpdGVtLmhyZWYgOiAnIycgXCIgQGNsaWNrPVwidG9nZ2xlQ29sbGFwc2VcIiA6Y2xhc3M9XCJpdGVtLmljb25cIiA+XG5cdFx0XHQ8aW1nIHYtaWY9XCJpdGVtLmljb25VcmxcIiA6YWx0PVwiaXRlbS50ZXh0XCIgOnNyYz1cIml0ZW0uaWNvblVybFwiPlxuXHRcdFx0e3tpdGVtLnRleHR9fVxuXHRcdDwvYT5cblxuXHRcdDwhLS0gUm91dGVyIGxpbmsgaWYgc3BlY2lmaWVkLiBocmVmIE9SIHJvdXRlciAtLT5cblx0XHQ8cm91dGVyLWxpbmsgOnRvPVwiaXRlbS5yb3V0ZXJcIiB2LWVsc2UtaWY9XCJpdGVtLnJvdXRlclwiIDpjbGFzcz1cIml0ZW0uaWNvblwiID5cblx0XHRcdDxpbWcgdi1pZj1cIml0ZW0uaWNvblVybFwiIDphbHQ9XCJpdGVtLnRleHRcIiA6c3JjPVwiaXRlbS5pY29uVXJsXCI+XG5cdFx0XHR7e2l0ZW0udGV4dH19XG5cdFx0PC9yb3V0ZXItbGluaz5cdFxuXG5cdFx0PCEtLSBQb3BvdmVyLCBjb3VudGVyIGFuZCBidXR0b24ocykgLS0+XG5cdFx0PGRpdiB2LWlmPVwiaXRlbS51dGlsc1wiIGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktdXRpbHNcIj5cblx0XHRcdDx1bD5cblx0XHRcdFx0PCEtLSBjb3VudGVyIC0tPlxuXHRcdFx0XHQ8bGkgdi1pZj1cIk51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1jb3VudGVyXCI+e3tpdGVtLnV0aWxzLmNvdW50ZXJ9fTwvbGk+XG5cblx0XHRcdFx0PCEtLSBmaXJzdCBhY3Rpb24gaWYgb25seSBvbmUgYWN0aW9uIGFuZCBjb3VudGVyIC0tPlxuXHRcdFx0XHQ8bGkgdi1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID09PSAxICYmIE51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1tZW51LWJ1dHRvblwiPlxuXHRcdFx0XHRcdDxidXR0b24gQGNsaWNrPVwiaXRlbS51dGlscy5hY3Rpb25zWzBdLmFjdGlvblwiIDpjbGFzcz1cIml0ZW0udXRpbHMuYWN0aW9uc1swXS5pY29uXCIgOnRpdGxlPVwiaXRlbS51dGlscy5hY3Rpb25zWzBdLnRleHRcIj48L2J1dHRvbj5cblx0XHRcdFx0PC9saT5cblxuXHRcdFx0XHQ8IS0tIHNlY29uZCBhY3Rpb24gb25seSB0d28gYWN0aW9ucyBhbmQgbm8gY291bnRlciAtLT5cblx0XHRcdFx0PGxpIHYtZWxzZS1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID09PSAyICYmICFOdW1iZXIuaXNJbnRlZ2VyKGl0ZW0udXRpbHMuY291bnRlcilcIlxuXHRcdFx0XHRcdHYtZm9yPVwiYWN0aW9uIGluIGl0ZW0udXRpbHMuYWN0aW9uc1wiIDprZXk9XCJhY3Rpb24uYWN0aW9uXCJcblx0XHRcdFx0XHRjbGFzcz1cImFwcC1uYXZpZ2F0aW9uLWVudHJ5LXV0aWxzLW1lbnUtYnV0dG9uXCI+XG5cdFx0XHRcdFx0PGJ1dHRvbiBAY2xpY2s9XCJhY3Rpb24uYWN0aW9uXCIgOmNsYXNzPVwiYWN0aW9uLmljb25cIiA6dGl0bGU9XCJhY3Rpb24udGV4dFwiPjwvYnV0dG9uPlxuXHRcdFx0XHQ8L2xpPlxuXG5cdFx0XHRcdDwhLS0gbWVudSBpZiBvbmx5IGF0IGxlYXN0IG9uZSBhY3Rpb24gYW5kIGNvdW50ZXIgT1IgdHdvIGFjdGlvbnMgYW5kIG5vIGNvdW50ZXItLT5cblx0XHRcdFx0PGxpIHYtZWxzZS1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID4gMSAmJiAoTnVtYmVyLmlzSW50ZWdlcihpdGVtLnV0aWxzLmNvdW50ZXIpIHx8IGl0ZW0udXRpbHMuYWN0aW9ucy5sZW5ndGggPiAyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1tZW51LWJ1dHRvblwiPlxuXHRcdFx0XHRcdDxidXR0b24gdi1jbGljay1vdXRzaWRlPVwiaGlkZU1lbnVcIiBAY2xpY2s9XCJzaG93TWVudVwiID48L2J1dHRvbj5cblx0XHRcdFx0PC9saT5cblx0XHRcdDwvdWw+XG5cdFx0PC9kaXY+XG5cblx0XHQ8IS0tIGlmIG1vcmUgdGhhbiAyIGFjdGlvbnMgb3IgbW9yZSB0aGFuIDEgYWN0aW9ucyB3aXRoIGNvdW50ZXIgLS0+XG5cdFx0PGRpdiB2LWlmPVwiaXRlbS51dGlscyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMgJiYgaXRlbS51dGlscy5hY3Rpb25zLmxlbmd0aCA+IDEgJiYgKE51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKSB8fCBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID4gMilcIlxuXHRcdFx0IGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktbWVudVwiIDpjbGFzcz1cInsgJ29wZW4nOiBvcGVuZWRNZW51IH1cIj5cblx0XHRcdCA8cG9wb3Zlci1tZW51IDptZW51PVwiaXRlbS51dGlscy5hY3Rpb25zXCIvPlxuXHRcdDwvZGl2PlxuXG5cdFx0PCEtLSB1bmRvIGVudHJ5IC0tPlxuXHRcdDxkaXYgY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1kZWxldGVkXCIgdi1pZj1cIml0ZW0udW5kb1wiPlxuXHRcdFx0PGRpdiBjbGFzcz1cImFwcC1uYXZpZ2F0aW9uLWVudHJ5LWRlbGV0ZWQtZGVzY3JpcHRpb25cIj57e2l0ZW0udW5kby50ZXh0fX08L2Rpdj5cblx0XHRcdDxidXR0b24gY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1kZWxldGVkLWJ1dHRvbiBpY29uLWhpc3RvcnlcIiA6dGl0bGU9XCJ0KCdzZXR0aW5ncycsICdVbmRvJylcIj48L2J1dHRvbj5cblx0XHQ8L2Rpdj5cblxuXHRcdDwhLS0gZWRpdCBlbnRyeSAtLT5cblx0XHQ8ZGl2IGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktZWRpdFwiIHYtaWY9XCJpdGVtLmVkaXRcIj5cblx0XHRcdDxmb3JtPlxuXHRcdFx0XHQ8aW5wdXQgdHlwZT1cInRleHRcIiB2LW1vZGVsPVwiaXRlbS50ZXh0XCI+XG5cdFx0XHRcdDxpbnB1dCB0eXBlPVwic3VibWl0XCIgdmFsdWU9XCJcIiBjbGFzcz1cImljb24tY29uZmlybVwiPlxuXHRcdFx0XHQ8aW5wdXQgdHlwZT1cInN1Ym1pdFwiIHZhbHVlPVwiXCIgY2xhc3M9XCJpY29uLWNsb3NlXCIgQGNsaWNrLnN0b3AucHJldmVudD1cImNhbmNlbEVkaXRcIj5cblx0XHRcdDwvZm9ybT5cblx0XHQ8L2Rpdj5cblxuXHRcdDwhLS0gaWYgdGhlIGl0ZW0gaGFzIGNoaWxkcmVuLCBpbmplY3QgdGhlIGNvbXBvbmVudCB3aXRoIHByb3BlciBkYXRhIC0tPlxuXHRcdDx1bCB2LWlmPVwiaXRlbS5jaGlsZHJlblwiPlxuXHRcdFx0PG5hdmlnYXRpb24taXRlbSB2LWZvcj1cIihpdGVtLCBrZXkpIGluIGl0ZW0uY2hpbGRyZW5cIiA6aXRlbT1cIml0ZW1cIiA6a2V5PVwia2V5XCIgLz5cblx0XHQ8L3VsPlxuXHQ8L2xpPlxuPC90ZW1wbGF0ZT5cblxuPHNjcmlwdD5cbmltcG9ydCBwb3BvdmVyTWVudSBmcm9tICcuLi9wb3BvdmVyTWVudSc7XG5pbXBvcnQgQ2xpY2tPdXRzaWRlIGZyb20gJ3Z1ZS1jbGljay1vdXRzaWRlJztcbmltcG9ydCBWdWUgZnJvbSAndnVlJztcblxuZXhwb3J0IGRlZmF1bHQge1xuXHRuYW1lOiAnbmF2aWdhdGlvbkl0ZW0nLFxuXHRwcm9wczogWydpdGVtJ10sXG5cdGNvbXBvbmVudHM6IHtcblx0XHRwb3BvdmVyTWVudVxuXHR9LFxuXHRkaXJlY3RpdmVzOiB7XG5cdFx0Q2xpY2tPdXRzaWRlXG5cdH0sXG5cdGRhdGEoKSB7XG5cdFx0cmV0dXJuIHtcblx0XHRcdG9wZW5lZE1lbnU6IGZhbHNlXG5cdFx0fVxuXHR9LFxuXHRtZXRob2RzOiB7XG5cdFx0c2hvd01lbigpIHtcblx0XHRcdHRoaXMub3BlbmVkTWVudSA9IHRydWU7XG5cdFx0fSxcblx0XHRoaWRlTWVudSgpIHtcblx0XHRcdHRoaXMub3BlbmVkTWVudSA9IGZhbHNlO1xuXHRcdH0sXG5cdFx0dG9nZ2xlQ29sbGFwc2UoKSB7XG5cdFx0XHQvLyBpZiBpdGVtLm9wZW5lZCBpc24ndCBzZXQsIFZ1ZSB3b24ndCB0cmlnZ2VyIHZpZXcgdXBkYXRlcyBodHRwczovL3Z1ZWpzLm9yZy92Mi9hcGkvI1Z1ZS1zZXRcblx0XHRcdC8vIHRlcm5hcnkgaXMgaGVyZSB0byBkZXRlY3QgdGhlIHVuZGVmaW5lZCBzdGF0ZSBvZiBpdGVtLm9wZW5lZFxuXHRcdFx0VnVlLnNldCh0aGlzLml0ZW0sICdvcGVuZWQnLCB0aGlzLml0ZW0ub3BlbmVkID8gIXRoaXMuaXRlbS5vcGVuZWQgOiB0cnVlKTtcblx0XHR9LFxuXHRcdGNhbmNlbEVkaXQoKSB7XG5cdFx0XHQvLyByZW1vdmUgdGhlIGVkaXRpbmcgY2xhc3Ncblx0XHRcdGlmIChBcnJheS5pc0FycmF5KHRoaXMuaXRlbS5jbGFzc2VzKSlcblx0XHRcdFx0dGhpcy5pdGVtLmNsYXNzZXMgPSB0aGlzLml0ZW0uY2xhc3Nlcy5maWx0ZXIoaXRlbSA9PiBpdGVtICE9PSAnZWRpdGluZycpO1xuXHRcdH1cblx0fSxcblx0bW91bnRlZCgpIHtcblx0XHQvLyBwcmV2ZW50IGNsaWNrIG91dHNpZGUgZXZlbnQgd2l0aCBwb3B1cEl0ZW0uXG5cdFx0dGhpcy5wb3B1cEl0ZW0gPSB0aGlzLiRlbDtcblx0fSxcbn1cbjwvc2NyaXB0PlxuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIHNyYy9jb21wb25lbnRzL2FwcE5hdmlnYXRpb24vbmF2aWdhdGlvbkl0ZW0udnVlIl0sInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///11\n");
+eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__popoverMenu__ = __webpack_require__(12);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_click_outside__ = __webpack_require__(15);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_click_outside___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_click_outside__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_vue__ = __webpack_require__(3);\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n\n\n/* harmony default export */ __webpack_exports__[\"a\"] = ({\n\tname: 'navigationItem',\n\tprops: ['item'],\n\tcomponents: {\n\t\tpopoverMenu: __WEBPACK_IMPORTED_MODULE_0__popoverMenu__[\"a\" /* default */]\n\t},\n\tdirectives: {\n\t\tClickOutside: __WEBPACK_IMPORTED_MODULE_1_vue_click_outside___default.a\n\t},\n\tdata: function data() {\n\t\treturn {\n\t\t\topenedMenu: false\n\t\t};\n\t},\n\n\tmethods: {\n\t\tshowMenu: function showMenu() {\n\t\t\tthis.openedMenu = true;\n\t\t},\n\t\thideMenu: function hideMenu() {\n\t\t\tthis.openedMenu = false;\n\t\t},\n\t\ttoggleCollapse: function toggleCollapse() {\n\t\t\t// if item.opened isn't set, Vue won't trigger view updates https://vuejs.org/v2/api/#Vue-set\n\t\t\t// ternary is here to detect the undefined state of item.opened\n\t\t\t__WEBPACK_IMPORTED_MODULE_2_vue__[\"a\" /* default */].set(this.item, 'opened', this.item.opened ? !this.item.opened : true);\n\t\t},\n\t\tcancelEdit: function cancelEdit() {\n\t\t\t// remove the editing class\n\t\t\tif (Array.isArray(this.item.classes)) this.item.classes = this.item.classes.filter(function (item) {\n\t\t\t\treturn item !== 'editing';\n\t\t\t});\n\t\t}\n\t},\n\tmounted: function mounted() {\n\t\t// prevent click outside event with popupItem.\n\t\tthis.popupItem = this.$el;\n\t}\n});\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vc3JjL2NvbXBvbmVudHMvYXBwTmF2aWdhdGlvbi9uYXZpZ2F0aW9uSXRlbS52dWU/OWVmZiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBMkVBO0FBQ0E7QUFDQTs7QUFFQTtPQUVBO1NBQ0E7O0FBR0E7QUFGQTs7QUFLQTtBQUZBO3VCQUdBOztlQUdBO0FBRkE7QUFHQTs7O2dDQUVBO3FCQUNBO0FBQ0E7Z0NBQ0E7cUJBQ0E7QUFDQTs0Q0FDQTtBQUNBO0FBQ0E7d0hBQ0E7QUFDQTtvQ0FDQTtBQUNBOytCQUNBO29CQUNBOztBQUVBO0FBakJBOzZCQWtCQTtBQUNBO3dCQUNBO0FBQ0E7QUFuQ0EiLCJmaWxlIjoiMTEuanMiLCJzb3VyY2VzQ29udGVudCI6WyI8dGVtcGxhdGU+XG5cdDxsaSA6aWQ9XCJpdGVtLmlkXCIgOmNsYXNzPVwiW3snaWNvbi1sb2FkaW5nLXNtYWxsJzogaXRlbS5sb2FkaW5nLCAnb3Blbic6IGl0ZW0ub3BlbmVkLCAnY29sbGFwc2libGUnOiBpdGVtLmNvbGxhcHNpYmxlJiZpdGVtLmNoaWxkcmVuJiZpdGVtLmNoaWxkcmVuLmxlbmd0aD4wIH0sIGl0ZW0uY2xhc3Nlc11cIj5cblxuXHRcdDwhLS0gQnVsbGV0IC0tPlxuXHRcdDxkaXYgdi1pZj1cIml0ZW0uYnVsbGV0XCIgY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1idWxsZXRcIiA6c3R5bGU9XCJ7IGJhY2tncm91bmRDb2xvcjogaXRlbS5idWxsZXQgfVwiPjwvZGl2PlxuXG5cdFx0PCEtLSBNYWluIGxpbmsgLS0+XG5cdFx0PGEgdi1pZj1cIml0ZW0uaHJlZlwiIDpocmVmPVwiKGl0ZW0uaHJlZikgPyBpdGVtLmhyZWYgOiAnIycgXCIgQGNsaWNrPVwidG9nZ2xlQ29sbGFwc2VcIiA6Y2xhc3M9XCJpdGVtLmljb25cIiA+XG5cdFx0XHQ8aW1nIHYtaWY9XCJpdGVtLmljb25VcmxcIiA6YWx0PVwiaXRlbS50ZXh0XCIgOnNyYz1cIml0ZW0uaWNvblVybFwiPlxuXHRcdFx0e3tpdGVtLnRleHR9fVxuXHRcdDwvYT5cblxuXHRcdDwhLS0gUm91dGVyIGxpbmsgaWYgc3BlY2lmaWVkLiBocmVmIE9SIHJvdXRlciAtLT5cblx0XHQ8cm91dGVyLWxpbmsgOnRvPVwiaXRlbS5yb3V0ZXJcIiB2LWVsc2UtaWY9XCJpdGVtLnJvdXRlclwiIDpjbGFzcz1cIml0ZW0uaWNvblwiID5cblx0XHRcdDxpbWcgdi1pZj1cIml0ZW0uaWNvblVybFwiIDphbHQ9XCJpdGVtLnRleHRcIiA6c3JjPVwiaXRlbS5pY29uVXJsXCI+XG5cdFx0XHR7e2l0ZW0udGV4dH19XG5cdFx0PC9yb3V0ZXItbGluaz5cdFxuXG5cdFx0PCEtLSBQb3BvdmVyLCBjb3VudGVyIGFuZCBidXR0b24ocykgLS0+XG5cdFx0PGRpdiB2LWlmPVwiaXRlbS51dGlsc1wiIGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktdXRpbHNcIj5cblx0XHRcdDx1bD5cblx0XHRcdFx0PCEtLSBjb3VudGVyIC0tPlxuXHRcdFx0XHQ8bGkgdi1pZj1cIk51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1jb3VudGVyXCI+e3tpdGVtLnV0aWxzLmNvdW50ZXJ9fTwvbGk+XG5cblx0XHRcdFx0PCEtLSBmaXJzdCBhY3Rpb24gaWYgb25seSBvbmUgYWN0aW9uIGFuZCBjb3VudGVyIC0tPlxuXHRcdFx0XHQ8bGkgdi1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID09PSAxICYmIE51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1tZW51LWJ1dHRvblwiPlxuXHRcdFx0XHRcdDxidXR0b24gQGNsaWNrPVwiaXRlbS51dGlscy5hY3Rpb25zWzBdLmFjdGlvblwiIDpjbGFzcz1cIml0ZW0udXRpbHMuYWN0aW9uc1swXS5pY29uXCIgOnRpdGxlPVwiaXRlbS51dGlscy5hY3Rpb25zWzBdLnRleHRcIj48L2J1dHRvbj5cblx0XHRcdFx0PC9saT5cblxuXHRcdFx0XHQ8IS0tIHNlY29uZCBhY3Rpb24gb25seSB0d28gYWN0aW9ucyBhbmQgbm8gY291bnRlciAtLT5cblx0XHRcdFx0PGxpIHYtZWxzZS1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID09PSAyICYmICFOdW1iZXIuaXNJbnRlZ2VyKGl0ZW0udXRpbHMuY291bnRlcilcIlxuXHRcdFx0XHRcdHYtZm9yPVwiYWN0aW9uIGluIGl0ZW0udXRpbHMuYWN0aW9uc1wiIDprZXk9XCJhY3Rpb24uYWN0aW9uXCJcblx0XHRcdFx0XHRjbGFzcz1cImFwcC1uYXZpZ2F0aW9uLWVudHJ5LXV0aWxzLW1lbnUtYnV0dG9uXCI+XG5cdFx0XHRcdFx0PGJ1dHRvbiBAY2xpY2s9XCJhY3Rpb24uYWN0aW9uXCIgOmNsYXNzPVwiYWN0aW9uLmljb25cIiA6dGl0bGU9XCJhY3Rpb24udGV4dFwiPjwvYnV0dG9uPlxuXHRcdFx0XHQ8L2xpPlxuXG5cdFx0XHRcdDwhLS0gbWVudSBpZiBvbmx5IGF0IGxlYXN0IG9uZSBhY3Rpb24gYW5kIGNvdW50ZXIgT1IgdHdvIGFjdGlvbnMgYW5kIG5vIGNvdW50ZXItLT5cblx0XHRcdFx0PGxpIHYtZWxzZS1pZj1cIml0ZW0udXRpbHMuYWN0aW9ucyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID4gMSAmJiAoTnVtYmVyLmlzSW50ZWdlcihpdGVtLnV0aWxzLmNvdW50ZXIpIHx8IGl0ZW0udXRpbHMuYWN0aW9ucy5sZW5ndGggPiAyKVwiXG5cdFx0XHRcdFx0Y2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS11dGlscy1tZW51LWJ1dHRvblwiPlxuXHRcdFx0XHRcdDxidXR0b24gdi1jbGljay1vdXRzaWRlPVwiaGlkZU1lbnVcIiBAY2xpY2s9XCJzaG93TWVudVwiID48L2J1dHRvbj5cblx0XHRcdFx0PC9saT5cblx0XHRcdDwvdWw+XG5cdFx0PC9kaXY+XG5cblx0XHQ8IS0tIGlmIG1vcmUgdGhhbiAyIGFjdGlvbnMgb3IgbW9yZSB0aGFuIDEgYWN0aW9ucyB3aXRoIGNvdW50ZXIgLS0+XG5cdFx0PGRpdiB2LWlmPVwiaXRlbS51dGlscyAmJiBpdGVtLnV0aWxzLmFjdGlvbnMgJiYgaXRlbS51dGlscy5hY3Rpb25zLmxlbmd0aCA+IDEgJiYgKE51bWJlci5pc0ludGVnZXIoaXRlbS51dGlscy5jb3VudGVyKSB8fCBpdGVtLnV0aWxzLmFjdGlvbnMubGVuZ3RoID4gMilcIlxuXHRcdFx0IGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktbWVudVwiIDpjbGFzcz1cInsgJ29wZW4nOiBvcGVuZWRNZW51IH1cIj5cblx0XHRcdCA8cG9wb3Zlci1tZW51IDptZW51PVwiaXRlbS51dGlscy5hY3Rpb25zXCIvPlxuXHRcdDwvZGl2PlxuXG5cdFx0PCEtLSB1bmRvIGVudHJ5IC0tPlxuXHRcdDxkaXYgY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1kZWxldGVkXCIgdi1pZj1cIml0ZW0udW5kb1wiPlxuXHRcdFx0PGRpdiBjbGFzcz1cImFwcC1uYXZpZ2F0aW9uLWVudHJ5LWRlbGV0ZWQtZGVzY3JpcHRpb25cIj57e2l0ZW0udW5kby50ZXh0fX08L2Rpdj5cblx0XHRcdDxidXR0b24gY2xhc3M9XCJhcHAtbmF2aWdhdGlvbi1lbnRyeS1kZWxldGVkLWJ1dHRvbiBpY29uLWhpc3RvcnlcIiA6dGl0bGU9XCJ0KCdzZXR0aW5ncycsICdVbmRvJylcIj48L2J1dHRvbj5cblx0XHQ8L2Rpdj5cblxuXHRcdDwhLS0gZWRpdCBlbnRyeSAtLT5cblx0XHQ8ZGl2IGNsYXNzPVwiYXBwLW5hdmlnYXRpb24tZW50cnktZWRpdFwiIHYtaWY9XCJpdGVtLmVkaXRcIj5cblx0XHRcdDxmb3JtPlxuXHRcdFx0XHQ8aW5wdXQgdHlwZT1cInRleHRcIiB2LW1vZGVsPVwiaXRlbS50ZXh0XCI+XG5cdFx0XHRcdDxpbnB1dCB0eXBlPVwic3VibWl0XCIgdmFsdWU9XCJcIiBjbGFzcz1cImljb24tY29uZmlybVwiPlxuXHRcdFx0XHQ8aW5wdXQgdHlwZT1cInN1Ym1pdFwiIHZhbHVlPVwiXCIgY2xhc3M9XCJpY29uLWNsb3NlXCIgQGNsaWNrLnN0b3AucHJldmVudD1cImNhbmNlbEVkaXRcIj5cblx0XHRcdDwvZm9ybT5cblx0XHQ8L2Rpdj5cblxuXHRcdDwhLS0gaWYgdGhlIGl0ZW0gaGFzIGNoaWxkcmVuLCBpbmplY3QgdGhlIGNvbXBvbmVudCB3aXRoIHByb3BlciBkYXRhIC0tPlxuXHRcdDx1bCB2LWlmPVwiaXRlbS5jaGlsZHJlblwiPlxuXHRcdFx0PG5hdmlnYXRpb24taXRlbSB2LWZvcj1cIihpdGVtLCBrZXkpIGluIGl0ZW0uY2hpbGRyZW5cIiA6aXRlbT1cIml0ZW1cIiA6a2V5PVwia2V5XCIgLz5cblx0XHQ8L3VsPlxuXHQ8L2xpPlxuPC90ZW1wbGF0ZT5cblxuPHNjcmlwdD5cbmltcG9ydCBwb3BvdmVyTWVudSBmcm9tICcuLi9wb3BvdmVyTWVudSc7XG5pbXBvcnQgQ2xpY2tPdXRzaWRlIGZyb20gJ3Z1ZS1jbGljay1vdXRzaWRlJztcbmltcG9ydCBWdWUgZnJvbSAndnVlJztcblxuZXhwb3J0IGRlZmF1bHQge1xuXHRuYW1lOiAnbmF2aWdhdGlvbkl0ZW0nLFxuXHRwcm9wczogWydpdGVtJ10sXG5cdGNvbXBvbmVudHM6IHtcblx0XHRwb3BvdmVyTWVudVxuXHR9LFxuXHRkaXJlY3RpdmVzOiB7XG5cdFx0Q2xpY2tPdXRzaWRlXG5cdH0sXG5cdGRhdGEoKSB7XG5cdFx0cmV0dXJuIHtcblx0XHRcdG9wZW5lZE1lbnU6IGZhbHNlXG5cdFx0fVxuXHR9LFxuXHRtZXRob2RzOiB7XG5cdFx0c2hvd01lbnUoKSB7XG5cdFx0XHR0aGlzLm9wZW5lZE1lbnUgPSB0cnVlO1xuXHRcdH0sXG5cdFx0aGlkZU1lbnUoKSB7XG5cdFx0XHR0aGlzLm9wZW5lZE1lbnUgPSBmYWxzZTtcblx0XHR9LFxuXHRcdHRvZ2dsZUNvbGxhcHNlKCkge1xuXHRcdFx0Ly8gaWYgaXRlbS5vcGVuZWQgaXNuJ3Qgc2V0LCBWdWUgd29uJ3QgdHJpZ2dlciB2aWV3IHVwZGF0ZXMgaHR0cHM6Ly92dWVqcy5vcmcvdjIvYXBpLyNWdWUtc2V0XG5cdFx0XHQvLyB0ZXJuYXJ5IGlzIGhlcmUgdG8gZGV0ZWN0IHRoZSB1bmRlZmluZWQgc3RhdGUgb2YgaXRlbS5vcGVuZWRcblx0XHRcdFZ1ZS5zZXQodGhpcy5pdGVtLCAnb3BlbmVkJywgdGhpcy5pdGVtLm9wZW5lZCA/ICF0aGlzLml0ZW0ub3BlbmVkIDogdHJ1ZSk7XG5cdFx0fSxcblx0XHRjYW5jZWxFZGl0KCkge1xuXHRcdFx0Ly8gcmVtb3ZlIHRoZSBlZGl0aW5nIGNsYXNzXG5cdFx0XHRpZiAoQXJyYXkuaXNBcnJheSh0aGlzLml0ZW0uY2xhc3NlcykpXG5cdFx0XHRcdHRoaXMuaXRlbS5jbGFzc2VzID0gdGhpcy5pdGVtLmNsYXNzZXMuZmlsdGVyKGl0ZW0gPT4gaXRlbSAhPT0gJ2VkaXRpbmcnKTtcblx0XHR9XG5cdH0sXG5cdG1vdW50ZWQoKSB7XG5cdFx0Ly8gcHJldmVudCBjbGljayBvdXRzaWRlIGV2ZW50IHdpdGggcG9wdXBJdGVtLlxuXHRcdHRoaXMucG9wdXBJdGVtID0gdGhpcy4kZWw7XG5cdH0sXG59XG48L3NjcmlwdD5cblxuXG5cbi8vIFdFQlBBQ0sgRk9PVEVSIC8vXG4vLyBzcmMvY29tcG9uZW50cy9hcHBOYXZpZ2F0aW9uL25hdmlnYXRpb25JdGVtLnZ1ZSJdLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///11\n");
/***/ }),
/* 12 */
diff --git a/settings/main.php b/settings/main.php
deleted file mode 100644
index 4329032fb97..00000000000
--- a/settings/main.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
- *
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
- $tmpl = new OC_Template("settings", "settings", "user");
- $tmpl->printPage();
diff --git a/settings/src/components/appNavigation/navigationItem.vue b/settings/src/components/appNavigation/navigationItem.vue
index e9ed7579a88..ee748ee826e 100644
--- a/settings/src/components/appNavigation/navigationItem.vue
+++ b/settings/src/components/appNavigation/navigationItem.vue
@@ -92,7 +92,7 @@ export default {
}
},
methods: {
- showMen() {
+ showMenu() {
this.openedMenu = true;
},
hideMenu() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 18:28:07 +0000