Skip to content

Conexao web-data-viz para aplicação rodar local e nuvem #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
didiegovieira wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conexao web-data-viz para aplicação rodar local e nuvem #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions site/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// process.env.AMBIENTE_PROCESSO = "desenvolvimento";
process.env.AMBIENTE_PROCESSO = "producao";
process.env.AMBIENTE_PROCESSO = "desenvolvimento";
// process.env.AMBIENTE_PROCESSO = "producao";

var express = require("express");
var cors = require("cors");
Expand Down
6 changes: 3 additions & 3 deletions site/public/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
border-radius: 5px;
color: #252525;
border: 0;
font-size: 20px;
font-size: 15px;
font-weight: 600;
}

Expand All @@ -51,7 +51,7 @@
justify-content: space-between;
align-items: center;
width: 25%;

gap: 20px;
}

.ultimaFrase{
Expand Down Expand Up @@ -79,5 +79,5 @@
margin-top: -16%;
rotate:calc(-5deg);
position: absolute;
margin-left: -50%;
margin-left: -50%;
}
0 site/public/dashboard/dashboard.html → site/public/dashboard/asdasf.html
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions site/public/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ <h2>Easy•Ware</h2>

<div class="content-text-email">
<label for="Email">Email</label>
<input class="text" placeholder="Insira seu Email">
<input id="email_input.value" class="text" placeholder="Insira seu Email">
</div>

<div class="content-text">
<div class="content-text-password">
<label for="Senha">Senha</label>
<input class="password" placeholder="Senha">
<input id="senha_input.value" class="password" placeholder="Senha">
</div>
<div class="content-text-email">
<label for="Cargo">Cargo</label>
Expand Down Expand Up @@ -115,7 +115,7 @@ <h2>Easy•Ware</h2>
sessionStorage.ID_USUARIO = json.id;

setTimeout(function () {
window.location = "./dashboard/cards.html";
window.location = "./dashboard/dashboardGerente.html";
}, 1000); // apenas para exibir o loading

});
Expand Down
8 changes: 4 additions & 4 deletions site/src/database/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var mysql = require("mysql2");
var sql = require('mssql');
// var sql = require('mssql');

// CONEXÃO DO SQL SERVER - AZURE (NUVEM)
var sqlServerConfig = {
Expand All @@ -20,9 +20,9 @@ var sqlServerConfig = {
// CONEXÃO DO MYSQL WORKBENCH (LOCAL)
var mySqlConfig = {
host: "localhost",
database: "SEU_DATABASE",
user: "SEU_USUARIO",
password: "SUA_SENHA",
database: "EasyWare",
user: "root",
password: "#Gf47643238855",
};

function executar(instrucao) {
Expand Down
2 changes: 1 addition & 1 deletion site/src/models/usuarioModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function listar() {
function entrar(email, senha) {
console.log("ACESSEI O USUARIO MODEL \n \n\t\t >> Se aqui der erro de 'Error: connect ECONNREFUSED',\n \t\t >> verifique suas credenciais de acesso ao banco\n \t\t >> e se o servidor de seu BD está rodando corretamente. \n\n function entrar(): ", email, senha)
var instrucao = `
SELECT * FROM usuario WHERE email = '${email}' AND senha = '${senha}';
SELECT * FROM DonoEmpresa WHERE email = '${email}' AND senha = '${senha}';
`;
console.log("Executando a instrução SQL: \n" + instrucao);
return database.executar(instrucao);
Expand Down