Merge pull request #6 from hisptz/develop

Develop

package.json

@@ -3,8 +3,10 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
+
     "start": "ng serve --proxy-config proxy-config.json",
     "build": "ng build --prod --aot && cd dist/datastore-import-export && zip -r -D datastore-import-export.zip .",
+
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
@@ -32,6 +34,7 @@
     "ng2-ace-editor": "^0.3.9",
     "ng2-json-editor": "^0.25.12",
     "ng2-jsoneditor": "^0.1.1",
+    "ng2-tooltip-directive": "^2.8.17",
     "ngx-filter-pipe": "^2.1.2",
     "ngx-json-viewer": "^2.4.0",
     "ngx-pagination": "^4.1.0",

src/app/app.component.css

@@ -1,29 +1,26 @@
-.row{
-    padding: 0px;
-    margin: 0px;
+.row {
+  padding: 0px;
+  margin: 0px;
 }
-.ds-ns-list{
-    border-right: 1px solid grey;
-    min-height: 90vh; 
+.ds-ns-list {
+  border-right: 1px solid grey;
+  min-height: 90vh;
 }
 
-.py{
-    padding-top: 8px;
-    padding-bottom: 8px;
-
+.py {
+  padding-top: 8px;
+  padding-bottom: 8px;
 }
 
-.px{
-    padding-left: 8px;
-    padding-right: 8px;
+.px {
+  padding-left: 8px;
+  padding-right: 8px;
 }
 
-.outlet{
-    min-height: 85vh;
-    border: 0.5px solid teal;
+.outlet {
+  min-height: 85vh;
 }
 
-*{
-    font-size: 0.8rem;
+* {
+  font-size: 0.8rem;
 }
-

src/app/app.component.html

@@ -18,8 +18,8 @@
     <app-namespaces></app-namespaces>
   </div>
 
-  <div class="col s10 outlet z-depth-3">
-      <router-outlet></router-outlet>
+  <div class="col s10 outlet">
+    <router-outlet></router-outlet>
   </div>
 </div>
 
@@ -30,5 +30,3 @@
 <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
 <!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * -->
 <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-

src/app/app.module.ts

@@ -3,25 +3,25 @@ import { NgModule } from "@angular/core";
 import { HttpClientModule } from "@angular/common/http";
 import { FormsModule } from "@angular/forms";
 
-
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";
 import { NamespacesComponent } from "./namespaces/namespaces.component";
-import { Routes, RouterModule } from "@angular/router";
+//import { Routes, RouterModule } from "@angular/router";
 import { NewComponent } from "./new/new.component";
 import { DashComponent } from "./dash/dash.component";
+import { TooltipModule } from "ng2-tooltip-directive";
 
 import { StoreModule } from "@ngrx/store";
 import { HomeComponent } from "./home/home.component";
-import {EventEmmiterService} from './event-emmiter.service';
-import { NgxJsonViewerModule } from 'ngx-json-viewer';
-import { KeyComponent } from './key/key.component';
-import { NgxDhis2HttpClientModule } from '@iapps/ngx-dhis2-http-client';
-import {NgxPaginationModule} from 'ngx-pagination';
-import { AceEditorModule } from 'ng2-ace-editor';
-import { FilterPipeModule } from 'ngx-filter-pipe';
-import { ImportComponent } from './import/import.component';
-
+import { EventEmmiterService } from "./event-emmiter.service";
+import { NgxJsonViewerModule } from "ngx-json-viewer";
+import { KeyComponent } from "./key/key.component";
+import { NgxDhis2HttpClientModule } from "@iapps/ngx-dhis2-http-client";
+import { NgxPaginationModule } from "ngx-pagination";
+import { AceEditorModule } from "ng2-ace-editor";
+import { FilterPipeModule } from "ngx-filter-pipe";
+import { ImportComponent } from "./import/import.component";
+import { ErrorComponent } from "./error/error.component";
 
 @NgModule({
   declarations: [
@@ -31,7 +31,8 @@ import { ImportComponent } from './import/import.component';
     DashComponent,
     HomeComponent,
     KeyComponent,
-    ImportComponent
+    ImportComponent,
+    ErrorComponent
   ],
   imports: [
     BrowserModule,
@@ -42,15 +43,14 @@ import { ImportComponent } from './import/import.component';
     NgxPaginationModule,
     AceEditorModule,
     FilterPipeModule,
+    TooltipModule,
     StoreModule.forRoot({}),
     NgxDhis2HttpClientModule.forRoot({
-      namespace: 'iapps',
+      namespace: "iapps",
       version: 1,
-      models: {
-
-      }
+      models: {}
     })
-   // RouterModule.forRoot(appRoutes)
+    // RouterModule.forRoot(appRoutes)
   ],
   providers: [EventEmmiterService],
   bootstrap: [AppComponent]

src/app/dash/dash.component.css

@@ -1,19 +1,22 @@
-.value-editor{
-    margin: 8px;
-    padding: 8px;
-    min-height:70vh;
+.value-editor {
+  margin: 8px;
+  padding: 8px;
+  min-height: 70vh;
 }
 
-.alert-div{
-    padding-left: 8px;
-    padding-right: 8px;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    margin: 8px;
-
+.alert-div {
+  padding-left: 8px;
+  padding-right: 8px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  margin: 8px;
 }
 
-.mx{
-    margin-left: 2px;
-    margin-right: 2px;
-}
+.mx {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+.del-btn:hover {
+  color: #004d4d !important;
+  cursor: pointer;
+}

src/app/dash/dash.component.html

@@ -4,23 +4,31 @@
       <span>Namespace : </span>
       {{ namespace }}
 
-      <a
+      <button
         class="btn-floating btn-small waves-effect waves-light #004d40 teal darken-4 mx"
         (click)="jsonFileExpNS(namespace)"
+        tooltip="Export namespace"
+        placement="top"
+        show-delay="100"
+        [disabled]="generatingKeys"
       >
         <i class="material-icons">file_download</i>
-      </a>
+      </button>
       <a
         class="btn-floating btn-small waves-effect waves-light #004d40 teal darken-4 mx"
         (click)="showKeyForm()"
+        tooltip="Add new Key"
+        placement="top"
+        show-delay="100"
       >
         <i class="material-icons">add</i>
       </a>
     </p>
 
     <div class="divider"></div>
     <div *ngIf="generatingKeys">
-      Generating {{ namespace }} json file.<br/> {{keysLoadProgress}} of {{keysList.length}} keys loaded.
+      Generating {{ namespace }} json file.<br />
+      {{ keysLoadProgress }} of {{ keysList.length }} keys loaded.
       <div class="progress">
         <div class="determinate" [style.width]="keysLoadPercent + '%'"></div>
       </div>
@@ -34,6 +42,8 @@
       <div class="indeterminate"></div>
     </div>
 
+    <app-error [errorObj]="errorObj" *ngIf="errorExists"></app-error>
+
     <form
       *ngIf="showForm"
       #NewKeyForm="ngForm"
@@ -49,7 +59,7 @@
           name="key"
           #key="ngModel"
         />
-        <label for="email">Email</label>
+        <label for="email">Key</label>
       </div>
       <div class="col s4">
         <button
@@ -82,7 +92,7 @@
         </td>
         <td>
           <button
-            class="waves-effect waves-white btn-flat grey-text text-lighten-3"
+            class="waves-effect waves-white btn-flat grey-text text-lighten-3 del-btn"
             (click)="deleteKey(namespace, key, loadedKeys.length)"
           >
             <i class="material-icons">delete</i>