From 2bf2557b13a4b43690e2858e0435c83e81821811 Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Fri, 18 Jan 2019 20:21:08 +0100 Subject: [PATCH] Move framework (again) --- packages/{@rondomoon/framework => server}/.gitignore | 0 packages/{@rondomoon/framework => server}/@types/express.d.ts | 0 packages/{@rondomoon/framework => server}/Buildfile | 0 packages/{@rondomoon/framework => server}/TODO.md | 0 packages/{@rondomoon/framework => server}/config/default.yml | 0 packages/{@rondomoon/framework => server}/config/test.yml | 0 packages/{@rondomoon/framework => server}/jest.config.js | 0 packages/{@rondomoon/framework => server}/jest.setup.js | 0 packages/{@rondomoon/framework => server}/ormconfig.js | 0 packages/{@rondomoon/framework => server}/package-lock.json | 0 packages/{@rondomoon/framework => server}/package.json | 2 ++ .../framework => server}/src/client/components/Component.tsx | 0 packages/{@rondomoon/framework => server}/src/client/index.tsx | 0 .../framework => server}/src/client/reducers/index.ts | 0 packages/{@rondomoon/framework => server}/src/client/store.ts | 0 packages/{@rondomoon/framework => server}/src/common/IAPIDef.ts | 0 packages/{@rondomoon/framework => server}/src/common/REST.ts | 0 .../framework => server}/src/server/application/Application.ts | 0 .../framework => server}/src/server/application/Bootstrap.ts | 0 .../framework => server}/src/server/application/IApplication.ts | 0 .../framework => server}/src/server/application/IBootstrap.ts | 0 .../framework => server}/src/server/application/IConfig.ts | 0 .../framework => server}/src/server/application/index.ts | 0 packages/{@rondomoon/framework => server}/src/server/config.ts | 0 .../framework => server}/src/server/database/Database.ts | 0 .../framework => server}/src/server/database/IDatabase.ts | 0 .../src/server/database/ITransactionManager.ts | 0 .../src/server/database/TransactionManager.ts | 0 .../framework => server}/src/server/database/index.test.ts | 0 .../framework => server}/src/server/database/index.ts | 0 .../framework => server}/src/server/entities/Session.ts | 0 .../framework => server}/src/server/entities/User.ts | 0 .../framework => server}/src/server/entities/UserEmail.ts | 0 packages/{@rondomoon/framework => server}/src/server/index.ts | 0 .../framework => server}/src/server/logger/ILogger.ts | 0 .../framework => server}/src/server/logger/ILoggerFactory.ts | 0 .../src/server/logger/LoggerFactory.test.ts | 0 .../framework => server}/src/server/logger/LoggerFactory.ts | 0 .../framework => server}/src/server/logger/SqlLogger.ts | 0 .../{@rondomoon/framework => server}/src/server/logger/index.ts | 0 .../src/server/middleware/Authenticator.test.ts | 0 .../framework => server}/src/server/middleware/Authenticator.ts | 0 .../src/server/middleware/ErrorApiHandler.ts | 0 .../src/server/middleware/ErrorPageHandler.ts | 0 .../framework => server}/src/server/middleware/IErrorHandler.ts | 0 .../framework => server}/src/server/middleware/IHandler.ts | 0 .../framework => server}/src/server/middleware/IMiddleware.ts | 0 .../src/server/middleware/IPromiseHandler.ts | 0 .../framework => server}/src/server/middleware/RequestLogger.ts | 0 .../framework => server}/src/server/middleware/Session.ts | 0 .../framework => server}/src/server/middleware/Transaction.ts | 0 .../framework => server}/src/server/middleware/csrf.ts | 0 .../src/server/middleware/ensureLoggedIn.test.ts | 0 .../src/server/middleware/ensureLoggedIn.ts | 0 .../framework => server}/src/server/middleware/handlePromise.ts | 0 .../framework => server}/src/server/middleware/index.ts | 0 .../src/server/migrations/1547031984999-user.ts | 0 .../src/server/migrations/1547474320589-session.ts | 0 .../src/server/migrations/1547480973242-sessionUserId.ts | 0 .../framework => server}/src/server/router/AsyncRouter.test.ts | 0 .../framework => server}/src/server/router/AsyncRouter.ts | 0 .../src/server/router/TransactionalRouter.ts | 0 .../{@rondomoon/framework => server}/src/server/router/index.ts | 0 .../framework => server}/src/server/routes/BaseRoute.ts | 0 .../framework => server}/src/server/routes/LoginRoutes.test.ts | 0 .../framework => server}/src/server/routes/LoginRoutes.ts | 0 .../framework => server}/src/server/routes/UserRoutes.test.ts | 0 .../framework => server}/src/server/routes/UserRoutes.ts | 0 .../framework => server}/src/server/routes/application.tsx | 0 .../{@rondomoon/framework => server}/src/server/routes/index.ts | 0 .../framework => server}/src/server/services/BaseService.ts | 0 .../framework => server}/src/server/services/ICredentials.ts | 0 .../framework => server}/src/server/services/IUser.ts | 0 .../framework => server}/src/server/services/IUserService.ts | 0 .../src/server/services/UserService.test.ts | 0 .../framework => server}/src/server/services/UserService.ts | 0 .../framework => server}/src/server/services/index.ts | 0 .../framework => server}/src/server/session/ISession.ts | 0 .../src/server/session/SessionStore.test.ts | 0 .../framework => server}/src/server/session/SessionStore.ts | 0 .../framework => server}/src/server/test-utils/NamespaceMock.ts | 0 .../src/server/test-utils/RequestTester.test.ts | 0 .../framework => server}/src/server/test-utils/RequestTester.ts | 0 .../framework => server}/src/server/test-utils/TestUtils.ts | 0 .../framework => server}/src/server/test-utils/index.ts | 0 packages/{@rondomoon/framework => server}/src/server/test.ts | 0 packages/{@rondomoon/framework => server}/tsconfig.json | 0 packages/{@rondomoon/framework => server}/tslint.json | 0 88 files changed, 2 insertions(+) rename packages/{@rondomoon/framework => server}/.gitignore (100%) rename packages/{@rondomoon/framework => server}/@types/express.d.ts (100%) rename packages/{@rondomoon/framework => server}/Buildfile (100%) rename packages/{@rondomoon/framework => server}/TODO.md (100%) rename packages/{@rondomoon/framework => server}/config/default.yml (100%) rename packages/{@rondomoon/framework => server}/config/test.yml (100%) rename packages/{@rondomoon/framework => server}/jest.config.js (100%) rename packages/{@rondomoon/framework => server}/jest.setup.js (100%) rename packages/{@rondomoon/framework => server}/ormconfig.js (100%) rename packages/{@rondomoon/framework => server}/package-lock.json (100%) rename packages/{@rondomoon/framework => server}/package.json (98%) rename packages/{@rondomoon/framework => server}/src/client/components/Component.tsx (100%) rename packages/{@rondomoon/framework => server}/src/client/index.tsx (100%) rename packages/{@rondomoon/framework => server}/src/client/reducers/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/client/store.ts (100%) rename packages/{@rondomoon/framework => server}/src/common/IAPIDef.ts (100%) rename packages/{@rondomoon/framework => server}/src/common/REST.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/Application.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/Bootstrap.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/IApplication.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/IBootstrap.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/IConfig.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/application/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/config.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/Database.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/IDatabase.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/ITransactionManager.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/TransactionManager.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/index.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/database/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/entities/Session.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/entities/User.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/entities/UserEmail.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/ILogger.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/ILoggerFactory.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/LoggerFactory.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/LoggerFactory.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/SqlLogger.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/logger/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/Authenticator.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/Authenticator.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/ErrorApiHandler.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/ErrorPageHandler.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/IErrorHandler.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/IHandler.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/IMiddleware.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/IPromiseHandler.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/RequestLogger.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/Session.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/Transaction.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/csrf.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/ensureLoggedIn.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/ensureLoggedIn.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/handlePromise.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/middleware/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/migrations/1547031984999-user.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/migrations/1547474320589-session.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/migrations/1547480973242-sessionUserId.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/router/AsyncRouter.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/router/AsyncRouter.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/router/TransactionalRouter.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/router/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/BaseRoute.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/LoginRoutes.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/LoginRoutes.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/UserRoutes.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/UserRoutes.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/application.tsx (100%) rename packages/{@rondomoon/framework => server}/src/server/routes/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/BaseService.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/ICredentials.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/IUser.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/IUserService.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/UserService.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/UserService.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/services/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/session/ISession.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/session/SessionStore.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/session/SessionStore.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test-utils/NamespaceMock.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test-utils/RequestTester.test.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test-utils/RequestTester.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test-utils/TestUtils.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test-utils/index.ts (100%) rename packages/{@rondomoon/framework => server}/src/server/test.ts (100%) rename packages/{@rondomoon/framework => server}/tsconfig.json (100%) rename packages/{@rondomoon/framework => server}/tslint.json (100%) diff --git a/packages/@rondomoon/framework/.gitignore b/packages/server/.gitignore similarity index 100% rename from packages/@rondomoon/framework/.gitignore rename to packages/server/.gitignore diff --git a/packages/@rondomoon/framework/@types/express.d.ts b/packages/server/@types/express.d.ts similarity index 100% rename from packages/@rondomoon/framework/@types/express.d.ts rename to packages/server/@types/express.d.ts diff --git a/packages/@rondomoon/framework/Buildfile b/packages/server/Buildfile similarity index 100% rename from packages/@rondomoon/framework/Buildfile rename to packages/server/Buildfile diff --git a/packages/@rondomoon/framework/TODO.md b/packages/server/TODO.md similarity index 100% rename from packages/@rondomoon/framework/TODO.md rename to packages/server/TODO.md diff --git a/packages/@rondomoon/framework/config/default.yml b/packages/server/config/default.yml similarity index 100% rename from packages/@rondomoon/framework/config/default.yml rename to packages/server/config/default.yml diff --git a/packages/@rondomoon/framework/config/test.yml b/packages/server/config/test.yml similarity index 100% rename from packages/@rondomoon/framework/config/test.yml rename to packages/server/config/test.yml diff --git a/packages/@rondomoon/framework/jest.config.js b/packages/server/jest.config.js similarity index 100% rename from packages/@rondomoon/framework/jest.config.js rename to packages/server/jest.config.js diff --git a/packages/@rondomoon/framework/jest.setup.js b/packages/server/jest.setup.js similarity index 100% rename from packages/@rondomoon/framework/jest.setup.js rename to packages/server/jest.setup.js diff --git a/packages/@rondomoon/framework/ormconfig.js b/packages/server/ormconfig.js similarity index 100% rename from packages/@rondomoon/framework/ormconfig.js rename to packages/server/ormconfig.js diff --git a/packages/@rondomoon/framework/package-lock.json b/packages/server/package-lock.json similarity index 100% rename from packages/@rondomoon/framework/package-lock.json rename to packages/server/package-lock.json diff --git a/packages/@rondomoon/framework/package.json b/packages/server/package.json similarity index 98% rename from packages/@rondomoon/framework/package.json rename to packages/server/package.json index 1c1efb6..fdabd42 100644 --- a/packages/@rondomoon/framework/package.json +++ b/packages/server/package.json @@ -1,4 +1,6 @@ { + "name": "@rondo/server", + "private": true, "scripts": { "test": "jest", "lint": "tslint --project .", diff --git a/packages/@rondomoon/framework/src/client/components/Component.tsx b/packages/server/src/client/components/Component.tsx similarity index 100% rename from packages/@rondomoon/framework/src/client/components/Component.tsx rename to packages/server/src/client/components/Component.tsx diff --git a/packages/@rondomoon/framework/src/client/index.tsx b/packages/server/src/client/index.tsx similarity index 100% rename from packages/@rondomoon/framework/src/client/index.tsx rename to packages/server/src/client/index.tsx diff --git a/packages/@rondomoon/framework/src/client/reducers/index.ts b/packages/server/src/client/reducers/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/client/reducers/index.ts rename to packages/server/src/client/reducers/index.ts diff --git a/packages/@rondomoon/framework/src/client/store.ts b/packages/server/src/client/store.ts similarity index 100% rename from packages/@rondomoon/framework/src/client/store.ts rename to packages/server/src/client/store.ts diff --git a/packages/@rondomoon/framework/src/common/IAPIDef.ts b/packages/server/src/common/IAPIDef.ts similarity index 100% rename from packages/@rondomoon/framework/src/common/IAPIDef.ts rename to packages/server/src/common/IAPIDef.ts diff --git a/packages/@rondomoon/framework/src/common/REST.ts b/packages/server/src/common/REST.ts similarity index 100% rename from packages/@rondomoon/framework/src/common/REST.ts rename to packages/server/src/common/REST.ts diff --git a/packages/@rondomoon/framework/src/server/application/Application.ts b/packages/server/src/server/application/Application.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/Application.ts rename to packages/server/src/server/application/Application.ts diff --git a/packages/@rondomoon/framework/src/server/application/Bootstrap.ts b/packages/server/src/server/application/Bootstrap.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/Bootstrap.ts rename to packages/server/src/server/application/Bootstrap.ts diff --git a/packages/@rondomoon/framework/src/server/application/IApplication.ts b/packages/server/src/server/application/IApplication.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/IApplication.ts rename to packages/server/src/server/application/IApplication.ts diff --git a/packages/@rondomoon/framework/src/server/application/IBootstrap.ts b/packages/server/src/server/application/IBootstrap.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/IBootstrap.ts rename to packages/server/src/server/application/IBootstrap.ts diff --git a/packages/@rondomoon/framework/src/server/application/IConfig.ts b/packages/server/src/server/application/IConfig.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/IConfig.ts rename to packages/server/src/server/application/IConfig.ts diff --git a/packages/@rondomoon/framework/src/server/application/index.ts b/packages/server/src/server/application/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/application/index.ts rename to packages/server/src/server/application/index.ts diff --git a/packages/@rondomoon/framework/src/server/config.ts b/packages/server/src/server/config.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/config.ts rename to packages/server/src/server/config.ts diff --git a/packages/@rondomoon/framework/src/server/database/Database.ts b/packages/server/src/server/database/Database.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/Database.ts rename to packages/server/src/server/database/Database.ts diff --git a/packages/@rondomoon/framework/src/server/database/IDatabase.ts b/packages/server/src/server/database/IDatabase.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/IDatabase.ts rename to packages/server/src/server/database/IDatabase.ts diff --git a/packages/@rondomoon/framework/src/server/database/ITransactionManager.ts b/packages/server/src/server/database/ITransactionManager.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/ITransactionManager.ts rename to packages/server/src/server/database/ITransactionManager.ts diff --git a/packages/@rondomoon/framework/src/server/database/TransactionManager.ts b/packages/server/src/server/database/TransactionManager.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/TransactionManager.ts rename to packages/server/src/server/database/TransactionManager.ts diff --git a/packages/@rondomoon/framework/src/server/database/index.test.ts b/packages/server/src/server/database/index.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/index.test.ts rename to packages/server/src/server/database/index.test.ts diff --git a/packages/@rondomoon/framework/src/server/database/index.ts b/packages/server/src/server/database/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/database/index.ts rename to packages/server/src/server/database/index.ts diff --git a/packages/@rondomoon/framework/src/server/entities/Session.ts b/packages/server/src/server/entities/Session.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/entities/Session.ts rename to packages/server/src/server/entities/Session.ts diff --git a/packages/@rondomoon/framework/src/server/entities/User.ts b/packages/server/src/server/entities/User.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/entities/User.ts rename to packages/server/src/server/entities/User.ts diff --git a/packages/@rondomoon/framework/src/server/entities/UserEmail.ts b/packages/server/src/server/entities/UserEmail.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/entities/UserEmail.ts rename to packages/server/src/server/entities/UserEmail.ts diff --git a/packages/@rondomoon/framework/src/server/index.ts b/packages/server/src/server/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/index.ts rename to packages/server/src/server/index.ts diff --git a/packages/@rondomoon/framework/src/server/logger/ILogger.ts b/packages/server/src/server/logger/ILogger.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/ILogger.ts rename to packages/server/src/server/logger/ILogger.ts diff --git a/packages/@rondomoon/framework/src/server/logger/ILoggerFactory.ts b/packages/server/src/server/logger/ILoggerFactory.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/ILoggerFactory.ts rename to packages/server/src/server/logger/ILoggerFactory.ts diff --git a/packages/@rondomoon/framework/src/server/logger/LoggerFactory.test.ts b/packages/server/src/server/logger/LoggerFactory.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/LoggerFactory.test.ts rename to packages/server/src/server/logger/LoggerFactory.test.ts diff --git a/packages/@rondomoon/framework/src/server/logger/LoggerFactory.ts b/packages/server/src/server/logger/LoggerFactory.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/LoggerFactory.ts rename to packages/server/src/server/logger/LoggerFactory.ts diff --git a/packages/@rondomoon/framework/src/server/logger/SqlLogger.ts b/packages/server/src/server/logger/SqlLogger.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/SqlLogger.ts rename to packages/server/src/server/logger/SqlLogger.ts diff --git a/packages/@rondomoon/framework/src/server/logger/index.ts b/packages/server/src/server/logger/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/logger/index.ts rename to packages/server/src/server/logger/index.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/Authenticator.test.ts b/packages/server/src/server/middleware/Authenticator.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/Authenticator.test.ts rename to packages/server/src/server/middleware/Authenticator.test.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/Authenticator.ts b/packages/server/src/server/middleware/Authenticator.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/Authenticator.ts rename to packages/server/src/server/middleware/Authenticator.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/ErrorApiHandler.ts b/packages/server/src/server/middleware/ErrorApiHandler.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/ErrorApiHandler.ts rename to packages/server/src/server/middleware/ErrorApiHandler.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/ErrorPageHandler.ts b/packages/server/src/server/middleware/ErrorPageHandler.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/ErrorPageHandler.ts rename to packages/server/src/server/middleware/ErrorPageHandler.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/IErrorHandler.ts b/packages/server/src/server/middleware/IErrorHandler.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/IErrorHandler.ts rename to packages/server/src/server/middleware/IErrorHandler.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/IHandler.ts b/packages/server/src/server/middleware/IHandler.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/IHandler.ts rename to packages/server/src/server/middleware/IHandler.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/IMiddleware.ts b/packages/server/src/server/middleware/IMiddleware.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/IMiddleware.ts rename to packages/server/src/server/middleware/IMiddleware.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/IPromiseHandler.ts b/packages/server/src/server/middleware/IPromiseHandler.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/IPromiseHandler.ts rename to packages/server/src/server/middleware/IPromiseHandler.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/RequestLogger.ts b/packages/server/src/server/middleware/RequestLogger.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/RequestLogger.ts rename to packages/server/src/server/middleware/RequestLogger.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/Session.ts b/packages/server/src/server/middleware/Session.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/Session.ts rename to packages/server/src/server/middleware/Session.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/Transaction.ts b/packages/server/src/server/middleware/Transaction.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/Transaction.ts rename to packages/server/src/server/middleware/Transaction.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/csrf.ts b/packages/server/src/server/middleware/csrf.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/csrf.ts rename to packages/server/src/server/middleware/csrf.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/ensureLoggedIn.test.ts b/packages/server/src/server/middleware/ensureLoggedIn.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/ensureLoggedIn.test.ts rename to packages/server/src/server/middleware/ensureLoggedIn.test.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/ensureLoggedIn.ts b/packages/server/src/server/middleware/ensureLoggedIn.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/ensureLoggedIn.ts rename to packages/server/src/server/middleware/ensureLoggedIn.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/handlePromise.ts b/packages/server/src/server/middleware/handlePromise.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/handlePromise.ts rename to packages/server/src/server/middleware/handlePromise.ts diff --git a/packages/@rondomoon/framework/src/server/middleware/index.ts b/packages/server/src/server/middleware/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/middleware/index.ts rename to packages/server/src/server/middleware/index.ts diff --git a/packages/@rondomoon/framework/src/server/migrations/1547031984999-user.ts b/packages/server/src/server/migrations/1547031984999-user.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/migrations/1547031984999-user.ts rename to packages/server/src/server/migrations/1547031984999-user.ts diff --git a/packages/@rondomoon/framework/src/server/migrations/1547474320589-session.ts b/packages/server/src/server/migrations/1547474320589-session.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/migrations/1547474320589-session.ts rename to packages/server/src/server/migrations/1547474320589-session.ts diff --git a/packages/@rondomoon/framework/src/server/migrations/1547480973242-sessionUserId.ts b/packages/server/src/server/migrations/1547480973242-sessionUserId.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/migrations/1547480973242-sessionUserId.ts rename to packages/server/src/server/migrations/1547480973242-sessionUserId.ts diff --git a/packages/@rondomoon/framework/src/server/router/AsyncRouter.test.ts b/packages/server/src/server/router/AsyncRouter.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/router/AsyncRouter.test.ts rename to packages/server/src/server/router/AsyncRouter.test.ts diff --git a/packages/@rondomoon/framework/src/server/router/AsyncRouter.ts b/packages/server/src/server/router/AsyncRouter.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/router/AsyncRouter.ts rename to packages/server/src/server/router/AsyncRouter.ts diff --git a/packages/@rondomoon/framework/src/server/router/TransactionalRouter.ts b/packages/server/src/server/router/TransactionalRouter.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/router/TransactionalRouter.ts rename to packages/server/src/server/router/TransactionalRouter.ts diff --git a/packages/@rondomoon/framework/src/server/router/index.ts b/packages/server/src/server/router/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/router/index.ts rename to packages/server/src/server/router/index.ts diff --git a/packages/@rondomoon/framework/src/server/routes/BaseRoute.ts b/packages/server/src/server/routes/BaseRoute.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/BaseRoute.ts rename to packages/server/src/server/routes/BaseRoute.ts diff --git a/packages/@rondomoon/framework/src/server/routes/LoginRoutes.test.ts b/packages/server/src/server/routes/LoginRoutes.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/LoginRoutes.test.ts rename to packages/server/src/server/routes/LoginRoutes.test.ts diff --git a/packages/@rondomoon/framework/src/server/routes/LoginRoutes.ts b/packages/server/src/server/routes/LoginRoutes.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/LoginRoutes.ts rename to packages/server/src/server/routes/LoginRoutes.ts diff --git a/packages/@rondomoon/framework/src/server/routes/UserRoutes.test.ts b/packages/server/src/server/routes/UserRoutes.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/UserRoutes.test.ts rename to packages/server/src/server/routes/UserRoutes.test.ts diff --git a/packages/@rondomoon/framework/src/server/routes/UserRoutes.ts b/packages/server/src/server/routes/UserRoutes.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/UserRoutes.ts rename to packages/server/src/server/routes/UserRoutes.ts diff --git a/packages/@rondomoon/framework/src/server/routes/application.tsx b/packages/server/src/server/routes/application.tsx similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/application.tsx rename to packages/server/src/server/routes/application.tsx diff --git a/packages/@rondomoon/framework/src/server/routes/index.ts b/packages/server/src/server/routes/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/routes/index.ts rename to packages/server/src/server/routes/index.ts diff --git a/packages/@rondomoon/framework/src/server/services/BaseService.ts b/packages/server/src/server/services/BaseService.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/BaseService.ts rename to packages/server/src/server/services/BaseService.ts diff --git a/packages/@rondomoon/framework/src/server/services/ICredentials.ts b/packages/server/src/server/services/ICredentials.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/ICredentials.ts rename to packages/server/src/server/services/ICredentials.ts diff --git a/packages/@rondomoon/framework/src/server/services/IUser.ts b/packages/server/src/server/services/IUser.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/IUser.ts rename to packages/server/src/server/services/IUser.ts diff --git a/packages/@rondomoon/framework/src/server/services/IUserService.ts b/packages/server/src/server/services/IUserService.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/IUserService.ts rename to packages/server/src/server/services/IUserService.ts diff --git a/packages/@rondomoon/framework/src/server/services/UserService.test.ts b/packages/server/src/server/services/UserService.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/UserService.test.ts rename to packages/server/src/server/services/UserService.test.ts diff --git a/packages/@rondomoon/framework/src/server/services/UserService.ts b/packages/server/src/server/services/UserService.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/UserService.ts rename to packages/server/src/server/services/UserService.ts diff --git a/packages/@rondomoon/framework/src/server/services/index.ts b/packages/server/src/server/services/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/services/index.ts rename to packages/server/src/server/services/index.ts diff --git a/packages/@rondomoon/framework/src/server/session/ISession.ts b/packages/server/src/server/session/ISession.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/session/ISession.ts rename to packages/server/src/server/session/ISession.ts diff --git a/packages/@rondomoon/framework/src/server/session/SessionStore.test.ts b/packages/server/src/server/session/SessionStore.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/session/SessionStore.test.ts rename to packages/server/src/server/session/SessionStore.test.ts diff --git a/packages/@rondomoon/framework/src/server/session/SessionStore.ts b/packages/server/src/server/session/SessionStore.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/session/SessionStore.ts rename to packages/server/src/server/session/SessionStore.ts diff --git a/packages/@rondomoon/framework/src/server/test-utils/NamespaceMock.ts b/packages/server/src/server/test-utils/NamespaceMock.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test-utils/NamespaceMock.ts rename to packages/server/src/server/test-utils/NamespaceMock.ts diff --git a/packages/@rondomoon/framework/src/server/test-utils/RequestTester.test.ts b/packages/server/src/server/test-utils/RequestTester.test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test-utils/RequestTester.test.ts rename to packages/server/src/server/test-utils/RequestTester.test.ts diff --git a/packages/@rondomoon/framework/src/server/test-utils/RequestTester.ts b/packages/server/src/server/test-utils/RequestTester.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test-utils/RequestTester.ts rename to packages/server/src/server/test-utils/RequestTester.ts diff --git a/packages/@rondomoon/framework/src/server/test-utils/TestUtils.ts b/packages/server/src/server/test-utils/TestUtils.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test-utils/TestUtils.ts rename to packages/server/src/server/test-utils/TestUtils.ts diff --git a/packages/@rondomoon/framework/src/server/test-utils/index.ts b/packages/server/src/server/test-utils/index.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test-utils/index.ts rename to packages/server/src/server/test-utils/index.ts diff --git a/packages/@rondomoon/framework/src/server/test.ts b/packages/server/src/server/test.ts similarity index 100% rename from packages/@rondomoon/framework/src/server/test.ts rename to packages/server/src/server/test.ts diff --git a/packages/@rondomoon/framework/tsconfig.json b/packages/server/tsconfig.json similarity index 100% rename from packages/@rondomoon/framework/tsconfig.json rename to packages/server/tsconfig.json diff --git a/packages/@rondomoon/framework/tslint.json b/packages/server/tslint.json similarity index 100% rename from packages/@rondomoon/framework/tslint.json rename to packages/server/tslint.json