From a366afe8f732a0dd9ebf523010024c3e5f4db38a Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Sun, 5 Sep 2021 16:22:58 +0200 Subject: [PATCH] sehr viel --- appinfo/app.php | 2 + appinfo/info.xml | 8 +-- appinfo/routes.php | 2 +- lib/AppInfo/Application.php | 4 +- lib/Controller/PageController.php | 7 +- src/App.vue | 12 +--- src/main.js | 13 ---- src/router/routes.js | 19 +---- src/store.js | 40 ----------- src/timemanagement.js | 4 ++ src/views/AgencyData.vue | 112 ------------------------------ src/views/GroupManagement.vue | 79 --------------------- src/views/Migrate.vue | 64 ----------------- templates/main.php | 1 + 14 files changed, 23 insertions(+), 344 deletions(-) create mode 100644 appinfo/app.php delete mode 100644 src/store.js create mode 100644 src/timemanagement.js delete mode 100644 src/views/AgencyData.vue delete mode 100644 src/views/GroupManagement.vue delete mode 100644 src/views/Migrate.vue diff --git a/appinfo/app.php b/appinfo/app.php new file mode 100644 index 0000000..f30a893 --- /dev/null +++ b/appinfo/app.php @@ -0,0 +1,2 @@ + - + diff --git a/appinfo/routes.php b/appinfo/routes.php index 9395ae4..2bfcad8 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -30,4 +30,4 @@ return [ ['name' => 'migrate#renameGroup', 'url' => '/regr', 'verb' => 'POST'], //['name' => 'migrate#createAGGroupFolder', 'url' => '/createagf', 'verb' => 'GET'], ] - ]; \ No newline at end of file + ]; \ No newline at end of file diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 7c4787e..e58c569 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -35,6 +35,8 @@ class Application extends App { # Event before a File is deletet $dispatcher->addServiceListener(BeforeNodeDeletedEvent::class, DeleteNCFileDjango::class); + + #Util::addScript($this->appName, 'da_agency-timemanagement'); } } @@ -66,8 +68,6 @@ class DeleteNCFileDjango extends Controller { ]; $context = stream_context_create($opts); - - $file = file_get_contents($this->nclink.'/api/deletefile/'.$event->getNode()->getId().'/87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN', false, $context); } } diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index eec7c1c..acf8984 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -27,10 +27,11 @@ class PageController extends Controller { */ public function index() { - Util::addScript($this->appName, 'agency-main'); - Util::addStyle($this->appName, 'icons'); + Util::addScript($this->appName, 'da_agency-main'); + //Util::addScript($this->appName, 'da_agency-timemanagement'); + //Util::addStyle($this->appName, 'icons'); - $response = new TemplateResponse($this->appName, 'main'); + $response = new TemplateResponse('da_agency', 'main'); return $response; } } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index e0a709f..28a44c9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,23 +1,15 @@ diff --git a/src/main.js b/src/main.js index 6f98c3e..3fee987 100644 --- a/src/main.js +++ b/src/main.js @@ -4,24 +4,11 @@ import VueRouter from 'vue-router' import Routes from './router/routes' import VueFormulate from '@braid/vue-formulate' import { de } from '@braid/vue-formulate-i18n' -import { BootstrapVue, BootstrapVueIcons } from 'bootstrap-vue' -import 'bootstrap/dist/css/bootstrap.css' -import 'bootstrap-vue/dist/bootstrap-vue.css' -import 'bootstrap-vue/dist/bootstrap-vue-icons.min.css' -import VueConfirmDialog from 'vue-confirm-dialog' -// import { translate, translatePlural } from '@nextcloud/l10n' -// import store from './store' - Vue.use(VueRouter) Vue.use(VueFormulate, { plugins: [de], locale: 'de', }) -// Vue.prototype.t = translate -// Vue.prototype.n = translatePlural -Vue.use(VueConfirmDialog) -Vue.use(BootstrapVue) -Vue.use(BootstrapVueIcons) Vue.prototype.$hostname = 'http://localhost:8080' const router = new VueRouter({ diff --git a/src/router/routes.js b/src/router/routes.js index dd73f5f..b008c85 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,22 +1,9 @@ -import AgencyData from '../views/AgencyData' -import Migrate from '../views/Migrate' -import GroupManagement from '../views/GroupManagement' +import App from '../App' export default [ - { - path: '/agencydata', - name: 'agencydata', - component: AgencyData, - }, - { - path: '/groupmanagement', - name: 'groupmanagemenet', - component: GroupManagement, - }, { path: '/', - name: 'migrate', - component: Migrate, + name: 'app', + component: App, }, ] -// TODO: Hier migrate usw. auf den richtigen Pfad setzen und agencydata auch wieder auf agencydata usw. diff --git a/src/store.js b/src/store.js deleted file mode 100644 index 0c85f73..0000000 --- a/src/store.js +++ /dev/null @@ -1,40 +0,0 @@ -/*import Vue from 'vue' -import Vuex from 'vuex' -import { generateUrl } from '@nextcloud/router' -const axios = require('axios').default - -Vue.use(Vuex) - -export default new Vuex.Store({ - state: { - agencyId: null, - agency: null, - }, - mutations: { - getAgencyId(state) { - return state.agencyId - }, - setAgencyId(state, id) { - state.agencyId = id - }, - getAgency(state) { - return state.agency - }, - setAgency(state, agency) { - state.agency = agency - }, - }, - actions: { - async loadAgencyData({ commit }) { - // axios.get(generateUrl('/apps/agency/getagencyidbyuser')).then(response => { - // console.log('Here we load...') - // this.agencyId = response.data.agency - // }) + this.$store.state.agencyId - const agencydata = await axios.get(generateUrl('/apps/agency/agencys/4')).then(function() { - commit('setAgency', agencydata.data) - return true - }) - return false - }, - }, -})*/ diff --git a/src/timemanagement.js b/src/timemanagement.js new file mode 100644 index 0000000..97898b3 --- /dev/null +++ b/src/timemanagement.js @@ -0,0 +1,4 @@ +(function($) { + "use strict"; + console.log("HI!"); +}(jQuery)); diff --git a/src/views/AgencyData.vue b/src/views/AgencyData.vue deleted file mode 100644 index 8e1c4fc..0000000 --- a/src/views/AgencyData.vue +++ /dev/null @@ -1,112 +0,0 @@ - - diff --git a/src/views/GroupManagement.vue b/src/views/GroupManagement.vue deleted file mode 100644 index 711cb0f..0000000 --- a/src/views/GroupManagement.vue +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/src/views/Migrate.vue b/src/views/Migrate.vue deleted file mode 100644 index b100b3d..0000000 --- a/src/views/Migrate.vue +++ /dev/null @@ -1,64 +0,0 @@ - - diff --git a/templates/main.php b/templates/main.php index fedcee4..4d82b99 100644 --- a/templates/main.php +++ b/templates/main.php @@ -1 +1,2 @@
+