From ab8193dc140549f66f1c3fe1e37cfe622f1105fe Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Mon, 21 Feb 2022 21:10:40 +0100
Subject: [PATCH] base route was moved inside routes folder
---
app/routes/authenticated/roles/add.js | 5 +++--
app/routes/authenticated/roles/edit.js | 5 +++--
app/routes/authenticated/roles/index.js | 2 +-
app/routes/authenticated/users/add.js | 5 +++--
app/routes/authenticated/users/change_password.js | 5 +++--
app/routes/authenticated/users/edit.js | 5 +++--
app/routes/authenticated/users/index.js | 2 +-
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/app/routes/authenticated/roles/add.js b/app/routes/authenticated/roles/add.js
index 2024071..585bf11 100644
--- a/app/routes/authenticated/roles/add.js
+++ b/app/routes/authenticated/roles/add.js
@@ -1,5 +1,6 @@
-import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import { service } from '@ember/service';
+import BaseRoute from 'papermerge/routes/base';
+
export default class AddRoleRoute extends BaseRoute {
@service store;
diff --git a/app/routes/authenticated/roles/edit.js b/app/routes/authenticated/roles/edit.js
index c8b0f7f..4aca363 100644
--- a/app/routes/authenticated/roles/edit.js
+++ b/app/routes/authenticated/roles/edit.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
export default class EditRoleRoute extends BaseRoute {
@service store;
diff --git a/app/routes/authenticated/roles/index.js b/app/routes/authenticated/roles/index.js
index e1b3064..8339180 100644
--- a/app/routes/authenticated/roles/index.js
+++ b/app/routes/authenticated/roles/index.js
@@ -1,5 +1,5 @@
import BaseRoute from 'papermerge/routes/base';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default class RolesRoute extends BaseRoute {
diff --git a/app/routes/authenticated/users/add.js b/app/routes/authenticated/users/add.js
index 08bf1cb..6b1eb3c 100644
--- a/app/routes/authenticated/users/add.js
+++ b/app/routes/authenticated/users/add.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
class AddUserRoute extends BaseRoute {
@service store;
diff --git a/app/routes/authenticated/users/change_password.js b/app/routes/authenticated/users/change_password.js
index 30477db..1c76ffc 100644
--- a/app/routes/authenticated/users/change_password.js
+++ b/app/routes/authenticated/users/change_password.js
@@ -1,5 +1,6 @@
-import { inject as service } from '@ember/service';
-import BaseRoute from 'papermerge/base/routing';
+import { service } from '@ember/service';
+import BaseRoute from 'papermerge/routes/base';
+
export default class ChangeUserPasswordRoute extends BaseRoute {
@service store;
diff --git a/app/routes/authenticated/users/edit.js b/app/routes/authenticated/users/edit.js
index b08d399..2ad9e0e 100644
--- a/app/routes/authenticated/users/edit.js
+++ b/app/routes/authenticated/users/edit.js
@@ -1,6 +1,7 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import RSVP from 'rsvp';
-import BaseRoute from 'papermerge/base/routing';
+import BaseRoute from 'papermerge/routes/base';
+
export default class EditUserRoute extends BaseRoute {
@service store;
diff --git a/app/routes/authenticated/users/index.js b/app/routes/authenticated/users/index.js
index 5178a34..1db4ffa 100644
--- a/app/routes/authenticated/users/index.js
+++ b/app/routes/authenticated/users/index.js
@@ -1,4 +1,4 @@
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import BaseRoute from 'papermerge/routes/base';
--
GitLab