diff --git a/package-lock.json b/package-lock.json index 16f1250..81b0d26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -753,6 +753,12 @@ "utilise": "^2.3.5" } }, + "@fortawesome/fontawesome-free": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.8.1.tgz", + "integrity": "sha512-GJtx6e55qLEOy2gPOsok2lohjpdWNGrYGtQx0FFT/++K4SYx+Z8LlPHdQBaFzKEwH5IbBB4fNgb//uyZjgYXoA==", + "dev": true + }, "@ngtools/webpack": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.1.4.tgz", @@ -2440,9 +2446,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000953", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000953.tgz", - "integrity": "sha512-2stdF/q5MZTDhQ6uC65HWbSgI9UMKbc7+HKvlwH5JBIslKoD/J9dvabP4J4Uiifu3NljbHj3iMpfYflLSNt09A==", + "version": "1.0.30000954", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000954.tgz", + "integrity": "sha512-Wopmc0eVSSG1d9/O4JTn0OmGhUfhEHNkHhoCjUrGSImvHI+2YQWkOI1RRNTUFNSHbSAD8J41jbdZrPP4r32cbQ==", "dev": true }, "canonical-path": { @@ -11278,9 +11284,9 @@ } }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true }, "source-map": { @@ -11596,6 +11602,30 @@ "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==", "dev": true }, + "uglify-es": { + "version": "3.3.9", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", + "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "dev": true, + "requires": { + "commander": "~2.13.0", + "source-map": "~0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "uglify-js": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.2.tgz", @@ -11632,12 +11662,6 @@ "worker-farm": "^1.5.2" }, "dependencies": { - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, "schema-utils": { "version": "0.4.7", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", @@ -11653,16 +11677,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" - } } } }, diff --git a/package.json b/package.json index ca133de..f99ce46 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,14 @@ "zone.js": "~0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.11.0", + "@angular-devkit/build-angular": "^0.11.4", "@angular/cli": "~7.1.2", "@angular/compiler-cli": "~7.1.0", "@angular/language-service": "~7.1.0", - "@types/node": "~8.9.4", + "@fortawesome/fontawesome-free": "^5.8.1", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", + "@types/node": "~8.9.4", "codelyzer": "~4.5.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5076dfb..a12adbf 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -8,19 +8,23 @@ import { HomePageComponent } from './home-page/home-page.component'; import { AlertModule } from 'ngx-bootstrap/alert'; import { BsDatepickerModule } from 'ngx-bootstrap/datepicker'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; +import { CarouselModule } from 'ngx-bootstrap/carousel'; +import { BorderCardDirective } from './directives/border-card.directive' + @NgModule({ declarations: [ AppComponent, - HomePageComponent + HomePageComponent, + BorderCardDirective ], imports: [ BrowserModule, AppRoutingModule, AlertModule.forRoot(), BsDatepickerModule.forRoot(), - BsDropdownModule.forRoot() - + BsDropdownModule.forRoot(), + CarouselModule.forRoot() ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/directives/border-card.directive.spec.ts b/src/app/directives/border-card.directive.spec.ts new file mode 100644 index 0000000..1aafd98 --- /dev/null +++ b/src/app/directives/border-card.directive.spec.ts @@ -0,0 +1,8 @@ +import { BorderCardDirective } from '../border-card.directive'; + +describe('BorderCardDirective', () => { + it('should create an instance', () => { + const directive = new BorderCardDirective(); + expect(directive).toBeTruthy(); + }); +}); diff --git a/src/app/directives/border-card.directive.ts b/src/app/directives/border-card.directive.ts new file mode 100644 index 0000000..cacfe26 --- /dev/null +++ b/src/app/directives/border-card.directive.ts @@ -0,0 +1,29 @@ +import { Directive, ElementRef, HostListener, Input } from '@angular/core'; + +@Directive({ + selector: '[appBorderCard]' +}) +export class BorderCardDirective { + + private initialColor: string = '#f5f5f5'; + private defaultColor: string = '#3366ff'; + + constructor(private el: ElementRef) { + + } + + @Input('appBorderCard') borderColor: string; + + @HostListener('mouseenter') onMouseEnter() { + this.setBorder(this.borderColor || this.defaultColor); + } + + @HostListener('mouseleave') onMouseLeave() { + this.setBorder(this.initialColor); + } + + private setBorder(color: string) { + let border = 'solid 4px ' + color; + this.el.nativeElement.style.border = border; + } +} diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html index cecbbc6..7977cf7 100644 --- a/src/app/home-page/home-page.component.html +++ b/src/app/home-page/home-page.component.html @@ -1,26 +1,135 @@ - - Weedzll done! You successfully read this important alert message. + + + + + first slide +
+

First slide label

+

Nulla vitae elit libero, a pharetra augue mollis interdum.

+
+ + + second slide +
+

Second slide label

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+
+ + + third slide +
+

Third slide label

+

Praesent commodo cursus magna, vel scelerisque nisl consectetur.

+
+ + + fourth slide +
+

Fourth slide label

+

Praesent commodo cursus magna, vel scelerisque nisl consectetur.

+
+ + + +

Still not registered?

+

Sign in now to access to your configuration panel

+ - -
-
- +
+
+
+ + MyMirror +
+
+

MIOTech

+
+

+ Histoire : + bla bla +

+
+

+ +

+
-
- - -
\ No newline at end of file +
+
+
+

+ Plan +

+
+

+ Plan +

+
+

+ Plan +

+
+
+ + + +
+
+
+ +
+
+
+
+
+
HUBERT
+ +
Ce beau goss
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ +
+
+
+
+
+
+
FRANSOLET
+ +
Cette gribouille
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ +
+
+
+
+
+
+
MICHEL
+ +
Ce poseur
+

Some quick example text to build on the card title and make up the bulk of the card's content.

+ +
+
+
+
+
diff --git a/src/app/home-page/home-page.component.spec.ts b/src/app/home-page/home-page.component.spec.ts index e180332..eaa5d91 100644 --- a/src/app/home-page/home-page.component.spec.ts +++ b/src/app/home-page/home-page.component.spec.ts @@ -2,6 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { HomePageComponent } from './home-page.component'; + describe('HomePageComponent', () => { let component: HomePageComponent; let fixture: ComponentFixture; diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts index 834207e..2fec697 100644 --- a/src/app/home-page/home-page.component.ts +++ b/src/app/home-page/home-page.component.ts @@ -1,6 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router' -import { $ } from 'protractor'; + + + + @Component({ selector: 'app-home-page', diff --git a/src/assets/css/bootstrap-social.css b/src/assets/css/bootstrap-social.css new file mode 100644 index 0000000..c189337 --- /dev/null +++ b/src/assets/css/bootstrap-social.css @@ -0,0 +1,75 @@ +ul.social-network { + list-style: none; + display: inline; + margin-left:0 !important; + padding: 0; +} +ul.social-network li { + display: inline; + margin: 0 5px; +} + +.social-network a.icoRss:hover { + background-color: #F56505; +} +.social-network a.icoFacebook:hover { + background-color:#3B5998; +} +.social-network a.icoTwitter:hover { + background-color:#33ccff; +} +.social-network a.icoGoogle:hover { + background-color:#BD3518; +} +.social-network a.icoVimeo:hover { + background-color:#0590B8; +} +.social-network a.icoLinkedin:hover { + background-color:#007bb7; +} +.social-network a.icoRss:hover i, .social-network a.icoFacebook:hover i, .social-network a.icoTwitter:hover i, +.social-network a.icoGoogle:hover i, .social-network a.icoVimeo:hover i, .social-network a.icoLinkedin:hover i { + color:#fff; +} +a.socialIcon:hover, .socialHoverClass { + color:#44BCDD; +} + +.social-circle li a { + display:inline-block; + position:relative; + margin:0 auto 0 auto; + -moz-border-radius:50%; + -webkit-border-radius:50%; + border-radius:50%; + text-align:center; + width: 50px; + height: 50px; + font-size:20px; + background-color: #D3D3D3; +} +.social-circle li i { + margin:0; + line-height:50px; + text-align: center; +} + +.social-circle li a:hover i, .triggeredHover { + -moz-transform: rotate(360deg); + -webkit-transform: rotate(360deg); + -ms--transform: rotate(360deg); + transform: rotate(360deg); + -webkit-transition: all 0.2s; + -moz-transition: all 0.2s; + -o-transition: all 0.2s; + -ms-transition: all 0.2s; + transition: all 0.2s; +} +.social-circle i { + color: #fff; + -webkit-transition: all 0.8s; + -moz-transition: all 0.8s; + -o-transition: all 0.8s; + -ms-transition: all 0.8s; + transition: all 0.8s; +} \ No newline at end of file diff --git a/src/assets/images/home-page/Hubert.jpg b/src/assets/images/home-page/Hubert.jpg new file mode 100644 index 0000000..bf800e2 Binary files /dev/null and b/src/assets/images/home-page/Hubert.jpg differ diff --git a/src/assets/images/home-page/Michel.jpg b/src/assets/images/home-page/Michel.jpg new file mode 100644 index 0000000..f8438bd Binary files /dev/null and b/src/assets/images/home-page/Michel.jpg differ diff --git a/src/assets/images/home-page/Michel2.jpg b/src/assets/images/home-page/Michel2.jpg new file mode 100644 index 0000000..0a3d126 Binary files /dev/null and b/src/assets/images/home-page/Michel2.jpg differ diff --git a/src/assets/images/home-page/Thomas.jpg b/src/assets/images/home-page/Thomas.jpg new file mode 100644 index 0000000..8a778f7 Binary files /dev/null and b/src/assets/images/home-page/Thomas.jpg differ diff --git a/src/assets/images/home-page/custo2.png b/src/assets/images/home-page/custo2.png new file mode 100644 index 0000000..6fa9684 Binary files /dev/null and b/src/assets/images/home-page/custo2.png differ diff --git a/src/assets/images/home-page/home.jpg b/src/assets/images/home-page/home.jpg new file mode 100644 index 0000000..19fcf73 Binary files /dev/null and b/src/assets/images/home-page/home.jpg differ diff --git a/src/assets/images/home-page/logoNew.png b/src/assets/images/home-page/logoNew.png new file mode 100644 index 0000000..e9adddf Binary files /dev/null and b/src/assets/images/home-page/logoNew.png differ diff --git a/src/assets/images/home-page/network3.png b/src/assets/images/home-page/network3.png new file mode 100644 index 0000000..2942035 Binary files /dev/null and b/src/assets/images/home-page/network3.png differ diff --git a/src/assets/images/home-page/news2.jpg b/src/assets/images/home-page/news2.jpg new file mode 100644 index 0000000..9200b40 Binary files /dev/null and b/src/assets/images/home-page/news2.jpg differ diff --git a/src/index.html b/src/index.html index ea8bb10..3ea70d7 100644 --- a/src/index.html +++ b/src/index.html @@ -1,4 +1,4 @@ - + @@ -10,6 +10,9 @@ + + + diff --git a/tsconfig.json b/tsconfig.json index b271fd9..8e0ab77 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "paths": { "*": ["types/*"] }, "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, diff --git a/types/@fortawesome/fontawesome-free.d.ts b/types/@fortawesome/fontawesome-free.d.ts new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/types/@fortawesome/fontawesome-free.d.ts @@ -0,0 +1 @@ +