diff --git a/ng8-seed/src/app/app.component.ts b/ng8-seed/src/app/app.component.ts index ecfcad9..fe42f72 100644 --- a/ng8-seed/src/app/app.component.ts +++ b/ng8-seed/src/app/app.component.ts @@ -12,5 +12,6 @@ export class AppComponent { const browserLang: string = translate.getBrowserLang(); translate.use(browserLang.match(/en|fr/) ? browserLang : 'en'); + console.log("app component") } } diff --git a/ng8-seed/src/app/app.module.ts b/ng8-seed/src/app/app.module.ts index 91a22a4..0312b4e 100644 --- a/ng8-seed/src/app/app.module.ts +++ b/ng8-seed/src/app/app.module.ts @@ -39,6 +39,7 @@ import { ProjectDetailComponent } from './components/project-detail/project-deta // import {MDBBootstrapModule} from 'angular-bootstrap-md' import {SlideshowModule} from 'ng-simple-slideshow'; import { FooterComponent } from './components/footer/footer.component' +import { ContributeComponent } from './components/contribute/contribute.component'; // import { AddEventModule } from './add-event.module'; export function HttpLoaderFactory(http: HttpClient) { @@ -60,6 +61,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { AuthLayoutComponent, // ProjectDetailComponent, FooterComponent, + ContributeComponent // ProjectListComponent ], imports: [ diff --git a/ng8-seed/src/app/app.routing.ts b/ng8-seed/src/app/app.routing.ts index ce5a69c..ac49bc8 100644 --- a/ng8-seed/src/app/app.routing.ts +++ b/ng8-seed/src/app/app.routing.ts @@ -3,6 +3,7 @@ import { Routes } from '@angular/router'; import { AdminLayoutComponent } from './layouts/admin/admin-layout.component'; import { AuthLayoutComponent } from './layouts/auth/auth-layout.component'; import { ProjectDetailComponent } from './components/project-detail/project-detail.component'; +import { ContributeComponent } from './components/contribute/contribute.component'; export const AppRoutes: Routes = [{ path: '', @@ -15,6 +16,9 @@ export const AppRoutes: Routes = [{ path: 'home', loadChildren: () => import('./dashboard/dashboard.module').then(m => m.DashboardModule) }, + {path : 'contribute', + // loadChildren :()=>import('./dashboard/dashboard.module').then(m=>m.) + component:ContributeComponent} ] }, { path: '', diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html new file mode 100644 index 0000000..a227d42 --- /dev/null +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -0,0 +1,205 @@ + +
+ + +
Contribute to school requirements
 +
+
+
+ + + + {{ drink.viewValue }} + + + + + + + {{ drink.viewValue }} + + + + + + + {{ drink.viewValue }} + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 RequirementQuantity Cost Per UnitSponsor
+ + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. + 25
$23.00 + 		+
+ +
+ 		+ $69.00 +
+ + + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. + 20
$23.00 + 		+
+ +
+ 		+ $69.00 +
+ + + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. + 20
$23.00 + 		+
+ +
+ 		+ $69.00 +
+ + + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. + 20
$23.00 + 		+
+ +
+ 		+ $69.00 +
+ Total + + $167.00 +
+
+ + +
+
+ + + + + + + + +
Or Contribute to General Development Fund
+ + + +
+ +
+
+ + + +
+
+ State School Dev Fund + District School Dev Fund + + + + {{ drink.viewValue }} + + + + School Dev Fund + + + + {{ drink.viewValue }} + + + + + + + +
+ + + + +
+ \ No newline at end of file diff --git a/ng8-seed/src/app/components/contribute/contribute.component.scss b/ng8-seed/src/app/components/contribute/contribute.component.scss new file mode 100644 index 0000000..606ee32 --- /dev/null +++ b/ng8-seed/src/app/components/contribute/contribute.component.scss @@ -0,0 +1,83 @@ + + table.shop-table { + // border-collapse: separate; + border-spacing: 0; + border-width: 1px 0 0 1px; + // table-layout: fixed; + width: 100%; + padding: 1rem; + } + + table { + width: 100%; + } + + .m-t-0 { + margin-top: 0; + } + + .table-responsive { + text-align: left; + } + + .calculated-shipping { + width: 50%; + float: right; + padding: 1rem; + } + + .update-btn { + float: right; + } + + .order-checkout { + margin-top: 1rem; + } + + table.shop-table th { + text-align: left; + } + + table td, + table th { + border: none; + border-bottom: 1px solid #e9e9e9; + padding: 12px; + vertical-align: middle; + } + + .order-total { + padding-bottom: 2rem; + } + + .product-name { + font-size: 1rem; + font-weight: bold; + } + + // .product-remove { + // width: 7%; + // .remove { + // font-size: 2rem; + // } + // } + .quantity.buttons_added{ + input{ + width: 50px; + } + + } + @media(max-width:768px) { + .main-detail-product { + padding: 0.3rem !important; + } + + } + @media(max-width:580px){ + .product-thumbnail { + display: none; + } + .calculated-shipping{ + width: 100%; + } + } \ No newline at end of file diff --git a/ng8-seed/src/app/components/contribute/contribute.component.spec.ts b/ng8-seed/src/app/components/contribute/contribute.component.spec.ts new file mode 100644 index 0000000..2a3e033 --- /dev/null +++ b/ng8-seed/src/app/components/contribute/contribute.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ContributeComponent } from './contribute.component'; + +describe('ContributeComponent', () => { + let component: ContributeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ContributeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ContributeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng8-seed/src/app/components/contribute/contribute.component.ts b/ng8-seed/src/app/components/contribute/contribute.component.ts new file mode 100644 index 0000000..bdc1a9c --- /dev/null +++ b/ng8-seed/src/app/components/contribute/contribute.component.ts @@ -0,0 +1,46 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-contribute', + templateUrl: './contribute.component.html', + styleUrls: ['./contribute.component.scss'] +}) +export class ContributeComponent implements OnInit { + isRequired = false; + isDisabled = false; + currentDrink: string; + + drinks = [{ + value: 'coke-0', + viewValue: 'Coke' + }, { + value: 'sprite-1', + viewValue: 'Sprite' + }, { + value: 'water-2', + viewValue: 'Water' + }, { + value: 'pepper-3', + viewValue: 'Dr. Pepper' + }, { + value: 'coffee-4', + viewValue: 'Coffee' + }, { + value: 'tea-5', + viewValue: 'Tea' + }, { + value: 'juice-6', + viewValue: 'Orange juice' + }, { + value: 'wine-7', + viewValue: 'Wine' + }, { + value: 'milk-8', + viewValue: 'Milk' + }]; + constructor() { } + + ngOnInit() { + } + +} diff --git a/ng8-seed/src/app/dashboard/dashboard.component.html b/ng8-seed/src/app/dashboard/dashboard.component.html index 039b735..d16fa95 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.html +++ b/ng8-seed/src/app/dashboard/dashboard.component.html @@ -1,8 +1,135 @@
-
-
- +
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+
+ +
+
School
+
+
+
+ +
+
+ +
+ -
- +
-
diff --git a/ng8-seed/src/app/session/register/register-component.html b/ng8-seed/src/app/session/register/register-component.html index 9a479a4..6a14c59 100644 --- a/ng8-seed/src/app/session/register/register-component.html +++ b/ng8-seed/src/app/session/register/register-component.html @@ -3,30 +3,49 @@
diff --git a/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts index 10860fe..2f8ef97 100644 --- a/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng8-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -35,16 +35,16 @@ const HORIZONTALMENUITEMS = [ icon: 'bookmark' }, { - state: 'home', + state: 'contribute', name: 'Contribute', type: 'link', icon: 'error_outline' }, { - state: 'dark', - name: 'DARK', + state: 'authentication', + name: 'Login', type: 'link', - icon: 'highlight' + icon: 'lock' }, // { // state: 'apps', diff --git a/ng8-seed/src/app/shared/menu-items/menu-items.ts b/ng8-seed/src/app/shared/menu-items/menu-items.ts index b44a0fc..ef32d16 100644 --- a/ng8-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng8-seed/src/app/shared/menu-items/menu-items.ts @@ -56,16 +56,16 @@ const MENUITEMS : Menu[] = [ icon: 'bookmark' }, { - state: 'home', + state: 'contribute', name: 'Contribute', type: 'link', icon: 'error_outline' }, { - state: 'dark', - name: 'DARK', + state: 'authentication', + name: 'Login', type: 'link', - icon: 'highlight' + icon: 'lock' }, ];