move some files around

web/static/src/ts/env.ts

@@ -2,13 +2,13 @@ import { QWeb } from "./core/qweb_vdom";
 import { idGenerator, memoize } from "./core/utils";
 import { WEnv } from "./core/widget";
 import { ActionManager, IActionManager } from "./services/action_manager";
-import { Ajax, IAjax } from "./services/ajax";
+import { Ajax, IAjax } from "./core/ajax";
 import {
   INotificationManager,
   NotificationManager
-} from "./services/notifications";
+} from "./core/notifications";
 import { registry, Registry } from "./services/registry";
-import { IRouter, Router } from "./services/router";
+import { IRouter, Router } from "./core/router";
 import { CRM } from "./widgets/crm";
 import { Discuss } from "./widgets/discuss";
 

web/static/src/ts/root.ts

@@ -1,7 +1,7 @@
 import { Widget } from "./core/widget";
 import { Env } from "./env";
 import { ActionStack } from "./services/action_manager";
-import { INotification } from "./services/notifications";
+import { INotification } from "./core/notifications";
 import { Action } from "./widgets/action";
 import { HomeMenu } from "./widgets/home_menu";
 import { Navbar } from "./widgets/navbar";

web/static/src/ts/services/action_manager.ts

@@ -3,7 +3,7 @@ import { Widget } from "../core/widget";
 import { Env } from "../env";
 import { Registry } from "./registry";
 import { Type } from "../types";
-import { IRouter, Query } from "./router";
+import { IRouter, Query } from "../core/router";
 
 //------------------------------------------------------------------------------
 // Types

web/static/src/ts/widgets/notification.ts

@@ -1,6 +1,6 @@
 import { Widget } from "../core/widget";
 import { Env } from "../env";
-import { INotification } from "../services/notifications";
+import { INotification } from "../core/notifications";
 
 export class Notification extends Widget<Env, INotification> {
   template = "notification";

web/static/tests/helpers.ts

@@ -2,13 +2,13 @@ import { QWeb } from "../src/ts/core/qweb_vdom";
 import { idGenerator } from "../src/ts/core/utils";
 import { WEnv } from "../src/ts/core/widget";
 import { Env } from "../src/ts/env";
-import { IAjax, RPCQuery } from "../src/ts/services/ajax";
+import { IAjax, RPCQuery } from "../src/ts/core/ajax";
 import { Registry } from "../src/ts/services/registry";
-import { NotificationManager } from "../src/ts/services/notifications";
+import { NotificationManager } from "../src/ts/core/notifications";
 
 import { IActionManager, ActionEvent } from "../src/ts/services/action_manager";
 import { Callback } from "../src/ts/core/event_bus";
-import { IRouter, Query, RouterEvent } from "../src/ts/services/router";
+import { IRouter, Query, RouterEvent } from "../src/ts/core/router";
 import { readFile } from "fs";
 
 export function makeTestFixture() {

web/static/tests/services/notifications.test.ts

@@ -1,7 +1,7 @@
 import {
   NotificationManager,
   INotification
-} from "../../src/ts/services/notifications";
+} from "../../src/ts/core/notifications";
 
 test("can subscribe and add notification", () => {
   let notifs: INotification[] = [];

web/static/tests/widgets/notification.test.ts

@@ -1,5 +1,5 @@
 import { Env } from "../../src/ts/env";
-import { INotification } from "../../src/ts/services/notifications";
+import { INotification } from "../../src/ts/core/notifications";
 import { Notification } from "../../src/ts/widgets/notification";
 import { makeTestEnv, makeTestFixture, loadTemplates } from "../helpers";