Adds news, organizes articles

src/app/app-routing.module.ts

@@ -1,18 +1,7 @@
-import {ArticleContentComponent} from './pages/articles/article-content/article-content.component';
-import {EugeneLambovComponent} from './pages/articles/eugene-lambov/eugene-lambov.component';
+import {CharityComponent, ContactsComponent, DocumentsComponent, HomeComponent, ReportComponent} from './pages';
+import {ResistanceComponent} from './pages/resistance/resistance.component';
 import {NgModule} from '@angular/core';
-import {Routes, RouterModule} from '@angular/router';
-import {
-    HomeComponent,
-    CharityComponent,
-    ContactsComponent,
-    DocumentsComponent,
-    ReportComponent
-} from './pages/index';
-
-import {
-    ResistanceComponent
-} from './pages/resistance/resistance.component';
+import {RouterModule, Routes} from '@angular/router';
 
 const routes: Routes = [
     {

src/app/pages/articles/articles/articles-routing.module.ts

@@ -1,7 +1,7 @@
-import {ObrashenieComponent} from './../obrashenie/obrashenie.component';
 import {ArticleContentComponent} from './../article-content/article-content.component';
-import {EugeneLambovComponent} from './../eugene-lambov/eugene-lambov.component';
-import {ZvernennjaDoOrganivComponent} from './../zvernennja-do-organiv/zvernennja-do-organiv.component';
+import {ObrashenieComponent} from './obrashenie/obrashenie.component';
+import {EugeneLambovComponent} from './eugene-lambov/eugene-lambov.component';
+import {ZvernennjaDoOrganivComponent} from './zvernennja-do-organiv/zvernennja-do-organiv.component';
 import {ArticlesComponent} from './../articles.component';
 import {NgModule} from '@angular/core';
 import {Routes, RouterModule} from '@angular/router';

src/app/pages/articles/articles/articles.module.ts

@@ -1,8 +1,8 @@
-import {ObrashenieComponent} from './../obrashenie/obrashenie.component';
+import {ObrashenieComponent} from './obrashenie/obrashenie.component';
 import {ShareButtonsModule} from 'ngx-sharebuttons';
 import {ArticlesComponent} from './../articles.component';
-import {ZvernennjaDoOrganivComponent} from './../zvernennja-do-organiv/zvernennja-do-organiv.component';
-import {EugeneLambovComponent} from './../eugene-lambov/eugene-lambov.component';
+import {ZvernennjaDoOrganivComponent} from './zvernennja-do-organiv/zvernennja-do-organiv.component';
+import {EugeneLambovComponent} from './eugene-lambov/eugene-lambov.component';
 import {ArticleContentComponent} from './../article-content/article-content.component';
 import {SharedModule} from './../../../shared/shared.module';
 import { NgModule } from '@angular/core';

src/app/pages/articles/eugene-lambov/eugene-lambov.component.scss → src/app/pages/articles/articles/eugene-lambov/eugene-lambov.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/app';
+@import '../../../../styles/app';
 
 
 .article-content {
@@ -19,4 +19,4 @@
 
 .iframe {
     max-width: 100%;
-}
+}

src/app/pages/articles/eugene-lambov/eugene-lambov.component.ts → src/app/pages/articles/articles/eugene-lambov/eugene-lambov.component.ts

@@ -1,4 +1,4 @@
-import {ModalService} from './../../../shared/modal.service';
+import {ModalService} from './../../../../shared/modal.service';
 import {Component, OnInit, ViewChild, ElementRef, Renderer2} from '@angular/core';
 
 @Component({

src/app/pages/articles/obrashenie/obrashenie.component.scss → src/app/pages/articles/articles/obrashenie/obrashenie.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/app';
+@import '../../../../styles/app';
 
 
 .article-content {

src/app/pages/articles/zvernennja-do-organiv/zvernennja-do-organiv.component.scss → src/app/pages/articles/articles/zvernennja-do-organiv/zvernennja-do-organiv.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/app';
+@import '../../../../styles/app';
 
 
 .article-content {

src/app/pages/charity/charity-list.ts

@@ -125,5 +125,23 @@ export const charityList = [
         goal: 'Покупка инвалидной коляски',
         summ: '4 700 грн.',
         add: '<img src="/assets/images/sinkevich.png" alt="Покупка инвалидной коляски" class="responsive-image popup">'
+    },
+    {
+        name: 'Гасевич Богдана',
+        goal: 'Оплата услуг реабилитации',
+        summ: '7 500 грн.',
+        add: '<img src="/assets/images/charity/bogdana.png" alt="Оплата услуг реабилитации Гасевич Богдана" class="responsive-image popup">'
+    },
+    {
+        name: 'Участник АТО Андрусов Р.И.',
+        goal: 'Приобретение медицинских препаратов',
+        summ: '15 300 грн.',
+        add: '<img src="/assets/images/charity/androsov.png" alt="Приобретение медицинских препаратов" class="responsive-image popup">'
+    },
+    {
+        name: 'Участник АТО Бережной C.А.',
+        goal: 'Приобретение медицинских препаратов',
+        summ: '2 400 грн.',
+        add: '<img src="/assets/images/charity/berezhnoy.png" alt="Приобретение медицинских препаратов" class="responsive-image popup">'
     }
 ];

src/app/pages/resistance/resistance.component.html

@@ -36,7 +36,10 @@ <h4 class="resistance__title">Глава Лиманской районной р
     <p>
         <a class="link" data-src="/assets/images/otvet.jpg" class="popup">Ответ на обращение к правоохранительным органам</a>
     <p>
-        <a class="link" [routerLink]="['/articles', 'obrashenie-o-sotrudnichestve']">Официальное обращение о  сотрудничестве.</a>
+        <a class="link" [routerLink]="['/articles', 'obrashenie-o-sotrudnichestve']">Официальное обращение о  сотрудничестве</a>
+    </p>
+    <p>
+        <a class="link" data-src="/assets/images/resistance/otvet-obrashenie.png" class="popup">Ответ на  обращение о  сотрудничестве</a>
     </p>
   </div>