diff --git a/Makefile b/Makefile index 5d18430..7d1171e 100644 --- a/Makefile +++ b/Makefile @@ -57,25 +57,27 @@ l10n-deps: # general deps: mkdir -p vendor - rm -rf vendor/* + mkdir -p js/vendor + rm -rf js/vendor/* npm i - cp node_modules/handlebars/dist/handlebars.js vendor/ - cp node_modules/isotope-layout/dist/isotope.pkgd.js vendor/ - cp node_modules/medium-editor/dist/js/medium-editor.js vendor/ + cp node_modules/handlebars/dist/handlebars.js js/vendor/ + cp node_modules/isotope-layout/dist/isotope.pkgd.js js/vendor/ + cp node_modules/medium-editor/dist/js/medium-editor.js js/vendor/ cp node_modules/medium-editor/dist/css/medium-editor.css vendor/ - cp node_modules/medium-editor-autolist/dist/autolist.js vendor/ - cp node_modules/lozad/dist/lozad.js vendor/ + cp node_modules/medium-editor-autolist/dist/autolist.js js/vendor/ + cp node_modules/lozad/dist/lozad.js js/vendor/ depsmin: mkdir -p vendor - rm -rf vendor/* + mkdir -p js/vendor + rm -rf js/vendor/* npm i - cp node_modules/handlebars/dist/handlebars.min.js vendor/handlebars.js - cp node_modules/isotope-layout/dist/isotope.pkgd.min.js vendor/isotope.pkgd.js - cp node_modules/medium-editor/dist/js/medium-editor.min.js vendor/medium-editor.js + cp node_modules/handlebars/dist/handlebars.min.js js/vendor/handlebars.js + cp node_modules/isotope-layout/dist/isotope.pkgd.min.js js/vendor/isotope.pkgd.js + cp node_modules/medium-editor/dist/js/medium-editor.min.js js/vendor/medium-editor.js cp node_modules/medium-editor/dist/css/medium-editor.min.css vendor/medium-editor.css - cp node_modules/medium-editor-autolist/dist/autolist.min.js vendor/autolist.js - cp node_modules/lozad/dist/lozad.min.js vendor/lozad.js + cp node_modules/medium-editor-autolist/dist/autolist.min.js js/vendor/autolist.js + cp node_modules/lozad/dist/lozad.min.js js/vendor/lozad.js # Build Rules diff --git a/appinfo/info.xml b/appinfo/info.xml index 53aed54..cc9a9cb 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,6 +20,6 @@ https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-attachments.jpeg https://raw.githubusercontent.com/matiasdelellis/quicknotes/master/doc/quicknotes-shared-note.jpeg - + \ No newline at end of file diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index a525ad9..8c25764 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -32,6 +32,7 @@ use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IServerContainer; +use OCP\INavigationManager; use OCA\QuickNotes\Dashboard\NotesWidget; use OCA\QuickNotes\Listeners\BeforeTemplateRenderedListener; @@ -65,7 +66,7 @@ class Application extends App implements IBootstrap { } private function registerNavigationEntry(IServerContainer $server): void { - $server->getNavigationManager()->add(static function () use ($server) { + $server->get(INavigationManager::class)->add(static function () use ($server) { $urlGenerator = $server->getURLGenerator(); $l10n = $server->getL10N(self::APP_ID); return [ diff --git a/templates/main.php b/templates/main.php index 40bfff8..d00bc36 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1,14 +1,13 @@