From 07bd907a8428c539e5852d95bc6ec76bdf8f3f26 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 4 Sep 2019 14:30:14 +0530 Subject: [PATCH] Fairoj : Component changes --- ng8-seed/package-lock.json | 5 +- ng8-seed/package.json | 2 +- .../contribute/contribute.component.html | 66 ++++++++++-------- .../contribute/contribute.component.scss | 28 +++++++- .../contribute/contribute.component.ts | 46 +++++++++++++ .../project-detail.component.html | 3 +- .../project-detail.component.ts | 10 +++ .../app/dashboard/dashboard.component.html | 27 +++++--- .../app/dashboard/dashboard.component.scss | 69 +++++++++++++++++++ .../src/app/dashboard/dashboard.component.ts | 50 +++++++++++++- .../styles/scss/_material.variables.scss | 1 + .../assets/styles/scss/core/_sessions.scss | 2 +- 12 files changed, 263 insertions(+), 46 deletions(-) diff --git a/ng8-seed/package-lock.json b/ng8-seed/package-lock.json index de47053..6799721 100644 --- a/ng8-seed/package-lock.json +++ b/ng8-seed/package-lock.json @@ -786,8 +786,9 @@ } }, "@swimlane/ngx-datatable": { - "version": "git+https://github.com/zackarychapple/ngx-datatable.git#24d02ef0dcf14b99c11809a35cda7612230f293a", - "from": "git+https://github.com/zackarychapple/ngx-datatable.git" + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-15.0.2.tgz", + "integrity": "sha512-IlUyCs/hLv12hzz2pGugbrdRpBbwE6JUM4Bm4CCqLptmZj+t8pw8Ywthde8yUDdpgGgTJeJ9G5o92QadyGbP3g==" }, "@types/d3": { "version": "3.5.43", diff --git a/ng8-seed/package.json b/ng8-seed/package.json index a330261..4178587 100644 --- a/ng8-seed/package.json +++ b/ng8-seed/package.json @@ -26,7 +26,7 @@ "@angular/router": "^8.2.2", "@ngx-translate/core": "^10.0.2", "@ngx-translate/http-loader": "^3.0.1", - "@swimlane/ngx-datatable": "git+https://github.com/zackarychapple/ngx-datatable.git", + "@swimlane/ngx-datatable": "^15.0.2", "angular-calendar": "^0.26.4", "angular-sortablejs": "^2.6.0", "angular-tree-component": "^8.4.0", diff --git a/ng8-seed/src/app/components/contribute/contribute.component.html b/ng8-seed/src/app/components/contribute/contribute.component.html index a227d42..630546c 100644 --- a/ng8-seed/src/app/components/contribute/contribute.component.html +++ b/ng8-seed/src/app/components/contribute/contribute.component.html @@ -1,3 +1,4 @@ +
@@ -8,22 +9,22 @@
- - {{ drink.viewValue }} + + {{ item.value }} - - {{ drink.viewValue }} + + {{ item.value }} - - {{ drink.viewValue }} + + {{ item.value }} @@ -44,11 +45,11 @@ - + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. - 25
$23.00 + 25
₹23.00
@@ -56,19 +57,19 @@
- $69.00 + ₹69.00 - + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. - 20
$23.00 + 20
₹23.00
@@ -76,19 +77,19 @@
- $69.00 + ₹69.00 - + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. - 20
$23.00 + 20
₹23.00
@@ -96,19 +97,19 @@
- $69.00 + ₹69.00 - + Student Benches required at Govt Girls School, Panruti, Villupuram Dt. - 20
$23.00 + 20
₹23.00
@@ -116,7 +117,7 @@
- $69.00 + ₹69.00 @@ -124,14 +125,14 @@ Total - $167.00 + ₹167.00
- +
+
@@ -34,7 +35,7 @@

Thiruvannamalai

- +

Tamil Nadu is one of the most literate states in India. The state's literacy rate is 80.33% in 2011, which is above the national average. A survey conducted by the Industry body Assocham ranks Tamil Nadu top among Indian states with about 100% Gross Enrollment Ratio (GER) in primary and upper primary education.

diff --git a/ng8-seed/src/app/components/project-detail/project-detail.component.ts b/ng8-seed/src/app/components/project-detail/project-detail.component.ts index e373d97..f3abe3f 100644 --- a/ng8-seed/src/app/components/project-detail/project-detail.component.ts +++ b/ng8-seed/src/app/components/project-detail/project-detail.component.ts @@ -28,6 +28,16 @@ export class ProjectDetailComponent implements OnInit { ngOnInit() { } + ngAfterViewInit() { + // Hack: Scrolls to top of Page after page view initialized + let top = document.getElementById('top'); + console.log("d",top); + if (top !== null) { + top.scrollIntoView(); + top = null; + } + } + thumbnailClick(index){ this.sliderimg.goToSlide(index); } diff --git a/ng8-seed/src/app/dashboard/dashboard.component.html b/ng8-seed/src/app/dashboard/dashboard.component.html index d16fa95..f19f7c5 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.html +++ b/ng8-seed/src/app/dashboard/dashboard.component.html @@ -1,22 +1,33 @@ +
-
-
- +
+ +
+
There is no exercise better for the heart than reaching down and lifting people up.
+
+ +
+ +
+ +
+
- +
-
School
+
{{flex_value.name}}
-
+ +
diff --git a/ng8-seed/src/app/dashboard/dashboard.component.scss b/ng8-seed/src/app/dashboard/dashboard.component.scss index c354135..446c428 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.scss +++ b/ng8-seed/src/app/dashboard/dashboard.component.scss @@ -16,21 +16,77 @@ $p: 12px; // } .mc-1{ background-color: rgba(51,211,192,0.9); + z-index: 4; +} +.mc-1 :hover{ + cursor: pointer; + background-color: rgba(65, 158, 147, 0.9); + i{ + font-size:52px; + // padding:10px; + + } +} +.mc-2 :hover{ + background-color: rgba(1, 152, 172, 0.9); + cursor: pointer; + i{ + font-size:52px; + + } +} +.mc-3 :hover{ + background-color: rgb(0, 126, 175); + cursor: pointer; + i{ + font-size:52px; + + } +} + +.mc-4 :hover{ + background-color: rgba(5, 107, 170, 0.9); + cursor: pointer; + i{ + font-size:52px; + + } +} +.mc-5 :hover{ + background-color: rgb(102, 90, 177); + cursor: pointer; + i{ + font-size:52px; + + } +} +.mc-6 :hover{ + background-color: rgba(180, 143, 69, 0.9); + cursor: pointer; + i{ + font-size:52px; + + } } .mc-2{ + z-index: 4; background-color: rgba(0,190,214,0.9); } .mc-3{ background-color: rgba(0,165,228,0.9); + z-index: 4; } .mc-4{ background-color: rgba(0,136,223,0.9); + z-index: 4; } .mc-5{ background-color: rgba(111,99,195,0.9); + z-index: 4; } .mc-6{ background-color: rgba(255,198,88,0.9); + z-index: 4; } .mc-7{ background-color: rgba(255,148,92,0.9); @@ -43,10 +99,23 @@ $p: 12px; } .mc-10{ background-color: rgba(150,55,144,0.9); + } .m-color{ color: #fff !important; } +.flex-text{ + color:white; + font-style: oblique; + font-size: 22px; + z-index: 2; +} +.flex-text2{ + color:white; + font-style: oblique; + font-size: 18px; + z-index: 2; +} .form-bg{ height: 80vh; min-height: calc(54vh + 70px); diff --git a/ng8-seed/src/app/dashboard/dashboard.component.ts b/ng8-seed/src/app/dashboard/dashboard.component.ts index d92fb89..46c2c80 100644 --- a/ng8-seed/src/app/dashboard/dashboard.component.ts +++ b/ng8-seed/src/app/dashboard/dashboard.component.ts @@ -23,10 +23,54 @@ export class DashboardComponent { // url:'https://cdn.vox-cdn.com/uploads/chorus_image/image/56789263/akrales_170919_1976_0104.0.jpg', url:'assets/images/csr-img/ban3.jpg', caption:'Third' - } - -] + }] + + flexContent=[{ + id:1, + icon:'fa fa-university fa-3x', + name:'School', + card_class:"mc-1" + }, + { + id:2, + icon:'fa fa-building fa-3x', + name:'Building', + card_class:'mc-2' + }, + { + id:3, + icon:'fa fa-laptop fa-3x', + name:'Furniture', + card_class:'mc-3' + }, + { + id:4, + icon:'fa fa-child fa-3x', + name:'Uniforms', + card_class:'mc-4' + }, + { + id:5, + icon:'fa fa-briefcase fa-3x', + name:'Bags', + card_class:'mc-5' + }, + { + id:6, + icon:'fa fa-book fa-3x', + name:'Kit', + card_class:'mc-6' + }] constructor() { this.txt=this.txt; } + ngAfterViewInit() { + // Hack: Scrolls to top of Page after page view initialized + let top = document.getElementById('top'); + console.log("d",top); + if (top !== null) { + top.scrollIntoView(); + top = null; + } + } } diff --git a/ng8-seed/src/assets/styles/scss/_material.variables.scss b/ng8-seed/src/assets/styles/scss/_material.variables.scss index 3bd0a9f..33789f0 100644 --- a/ng8-seed/src/assets/styles/scss/_material.variables.scss +++ b/ng8-seed/src/assets/styles/scss/_material.variables.scss @@ -4,6 +4,7 @@ @import '~@angular/material/theming'; $primary: mat-palette($mat-deep-purple); +$secondary:rgb(69, 189, 189); $accent: mat-palette($mat-amber, A200, A100, A400); $warn: mat-palette($mat-red); $theme: mat-light-theme($primary, $accent, $warn); diff --git a/ng8-seed/src/assets/styles/scss/core/_sessions.scss b/ng8-seed/src/assets/styles/scss/core/_sessions.scss index 3a0f7f2..270978c 100644 --- a/ng8-seed/src/assets/styles/scss/core/_sessions.scss +++ b/ng8-seed/src/assets/styles/scss/core/_sessions.scss @@ -8,7 +8,7 @@ } .form-bg { - background-image: url("/../../../assets/images/login.jpg"); + background-image: url("assets/images/login.jpg"); } .form-bg {