change conf.json to adminapi/objects/tribes/itm/adminapi.conf to harmonize all tribes management

models/Nations.js

@@ -4,7 +4,7 @@ const glob = require("glob");
 const jwt = require("jwt-simple");
 const axios = require("axios");
 const path = require("path");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Odmdb = require("./Odmdb.js");
 // lowercase 1st letter is normal
 const towns = require("./Towns.js");

models/Notifications.js

@@ -7,7 +7,7 @@ const Mustache = require('mustache');
 const Checkjson = require(`./Checkjson.js`);
 //const smtp = require("smtp-client");
 const nodemailer = require("nodemailer");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const currentmod = "Notifications";
 const log = conf.api.activelog.includes(currentmod);
 /**
@@ -153,9 +153,9 @@ Notifications.sendsms = async (data, tribeId) => {
     };
   }
   let confsms = conf.sms;
-  if (fs.existsSync(`../../itm/${req.session.header.xtribe}.json`)) {
+  if (fs.existsSync(`../../adminapi/objects/tribes/itm/${req.session.header.xtribe}.json`)) {
     const conftrib = fs.readJSONSync(
-      `../../itm/${req.session.header.xtribe}.json`
+      `../../adminapi/objects/tribes/itm/${req.session.header.xtribe}.json`
     );
     if (conftrib.sms) confsms = conftrib.sms;
   }
@@ -332,7 +332,7 @@ Notifications.sendmail = async (data, tribe) => {
     };
   }
   let confsmtp = conf.smtp;
-  const conftribfile = `../../itm/${tribe}.json`;
+  const conftribfile = `../../adminapi/objects/tribes/itm/${tribe}.json`;
   if (fs.existsSync(conftribfile)) {
     const conftrib = fs.readJSONSync(conftribfile);
     if (!conftrib.emailcontact){

models/Odmdb.js

@@ -3,7 +3,7 @@ const path = require("path");
 const fs = require("fs-extra");
 const dayjs = require("dayjs");
 const axios = require("axios");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Checkjson = require(`./Checkjson.js`);
 const { promiseHooks } = require("v8");
 const currentmod = "Odmdb";

models/Pagans.js

@@ -8,7 +8,7 @@ const openpgp = require("openpgp");
 const Notifications = require("./Notifications.js");
 const Odmdb = require("./Odmdb.js");
 
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const currentmod = "Pagans";
 const log = conf.api.activelog.includes(currentmod);
 /**

models/PagansPeter.js

@@ -8,7 +8,7 @@ const openpgp = require("openpgp");
 const Notifications = require("./Notifications.js");
 const Odmdb = require("./Odmdb.js");
 
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const currentmod = "Pagans";
 const log = conf.api.activelog.includes(currentmod);
 /**

models/Towns.js

@@ -4,7 +4,7 @@ const glob = require("glob");
 const moment = require("moment");
 const jwt = require("jwt-simple");
 const UUID = require("uuid");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Checkjson = require(`./Checkjson.js`);
 const Odmdb = require("./Odmdb.js");
 

models/Trackings.js

@@ -3,7 +3,7 @@ const path = require("path");
 const fs = require("fs-extra");
 const dayjs = require("dayjs");
 const axios = require("axios");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Checkjson = require(`./Checkjson.js`);
 
 const Trackings = {}

models/Tribes.js

@@ -10,7 +10,7 @@ const jwt = require( 'jwt-simple' );
 const moment = require( 'moment' );
 const UUID = require( 'uuid' );
 const Pagans = require( './Pagans.js' );
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Checkjson = require( `./Checkjson.js`);
 /*
 tribeid manager

models/Wwws.js

@@ -4,7 +4,7 @@ const dnsSync = require("dns-sync");
 const mustache = require("mustache");
 const readlineSync = require("readline-sync");
 const Odmdb = require("./Odmdb.js");
-const conf = require(`../../../conf.json`);
+const conf = require(`../../../adminapi/objects/tribes/itm/adminapi.json`);
 const Wwws = {};
 
 Wwws.initlocalwco=(tribwco,profils,lg)=>{
@@ -83,10 +83,11 @@ Wwws.initlocaldata = (tribe, appname, pagename, version, profils, lg) => {
   if (loc.itms){
     Object.keys(loc.itms).forEach((r) => {
       const src = `../../${loc.itms[r]}.json`;
+      console.log("hhhhhhhhhhhhhh",path.resolve(src))
       if (fs.existsSync(src)) {
         localstorage.itms[r] = fs.readJSONSync(src);
       } else {
-        localstorage.itms[r] = `Check your ${fileparam} for itms in ${pagename} and ${r}`;
+        localstorage.itms[r] = `Check your ${fileparam}.json for itms in ${pagename} and ${r}`;
       }
     });
   }
@@ -98,7 +99,7 @@ Wwws.initlocaldata = (tribe, appname, pagename, version, profils, lg) => {
       } else {
         localstorage.ref[
           r
-        ] = `Check your ${fileparam} for ref in ${pagename} and ${r}`;
+        ] = `Check your ${fileparam}.json for ref in ${pagename} and ${r}`;
       }
     });
   }