diff --git a/assets/README.md b/assets/README.md index d8454ce..2b0182a 100644 --- a/assets/README.md +++ b/assets/README.md @@ -76,16 +76,53 @@ > ###          As ativações e criações de serviço são feita de acordo com sua demanda, como exemplo, o Directions API, uma API do Google Maps que te retorna rotas, precisamos ativá-la e então configurar uma credencial chamada API KEY. >
>
-> +> +>
+>
+> +> ###          Após ativar a API Desejada, você terá algumas abas abaixos como "Documentação", lá você poderá como utilizar os serviços nas tecnologias desejadas, como configurar, etc. No caso desta API, você verá na documentação que é necessária uma API KEY, que faremos agora na aba "Credenciais" em API. +>
+>
+> +>
+>
> +> ###          Na seção das credenciais, na parte superior clique em "Criar Credencial", clique em "Chave de API". +>
+>
+> +>
+>
> +> ###          Após criar sua chave, ele irá ser mostrada e pedirá para que você configure restrições da chave API. +>
+>
+> +>
+>
+> +> ###          Você poderá restringir por Referenciadores HTTP, Endereços IP, Apps Android ou iOS. No nosso caso, preferimos não restringir, mas por questões de segurança e mal uso de sua chave, você poderá fazer isso. Caso tenha uma provedora de internet com IP Dinâmico, não esqueça de instalar um DDNS ou Fixar seu IP de onde sua requisição irá ser feita para evitar erros de restrição.

## 5 - CONFIGURAR BANCO SQL - +> ###          Para configurarmos uma instância de Banco de Dados MySQL, deveremos primeiro criar e configurar nossa máquina virtual, não se preocupe, pois a questão da instalação, configuração do S.O. e do Serviço de Banco de Dados o próprio Google toma conta. Então primeiro passo, criaremos nossa instância virtual como a seguir. +>
+>
+> +>
+>
+> +> ###          Daremos um nome para nossa instância, criaremos a senha para o usuário raiz (root) e escolheremos a versão do nosso MySQL, na opção de Configuração Inicial, você pode decidir em Produção real (o que cria uma configuração para altas demandas) ou para Desenvolvimento (o que diminui a performance mas economiza nos custos), mais abaixo temos a disponibilidade por região, caso esteja criando o servidor no Brasil e deseja que haja menor latência de resposta e maior fidelidade de entrega de dados, escolha a região de São Paulo, possivelmente haverá duas alternativas, escolha a que melhor se encaixa com sua demanda. +>
+>
+> +>
+>
+> +> ###          Após

diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java index f857e39..8916be7 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/QuoteController.java @@ -35,12 +35,6 @@ public RecentQuote recentPackage(@RequestBody RecentQuote quote) { return recentQuoteRepository.save(quote); } - @PostMapping("/register") - public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { - quote.setPost(LocalDate.now()); - return registerQuoteRepository.save(quote); - } - @GetMapping("/recent/{id}") public List recentQuote(@PathVariable("id") int id){ return recentQuoteRepository.findOwnQuote(id); @@ -51,6 +45,32 @@ public void deleteQuote(@PathVariable("id") int id){ recentQuoteRepository.deleteById(id); } + @PostMapping("/register") + public RegisterQuote registerPackage(@RequestBody RegisterQuote quote) { + quote.setPost(LocalDate.now()); + return registerQuoteRepository.save(quote); + } + + @GetMapping("/packs/user/{id}") + public List getAllMyPacks(@PathVariable("id") int id){ + return registerQuoteRepository.findPackByUserId(id); + } + + @GetMapping("/packs/carrier/{id}") + public List getAllCarrierPacks(@PathVariable("id") int id){ + return registerQuoteRepository.findPackByCarrierId(id); + } + + @GetMapping("/packs/user/recent/{id}") + public List getRecentUserPacks(@PathVariable("id") int id){ + return registerQuoteRepository.findPackByUserIdRecent(id, LocalDate.now(), LocalDate.now().minusDays(7)); + } + + @GetMapping("/packs/carrier/recent/{id}") + public List getRecentCarrierPacks(@PathVariable("id") int id){ + return registerQuoteRepository.findPackByCarrierIdRecent(id, LocalDate.now(), LocalDate.now().minusDays(7)); + } + @GetMapping("/go") public int goingPackages() { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java index 785a265..382c120 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/interfaces/RegisterQuoteRepository.java @@ -1,9 +1,30 @@ package br.com.entra21.teamroxo.TMSProject.interfaces; +import java.time.LocalDate; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; import br.com.entra21.teamroxo.TMSProject.template.RegisterQuote; +@Repository +@EnableJpaRepositories public interface RegisterQuoteRepository extends JpaRepository { + @Query("FROM RegisterQuote WHERE carrier_id = :carrierId") + List findPackByCarrierId(@Param("carrierId") int id); + + @Query("FROM RegisterQuote WHERE pessoa_id = :userId") + List findPackByUserId(@Param("userId") int id); + + @Query("FROM RegisterQuote WHERE pessoa_id = :userId and post BETWEEN :lastWeek and :now") + List findPackByUserIdRecent(@Param("userId") int id, @Param("now") LocalDate now, @Param("lastWeek") LocalDate lastWeek); + + @Query("FROM RegisterQuote WHERE carrier_id = :carrierId and post BETWEEN :lastWeek and :now") + List findPackByCarrierIdRecent(@Param("carrierId") int id, @Param("now") LocalDate now, @Param("lastWeek") LocalDate lastWeek); + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java index 1cf8191..7a85b3c 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/RegisterQuote.java @@ -22,6 +22,7 @@ public class RegisterQuote { private byte carrier_id; private float cub_height; private int pessoa_id; + private int pessoa_id_destiny; public RegisterQuote() { super(); @@ -111,4 +112,12 @@ public void setPost(LocalDate post) { this.post = post; } + public int getPessoa_id_destiny() { + return pessoa_id_destiny; + } + + public void setPessoa_id_destiny(int pessoa_id_destiny) { + this.pessoa_id_destiny = pessoa_id_destiny; + } + } diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java index 5344a13..dad8f17 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/SystemLink.java @@ -1,13 +1,56 @@ package br.com.entra21.teamroxo.TMSProject.template; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Table; +@Entity +@Table(name = "link") public class SystemLink { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; + private int client; + + private int enterprise; + + public SystemLink() { + super(); + } + + public SystemLink(Integer id, int client, int enterprise) { + super(); + this.id = id; + this.client = client; + this.enterprise = enterprise; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public int getClient() { + return client; + } + + public void setClient(int client) { + this.client = client; + } + + public int getEnterprise() { + return enterprise; + } + + public void setEnterprise(int enterprise) { + this.enterprise = enterprise; + } + } diff --git a/frontend/main/src/app/body/body.component.html b/frontend/main/src/app/body/body.component.html index f010d99..3718070 100644 --- a/frontend/main/src/app/body/body.component.html +++ b/frontend/main/src/app/body/body.component.html @@ -24,7 +24,7 @@

Parabéns:

- {{aniversariante.nome}} + {{aniversariante.nome}}

@@ -63,29 +63,50 @@

See All Messages +
  • + + + {{this.notificationCount}} + +
    + +
    +
    • + - + \ No newline at end of file diff --git a/frontend/main/src/app/body/body.component.ts b/frontend/main/src/app/body/body.component.ts index 628c4b0..5edc99e 100644 --- a/frontend/main/src/app/body/body.component.ts +++ b/frontend/main/src/app/body/body.component.ts @@ -4,6 +4,7 @@ import { LoginserviceService } from '../loginservice.service'; import { HttpClient } from '@angular/common/http'; import { Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { NotificationService } from '../notification.service'; @Component({ selector: 'app-body', @@ -20,18 +21,25 @@ export class BodyComponent implements OnInit { birthmonth! : string aniversariantes!: Array aniversariantesMes!: Array + notificacoes!:Array + notificationCount!:number id!: number nome!: string email!: string birth!: Date document!: string - constructor(public loginService:LoginserviceService, private router:Router, private http:HttpClient) { } + constructor(public loginService:LoginserviceService, private router:Router, private http:HttpClient, private notify:NotificationService) { } ngOnInit(): void { this.aniversariantes = new Array() this.aniversariantesMes = new Array() + this.notificacoes = new Array() + + if(this.loginService.document == null || this.loginService.birth == null){ + this.notificacoes.push({title:"Complete seu Cadastro!", text:"Clique aqui para concluir!", route:"edit"}) + } this.http.get(this.APIBirthNow) .subscribe((resultado:any) => { @@ -40,6 +48,10 @@ export class BodyComponent implements OnInit { for(let i=0;i -

    LUCRO

    - - - Created with Sketch. - - - +
    +
    +
    +

    LUCRO

    + + + Created with Sketch. + + + - 0 + 0 - 25 + 25 - 50 + 50 - 75 + 75 - 100 + 100 + + + + + + + + + + 1 + + + 2 + + + + 3 + + + + 4 + + + + 5 + + + + 6 + + + 7 + + + + + + + + + + + + + - - - - - - + +
    + +
    +

    LUCRO

    + + + Created with Sketch. + + + + + 0 + + + 25 + + + 50 + + + 75 + + + 100 + + + + + + + + - 1 + 1 - + - 3 + 2 - + - 5 + 3 - + - 7 + 4 - + - 9 + 5 - + - 11 + 6 - 12 + 7 - - + + @@ -75,7 +173,14 @@

    LUCRO

    + - - + +
    +
    +
    +

    R$ {{this.mediumCostPack}}/Package

    +
    +

    R$ {{this.mediumCostCubHeight}}/Cubical Height

    +
    diff --git a/frontend/main/src/app/finance/finance.component.ts b/frontend/main/src/app/finance/finance.component.ts index b9a2e5d..51256b9 100644 --- a/frontend/main/src/app/finance/finance.component.ts +++ b/frontend/main/src/app/finance/finance.component.ts @@ -1,4 +1,8 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { count } from 'console'; +import { Observable } from 'rxjs'; +import { LoginserviceService } from '../loginservice.service'; @Component({ selector: 'app-finance', @@ -7,9 +11,110 @@ import { Component, OnInit } from '@angular/core'; }) export class FinanceComponent implements OnInit { - constructor() { } + readonly packAPI: string = "http://localhost:8080/quote/packs/user/" + + totalCost: number = 0 + recentCost: number = 0 + mediumCostPerPack: number = 0 + mediumCostPack!: string + totalPacks: number = 0 + mediumCostPerCubHeight: number = 0 + mediumCostCubHeight!: string + totalCubHeight: number = 0 + + poly_1_p1: number = -10 + poly_1_p2: number = -10 + poly_1_p3: number = -10 + poly_1_p4: number = -10 + poly_1_p5: number = -10 + poly_1_p6: number = -10 + poly_1_p7: number = -10 + + poly_2_p1: number = 115 + poly_2_p2: number = 115 + poly_2_p3: number = 115 + poly_2_p4: number = 115 + poly_2_p5: number = 115 + poly_2_p6: number = 115 + poly_2_p7: number = 115 + + poly_3_p1: number = 245 + poly_3_p2: number = 245 + poly_3_p3: number = 245 + poly_3_p4: number = 245 + poly_3_p5: number = 245 + poly_3_p6: number = 245 + poly_3_p7: number = 245 + + poly_4_p1: number = -10 + poly_4_p2: number = -10 + poly_4_p3: number = -10 + poly_4_p4: number = -10 + poly_4_p5: number = -10 + poly_4_p6: number = -10 + poly_4_p7: number = -10 + + poly_5_p1: number = 115 + poly_5_p2: number = 115 + poly_5_p3: number = 115 + poly_5_p4: number = 115 + poly_5_p5: number = 115 + poly_5_p6: number = 115 + poly_5_p7: number = 115 + + constructor(private login: LoginserviceService, private http: HttpClient) { } ngOnInit(): void { + + this.http.get(this.packAPI + this.login.pessoaID) + .subscribe((response: any) => { + console.log(response); + + this.totalPacks = Object.keys(response).length + + if (this.totalPacks > 0) { + + for (let i = 0; i < this.totalPacks; i++) { + this.totalCost = + response[i].price + this.totalCubHeight = + response[i].cub_height + } + + this.mediumCostPerPack = (this.totalCost / this.totalPacks) + this.mediumCostPerCubHeight = (this.totalCost / this.totalCubHeight) + + } + + this.mediumCostPack = this.mediumCostPerPack + .toLocaleString('pt-BR', { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }) + this.mediumCostCubHeight = this.mediumCostPerCubHeight + .toLocaleString('pt-BR', { + minimumFractionDigits: 2, + maximumFractionDigits: 2 + }) + + }) + + this.http.get(this.packAPI + 'recent/' + this.login.pessoaID) + .subscribe((response: any) => { + console.log(response); + + + + }) + + document.getElementById('lucro3')?.setAttribute('points', '0.396183206 ' + this.poly_3_p1 + ' 73.40789833833333 ' + this.poly_3_p2 + ' 146.4196134706667 ' + this.poly_3_p3 + ' 219.431328603 ' + this.poly_3_p4 + ' 292.4430437353333 ' + this.poly_3_p5 + ' 365.4547588676667 ' + this.poly_3_p6 + ' 440 ' + this.poly_3_p7) + + document.getElementById('lucro2')?.setAttribute('points', '0.396183206 ' + this.poly_2_p1 + ' 73.40789833833333 ' + this.poly_2_p2 + ' 146.4196134706667 ' + this.poly_2_p3 + ' 219.431328603 ' + this.poly_2_p4 + ' 292.4430437353333 ' + this.poly_2_p5 + ' 365.4547588676667 ' + this.poly_2_p6 + ' 440 ' + this.poly_2_p7) + + document.getElementById('lucro1')?.setAttribute('points', '0.396183206 ' + this.poly_1_p1 + ' 73.40789833833333 ' + this.poly_1_p2 + ' 146.4196134706667 ' + this.poly_1_p3 + ' 219.431328603 ' + this.poly_1_p4 + ' 292.4430437353333 ' + this.poly_1_p5 + ' 365.4547588676667 ' + this.poly_1_p6 + ' 440 ' + this.poly_1_p7) + + document.getElementById('cost1')?.setAttribute('points', '0.396183206 ' + this.poly_4_p1 + ' 73.40789833833333 ' + this.poly_4_p2 + ' 146.4196134706667 ' + this.poly_4_p3 + ' 219.431328603 ' + this.poly_4_p4 + ' 292.4430437353333 ' + this.poly_4_p5 + ' 365.4547588676667 ' + this.poly_4_p6 + ' 440 ' + this.poly_4_p7) + + document.getElementById('cost2')?.setAttribute('points', '0.396183206 ' + this.poly_5_p1 + ' 73.40789833833333 ' + this.poly_5_p2 + ' 146.4196134706667 ' + this.poly_5_p3 + ' 219.431328603 ' + this.poly_5_p4 + ' 292.4430437353333 ' + this.poly_5_p5 + ' 365.4547588676667 ' + this.poly_5_p6 + ' 440 ' + this.poly_5_p7) + } } diff --git a/frontend/main/src/app/insight/insight.component.html b/frontend/main/src/app/insight/insight.component.html index 4741b70..24939fb 100644 --- a/frontend/main/src/app/insight/insight.component.html +++ b/frontend/main/src/app/insight/insight.component.html @@ -4,7 +4,7 @@
    -

    {{countPackages}}

    +

    {{countPacks()}}

    New packages

    @@ -19,23 +19,24 @@

    {{countPackages}}

    -

    {{countBounce}}%

    +

    {{countBounces()}}%

    Bounce Rate

    - More info + Used Indicator
    +
    -

    {{countClient}}

    +

    {{countClients()}}

    Registered Users

    @@ -49,8 +50,8 @@

    {{countClient}}

    -
    -

    {{countVisitors}}

    +
    +

    {{countVisits()}}

    Visits

    @@ -289,3 +290,4 @@

    + diff --git a/frontend/main/src/app/insight/insight.component.ts b/frontend/main/src/app/insight/insight.component.ts index f94e47c..1abbf46 100644 --- a/frontend/main/src/app/insight/insight.component.ts +++ b/frontend/main/src/app/insight/insight.component.ts @@ -16,7 +16,7 @@ export class InsightComponent implements OnInit { readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" readonly APICountPackages:string = "http://localhost:8080/quote/go" - + readonly APICountBounce:string = "http://localhost:8080/user/bounce" countClient!: number @@ -29,17 +29,17 @@ export class InsightComponent implements OnInit { } ngOnInit(): void { - - this.http.get(this.APICountUsers) + + this.http.get(this.APICountUsers) .subscribe((resultado:any) => { this.countClient=resultado }); this.http.get(this.APICountVisits) - .subscribe((resultado:any) => { - var count = Object.keys(resultado).length - this.countVisitors = count - }); + .subscribe((resultado:any) => { + var count = Object.keys(resultado).length + this.countVisitors = count + }); this.http.get(this.APICountPackages) .subscribe((response:any)=>{ @@ -51,7 +51,6 @@ export class InsightComponent implements OnInit { this.countBounce=response }) - } register(){ @@ -66,5 +65,20 @@ export class InsightComponent implements OnInit { this.router.navigateByUrl('visits') } + countVisits():number{ + return this.countVisitors + } + + countClients():number{ + return this.countClient + } + + countPacks():number { + return this.countPackages + } + + countBounces(): number{ + return this.countBounce + } } diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index 4545f57..cbb9791 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -44,7 +44,7 @@ export class LoginComponent implements OnInit { } gotoHome(){ - this.router.navigateByUrl('home') + this.router.navigateByUrl('dashboard') } register(){ diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 656cd3c..e9a15f5 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -58,6 +58,7 @@ export class LoginserviceService implements CanActivate { this.admin = response[0].admin this.enterprise = response[0].enterprise + this.user = response[0].user if(this.admin == true){ this.adminEnter = true; diff --git a/frontend/main/src/app/notification.service.ts b/frontend/main/src/app/notification.service.ts index 21001b5..4790811 100644 --- a/frontend/main/src/app/notification.service.ts +++ b/frontend/main/src/app/notification.service.ts @@ -1,3 +1,4 @@ +import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { LoginserviceService } from './loginservice.service'; @@ -6,8 +7,14 @@ import { LoginserviceService } from './loginservice.service'; }) export class NotificationService { - constructor(private login:LoginserviceService) { } + notificacoes!:Array - + constructor(private login:LoginserviceService, private http:HttpClient) { } + + findNotification(){ + + + + } } diff --git a/frontend/main/src/app/visits.service.spec.ts b/frontend/main/src/app/visits.service.spec.ts new file mode 100644 index 0000000..0f62e0c --- /dev/null +++ b/frontend/main/src/app/visits.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { VisitsService } from './visits.service'; + +describe('VisitsService', () => { + let service: VisitsService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(VisitsService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/main/src/app/visits.service.ts b/frontend/main/src/app/visits.service.ts new file mode 100644 index 0000000..7dbd347 --- /dev/null +++ b/frontend/main/src/app/visits.service.ts @@ -0,0 +1,23 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; + +@Injectable({ + providedIn: 'root' +}) +export class VisitsService { + + readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" + + constructor(private router: Router, private http: HttpClient) { } + + + listVisits():any{ + + return this.http.get(this.APICountVisits) + + } + + + +} diff --git a/frontend/main/src/app/visits/visits.component.html b/frontend/main/src/app/visits/visits.component.html index c542c19..7301ff6 100644 --- a/frontend/main/src/app/visits/visits.component.html +++ b/frontend/main/src/app/visits/visits.component.html @@ -1,18 +1,28 @@ - +
    + + - + + +
    ID Data Time User Bounce Rate
    {{visit.id}} {{visit.date}} {{visit.time}} {{visit.user}} {{visit.bounceRate}}
    + + + + + + diff --git a/frontend/main/src/app/visits/visits.component.ts b/frontend/main/src/app/visits/visits.component.ts index 2937a48..8b4267c 100644 --- a/frontend/main/src/app/visits/visits.component.ts +++ b/frontend/main/src/app/visits/visits.component.ts @@ -1,6 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { VisitsService } from '../visits.service'; @Component({ selector: 'app-visits', @@ -9,25 +10,51 @@ import { Router } from '@angular/router'; }) export class VisitsComponent implements OnInit { - readonly APICountVisits:string = "http://localhost:8080/user/countVisitors" + visits!: Array + id!: number + date!: string + time!: number + user!: string + bounceRate!: boolean + + - visits! : Array - - constructor(private router:Router, private http:HttpClient) { } + constructor(public visitsService: VisitsService, private router:Router, private http:HttpClient) { } ngOnInit(): void { + this.visits = new Array() - this.http.get(this.APICountVisits) - .subscribe((resultado:any)=>{ - var count = Object.keys(resultado).length - for(let i = 0; i { + + console.log(response); + + + + var count = Object.keys(response).length; + + for (let i = 0; i < count; i++) { + + this.id = response[i].id; + this.date = response[i].date; + this.time = response[i].time; + this.user = response[i].user; + this.bounceRate = response[i].bounce_rate; + + console.log(this.id); + console.log(this.date); + console.log(this.time); + console.log(this.user); + console.log(this.bounceRate); + + this.visits.push({id: this.id, date: this.date, time: this.time, user: this.user, bounceRate: this.bounceRate }) + } }) + } } diff --git a/webpage/index.html b/webpage/index.html index 13a4723..002864c 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -1,621 +1,703 @@ - - - - - - TMS - Transport Management Service - - - - - - - - - - - - - + +
    +
    +
    Welcome To Website!
    +
    It's Nice Have You Here!
    + Tell Me More +
    +
    + +
    +
    +
    +

    Services

    +
    +
    - - -
    -
    -
    -

    Services

    -
    -
    +
    +
    + + + + +

    E-Commerce

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam + architecto quo inventore harum ex magni, dicta impedit.

    -
    -
    - - - - -

    E-Commerce

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.

    -
    -
    - - - - -

    Responsive Design

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.

    -
    -
    - - - - -

    Web Security

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam architecto quo inventore harum ex magni, dicta impedit.

    -
    +
    + + + + +

    Responsive Design

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam + architecto quo inventore harum ex magni, dicta impedit.

    -
    -
    - -
    -
    -
    -

    Portfolio

    -

    Lorem ipsum dolor sit amet consectetur.

    +
    + + + + +

    Web Security

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima maxime quam + architecto quo inventore harum ex magni, dicta impedit.

    -
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Threads
    -
    Illustration
    +
    +
    +
    + +
    +
    +
    +

    Portfolio

    +

    Lorem ipsum dolor sit amet consectetur.

    +
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Threads
    +
    Illustration
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Explore
    -
    Graphic Design
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Explore
    +
    Graphic Design
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Finish
    -
    Identity
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Finish
    +
    Identity
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Lines
    -
    Branding
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Lines
    +
    Branding
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Southwest
    -
    Website Design
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Southwest
    +
    Website Design
    -
    - -
    - -
    -
    -
    - ... -     -
    -
    Window
    -
    Photography
    +
    +
    + +
    + +
    +
    + ... +     +
    +
    Window
    +
    Photography
    -
    - -
    -
    -
    -

    About

    -

    Beginning of our story.

    -
    -
      -
    • -
      ...
      -
      -
      -

      March 2022

      -

      Our First Drafts

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!

      +
      +
    + +
    +
    +
    +

    About

    +

    Beginning of our story.

    +
    +
      +
    • +
      ...
      +
      +
      +

      March 2022

      +

      Start in the course

      -
      • -
    • -
      ...
      -
      -
      -

      April 2022

      -

      Our First Backend Project

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!

      +
      +

      Here we started our development as Java developers in the Entra21 + course. We took our first step in our careers.

      -
      • -
    • -
      ...
      -
      -
      -

      December 2015

      -

      Transition to Full Service

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!

      +
      +
      • +
    • +
      ...
      +
      +
      +

      April 2022

      +

      Our First Backend Project

      -
      • -
    • -
      ...
      -
      -
      -

      July 2020

      -

      Phase Two Expansion

      -
      -

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero unde, sed, incidunt et ea quo dolore laudantium consectetur!

      +
      +

      Our first project, where we met, defined our roles and defined the + theme for both this project and our final project.

      -
      • -
    • -
      -

      - Be Part -
      - Of Our -
      - Story! -

      +
      +
      • +
    • +
      ...
      +
      +
      +

      August 2022

      +

      Start of the final project

      -
      • -
    -
    -
    - -
    -
    -
    -

    Our Amazing Team!

    -

    Just people who love developing❤

    -
    -
    -
    -
    - ... -

    Bruno Roberto

    -

    Frontend Dev.

    - - - +
    +

    Our final project!! Here we show all our learning in the course, both + in backend and frontend. An especially complex and cool job to have done. where we + developed a working application from scratch

    -
    -
    - ... -

    Cristian Schauffert

    -

    Web Designer

    - - - + +
  • +
    ...
    +
    +
    +

    October 2022

    +

    Deploy

    -
    -
    -
    - ... -

    Kalil Fakhouri

    -

    Lead Developer

    - - - +
    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt ut + voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae sit vero + unde, sed, incidunt et ea quo dolore laudantium consectetur!

    -
    -
    - ... -

    Mateus Felipe

    -

    Lead Developer

    - - - -
    +
    • +
  • +
    +

    + Be Part +
    + Of Our +
    + Story! +

    -
    • -
    -

    -
    + + +
    +
    + +
    +
    +
    +

    Our Amazing Team!

    +

    Just people who love developing❤

    -
    - -
    -
    -
    -
    - ... +
    +
    +
    + ... +

    Bruno Roberto

    +

    Frontend Dev.

    + + +
    -
    - ... +
    +
    +
    + ... +

    Cristian Schauffert

    +

    Web Designer

    + + +
    -
    - ... +
    +
    +
    + ... +

    Kalil Fakhouri

    +

    Lead Developer

    + + +
    -
    - ... +
    +
    +
    + ... +

    Mateus Felipe

    +

    Lead Developer

    + + +
    +
    +
    +

    +
    +
    - -
    -
    -
    -

    Contact Us

    -

    Lorem ipsum dolor sit amet consectetur.

    +
    + +
    +
    +
    +
    + ...
    - - - - - - - -
    -
    -
    -
    - - -
    A name is required.
    -
    -
    - - -
    An email is required.
    -
    Email is not valid.
    -
    -
    - - -
    A phone number is required.
    -
    +
    + ... +
    +
    + ... +
    +
    + ... +
    +
    +
    +
    + +
    +
    +
    +

    Contact Us

    +

    Lorem ipsum dolor sit amet consectetur.

    +
    + + + + + + + + +
    +
    +
    + + +
    A name is required.
    -
    -
    - - -
    A message is required.
    +
    + + +
    An email is required.
    +
    Email is not valid.
    +
    +
    + + +
    A phone number is required.
    - - - - -
    -
    -
    Form submission successful!
    - To activate this form, sign up at -
    - https://startbootstrap.com/solution/contact-forms +
    +
    + + +
    A message is required. +
    - - - - -
    Error sending message!
    - -
    - -
    -
    - -
    + + - - -