Skip to content

Commit

Permalink
#1 - Update MongoDB and MQTT code for home page
Browse files Browse the repository at this point in the history
  • Loading branch information
FernandoCZanchetta committed Jun 26, 2024
1 parent 5f17fe4 commit a5592d0
Show file tree
Hide file tree
Showing 25 changed files with 36,814 additions and 16,388 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
<p align="center">
<a href="https://sharpprobe-fernando-zanchettas-projects.vercel.app/">
<img src="https://img.shields.io/badge/Check%20out-Sharp Probe Oficial Website-black?style=for-the-badge" />
</a>
</a>
52,509 changes: 36,285 additions & 16,224 deletions package-lock.json

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,44 @@
"@angular/platform-browser": "^18.0.3",
"@angular/platform-browser-dynamic": "^18.0.3",
"@angular/router": "^18.0.3",
"@aws-sdk/credential-providers": "^3.600.0",
"@mongodb-js/zstd": "^1.2.0",
"@npmcli/package-json": "^5.2.0",
"@types/ws": "^8.5.4",
"async_hooks": "^1.0.0",
"body-parser": "^1.20.2",
"bootstrap": "^5.3.3",
"chart.js": "^4.4.3",
"cors": "^2.8.5",
"crypto": "^1.0.1",
"dotenv": "^16.4.5",
"fs": "^0.0.1-security",
"gcp-metadata": "^5.3.0",
"glob": "^10.4.1",
"i": "^0.3.7",
"install": "^0.13.0",
"kerberos": "^2.1.0",
"mongodb": "^6.7.0",
"ng-apexcharts": "^1.11.0",
"ngx-bootstrap": "^12.0.0",
"ngx-mqtt": "^17.0.0",
"npm": "^10.8.1",
"realm-web": "^2.0.1",
"regexpu-core": "^6.0.0",
"rxjs": "~7.4.0",
"snappy": "^7.2.2",
"tslib": "^2.3.0",
"util": "^0.12.5",
"zone.js": "^0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.0.4",
"@angular/cli": "^18.0.4",
"@angular-devkit/build-angular": "^18.0.3",
"@angular/cli": "^18.0.3",
"@angular/compiler-cli": "^18.0.3",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.5.0",
"@types/bootstrap": "^5.1.9",
"@types/cors": "^2.8.17",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.20.43",
"@typescript-eslint/eslint-plugin": "^5.10.0",
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import { ModalModule } from 'ngx-bootstrap/modal'
import { TooltipModule } from 'ngx-bootstrap/tooltip'
import { AppRoutingModule } from './app-routing.module'
import { AppComponent } from './app.component'
import { MqttModule, IMqttServiceOptions } from "ngx-mqtt";
import { MqttModule, IMqttServiceOptions } from 'ngx-mqtt'
import { environment } from '../environments/environment'
export const MQTT_SERVICE_OPTIONS: IMqttServiceOptions = {
hostname: environment.MQTT_SERVICE_OPTIONS.hostname,
port: environment.MQTT_SERVICE_OPTIONS.port,
/**path: environment.MQTT_SERVICE_OPTIONS.path,**/
/** path: environment.MQTT_SERVICE_OPTIONS.path,**/
username: environment.MQTT_SERVICE_OPTIONS.user,
password: environment.MQTT_SERVICE_OPTIONS.password,
}
Expand Down Expand Up @@ -67,7 +67,7 @@ export const MQTT_SERVICE_OPTIONS: IMqttServiceOptions = {
CollapseModule.forRoot(),
ModalModule.forRoot(),
TooltipModule.forRoot(),
MqttModule.forRoot(MQTT_SERVICE_OPTIONS)
MqttModule.forRoot(MQTT_SERVICE_OPTIONS),
],
providers: [],
bootstrap: [AppComponent],
Expand Down
33 changes: 21 additions & 12 deletions src/app/core/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,41 @@

<app-title [subtitle]="true"></app-title>
<p>
O <i>Sharp_Probe</i> é um projeto de graduação da Escola de Engenharia de São Carlos da disciplina <strong>SEL0373 - Projetos em Internet das Coisas</strong>
Este projeto tem o obejtivo de demonstrar o funcionamento de uma sonda climática, apresentando dados como posição, altura e temperatura.
O <i>Sharp_Probe</i> é um projeto de graduação da Escola de Engenharia de São Carlos
da disciplina <strong>SEL0373 - Projetos em Internet das Coisas</strong>
Este projeto tem o obejtivo de demonstrar o funcionamento de uma sonda climática,
apresentando dados como posição, altura e temperatura.
</p>

<p>
Foto da Sonda
<button type="button" class="btn btn-primary" onclick="doPublish">Requisitar Foto</button>
<button type="button" class="btn btn-primary" onclick="doPublish">
Requisitar Foto
</button>
</p>

<div>
Altura
<app-image-grid [gridItems]="altura"></app-image-grid>
Localização
<app-image-grid [gridItems]="latlongalt"></app-image-grid>
</div>

<div>
Temperatura
<app-image-grid [gridItems]="temperatura"></app-image-grid>
Data e Hora
<app-image-grid [gridItems]="datatime"></app-image-grid>
</div>

<div>
<p>Latitude e Longitude</p>
Dados BME
<app-image-grid [gridItems]="bme"></app-image-grid>
</div>

<div>
Umidade
<app-image-grid [gridItems]="umidade"></app-image-grid>
Dados MPU
<app-image-grid [gridItems]="mpu"></app-image-grid>
</div>

</section>

<div>
Dados DHT
<app-image-grid [gridItems]="dht"></app-image-grid>
</div>
</section>
Loading

0 comments on commit a5592d0

Please sign in to comment.