Updates

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174340 ce508802-f39f-4f6c-b175-0d175dae99d5

ecm/Angular/ProteusECM/trunk/src/app/app.component.ts

@@ -18,6 +18,7 @@ export class AppComponent {
   checkAppState(){
    this.setItem('jwtToken', this.get('jwtToken'), false );
    this.setItem('appstate', this.get('app_stat'), true );
+   this.setItem('TOKEN_ID', this.get('TOKEN_ID'), true );
   }
   get(name){
    var retVal = 'undefined';

ecm/Angular/ProteusECM/trunk/src/app/app.module.ts

@@ -23,15 +23,23 @@ import { ECMNavMenuComponent } from './ecm-nav-menu/ecm-nav-menu.component';
 import { ECMHomeComponent } from './ecm-home/ecm-home.component';
 import { ViewComponent} from './ecm-view/view.component';
 import { ShareComponent} from './ecm-view/share.component';
+import { ScrollService } from './scroll.service';
+import { EcmImageComponent } from './ecm-image/ecm-image.component';
+import { EcmSigninComponent } from './ecm-signin/ecm-signin.component';
+import { EcmUserOptionComponent } from './ecm-user-option/ecm-user-option.component';
+import { EcmInputComponent } from './ecm-input/ecm-input.component';
+import { EcmSearchResultComponent } from './ecm-search/ecm-search-result/ecm-search-result.component';
+import { SearchService } from './ecm-search/ecm-search-result/search.service';
+import { EcmSearchItemComponent } from './ecm-search/ecm-search-result/ecm-search-item/ecm-search-item.component';
 
 //Changes by Prajyot
 const appRoutes: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
-  { path: 'home', component: ECMHomeComponent, data: { breadcrumb: "Home" }, children:[
-      { path: 'content', component: ECMContentComponent , outlet:'content', data: { breadcrumb: "Category" }},
-      { path: 'list/:type/:key', component: EcmSubCategoryComponent , outlet:'content', data: { breadcrumb: "Subcategory" }},
-      { path: 'share/:type/:catCode', component: ShareComponent, outlet:'content', data: { breadcrumb: "Share" } }
-  ]}
+  { path: 'home', component: ECMHomeComponent},
+  { path: 'list/:type/:key', component: EcmSubCategoryComponent},
+  { path: 'share/:type/:catCode', component: ShareComponent},
+  { path: 'signin', component: EcmSigninComponent},
+  { path: 'search/:value', component: EcmSearchResultComponent}
 ];
 @NgModule({
   declarations: [
@@ -49,7 +57,13 @@ const appRoutes: Routes = [
     ECMNavMenuComponent,
     ECMHomeComponent,
     ViewComponent,
-    ShareComponent
+    ShareComponent,
+    EcmImageComponent,
+    EcmSigninComponent,
+    EcmUserOptionComponent,
+    EcmInputComponent,
+    EcmSearchResultComponent,
+    EcmSearchItemComponent
   ],
   imports: [
     BrowserModule,
@@ -59,7 +73,9 @@ const appRoutes: Routes = [
     NgbCarouselModule.forRoot()
   ],
   providers: [
-	{provide: LocationStrategy, useClass: HashLocationStrategy}
+	{provide: LocationStrategy, useClass: HashLocationStrategy},
+	ScrollService,
+	SearchService
   ],
   bootstrap: [AppComponent]
 })

ecm/Angular/ProteusECM/trunk/src/app/ecm-nav-menu/ecm-nav-menu.component.css

@@ -16,7 +16,7 @@ a {
 	position: relative;
 	margin: 0;
 	width: 300px;
-	height: 534px;
+/* 	height: 534px; */
 	background-color: #533557;
 	background-color: transparent;
 	overflow: hidden;
@@ -34,6 +34,7 @@ a {
 }
 #toggle:checked ~ .container {
 	background-color: blue;
+	width: 300px !important;
 }
 #toggle:checked ~ .toggle-container .button-toggle {
 	box-shadow: 0 0 0 700px rgba(0, 0, 0, 0.1), inset 0 0 0 20px

ecm/Angular/ProteusECM/trunk/src/app/scroll.service.ts

+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class ScrollService {
+
+  constructor() { }
+  
+  catg_pos=0;
+  sub_catg_pos=0;
+  
+  setCatPos(value){
+  	this.catg_pos=value;
+  }
+  
+  getCatPos(){
+  	return this.catg_pos;
+  }
+	
+	
+  setSubCatPos(value){
+  	this.sub_catg_pos=value;
+  }
+  getSubCatPos(){
+  	return this.sub_catg_pos;
+  }
+}