Browse Source

Temporary - to be completely reviewd

Kora 1 month ago
parent
commit
8ba154fe54

+ 1 - 0
.gitignore

@@ -7,3 +7,4 @@ __pycache__/
 flask_be/nohup.out
 flask_be/pid.nohup
 /node_modules/
+/db/ovi.gat4

+ 3 - 2
flask_be/Config/config_OVI.json

@@ -1,7 +1,8 @@
+
 {
     "LOCAL_ENVIRONMENT": true,
     "DATA_CONFIG": {
-        "dbPath": "/home/fpinna/temp_for_TIGRO/temp/ovi.gat4/",
+        "dbPath": "/usr/local/db/",
         "dbfile_default": "ovi.db",
         "data_interface": "sqlite3",
         "dynamic_occ_tables": true,
@@ -12,4 +13,4 @@
         "filename": "Progetto2023_BE.log",
         "level": "info"
     }
-}
+}

+ 2 - 2
flask_be/Dockerfile

@@ -2,11 +2,11 @@ FROM python:3.11.4-bullseye
 
 COPY . /usr/local/app/
 
-ENV SELECTED_CONFIG_FILE = "config_OVI.json"
+ENV SELECTED_CONFIG_FILE=config_OVI.json
 
 RUN ["pip", "install", "waitress"]
 WORKDIR /usr/local/app
 RUN ["pip", "install", "-r", "requirements.txt"]
 CMD ["waitress-serve", "--listen=0.0.0.0:5000", "app:app"]
 
-EXPOSE 5000
+EXPOSE 5001

+ 16 - 0
flask_be/requirements.txt

@@ -0,0 +1,16 @@
+# Created with Python 3.12 on Ubuntu 24.04 LTS
+blinker==1.8.2
+click==8.1.7
+Flask==3.0.3
+Flask-Cors==4.0.1
+itsdangerous==2.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+numpy==1.26.4
+pandas==2.2.2
+python-dateutil==2.9.0.post0
+pytz==2024.1
+six==1.16.0
+tzdata==2024.1
+waitress==3.0.0
+Werkzeug==3.0.3

+ 2 - 2
public/Dockerfile

@@ -6,9 +6,9 @@ WORKDIR /usr/src/app
 COPY . .
 
 # Installa http-server globalmente
-RUN npm install -g http-server
+RUN npm install
 
 EXPOSE 8081
 
 # Avvia il server
-CMD ["http-server", "-p", "8081", ".", "-o", "http://localhost:8081/index.html"]
+CMD ["node", "server.js"]

+ 0 - 0
package.json → public/package.json


+ 0 - 0
public/css/format.css → public/public/css/format.css


+ 0 - 0
public/css/mystyle.css → public/public/css/mystyle.css


+ 0 - 0
public/deploy/deploy.bash → public/public/deploy/deploy.bash


+ 0 - 0
public/deploy/readme_deploy.md → public/public/deploy/readme_deploy.md


+ 0 - 0
public/deploy/site.conf → public/public/deploy/site.conf


+ 0 - 0
public/img/TIgrO icon.png → public/public/img/TIgrO icon.png


+ 0 - 0
public/img/dariah-logo.jpeg → public/public/img/dariah-logo.jpeg


+ 0 - 0
public/img/dariah-logo.png → public/public/img/dariah-logo.png


+ 0 - 0
public/img/tigro.jpeg → public/public/img/tigro.jpeg


+ 0 - 0
public/img_tree.png → public/public/img_tree.png


+ 0 - 0
public/index.html → public/public/index.html


+ 0 - 0
public/js/cercaContesti.js → public/public/js/cercaContesti.js


+ 0 - 0
public/js/config.js → public/public/js/config.js


+ 0 - 0
public/js/config_alt.js → public/public/js/config_alt.js


+ 0 - 0
public/js/createCooccorrenza.js → public/public/js/createCooccorrenza.js


+ 0 - 0
public/js/createSingleContext.js → public/public/js/createSingleContext.js


+ 0 - 0
public/js/createTable.js → public/public/js/createTable.js


+ 0 - 0
public/js/format.js → public/public/js/format.js


+ 0 - 0
public/js/index.js → public/public/js/index.js


+ 0 - 0
public/js/pagination.js → public/public/js/pagination.js


+ 0 - 0
public/js/processData.js → public/public/js/processData.js


+ 0 - 0
public/js/ricerca.js → public/public/js/ricerca.js


+ 0 - 0
public/js/toExport.js → public/public/js/toExport.js


+ 0 - 0
public/js/toExport_alt.js → public/public/js/toExport_alt.js


+ 1 - 1
public/login.html → public/public/login.html

@@ -16,7 +16,7 @@
             const username = document.getElementById("username").value;
             const password = document.getElementById("password").value;
 
-            const response = await fetch("http://localhost:8082/api/login", {
+            const response = await fetch("http://149.139.26.245/api/login", {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
                 body: JSON.stringify({ username, password }),

+ 0 - 0
public/pages/singleContext.html → public/public/pages/singleContext.html


+ 0 - 0
public/vendor/jquery/jquery.min.js → public/public/vendor/jquery/jquery.min.js


+ 2 - 1
server.js → public/server.js

@@ -3,7 +3,7 @@ const jwt = require("jsonwebtoken");
 const cors = require("cors");
 
 const app = express();
-const PORT = 8082; // Porta del server
+const PORT = 8081; // Porta del server
 const SECRET_KEY = "supersegreto"; // Chiave segreta per firmare il token
 
 app.use(express.json()); // Abilita parsing JSON
@@ -38,6 +38,7 @@ app.get("/index.html", (req, res) => {
 
     try {
         jwt.verify(token, SECRET_KEY);
+        console.log(__dirname);
         res.sendFile(path.join(__dirname, "public", "index.html"));
     } catch {
         res.status(403).send("Token non valido!");