Skip to content

Commit 5281d14

Browse files
committed
Restructure Shared Module;
1 parent 0b14b76 commit 5281d14

31 files changed

+26
-30
lines changed

src/app/screens/content/content.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import gql from 'graphql-tag';
33
import {AppService} from '../../app.service';
44
import {BehaviorSubject, combineLatest, Observable} from 'rxjs';
55
import {map} from 'rxjs/operators';
6-
import {IFilters} from '../../shared/filters/interfaces/filters.interface';
6+
import {IFilters} from '../../shared/components/filters/interfaces/filters.interface';
77
import {Apollo, QueryRef} from 'apollo-angular';
88
import {IContentItem} from '../../interfaces/content-item.interface';
99
import {ActivatedRoute} from '@angular/router';

src/app/shared/blog-article-card/blog-article-card.component.scss renamed to src/app/shared/components/blog-article-card/blog-article-card.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../theme/index';
1+
@import 'theme';
22

33
.blog-article-item {
44
position: relative;
@@ -9,7 +9,7 @@
99
background-repeat: no-repeat;
1010
background-size: cover;
1111

12-
mask: url(../../../assets/card/cta-blog.png);
12+
mask: url(/assets/card/cta-blog.png);
1313
mask-size: cover;
1414

1515
.mask-overlay {

src/app/shared/content-card/content-card.component.ts renamed to src/app/shared/components/content-card/content-card.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, Input, OnInit} from '@angular/core';
2-
import {IContentItem} from '../../interfaces/content-item.interface';
2+
import {IContentItem} from '../../../interfaces/content-item.interface';
33

44
@Component({
55
selector: 't4e-content-card',

src/app/shared/navbar/navbar.component.html renamed to src/app/shared/components/navbar/navbar.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<nav class="navbar">
66
<a routerLink="/" class="brand">
7-
<img src="../../../assets/Logo.png" alt="Tools4Edu Logo">
7+
<img src="../../../../assets/Logo.png" alt="Tools4Edu Logo">
88
</a>
99
<ul class="navbar__nav-items">
1010
<li class="nav-item nav-item--home">
@@ -31,7 +31,7 @@
3131
</div>
3232

3333
<a href="/" class="brand">
34-
<img src="../../../assets/Logo-mobile.png" alt="Tools4Edu Logo">
34+
<img src="../../../../assets/Logo-mobile.png" alt="Tools4Edu Logo">
3535
</a>
3636
<ul class="navbar__nav-items navbar--mobile__nav-items">
3737
<li class="nav-item nav-item--home">

src/app/shared/navbar/navbar.component.scss renamed to src/app/shared/components/navbar/navbar.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../theme/index';
1+
@import 'theme';
22

33
:host {
44
position: relative;

src/app/shared/page-header/page-header.component.scss renamed to src/app/shared/components/page-header/page-header.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../theme/index';
1+
@import 'theme';
22

33
.t4e-page-header {
44

src/app/shared/shared.module.ts

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3-
import { NavbarComponent } from './navbar/navbar.component';
3+
import { NavbarComponent } from './components/navbar/navbar.component';
44
import { RouterModule } from '@angular/router';
5-
import { PageHeaderComponent } from './page-header/page-header.component';
6-
import { FooterComponent } from './footer/footer.component';
5+
import { PageHeaderComponent } from './components/page-header/page-header.component';
6+
import { FooterComponent } from './components/footer/footer.component';
77
import { CarouselModule } from 'ngx-owl-carousel-o';
8-
import { BlogArticleCardComponent } from './blog-article-card/blog-article-card.component';
9-
import { FiltersComponent } from './filters/filters.component';
8+
import { BlogArticleCardComponent } from './components/blog-article-card/blog-article-card.component';
9+
import { FiltersComponent } from './components/filters/filters.component';
1010
import {ReactiveFormsModule} from '@angular/forms';
11-
import { ContentCardComponent } from './content-card/content-card.component';
12-
import { FilterDrawerComponent } from './filter-drawer/filter-drawer.component';
13-
11+
import { ContentCardComponent } from './components/content-card/content-card.component';
12+
import { FilterDrawerComponent } from './components/filter-drawer/filter-drawer.component';
1413

14+
const SHARED_COMPONENTS = [
15+
NavbarComponent,
16+
PageHeaderComponent,
17+
FooterComponent,
18+
BlogArticleCardComponent,
19+
FiltersComponent,
20+
ContentCardComponent,
21+
FilterDrawerComponent,
22+
]
1523

1624
@NgModule({
1725
declarations: [
18-
NavbarComponent,
19-
PageHeaderComponent,
20-
FooterComponent,
21-
BlogArticleCardComponent,
22-
FiltersComponent,
23-
ContentCardComponent,
24-
FilterDrawerComponent,
26+
...SHARED_COMPONENTS
2527
],
2628
imports: [
2729
CommonModule,
@@ -30,13 +32,7 @@ import { FilterDrawerComponent } from './filter-drawer/filter-drawer.component';
3032
ReactiveFormsModule
3133
],
3234
exports: [
33-
NavbarComponent,
34-
PageHeaderComponent,
35-
FooterComponent,
36-
BlogArticleCardComponent,
37-
FiltersComponent,
38-
ContentCardComponent,
39-
FilterDrawerComponent
35+
...SHARED_COMPONENTS
4036
]
4137
})
4238
export class SharedModule { }

0 commit comments

Comments
 (0)