diff --git a/appinfo/info.xml b/appinfo/info.xml index 57d4f8922d249a01c1436802a5fe0ee12b09c59a..6f62f12ecf00ecaf4350ddb1622cdffb138b47af 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -2,22 +2,31 @@ ecloud-dashboard - ECloud dashboard - /e/ Cloud Dashboard - - 0.0.2 + Murena dashboard + Murena Dashboard + + 0.0.6 agpl - Ronak Patel + ECORP SAS EcloudDashboard dashboard - https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/ecloud-dashboard/-/issues + https://gitlab.e.foundation/e/infra/selfhost/nextcloud-apps/home/-/issues - Ecloud Dashboard - ecloud-dashboard.page.index + Murena Dashboard + home.page.index + + + OCA\EcloudDashboard\Migration\SetDefaultApp + + + OCA\EcloudDashboard\Migration\UnsetDefaultApp + + + diff --git a/l10n/de.js b/l10n/de.js index 278625a154b934e435c72ce727774c839bca1052..4d1138f35bc4815610e9cfa6cc97a45546d784e3 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "home", { "Welcome back" : "Willkommen zurück", "Storage": "Lager", diff --git a/l10n/en.js b/l10n/en.js index b77fdf4a81344bbce2ce547097bf17f228b0a3b1..51d9680b3cc37dcb418e2ec4db9716c78aa4f842 100755 --- a/l10n/en.js +++ b/l10n/en.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "home", { "Welcome back" : "Welcome back", "Storage": "Storage", diff --git a/l10n/es.js b/l10n/es.js index dc0c5d045020f1c172a3c74537a37d77e7802f14..9126539c2135879314bcc064dc6c8cf26f256501 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "home", { "Welcome back" : "Bienvenido de nuevo", "Storage": "Almacenamiento", diff --git a/l10n/fr.js b/l10n/fr.js index 2c6021447894a137c0fd95b6bcaf9e3f22ff975f..5ee7690aa13fd8d608129ddd45531d35e5c313ca 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -1,5 +1,5 @@ OC.L10N.register( - "ecloud-dashboard", + "home", { "Welcome back" : "Content de vous revoir", "Storage": "Espace de stockage", diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 23e705093ff1260dc820da1aa994433f81c88cba..1e12e30d7de394ddca61b2577f696271d1cc2956 100755 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -8,7 +8,7 @@ class Application extends App { public function __construct(array $urlParams = array()) { - $appName = "ecloud-dashboard"; + $appName = "home"; parent::__construct($appName, $urlParams); } } diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 9cbc1706183d32b514433912595f75cc003f80a4..06cd5bdd4611cc15981e78626107683a3ca70980 100755 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -24,6 +24,6 @@ class PageController extends Controller { * @NoCSRFRequired */ public function index() { - return new TemplateResponse('ecloud-dashboard', 'edashboard'); // templates/edashboard.php + return new TemplateResponse('home', 'edashboard'); // templates/edashboard.php } } \ No newline at end of file diff --git a/lib/Migration/SetDefaultApp.php b/lib/Migration/SetDefaultApp.php new file mode 100644 index 0000000000000000000000000000000000000000..88858275970f1f98be472c5ff972b56b741c88fb --- /dev/null +++ b/lib/Migration/SetDefaultApp.php @@ -0,0 +1,24 @@ +config = $config; + } + + public function getName() { + return 'Set the custom email template'; + } + + public function run(IOutput $output) { + $this->config->setSystemValue('defaultapp', 'home,dashboard'); + } +} diff --git a/lib/Migration/UnsetDefaultApp.php b/lib/Migration/UnsetDefaultApp.php new file mode 100644 index 0000000000000000000000000000000000000000..3c89d0599c5b2dd536b85bbb834ed6adaf548594 --- /dev/null +++ b/lib/Migration/UnsetDefaultApp.php @@ -0,0 +1,26 @@ +config = $config; + } + + public function getName() { + return 'Reset the email template to default'; + } + + public function run(IOutput $output) { + if ($this->config->getSystemValue('defaultapp') === EMailTemplate::class) { + $this->config->deleteSystemValue('defaultapp'); + } + } +} diff --git a/lib/Util.php b/lib/Util.php index ef07c2c8c9d86c161410884a2922ca05d8b5b84e..09966da3960edd1a4c621fa6f8af4d0b61699ab3 100755 --- a/lib/Util.php +++ b/lib/Util.php @@ -97,7 +97,7 @@ class Util } } unset($entriesByHref['/apps/dashboard/']); - unset($entriesByHref['/apps/ecloud-dashboard/']); + unset($entriesByHref['/apps/home/']); $entries = array_values($entriesByHref); return array( 'apps' => $entries ); diff --git a/package-lock.json b/package-lock.json index 232ef1129ad6c350e21b6efab5f6d076875c2341..705bef98a9b85d88df88cc97ba1d116a5cd3a95a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "ecloud-dashboard", + "name": "home", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "ecloud-dashboard", + "name": "home", "version": "0.1.0", "license": "AGPL-3.0-or-later", "dependencies": { @@ -3285,16 +3285,6 @@ "node": ">=8" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dev": true, - "optional": true, - "dependencies": { - "file-uri-to-path": "1.0.0" - } - }, "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -5784,13 +5774,6 @@ "node": ">=4" } }, - "node_modules/file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -6116,20 +6099,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -8493,13 +8462,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "node_modules/nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "dev": true, - "optional": true - }, "node_modules/nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -12893,25 +12855,6 @@ "node": ">=0.10.0" } }, - "node_modules/watchpack-chokidar2/node_modules/fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/watchpack-chokidar2/node_modules/glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", @@ -16182,16 +16125,6 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "optional": true }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dev": true, - "optional": true, - "requires": { - "file-uri-to-path": "1.0.0" - } - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -18196,13 +18129,6 @@ "flat-cache": "^2.0.1" } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -18462,13 +18388,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -20247,13 +20166,6 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "nan": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", - "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==", - "dev": true, - "optional": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -23724,17 +23636,6 @@ "to-regex-range": "^2.1.0" } }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } - }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", diff --git a/package.json b/package.json index 4d91f8866a0958e6c7db0917ea7ebf60f9d644e2..9529ff70fa8745bf2415f26f2d614efa8520401f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "ecloud-dashboard", + "name": "home", "version": "0.1.0", "private": true, "description": "Place this app in **nextcloud/custom_apps/**", diff --git a/src/components/AllApps.vue b/src/components/AllApps.vue index 84e43324df422298560f85eeb60ad81c656cce9a..81b5e8e61f051a8ce64c606eb134c824703475aa 100755 --- a/src/components/AllApps.vue +++ b/src/components/AllApps.vue @@ -45,9 +45,9 @@ export default { entries: [], external: [], userInfo: [], - showAllApps: OC.L10N.translate('ecloud-dashboard', 'Show All Apps'), - showLessApps: OC.L10N.translate('ecloud-dashboard', 'Show Less Apps'), - WelcomeBack: OC.L10N.translate('ecloud-dashboard', 'Welcome back'), + showAllApps: OC.L10N.translate('home', 'Show All Apps'), + showLessApps: OC.L10N.translate('home', 'Show Less Apps'), + WelcomeBack: OC.L10N.translate('home', 'Welcome back'), } }, mounted() { @@ -57,7 +57,7 @@ export default { methods: { getEntries() { axios - .get(generateUrl('/apps/ecloud-dashboard/get-apps')) + .get(generateUrl('/apps/home/get-apps')) .then((response) => { this.entries = response.data.apps this.entries = this.entries.map((entry) => { diff --git a/src/components/StorageLayout.vue b/src/components/StorageLayout.vue index f51311a62c8677642c695a95a88dcbfc09b8feae..b0c0cd963f90502e9ab4df04bcb9e8dd251dc3a8 100755 --- a/src/components/StorageLayout.vue +++ b/src/components/StorageLayout.vue @@ -56,12 +56,12 @@ export default { isHidden: false, redirectURL: '', storageLink: '', - storage: OC.L10N.translate('ecloud-dashboard', 'Storage'), - upgradeStorage: OC.L10N.translate('ecloud-dashboard', 'Upgrade Storage'), - getCredits: OC.L10N.translate('ecloud-dashboard', 'getCredits'), - openAnAccount: OC.L10N.translate('ecloud-dashboard', 'openAnAccount'), + storage: OC.L10N.translate('home', 'Storage'), + upgradeStorage: OC.L10N.translate('home', 'Upgrade Storage'), + getCredits: OC.L10N.translate('home', 'getCredits'), + openAnAccount: OC.L10N.translate('home', 'openAnAccount'), inviteYourFriends: OC.L10N.translate( - 'ecloud-dashboard', + 'home', 'Invite Your Friends' ), } @@ -111,7 +111,7 @@ export default { }, getRedirections() { axios - .get(generateUrl('/apps/ecloud-dashboard/apps/get-redirections')) + .get(generateUrl('/apps/home/apps/get-redirections')) .then((response) => { this.storageLink = response.data.storageLink this.redirectURL = response.data.redirectURL @@ -136,12 +136,12 @@ export default { storageInfo: [], redirectURL: '', storageLink: '', - storage: OC.L10N.translate('ecloud-dashboard', 'Storage'), - upgradeStorage: OC.L10N.translate('ecloud-dashboard', 'Upgrade Storage'), - getCredits: OC.L10N.translate('ecloud-dashboard', 'getCredits'), - openAnAccount: OC.L10N.translate('ecloud-dashboard', 'openAnAccount'), + storage: OC.L10N.translate('home', 'Storage'), + upgradeStorage: OC.L10N.translate('home', 'Upgrade Storage'), + getCredits: OC.L10N.translate('home', 'getCredits'), + openAnAccount: OC.L10N.translate('home', 'openAnAccount'), inviteYourFriends: OC.L10N.translate( - 'ecloud-dashboard', + 'home', 'Invite Your Friends' ), } @@ -191,7 +191,7 @@ export default { }, getRedirections() { axios - .get(generateUrl('/apps/ecloud-dashboard/apps/get-redirections')) + .get(generateUrl('/apps/home/apps/get-redirections')) .then((response) => { this.storageLink = response.data.storageLink this.redirectURL = response.data.redirectURL diff --git a/templates/edashboard.php b/templates/edashboard.php index 6394734e13b5a0136a771bd18b76323289c3bf3a..24ad93acfef6d4a4195fd654f70e3357547a9426 100644 --- a/templates/edashboard.php +++ b/templates/edashboard.php @@ -1,4 +1,4 @@
\ No newline at end of file