From 98f6d59c9b9e7fa9296cc01e3e474f3ffe744310 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sun, 21 Oct 2018 16:12:56 +0200 Subject: [PATCH] Move current user to root folder --- ui/src/{stores => }/CurrentUser.ts | 4 ++-- ui/src/actions/axios.ts | 2 +- ui/src/index.tsx | 2 +- ui/src/inject.tsx | 2 +- ui/src/message/WebSocketStore.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename ui/src/{stores => }/CurrentUser.ts (97%) diff --git a/ui/src/stores/CurrentUser.ts b/ui/src/CurrentUser.ts similarity index 97% rename from ui/src/stores/CurrentUser.ts rename to ui/src/CurrentUser.ts index 2fb3017..46ac7fc 100644 --- a/ui/src/stores/CurrentUser.ts +++ b/ui/src/CurrentUser.ts @@ -1,7 +1,7 @@ import axios, {AxiosResponse} from 'axios'; -import * as config from '../config'; +import * as config from './config'; import {detect} from 'detect-browser'; -import {SnackReporter} from '../snack/SnackManager'; +import {SnackReporter} from './snack/SnackManager'; import {observable} from 'mobx'; const tokenKey = 'gotify-login-key'; diff --git a/ui/src/actions/axios.ts b/ui/src/actions/axios.ts index 5cb6efa..2d6d535 100644 --- a/ui/src/actions/axios.ts +++ b/ui/src/actions/axios.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import {CurrentUser} from '../stores/CurrentUser'; +import {CurrentUser} from '../CurrentUser'; import {SnackReporter} from '../snack/SnackManager'; export const initAxios = (currentUser: CurrentUser, snack: SnackReporter) => { diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 99aeaa7..a52d262 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -7,7 +7,7 @@ import * as config from './config'; import Layout from './layout/Layout'; import registerServiceWorker from './registerServiceWorker'; import * as Notifications from './stores/Notifications'; -import {CurrentUser} from './stores/CurrentUser'; +import {CurrentUser} from './CurrentUser'; import {AppStore} from './application/AppStore'; import {reaction} from 'mobx'; import {WebSocketStore} from './message/WebSocketStore'; diff --git a/ui/src/inject.tsx b/ui/src/inject.tsx index 9fa6ad9..86efb5f 100644 --- a/ui/src/inject.tsx +++ b/ui/src/inject.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import {UserStore} from './user/UserStore'; import {SnackManager} from './snack/SnackManager'; import {MessagesStore} from './message/MessagesStore'; -import {CurrentUser} from './stores/CurrentUser'; +import {CurrentUser} from './CurrentUser'; import {ClientStore} from './client/ClientStore'; import {AppStore} from './application/AppStore'; import {inject as mobxInject, Provider} from 'mobx-react'; diff --git a/ui/src/message/WebSocketStore.ts b/ui/src/message/WebSocketStore.ts index 2477cf1..2ee2408 100644 --- a/ui/src/message/WebSocketStore.ts +++ b/ui/src/message/WebSocketStore.ts @@ -1,5 +1,5 @@ import {SnackReporter} from '../snack/SnackManager'; -import {CurrentUser} from '../stores/CurrentUser'; +import {CurrentUser} from '../CurrentUser'; import * as config from '../config'; import {MessagesStore} from './MessagesStore';