Skip to content

Commit

Permalink
moved domains and dto
Browse files Browse the repository at this point in the history
  • Loading branch information
ruchirsachdeva committed Sep 29, 2016
1 parent 39b19ad commit 0ba5c42
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 17 deletions.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/core/services/user.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "@angular/http";
import {MockBackend} from "@angular/http/testing";
import {UserService} from "./user.service";
import {UserParams} from "../../../shared/dto";
import {UserParams} from "../dto";
import {APP_TEST_HTTP_PROVIDERS} from "../http/index";

const dummyListJson = [
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/services/user.service.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Observable} from "rxjs/Observable";
import {Injectable} from "@angular/core";
import {Response} from "@angular/http";
import {User, RelatedUser} from "../../../shared/domains";
import {User, RelatedUser} from "../domains";
import {objToSearchParams} from "./helpers";
import {PageRequest, Page, UserParams} from "../../../shared/dto";
import {PageRequest, Page, UserParams} from "../dto";
import {MyHttp} from "../http/http";

const url = '/api/users';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, OnInit, Input} from "@angular/core";
import {MicropostListService} from "./micropost-list.service";
import {Micropost, UserStats} from "../../../shared/domains";
import {Micropost, UserStats} from "../../core/domains";
import {MicropostService} from "../../core/services/micropost.service";
import {UserService} from "../../core/services/user.service";
import {HttpErrorHandler} from "../../core/services/http-error-handler";
Expand Down
2 changes: 1 addition & 1 deletion src/app/micropost/micropost-list/micropost-list.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Observable} from "rxjs/Observable";
import {Injectable} from "@angular/core";
import {MyHttp} from "../../core/http/http";
import {Micropost} from "../../../shared/domains";
import {Micropost} from "../../core/domains";
import {objToSearchParams} from "../../core/services/helpers";

const url = (userId:string):string => `/api/users/${userId}/microposts`;
Expand Down
1 change: 0 additions & 1 deletion src/app/pages/help/help.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {Component, OnInit} from "@angular/core";
export class HelpComponent implements OnInit {

ngOnInit(): void {
console.log("test");
}

}
2 changes: 1 addition & 1 deletion src/app/pages/home/feed/feed.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, EventEmitter, Output} from "@angular/core";
import {FeedService} from "./feed.service";
import {Micropost} from "../../../../shared/domains";
import {Micropost} from "../../../core/domains";
import {MicropostService} from "../../../core/services/micropost.service";
import {HttpErrorHandler} from "../../../core/services/http-error-handler";

Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/home/feed/feed.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Observable} from "rxjs/Observable";
import {Injectable} from "@angular/core";
import {MyHttp} from "../../../core/http/http";
import {Micropost} from "../../../../shared/domains";
import {Micropost} from "../../../core/domains";

const url = '/api/feed';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Observable} from "rxjs/Observable";
import {Component, OnInit} from "@angular/core";
import {ActivatedRoute} from "@angular/router";
import {RelatedUser} from "../../../../shared/domains";
import {RelatedUser} from "../../../core/domains";
import {UserService} from "../../../core/services/user.service";

@Component({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Observable} from "rxjs/Observable";
import {Component, OnInit} from "@angular/core";
import {ActivatedRoute} from "@angular/router";
import {RelatedUser} from "../../../../shared/domains";
import {RelatedUser} from "../../../core/domains";
import {UserService} from "../../../core/services/user.service";

@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {getDOM} from "@angular/platform-browser/src/dom/dom_adapter";
import {TestBed, fakeAsync} from "@angular/core/testing";
import {RelatedUserListComponent} from "./related-user-list.component";
import {RouterTestingModule} from "@angular/router/testing";
import {RelatedUser} from "../../../../shared/domains";
import {RelatedUser} from "../../../core/domains";
import {CoreModule} from "../../../core/core.module";
import {GravatarComponent} from "../../../shared/gravatar/gravatar.component";
import {RelatedUserListModule} from "./related-user-list.module";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Observable} from "rxjs/Observable";
import {Component, OnInit, Input} from "@angular/core";
import {RelatedUser} from "../../../../shared/domains";
import {RelatedUser} from "../../../core/domains";
import {HttpErrorHandler} from "../../../core/services/http-error-handler";

@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/user/user-edit/user-edit.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {MockBackend} from "@angular/http/testing";
import {UserEditComponent} from "./user-edit.component";
import {RouterTestingModule} from "@angular/router/testing";
import {UserService} from "../../../core/services/user.service";
import {User} from "../../../../shared/domains";
import {User} from "../../../core/domains";
import {ProfileDataResolver} from "../../../core/services/profile-data.resolver";
import {APP_TEST_HTTP_PROVIDERS} from "../../../core/http/index";
import {CoreModule} from "../../../core/core.module";
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/user/user-edit/user-edit.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {FormGroup, FormControl, Validators} from "@angular/forms";
import {ActivatedRoute} from "@angular/router";
import {isEmpty, omitBy} from "lodash";
import * as toastr from "toastr";
import {User} from "../../../../shared/domains";
import {User} from "../../../core/domains";
import {UserService} from "../../../core/services/user.service";
import {
EMAIL_PATTERN,
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/user/user-list/user-list.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, OnInit} from "@angular/core";
import {ActivatedRoute, Router} from "@angular/router";
import {User} from "../../../../shared/domains";
import {User} from "../../../core/domains";
import {UserService} from "../../../core/services/user.service";
import {HttpErrorHandler} from "../../../core/services/http-error-handler";

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/follow-btn/follow-btn.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Component, OnChanges, EventEmitter, Output, Input} from "@angular/core";
import {FollowBtnService} from "./follow-btn.service";
import {UserService} from "../../core/services/user.service";
import {HttpErrorHandler} from "../../core/services/http-error-handler";
import {User} from "../../../shared/domains";
import {User} from "../../core/domains";

@Component({
selector: 'mpt-follow-btn',
Expand Down
2 changes: 1 addition & 1 deletion src/app/user-stats/user-stats.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, OnInit, Input} from "@angular/core";
import {User} from "../../shared/domains";
import {User} from "../core/domains";
import {UserService} from "../core/services/user.service";
import {HttpErrorHandler} from "../core/services/http-error-handler";

Expand Down

0 comments on commit 0ba5c42

Please sign in to comment.