From b93f917c3564e67496e4da357d9c95ab963becb2 Mon Sep 17 00:00:00 2001 From: tamarklein <90680302+tamarklein@users.noreply.github.com> Date: Wed, 15 Sep 2021 11:32:16 +0300 Subject: [PATCH] Fix wrong pathes (#10) * fix wrong pathes * paths fix, removing capitals Co-authored-by: Tamar Klein --- src/app/app.component.ts | 2 +- .../{Actions => actions}/layout.actions.ts | 0 .../usage-stats.actions.ts | 0 .../core/{Actions => actions}/users.action.ts | 0 src/app/core/core.module.ts | 2 +- .../usage-stats.service.ts | 0 .../usage-stats/usage-stats.component.ts | 2 +- .../core/effects/users.effects.ts | 22 +++++++++---------- .../core/interceptors/webapp-interceptor.ts | 6 ++--- .../project-context-navbar.component.ts | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) rename src/app/core/{Actions => actions}/layout.actions.ts (100%) rename src/app/core/{Actions => actions}/usage-stats.actions.ts (100%) rename src/app/core/{Actions => actions}/users.action.ts (100%) rename src/app/core/{Services => services}/usage-stats.service.ts (100%) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9dbcebef..cd74a83d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -32,7 +32,7 @@ import {selectAvailableUpdates, selectShowSurvey} from './core/reducers/view-red import {UPDATE_SERVER_PATH} from './app.constants'; import {firstLogin, plotlyReady, setScaleFactor, visibilityChanged} from '@common/core/actions/layout.actions'; import {UiUpdatesService} from '@common/shared/services/ui-updates.service'; -import {UsageStatsService} from './core/Services/usage-stats.service'; +import {UsageStatsService} from './core/services/usage-stats.service'; import {dismissSurvey} from './core/actions/layout.actions'; import {getScaleFactor} from '@common/shared/utils/shared-utils'; import {User} from './business-logic/model/users/user'; diff --git a/src/app/core/Actions/layout.actions.ts b/src/app/core/actions/layout.actions.ts similarity index 100% rename from src/app/core/Actions/layout.actions.ts rename to src/app/core/actions/layout.actions.ts diff --git a/src/app/core/Actions/usage-stats.actions.ts b/src/app/core/actions/usage-stats.actions.ts similarity index 100% rename from src/app/core/Actions/usage-stats.actions.ts rename to src/app/core/actions/usage-stats.actions.ts diff --git a/src/app/core/Actions/users.action.ts b/src/app/core/actions/users.action.ts similarity index 100% rename from src/app/core/Actions/users.action.ts rename to src/app/core/actions/users.action.ts diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 55e724b9..e55a9e6a 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -19,7 +19,7 @@ import {CommonUserEffects} from '../webapp-common/core/effects/users.effects'; import {UserEffects} from './effects/users.effects'; import {CommonAuthEffectsService} from '../webapp-common/core/effects/common-auth-effects.service'; import {createLocalStorageReducer} from '../webapp-common/core/meta-reducers/local-storage-reducer'; -import {UsageStatsService} from './Services/usage-stats.service'; +import {UsageStatsService} from './services/usage-stats.service'; import {usageStatsReducer} from './reducers/usage-stats.reducer'; import {commonAuthReducer} from '../webapp-common/core/reducers/common-auth-reducer'; import {PROJECTS_PREFIX} from '../webapp-common/core/actions/projects.actions'; diff --git a/src/app/core/Services/usage-stats.service.ts b/src/app/core/services/usage-stats.service.ts similarity index 100% rename from src/app/core/Services/usage-stats.service.ts rename to src/app/core/services/usage-stats.service.ts diff --git a/src/app/features/admin/usage-stats/usage-stats.component.ts b/src/app/features/admin/usage-stats/usage-stats.component.ts index 2f8f8737..69b54957 100644 --- a/src/app/features/admin/usage-stats/usage-stats.component.ts +++ b/src/app/features/admin/usage-stats/usage-stats.component.ts @@ -3,7 +3,7 @@ import { MatSlideToggleChange } from '@angular/material/slide-toggle'; import {Store} from '@ngrx/store'; import {selectAllowed} from '../../../core/reducers/usage-stats.reducer'; import {Observable} from 'rxjs'; -import { updateUsageStats } from '../../../core/actions/usage-stats.actions'; +import { updateUsageStats } from 'app/core/actions/usage-stats.actions'; import {ConfigurationService} from '../../../webapp-common/shared/services/configuration.service'; diff --git a/src/app/webapp-common/core/effects/users.effects.ts b/src/app/webapp-common/core/effects/users.effects.ts index a60afe1e..0429343f 100644 --- a/src/app/webapp-common/core/effects/users.effects.ts +++ b/src/app/webapp-common/core/effects/users.effects.ts @@ -2,26 +2,26 @@ import {Injectable} from '@angular/core'; import {Router} from '@angular/router'; import {Actions, createEffect, ofType} from '@ngrx/effects'; import {Store} from '@ngrx/store'; -import {MESSAGES_SEVERITY} from '~/app.constants'; -import {ApiUsersService} from '~/business-logic/api-services/users.service'; +import {MESSAGES_SEVERITY} from 'app/app.constants'; +import {ApiUsersService} from 'app/business-logic/api-services/users.service'; import { fetchCurrentUser, getApiVersion, getInviteUserLink, getUserWorkspaces, leaveWorkspace, logout, logoutSuccess, removeWorkspace, setAccountAdministrationPage, setActiveWorkspace, setApiVersion, setInviteUserLink, setUserWorkspaces, setUserWorkspacesFromUser } from '../actions/users.actions'; import {catchError, map, mergeMap, switchMap, withLatestFrom} from 'rxjs/operators'; import {requestFailed} from '../actions/http.actions'; -import {ApiAuthService} from '~/business-logic/api-services/auth.service'; -import {ApiOrganizationService} from '~/business-logic/api-services/organization.service'; +import {ApiAuthService} from 'app/business-logic/api-services/auth.service'; +import {ApiOrganizationService} from 'app/business-logic/api-services/organization.service'; import {addMessage, deactivateLoader, setServerError} from '../actions/layout.actions'; -import {OrganizationCreateInviteResponse} from '~/business-logic/model/organization/organizationCreateInviteResponse'; -import {ApiLoginService} from '~/business-logic/api-services/login.service'; -import {OrganizationGetUserCompaniesResponse} from '~/business-logic/model/organization/organizationGetUserCompaniesResponse'; +import {OrganizationCreateInviteResponse} from 'app/business-logic/model/organization/organizationCreateInviteResponse'; +import {ApiLoginService} from 'app/business-logic/api-services/login.service'; +import {OrganizationGetUserCompaniesResponse} from 'app/business-logic/model/organization/organizationGetUserCompaniesResponse'; import {selectRouterUrl} from '../reducers/router-reducer'; -import {LoginLogoutResponse} from '~/business-logic/model/login/loginLogoutResponse'; +import {LoginLogoutResponse} from 'app/business-logic/model/login/loginLogoutResponse'; import {ErrorService} from '../../shared/services/error.service'; -import {ApiServerService} from '~/business-logic/api-services/server.service'; -import {ServerInfoResponse} from '~/business-logic/model/server/serverInfoResponse'; -import {setCurrentUser} from '~/core/actions/users.action'; +import {ApiServerService} from 'app/business-logic/api-services/server.service'; +import {ServerInfoResponse} from 'app/business-logic/model/server/serverInfoResponse'; +import {setCurrentUser} from 'app/core/actions/users.action'; @Injectable() diff --git a/src/app/webapp-common/core/interceptors/webapp-interceptor.ts b/src/app/webapp-common/core/interceptors/webapp-interceptor.ts index 5401908a..174c5505 100644 --- a/src/app/webapp-common/core/interceptors/webapp-interceptor.ts +++ b/src/app/webapp-common/core/interceptors/webapp-interceptor.ts @@ -6,10 +6,10 @@ import {catchError} from 'rxjs/operators'; import { Router } from '@angular/router'; import {selectCurrentUser, selectActiveWorkspace, selectSelectedWorkspaceTab} from '../reducers/users-reducer'; import {Store} from '@ngrx/store'; -import {GetCurrentUserResponseUserObject} from '~/business-logic/model/users/getCurrentUserResponseUserObject'; -import {GetCurrentUserResponseUserObjectCompany} from '~/business-logic/model/users/getCurrentUserResponseUserObjectCompany'; +import {GetCurrentUserResponseUserObject} from 'app/business-logic/model/users/getCurrentUserResponseUserObject'; +import {GetCurrentUserResponseUserObjectCompany} from 'app/business-logic/model/users/getCurrentUserResponseUserObjectCompany'; import {ConfigurationService} from '../../shared/services/configuration.service'; -import {setCurrentUser} from '~/core/actions/users.action'; +import {setCurrentUser} from 'app/core/actions/users.action'; @Injectable() export class WebappInterceptor implements HttpInterceptor { diff --git a/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.ts b/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.ts index 278f7557..27a524de 100644 --- a/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.ts +++ b/src/app/webapp-common/layout/project-context-navbar/project-context-navbar.component.ts @@ -1,6 +1,6 @@ import {Component, EventEmitter, Input, Output} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {PROJECT_ROUTES, ProjectRoute} from '~/features/projects/projects.consts'; +import {PROJECT_ROUTES, ProjectRoute} from 'app/features/projects/projects.consts'; @Component({ selector : 'sm-project-context-navbar',