- risolto problema spazi vuoti in cima alla app

- risolto problema sulle card di telegram, immagini non alte uguali e non si vedono bene...

.env.development

@@ -1,12 +1,12 @@
-DATABASE=test_PiuCheBuono
+DATABASE=test_FreePlanet
 UDB=paofreeplanet
 PDB=mypassword@1A
 SEND_EMAIL=0
 SEND_EMAIL_ORDERS=1
 PORT=3000
-appTelegram_TEST=["1","17"]
+appTelegram_TEST=["1","13"]
-appTelegram=["1","17"]
+appTelegram=["1","13"]
-appTelegram_DEVELOP=["17"]
+appTelegram_DEVELOP=["13"]
 DOMAIN=mongodb://localhost:27017/
 AUTH_MONGODB=0
 ENABLE_PUSHNOTIFICATION=1
@@ -29,7 +29,7 @@ GCM_API_KEY=""
 PROD=0
 PROJECT_DESCR_MAIN='__PROJECTS'
 SECRK=Askb38v23jjDFaoskBOWj92axXCQ
-TOKEN_LIFE=2h
+TOKEN_LIFE=10m
 REFRESH_TOKEN_LIFE=14d
 FTPSERVER_HOST=139.162.166.31
 FTPSERVER_PORT=21
@@ -38,9 +38,4 @@ FTPSERVER_PWD=ftpmypwd@1A_
 AUTH_NEW_SITES=123123123
 SCRIPTS_DIR=admin_scripts
 CLOUDFLARE_TOKENS=[{"label":"Paolo.arena77@gmail.com","value":"M9EM309v8WFquJKpYgZCw-TViM2wX6vB3wlK6GD0"},{"label":"gruppomacro.com","value":"bqmzGShoX7WqOBzkXocoECyBkPq3GfqcM5t6VFd8"}]
-MIAB_HOST=box.lamiaposta.org
-MIAB_ADMIN_EMAIL=admin@lamiaposta.org
-MIAB_ADMIN_PASSWORD=passpao1pabox@1A
 DS_API_KEY="sk-222e3addb3d8455d8b0516d93906eec7"
-SERVER_A_URL="http://51.77.156.69:3000"
-API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK"

deploynode_pcb_prod.sh

@@ -75,7 +75,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
     echo ""
     echo "*** Copia del file aggiornaserver.txt ... "
     rsync -avz -e "ssh $SSH_OPTIONS" \
-        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/aggiornaserver.txt"
+        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:/opt/scripts/aggiornaserver_pcb_prod.txt"
 
     # Verifica il risultato
     if [ $? -eq 0 ]; then

deploynode_pcb_test.sh

@@ -75,7 +75,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
     echo ""
     echo "*** Copia del file aggiornaserver.txt ... "
     rsync -avz -e "ssh $SSH_OPTIONS" \
-        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/aggiornaserver.txt"
+        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:/opt/scripts/aggiornaserver_pcb_test.txt"
 
     # Verifica il risultato
     if [ $? -eq 0 ]; then

deploynode_riso_prod.sh

@@ -70,7 +70,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
     echo ""
     echo "*** Copia del file aggiornaserver.txt ... "
     rsync -avz -e "ssh $SSH_OPTIONS" \
-        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/aggiornaserver.txt"
+        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:/opt/scripts/aggiornaserver_riso_prod.txt"
 
 
     # Verifica il risultato

deploynode_riso_test.sh

@@ -78,7 +78,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
     echo ""
     echo "*** Copia del file aggiornaserver.txt ... "
     rsync -avz -e "ssh $SSH_OPTIONS" \
-        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/aggiornaserver.txt"
+        aggiornaserver.txt "$REMOTE_USER@$REMOTE_HOST:/opt/scripts/aggiornaserver_riso_test.txt"
 
 
     # Verifica il risultato

src/server/router/cart_router.js

@@ -36,17 +36,17 @@ const OrdersCart = require('../models/orderscart');
 
 //GET cart
 router.get('/:userId', authenticate, async function (req, res, next) {
-  let userId = req.params.userId;
+  try {
-  let idapp = req.user.idapp;
+    let userId = req.params.userId;
-  return await Cart.getCartByUserId(userId, idapp)
+    let idapp = req.user.idapp;
-    .then((cart) => {
+
-      if (cart) return res.send({ code: server_constants.RIS_CODE_OK, cart });
+    const cart = await Cart.getCartByUserId(userId, idapp);
-      else return res.send({ code: server_constants.RIS_CODE_OK, cart: null });
+    if (cart) return res.send({ code: server_constants.RIS_CODE_OK, cart });
-    })
+    else return res.send({ code: server_constants.RIS_CODE_OK, cart: null });
-    .catch((err) => {
+  } catch (err) {
-      console.error('Err', err);
+    console.error('Err', err);
-      return res.send({ code: server_constants.RIS_CODE_ERR, cart: null });
+    return res.send({ code: server_constants.RIS_CODE_ERR, cart: null });
-    });
+  }
 });
 
 async function aggiornaCarrello(mycartpar, userId, idapp) {
@@ -71,13 +71,13 @@ async function aggiornaCarrello(mycartpar, userId, idapp) {
 
 //POST cart
 router.post('/:userId', authenticate, async function (req, res, next) {
-  let idapp = req.body.idapp;
-  let userId = req.params.userId;
-  let addqty = req.body.addqty;
-  let subqty = req.body.subqty;
-  let order = req.body.order;
-
   try {
+    let idapp = req.body.idapp;
+    let userId = req.params.userId;
+    let addqty = req.body.addqty;
+    let subqty = req.body.subqty;
+    let order = req.body.order;
+
     let mycart = await Cart.getCartByUserId(userId, idapp);
 
     if (!order) {

src/server/server.js

@@ -197,9 +197,6 @@ connectToDatabase(connectionUrl, options)
       //   next(err);
       // });
 
-      // app.set('views', path.join(__dirname, 'views'));
-      // app.set('view engine', 'pug');
-
       // development error handler
       // will print stacktrace
       if (app.get('env') === 'development') {
@@ -217,8 +214,6 @@ connectToDatabase(connectionUrl, options)
         console.log('*** PRODUCTION! ');
       }
 
-      if (process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'test') {
-      }
       startServer(app, process.env.PORT);
 
       // Use Routes
@@ -802,6 +797,9 @@ connectToDatabase(connectionUrl, options)
           'https://localhost:8088',
           'https://localhost:8099',
           'https://localhost:8094',
+          'https://192.168.8.182',
+          'https://192.168.8.182:8084/',
+          'http://192.168.8.182:8084/',
         ];
       }
 
@@ -831,7 +829,7 @@ connectToDatabase(connectionUrl, options)
 
       const allowedOrigins = buildAllowedOrigins(domains, domainsAllowed, isProduction);
 
-      const originValidator = (origin, callback) => {
+      let originValidator = (origin, callback) => {
         if (!origin) {
           // console.log('✅ Origin undefined or empty — allowing');
           return callback(null, true);
@@ -850,6 +848,10 @@ connectToDatabase(connectionUrl, options)
         return callback(new Error('CORS non permesso per questa origine'), false);
       };
 
+      if (app.get('env') === 'development') {
+        originValidator = (_origin, callback) => callback(null, true);
+      }
+
       return {
         origin: originValidator,
         credentials: true,
@@ -951,7 +953,7 @@ connectToDatabase(connectionUrl, options)
           };
 
           const httpsServer = https.createServer(credentials, app);
-          httpsServer.listen(port);
+          httpsServer.listen(port, '0.0.0.0');
           console.log('⭐️ HTTPS server running locally on port', port);
           return httpsServer;
         } catch (error) {

src/server/version.txt

@@ -1 +1 @@
-1.2.75
+1.2.76