Commit 284e9d9f6ee19b3f9bbd9c39112203f01fe01d15
1 parent
5782eaea
Exists in
master
and in
30 other branches
Fix paths to login popup on navbar
Showing
3 changed files
with
11 additions
and
11 deletions
Show diff stats
README.md
... | ... | @@ -20,10 +20,10 @@ Just set the profile theme to `angular-theme`. |
20 | 20 | The folder structure of this project was sorted by feature. |
21 | 21 | See some important folders bellow: |
22 | 22 | |
23 | -- Directives for blocks: `src/app/components/noosfero-blocks` | |
24 | -- Directives for articles: `src/app/components/noosfero-articles` | |
25 | -- Directives for activities: `src/app/components/noosfero-activities` | |
26 | -- Service to connect with Noosfero API: `src/app/components/noosfero` | |
27 | -- Content viewer controller: `src/app/content-viewer` | |
28 | -- Profile controller: `src/app/profile` | |
29 | -- Profile info controller: `src/app/profile-info` | |
23 | +- Directives for blocks: `src/app/layout/blocks` | |
24 | +- Directives for articles: `src/app/article` | |
25 | +- Directives for activities: `src/app/profile/activities` | |
26 | +- Service to connect with Noosfero API: `src/lib/ng-noosfero-api` | |
27 | +- Content viewer component: `src/app/article/content-viewer` | |
28 | +- Profile component: `src/app/profile` | |
29 | +- Profile Info component: `src/app/profile/info` | ... | ... |
src/app/layout/navbar/navbar.spec.ts
... | ... | @@ -24,7 +24,7 @@ describe("Components", () => { |
24 | 24 | |
25 | 25 | let provideFunc = provide; |
26 | 26 | |
27 | - // before Each -> loading mocks on locals variables | |
27 | + // before Each -> loading mocks on locals variables | |
28 | 28 | beforeEach(() => { |
29 | 29 | user = <noosfero.User>{ |
30 | 30 | id: 1, |
... | ... | @@ -46,7 +46,7 @@ describe("Components", () => { |
46 | 46 | // this function allow build the fixture of the container component |
47 | 47 | // and is reused in each test |
48 | 48 | // The main idea behing not prebuild it on a general beforeEach block is |
49 | - // to allow tests configure the mock services accordilly their own needs | |
49 | + // to allow tests configure the mock services accordilly their own needs | |
50 | 50 | let buildComponent = (): Promise<ComponentFixture> => { |
51 | 51 | return helpers.quickCreateComponent({ |
52 | 52 | providers: [ |
... | ... | @@ -97,7 +97,7 @@ describe("Components", () => { |
97 | 97 | navbarComp.openLogin(); |
98 | 98 | expect($modal.open).toHaveBeenCalled(); |
99 | 99 | expect($modal.open).toHaveBeenCalledWith({ |
100 | - templateUrl: 'app/components/auth/login.html', | |
100 | + templateUrl: 'app/login/login.html', | |
101 | 101 | controller: AuthController, |
102 | 102 | controllerAs: 'vm', |
103 | 103 | bindToController: true | ... | ... |
src/app/layout/navbar/navbar.ts
... | ... | @@ -43,7 +43,7 @@ export class Navbar { |
43 | 43 | |
44 | 44 | openLogin() { |
45 | 45 | this.modalInstance = this.$modal.open({ |
46 | - templateUrl: 'app/components/auth/login.html', | |
46 | + templateUrl: 'app/login/login.html', | |
47 | 47 | controller: AuthController, |
48 | 48 | controllerAs: 'vm', |
49 | 49 | bindToController: true | ... | ... |