diff --git a/frontend/main/package-lock.json b/frontend/main/package-lock.json index 4c7bfee..1326ade 100644 --- a/frontend/main/package-lock.json +++ b/frontend/main/package-lock.json @@ -17,6 +17,7 @@ "@angular/platform-browser-dynamic": "^14.0.0", "@angular/router": "^14.0.0", "admin-lte": "3.0", + "jquery": "^3.6.1", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -26,6 +27,7 @@ "@angular/cli": "^14.2.1", "@angular/compiler-cli": "^14.0.0", "@types/jasmine": "~4.0.0", + "@types/jquery": "^3.5.14", "jasmine-core": "~4.3.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", @@ -3045,6 +3047,15 @@ "integrity": "sha512-Opp1LvvEuZdk8fSSvchK2mZwhVrsNT0JgJE9Di6MjnaIpmEXM8TLCPPrVtNTYh8+5MPdY8j9bAHMu2SSfwpZJg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.14", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz", + "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==", + "dev": true, + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", @@ -3106,6 +3117,12 @@ "@types/node": "*" } }, + "node_modules/@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "dev": true + }, "node_modules/@types/sockjs": { "version": "0.3.33", "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", @@ -15481,6 +15498,15 @@ "integrity": "sha512-Opp1LvvEuZdk8fSSvchK2mZwhVrsNT0JgJE9Di6MjnaIpmEXM8TLCPPrVtNTYh8+5MPdY8j9bAHMu2SSfwpZJg==", "dev": true }, + "@types/jquery": { + "version": "3.5.14", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz", + "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==", + "dev": true, + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", @@ -15542,6 +15568,12 @@ "@types/node": "*" } }, + "@types/sizzle": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", + "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", + "dev": true + }, "@types/sockjs": { "version": "0.3.33", "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz", diff --git a/frontend/main/package.json b/frontend/main/package.json index 1e6d859..a123bbb 100644 --- a/frontend/main/package.json +++ b/frontend/main/package.json @@ -19,6 +19,7 @@ "@angular/platform-browser-dynamic": "^14.0.0", "@angular/router": "^14.0.0", "admin-lte": "3.0", + "jquery": "^3.6.1", "rxjs": "~7.5.0", "tslib": "^2.3.0", "zone.js": "~0.11.4" @@ -28,6 +29,7 @@ "@angular/cli": "^14.2.1", "@angular/compiler-cli": "^14.0.0", "@types/jasmine": "~4.0.0", + "@types/jquery": "^3.5.14", "jasmine-core": "~4.3.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", diff --git a/frontend/main/src/app/home/home.component.css b/frontend/main/src/app/home/home.component.css index e69de29..79766e3 100644 --- a/frontend/main/src/app/home/home.component.css +++ b/frontend/main/src/app/home/home.component.css @@ -0,0 +1,13 @@ +.card-title{ + font-size: 25px; +} +#cards .row{ + margin-left: 100px; + margin-top: 80px; +} +.card-body ul li a{ + color: white; +} +.card-body ul li a:hover{ + color: lightslategrey; +} diff --git a/frontend/main/src/app/home/home.component.html b/frontend/main/src/app/home/home.component.html index 379edb3..c25cb1a 100644 --- a/frontend/main/src/app/home/home.component.html +++ b/frontend/main/src/app/home/home.component.html @@ -1,75 +1,104 @@
-
-
-
-
-

Welcome!!

-

Where do you want to go?

-
-
+
+
+
+
+

Welcome!!

+

Where do you want to go?

+
+
- -
-
-
+ +
+
+
-
-

Dashboards

-



Clique para ver os Dashboards

-
+
+

  Dashboards

+



Click here to go to Dashboards!

+
-
-
-
-
-

User

-



Clique para ver User

+
+
+
+
+

  User

+
+ +
-
-
-
-
-
-

Packages

-



Clique para ver Packages

+
+
+
+
+

  Packages

+
+ +
+
-
-
-
-
-
-

Finance

-



Clique para ver Finance

-
-
+
+
+
+

  Finance

+
+ +
-
-
-
-

Quotes

-



Clique para ver Quotes

-
-
+
+
+
+
+

  Quotes

+
+ +
-
-
-
-

About us

-



Clique para ver About Us

-
-
+
+
+
+
+

  About us

+



Click here to go to About Us

+
+
- - - - - - - - \ No newline at end of file +
+ diff --git a/frontend/main/src/app/login/login.component.html b/frontend/main/src/app/login/login.component.html index 7f20a19..970825f 100644 --- a/frontend/main/src/app/login/login.component.html +++ b/frontend/main/src/app/login/login.component.html @@ -22,7 +22,7 @@

Log In

autocomplete="on" [(ngModel)]="password" required>
- submit + submit

Forgot your password?

diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index b5bcf16..ce652bb 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { catchError, of } from 'rxjs'; import { LoginserviceService } from '../loginservice.service'; +import * as $ from 'jquery' @Component({ selector: 'app-login', @@ -21,12 +22,16 @@ export class LoginComponent implements OnInit { ngOnInit(): void { this.loginService.succeed = false + document.addEventListener("keypress", function(e){ + if(e.key === 'Enter'){ + $('#submitButton') + alert('Ainda na luta pra fazer funcionar esse button pelo Enter') + } + }) } submit():void{ if(this.user != null && this.password != null){ - this.loginService.succeed = true - this.router.navigateByUrl('home') this.loginService.logging(this.user, this.password) .pipe( catchError((error)=>{ @@ -41,6 +46,10 @@ export class LoginComponent implements OnInit { } } + gotoHome(){ + this.router.navigateByUrl('home') + } + register(){ if(this.nameReg != null && this.passwordReg != null && this.emailReg != null){ this.loginService.succeed = true diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index d638c50..a5c3508 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -1,7 +1,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { InjectSetupWrapper } from '@angular/core/testing'; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; +import { LoginComponent } from './login/login.component'; @Injectable({ providedIn: 'root' @@ -9,13 +11,26 @@ import { Observable } from 'rxjs'; export class LoginserviceService implements CanActivate { user!:string - TMSLoginAPI:string = "https://imagina-uma-api-bem-daora-aqui.com" + TMSLoginAPI:string = "https://randomuser.me/api/?results=1" succeed!:boolean constructor(private router:Router, private http:HttpClient) {} logging(user:string, password:string){ - this.user = user + fetch(this.TMSLoginAPI) + .then((resp) => resp.json()) + .then((data) =>{ + let ranUsers = data.results; + return ranUsers.map((ranUser:any) =>{ + this.user = `${ranUser.name.first}` + this.succeed = true + new LoginComponent(this.router, this).gotoHome() + }) + }) + .catch(function(error){ + console.log(error); + }) + return this.http.get(this.TMSLoginAPI+'/'+user+'/'+password) } diff --git a/webpage/assets/HatchfulExport-All/facebook_cover_photo_1.png b/webpage/assets/HatchfulExport-All/facebook_cover_photo_1.png new file mode 100644 index 0000000..161e88f Binary files /dev/null and b/webpage/assets/HatchfulExport-All/facebook_cover_photo_1.png differ diff --git a/webpage/assets/HatchfulExport-All/facebook_cover_photo_2.png b/webpage/assets/HatchfulExport-All/facebook_cover_photo_2.png new file mode 100644 index 0000000..d3f6ac8 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/facebook_cover_photo_2.png differ diff --git a/webpage/assets/HatchfulExport-All/facebook_profile_image.png b/webpage/assets/HatchfulExport-All/facebook_profile_image.png new file mode 100644 index 0000000..0bd92d7 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/facebook_profile_image.png differ diff --git a/webpage/assets/HatchfulExport-All/favicon.ico b/webpage/assets/HatchfulExport-All/favicon.ico new file mode 100644 index 0000000..e62a088 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/favicon.ico differ diff --git a/webpage/assets/HatchfulExport-All/instagram_profile_image.png b/webpage/assets/HatchfulExport-All/instagram_profile_image.png new file mode 100644 index 0000000..045f223 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/instagram_profile_image.png differ diff --git a/webpage/assets/HatchfulExport-All/linkedin_banner_image_1.png b/webpage/assets/HatchfulExport-All/linkedin_banner_image_1.png new file mode 100644 index 0000000..cb11d1b Binary files /dev/null and b/webpage/assets/HatchfulExport-All/linkedin_banner_image_1.png differ diff --git a/webpage/assets/HatchfulExport-All/linkedin_banner_image_2.png b/webpage/assets/HatchfulExport-All/linkedin_banner_image_2.png new file mode 100644 index 0000000..d29fab3 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/linkedin_banner_image_2.png differ diff --git a/webpage/assets/HatchfulExport-All/linkedin_profile_image.png b/webpage/assets/HatchfulExport-All/linkedin_profile_image.png new file mode 100644 index 0000000..045f223 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/linkedin_profile_image.png differ diff --git a/webpage/assets/HatchfulExport-All/logo.png b/webpage/assets/HatchfulExport-All/logo.png new file mode 100644 index 0000000..0bd92d7 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/logo.png differ diff --git a/webpage/assets/HatchfulExport-All/logo_transparent.png b/webpage/assets/HatchfulExport-All/logo_transparent.png new file mode 100644 index 0000000..e2b9134 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/logo_transparent.png differ diff --git a/webpage/assets/HatchfulExport-All/pinterest_board_photo.png b/webpage/assets/HatchfulExport-All/pinterest_board_photo.png new file mode 100644 index 0000000..1852b7a Binary files /dev/null and b/webpage/assets/HatchfulExport-All/pinterest_board_photo.png differ diff --git a/webpage/assets/HatchfulExport-All/pinterest_profile_image.png b/webpage/assets/HatchfulExport-All/pinterest_profile_image.png new file mode 100644 index 0000000..6df41c5 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/pinterest_profile_image.png differ diff --git a/webpage/assets/HatchfulExport-All/twitter_header_photo_1.png b/webpage/assets/HatchfulExport-All/twitter_header_photo_1.png new file mode 100644 index 0000000..cd3cdef Binary files /dev/null and b/webpage/assets/HatchfulExport-All/twitter_header_photo_1.png differ diff --git a/webpage/assets/HatchfulExport-All/twitter_header_photo_2.png b/webpage/assets/HatchfulExport-All/twitter_header_photo_2.png new file mode 100644 index 0000000..9480d83 Binary files /dev/null and b/webpage/assets/HatchfulExport-All/twitter_header_photo_2.png differ diff --git a/webpage/assets/HatchfulExport-All/twitter_profile_image.png b/webpage/assets/HatchfulExport-All/twitter_profile_image.png new file mode 100644 index 0000000..1852b7a Binary files /dev/null and b/webpage/assets/HatchfulExport-All/twitter_profile_image.png differ diff --git a/webpage/assets/HatchfulExport-All/youtube_profile_image.png b/webpage/assets/HatchfulExport-All/youtube_profile_image.png new file mode 100644 index 0000000..1852b7a Binary files /dev/null and b/webpage/assets/HatchfulExport-All/youtube_profile_image.png differ diff --git a/webpage/assets/img/pexels-artem-podrez-5025512.jpg b/webpage/assets/img/pexels-artem-podrez-5025512.jpg new file mode 100644 index 0000000..c843612 Binary files /dev/null and b/webpage/assets/img/pexels-artem-podrez-5025512.jpg differ diff --git a/webpage/assets/img/pexels-karolina-grabowska-4498128.jpg b/webpage/assets/img/pexels-karolina-grabowska-4498128.jpg new file mode 100644 index 0000000..2e80a24 Binary files /dev/null and b/webpage/assets/img/pexels-karolina-grabowska-4498128.jpg differ diff --git a/webpage/assets/img/pexels-karolina-grabowska-4498142.jpg b/webpage/assets/img/pexels-karolina-grabowska-4498142.jpg new file mode 100644 index 0000000..91cea0f Binary files /dev/null and b/webpage/assets/img/pexels-karolina-grabowska-4498142.jpg differ diff --git a/webpage/assets/img/pexels-karolina-grabowska-4506249.jpg b/webpage/assets/img/pexels-karolina-grabowska-4506249.jpg new file mode 100644 index 0000000..f785e7e Binary files /dev/null and b/webpage/assets/img/pexels-karolina-grabowska-4506249.jpg differ diff --git a/webpage/assets/img/pexels-liza-summer-6348097.jpg b/webpage/assets/img/pexels-liza-summer-6348097.jpg new file mode 100644 index 0000000..7372888 Binary files /dev/null and b/webpage/assets/img/pexels-liza-summer-6348097.jpg differ diff --git a/webpage/assets/img/pexels-tima-miroshnichenko-6169178.jpg b/webpage/assets/img/pexels-tima-miroshnichenko-6169178.jpg new file mode 100644 index 0000000..dbe4ae0 Binary files /dev/null and b/webpage/assets/img/pexels-tima-miroshnichenko-6169178.jpg differ diff --git a/webpage/assets/img/pexels-tima-miroshnichenko-6169668.jpg b/webpage/assets/img/pexels-tima-miroshnichenko-6169668.jpg new file mode 100644 index 0000000..2d5bd0d Binary files /dev/null and b/webpage/assets/img/pexels-tima-miroshnichenko-6169668.jpg differ diff --git a/webpage/assets/img/pexels-tima-miroshnichenko-6170154.jpg b/webpage/assets/img/pexels-tima-miroshnichenko-6170154.jpg new file mode 100644 index 0000000..8e02d30 Binary files /dev/null and b/webpage/assets/img/pexels-tima-miroshnichenko-6170154.jpg differ diff --git a/webpage/assets/img/unnamed_14.jpg b/webpage/assets/img/unnamed_14.jpg new file mode 100644 index 0000000..fe69095 Binary files /dev/null and b/webpage/assets/img/unnamed_14.jpg differ diff --git a/webpage/css/styles.css b/webpage/css/styles.css index 42d00e4..0ac4a6c 100644 --- a/webpage/css/styles.css +++ b/webpage/css/styles.css @@ -11410,7 +11410,7 @@ header.masthead { padding-bottom: 6rem; text-align: center; color: #fff; - background-image: url("../assets/img/header-bg.jpg"); + background-image: url("../assets/img/pexels-karolina-grabowska-4506249.jpg"); background-repeat: no-repeat; background-attachment: scroll; background-position: center center; diff --git a/webpage/index.html b/webpage/index.html index 876ffa6..4894b43 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -5,9 +5,9 @@ - Agency - Start Bootstrap Theme + TMS - Transport Management Service - + @@ -20,7 +20,7 @@