Merge branch 'staging'

dist/README.md

@@ -2,9 +2,9 @@
 
 Official Angular cross-platform client for the CTemplar secure email service available at [https://ctemplar.com](https://ctemplar.com).
 
-RELEASE VERSION : **v1.1.33**    
+RELEASE VERSION : **v1.1.34**    
 
-SHA-256 checksum of `index.html` : **8444c6af45f8744a137f592a509b09904290b260f65a7674f25d7dbbf65a76c6**  
+SHA-256 checksum of `index.html` : **51bbe9f84d6b50bf8c33951b7442470cec96cd413f672587d486b6c0d4935b35**  
 
 Find full release code and distribution at : [https://github.com/CTemplar/webclient/releases/latest](https://github.com/CTemplar/webclient/releases/latest)
 

dist/index.html

@@ -85,6 +85,6 @@ <h1 class="page-title text-secondary">
         </div>
     </noscript>
     <app-root></app-root>
-<script type="text/javascript" src="runtime.342720d51562858f718f.js" integrity="sha384-DaJkrChOo8D23Wfutf71FEzHH/paJs6cfbIGl8ryQIE86JwOEI1IAUSnEZTbxWjM" crossorigin="anonymous"></script><script type="text/javascript" src="polyfills.c6cdf1b91f8032c61d53.js" integrity="sha384-8XtHUNH2tfyVAzUAJGrQH+mA64AcRQdcAdn3rJ1SRQ7deHdCYaRDNxouJcZ3EwkE" crossorigin="anonymous"></script><script type="text/javascript" src="scripts.2b355891e0dd05f2cdd5.js" integrity="sha384-mYWPHV3OvTp4Rm5Bb9cerNTGt0LBYdnEEV5CtcuAX5cerXkjPYrVC7KstOfnun6O" crossorigin="anonymous"></script><script type="text/javascript" src="main.40a3f9da4db591599f0b.js" integrity="sha384-4hv/ATO6AqMtfiBxkzjA5wbLMEubSq4M3WpYGxYsHnM2I1jXu2Fjb4Vha8bt/pr5" crossorigin="anonymous"></script></body>
+<script type="text/javascript" src="runtime.6f95df180f6d92715e21.js" integrity="sha384-KMQsLaPjW9IIzKZ0ftkMVL/FgiE80YH8O5EpdxtyQnyO75nFZSzFgXZaVWmr/9Iw" crossorigin="anonymous"></script><script type="text/javascript" src="polyfills.c6cdf1b91f8032c61d53.js" integrity="sha384-8XtHUNH2tfyVAzUAJGrQH+mA64AcRQdcAdn3rJ1SRQ7deHdCYaRDNxouJcZ3EwkE" crossorigin="anonymous"></script><script type="text/javascript" src="scripts.2b355891e0dd05f2cdd5.js" integrity="sha384-mYWPHV3OvTp4Rm5Bb9cerNTGt0LBYdnEEV5CtcuAX5cerXkjPYrVC7KstOfnun6O" crossorigin="anonymous"></script><script type="text/javascript" src="main.a5509de6aa099c5d6cc5.js" integrity="sha384-HIxivDkIYALAPJddc7+GzEZyZqLmys042CiJ2kuuWw7mvH68FiFhppfCrx7o9Foo" crossorigin="anonymous"></script></body>
 
 </html>

src/app/app-routing.module.ts

@@ -1,17 +1,19 @@
 // Angular
-import { ModuleWithProviders } from '@angular/core';
-import { RouterModule, Routes, Router } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { HomeComponent } from './home/home.component';
 
 
 const routes: Routes = [
+  { path: '', component: HomeComponent },
   {
-    path: '',
-    loadChildren: 'app/home/home.module#HomeModule'
-  },
-  {
-    path: 'blog',
-    loadChildren: 'app/blog/blog.module#BlogModule'
+    path: 'mail',
+    loadChildren: 'app/mail/mail.module#MailModule'
   }
 ];
-
-export const AppRoutingModule: ModuleWithProviders = RouterModule.forRoot(routes);
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {
+}

src/app/app.module.ts

@@ -10,12 +10,9 @@ import { MatKeyboardModule } from 'ngx7-material-keyboard';
 // Components
 import { AppComponent } from './app.component';
 // Modules
-import { AppRoutingModule } from './app-routing.module';
-import { BlogModule } from './blog/blog.module';
 import { FooterModule } from './footer/footer.module';
 import { HeaderModule } from './header/header.module';
 import { HomeModule } from './home/home.module';
-import { MailModule } from './mail/mail.module';
 import { PagesModule } from './pages/pages.module';
 import { DateTimeUtilService } from './store/services/datetime-util.service';
 import { UsersModule } from './users/users.module';
@@ -24,16 +21,14 @@ import { AppStoreModule } from './store/store.module';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatIconModule } from '@angular/material/icon';
 // Services
-import { AuthGuard, BitcoinService, BlogService, MailService, OpenPgpService, SharedService, TokenInterceptor } from './store/services';
+import { AuthGuard, BitcoinService, MailService, OpenPgpService, SharedService, TokenInterceptor } from './store/services';
 import { NotificationService } from './store/services/notification.service';
 import { BreakpointsService } from './store/services/breakpoint.service';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { TimezoneService } from './store/services/timezone.service';
-import { ComposeMailService } from './store/services/compose-mail.service';
 import { DonationService } from './store/services/donation.service';
-import { MailSettingsService } from './store/services/mail-settings.service';
-import { WebsocketService } from './shared/services/websocket.service';
+import { AppRoutingModule } from './app-routing.module';
 
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(http: HttpClient) {
@@ -44,17 +39,15 @@ export function HttpLoaderFactory(http: HttpClient) {
   declarations: [AppComponent],
   imports: [
     SharedModule,
+    AppRoutingModule,
     BrowserModule,
     HttpClientModule,
     BrowserAnimationsModule,
     NgbModule.forRoot(),
     AppStoreModule,
-    AppRoutingModule,
-    BlogModule,
     FooterModule,
     HeaderModule,
     HomeModule,
-    MailModule,
     PagesModule,
     UsersModule,
     TranslateModule.forRoot({
@@ -72,24 +65,20 @@ export function HttpLoaderFactory(http: HttpClient) {
   ],
   providers: [
     AuthGuard,
-    BlogService,
     SharedService,
     OpenPgpService,
     BitcoinService,
     NotificationService,
     BreakpointsService,
     TimezoneService,
     MailService,
-    MailSettingsService,
-    ComposeMailService,
-    WebsocketService,
     DateTimeUtilService,
     DonationService,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: TokenInterceptor,
       multi: true
-    }
+    },
   ],
   bootstrap: [AppComponent]
 })

src/app/blog/shared/blog-grid/blog-grid.component.ts → src/app/blog/blog-grid/blog-grid.component.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import { Post, Category } from '../../../store/models';
-import { BlogService } from '../../../store/services/blog.service';
+import { Category, Post } from '../../store/models';
+import { HttpClient } from '@angular/common/http';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-blog-grid',
@@ -15,18 +16,27 @@ export class BlogGridComponent implements OnInit {
     id: 1,
     name: 'NEWS',
     color: '#ffcc00'
-    },{
+  }, {
     id: 2,
     name: 'ARTICLE',
     color: '#ffcc00'
   }];
 
-  constructor(private blogService: BlogService) { }
+  constructor(private http: HttpClient) {
+  }
 
   ngOnInit() {
-    this.blogService.getBlogPosts().subscribe((posts: Post[]) => {
+    this.getBlogPosts().subscribe((posts: Post[]) => {
       this.posts = posts;
     });
   }
 
+  getBlogPosts() {
+    const url = `/assets/blogs.json`;
+    return this.http.get<Post[]>(url)
+      .pipe(
+        map(data => data['results'])
+      );
+  }
+
 }