Browse Source
Bump makefile, readme, fix typo and cleanup
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>tags/v14.0.0beta1
John Molakvoæ (skjnldsv)
6 years ago
7 changed files with 27 additions and 53 deletions
+ 5
- 2
settings/.editorconfig
View File
| @@ -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 | |||
+ 10
- 5
settings/Makefile
View File
| @@ -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 | |||
+ 10
- 9
settings/README.md
View File
| @@ -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 | |||
| ``` | |||
+ 0
- 11
settings/index.html
View File
| @@ -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> | |||
+ 1
- 1
settings/js/main.js
File diff suppressed because it is too large
View File
+ 0
- 24
settings/main.php
View File
| @@ -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(); | |||
+ 1
- 1
settings/src/components/appNavigation/navigationItem.vue
View File
| @@ -92,7 +92,7 @@ export default { | |||
| } | |||
| }, | |||
| methods: { | |||
| showMen() { | |||
| showMenu() { | |||
| this.openedMenu = true; | |||
| }, | |||
| hideMenu() { | |||
Loading…