diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index e3ca194..b88588b 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.html +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -2,7 +2,7 @@
- +
Contribute to Specific Need

@@ -51,54 +51,54 @@ - Item Needed - {{row.material_name}} + Item Needed + {{row.material_name}} - School + School {{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District. - Required Qty + Required Qty {{row.qty}} - Received Qty - {{row.received_qty}} + Received Qty + {{row.received_qty}} - Balance Qty + Balance Qty {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }} - Sponsored Qty - + Sponsored Qty + - Cost Per Unit (in Rs) - {{row.cost_per_unit === null?0:row.cost_per_unit}} + Cost Per Unit
(in Rs) + {{row.cost_per_unit === null?0:row.cost_per_unit}}
- Amount
(in Rs) - {{Total[i]}} + Amount
(in Rs) + {{Total[i]}}
@@ -152,14 +152,14 @@ -

”Alone we can do so little, together we can do so much”
- Hellen Keller

-
Contribute to State School Development Fund
+

”Alone we can do so little,
together we can do so much”
- Hellen Keller

+
Contribute to
State School Development Fund
- +
@@ -190,8 +190,8 @@ - -

”We make a living by what we get. But we make a life by what we give”
- Winston Churchill

+ +

”We make a living by what we get.
But we make a life by what we give”
- Winston Churchill

diff --git a/ng8-seed/src/app/components/login/login-component.html b/ng8-seed/src/app/components/login/login-component.html index 0284477..03e5aa5 100644 --- a/ng8-seed/src/app/components/login/login-component.html +++ b/ng8-seed/src/app/components/login/login-component.html @@ -7,7 +7,7 @@
close
-

Login Form

+

Login

Enter Your Login Details

diff --git a/ng8-seed/src/app/components/payment/payment.component.html b/ng8-seed/src/app/components/payment/payment.component.html index 0f15d61..e6c9cf2 100644 --- a/ng8-seed/src/app/components/payment/payment.component.html +++ b/ng8-seed/src/app/components/payment/payment.component.html @@ -91,8 +91,8 @@
-

A/c Name : Tamil Nadu State Parent Teacher

-

Association : CSR Funds

+

A/c Name : Tamil Nadu State Parent Teacher Association - CSR Funds

+

A/C Number : 142301000022944

MICR : 600020076

IFSC : IOBA0001423

diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.html b/ng8-seed/src/app/components/project-detail/project-detail.component.html index b4c1590..6872012 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.html +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.html @@ -40,7 +40,105 @@
-->
-
+ +
+
+ +
Classes
+
{{schoolInfo.low_class === '13' ? 'LKG': schoolInfo.low_class === '14' ? 'UKG' : schoolInfo.low_class === '15' ? 'Pre-kg' : schoolInfo.low_class}} - {{schoolInfo.high_class === '13' ? 'LKG': schoolInfo.high_class === '14' ? 'UKG' : schoolInfo.high_class === '15' ? 'Pre-kg' : schoolInfo.high_class}}
+
+
+
+
+
+ + +
+
+
Students
+
+
+ +
 {{schoolInfo.total}}
+
+
+
+
+ + +
 {{schoolInfo.total_b}}
+
+
+ + +
 {{schoolInfo.total_g}}
+ +
+ +
+ +
+
+
+ + +
+
+
Staff
+
+
+ +
 {{schoolInfo.totstaff}}
+
+
+
+
+ +
 {{schoolInfo.teach_tot}}Teaching
+
+
+ +
 {{schoolInfo.nonteach_tot}}Non-Teaching
+ +
+ +
+ +
+
+
+ -
 {{schoolInfo.low_class === '13' ? 'LKG': schoolInfo.low_class === '14' ? 'UKG' : schoolInfo.low_class === '15' ? 'Pre-kg' : schoolInfo.low_class}} - {{schoolInfo.high_class === '13' ? 'LKG': schoolInfo.high_class === '14' ? 'UKG' : schoolInfo.high_class === '15' ? 'Pre-kg' : schoolInfo.high_class}}
+
 {{schoolInfo.low_class === '13' ? 'LKG': schoolInfo.low_class === '14' ? 'UKG' : schoolInfo.low_class === '15' ? 'Pre-kg' : schoolInfo.low_class}} - {{schoolInfo.high_class === '13' ? 'LKG': schoolInfo.high_class === '14' ? 'UKG' : schoolInfo.high_class === '15' ? 'Pre-kg' : schoolInfo.high_class}}
@@ -61,20 +158,19 @@
- -
 {{schoolInfo.total}}
+
 {{schoolInfo.total}}
- -
 {{schoolInfo.total_b}}
+ +
 {{schoolInfo.total_b}}
- -
 {{schoolInfo.total_g}}
+ +
 {{schoolInfo.total_g}}
@@ -87,24 +183,24 @@
-
 {{schoolInfo.totstaff}}
+
 {{schoolInfo.totstaff}}
-
 {{schoolInfo.teach_tot}}

Teaching

+
 {{schoolInfo.teach_tot}}

Teaching

-
 {{schoolInfo.nonteach_tot}}

Non-Teaching

+
 {{schoolInfo.nonteach_tot}}

Non-Teaching

-
+
--> -
+
diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.scss b/ng8-seed/src/app/components/project-detail/project-detail.component.scss index b93293a..d7aad2b 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.scss +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.scss @@ -259,3 +259,47 @@ table th { + +//wheather +.card-wheather { + height: 220px; + color: #fff; +} + + + +.city { + + font-size: 26px; +} + +.date { + font-size: 20px; + line-height: 40px; +} + +.sun { + height: 70px; +} + +.grad-blue { + background: linear-gradient(58deg, #f44336, #673ab7); + color: #fff; +} + +.grad-green { + background: linear-gradient(58deg, #009688, #673ab7); + color: #fff; +} + +.grad-red { + background: linear-gradient(58deg, #f44336, #673ab7); + color: #fff; +} +.card-wheather{ + padding: 2rem; +} +.temp { + font-size: 14px; + display: inline-block; +} diff --git a/ng8-seed/src/app/components/project-list/project-list.component.html b/ng8-seed/src/app/components/project-list/project-list.component.html index 1fb03e0..fbc8784 100644 --- a/ng8-seed/src/app/components/project-list/project-list.component.html +++ b/ng8-seed/src/app/components/project-list/project-list.component.html @@ -1,5 +1,5 @@ -
Projects
+
Requirements


@@ -18,7 +18,7 @@
-
+
@@ -54,6 +54,11 @@
+
+ +

More

+
+
- Item Needed + Item Needed {{row.material_name}} - School - {{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District. + School + {{row.school_name}}, {{row.block_name}} Block, {{row.district_name}} District. - Required Qty - {{row.qty}} + Required Qty + {{row.qty}} - Received Qty + Received Qty {{row.received_qty}} - Balance Qty + Balance Qty {{row.qty-row.received_qty <= 0 ? '' : row.qty-row.received_qty }} - Sponsor Qty - {{row.sponsor_qty}} + Sponsor Qty + {{row.sponsor_qty}} - Cost Per Unit
(in Rs) - {{row.cost_per_unit === null ? 0 : row.cost_per_unit}} + Cost Per Unit
(in Rs) + {{row.cost_per_unit === null ? 0 : row.cost_per_unit}}
- Amount (in Rs) - {{row.amount}} + Amount (in Rs) + {{row.amount}} diff --git a/ng8-seed/src/app/dashboard/dashboard.component.html b/ng8-seed/src/app/dashboard/dashboard.component.html index 978fcdd..999af9b 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.html +++ b/ng8-seed/src/app/dashboard/dashboard.component.html @@ -50,24 +50,16 @@ showCaptions="true"
Support Recieved

-
-
-

1000+

-

Desktop Computers

-
-
-

75+

-

Smart Boards

+
+
+

18

+

Supporters

-
-

80+

-

Televisions

-
-
-

50+

-

Printers

+
+

Rs.80,00,000

+

Contributed

diff --git a/ng8-seed/src/app/dashboard/dashboard.component.ts b/ng8-seed/src/app/dashboard/dashboard.component.ts index 99f7fa9..31e1feb 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.ts +++ b/ng8-seed/src/app/dashboard/dashboard.component.ts @@ -20,7 +20,8 @@ export class DashboardComponent { {img: "assets/images/csr-img/TN_client_logo/9.png"}, {img: "assets/images/csr-img/TN_client_logo/10.png"}, {img: "assets/images/csr-img/TN_client_logo/11.png"}, - {img: "assets/images/csr-img/TN_client_logo/12.png"} + {img: "assets/images/csr-img/TN_client_logo/12.png"}, + {img: "assets/images/csr-img/TN_client_logo/13.png"} ]; slideConfig = {"slidesToShow": 8, "slidesToScroll": 1,"dots": true,"infinite": true,"autoplay": true,"autoplaySpeed": 1200}; diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.html b/ng8-seed/src/app/layouts/admin/admin-layout.component.html index 47fd3f3..1b3d6ec 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.html @@ -1,568 +1,579 @@ -
-
- - - +
+ + -
- -
-
- - + + +
+ Settings +
+ + + + +
+
+ + - - - - -
- Settings -
- - - - -
-
-
- -
- -
- - - - Today -
- - -
-

{{ today | date:'EEEE' }}

-
{{ today | date:'dd' }} {{ today | date:'MMMM' }}
-
-
-
- - -

Projects Stats

- -

Project A

- -
- -

Project B

- -
- -

Project C

- -
- -

Todo

- - Consectetur adipisicing elit. Nemo omnis. -

2:45PM

-
- - Temporibus cumque cupiditate -

3:20PM

-
- - Libero voluptatibus harum quis accusamus -

16:00PM

-
-
-
-
- - Notifications -
- - - people -

Social

-

5 new members joined today

-
- - local_offer -

Promotions

-

Updated your email -

-
- - info -

Updates

-

15 new product added

-
- - delete_sweep -

2 order cancelled

- {{ 1427207139000 | date: 'fullDate' }} -
- - check_circle -

System Scan completed

- {{ 1427412725000 | date: 'fullDate' }} -
- - person_add -

4 Users connected

- {{ 1428275520000 | date: 'fullDate' }} -
-
-
-
-
-
- - - + - - -
- - - + + --> + + +
+ + + + \ No newline at end of file diff --git a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts index fa483c2..816b336 100644 --- a/ng8-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng8-seed/src/app/layouts/admin/admin-layout.component.ts @@ -237,7 +237,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { // [routerLink]="['/'+menuitem.state]" navRedirection(menuitem){ console.log(menuitem,this.user_name) - if(menuitem.state == 'authentication'){ + if(menuitem.state == 'login'){ if(this.user_name != ''){ // return this.router.navigateByUrl('/user-profile') @@ -287,4 +287,12 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { this.router.navigateByUrl('/'+menuitem.state) } } + SubMenu(childitem){ + if(childitem.name == 'Log Out'){ + this.signOut() + } + else{ + this.router.navigateByUrl('/'+childitem.state) + } + } } 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 04fc82e..20d8978 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 @@ -61,12 +61,22 @@ const HORIZONTALMENUITEMS = [ { state: '', - name: 'General Guidelines', + name: 'Guidelines', type: 'link', icon: 'lock' }, { - state: 'authentication', + state: '', + name: 'My Account', + type: 'sub', + icon: 'lock', + children: [ + {state: 'user-profile', name: 'My Account'}, + {state: '', name: 'Log Out'} + ] + }, + { + state: 'login', name: 'Login', type: 'link', icon: 'lock' diff --git a/ng8-seed/src/assets/images/csr-img/TN_client_logo/13.png b/ng8-seed/src/assets/images/csr-img/TN_client_logo/13.png new file mode 100644 index 0000000..4c5459d Binary files /dev/null and b/ng8-seed/src/assets/images/csr-img/TN_client_logo/13.png differ