a

rocksnow1942 · Jan 13, 2022 · 130323b · 130323b
1 parent 1984e58
commit 130323b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/ScannerApp/__version__.py b/ScannerApp/__version__.py
@@ -0,0 +1 @@
+version = "1.0.0"
diff --git a/ScannerApp/scanApp.py b/ScannerApp/scanApp.py
@@ -12,6 +12,7 @@
 from .utils import AMS_Database,Firebase
 import sys
 from pathlib import Path
+from .__version__ import version
 
 class ScannerApp(tk.Tk,Logger):
     def __init__(self):
@@ -78,7 +79,7 @@ def FirebaseConfig(self):
         # the credential  is a json string.
         key = self.config['firebaseConfig']['firebaseKey']
         token = self.config['firebaseConfig']['firebaseToken']        
-        res = json.loads(decode(key,token))
+        res = json.loads(decode(key,token))        
         res.update(url=self.config['firebaseConfig']['firebaseURL'])
         return res
     @property
@@ -127,9 +128,8 @@ def validateInDatabase(self,code,codeType,validationType=None):
 
     def loadConfig(self):
         "load configuration from .ini"
-        # load version from package.json
-        with open('../package.json','rt') as f:
-            self.__version__ = json.load(f).get('version')
+        # load version from package.json        
+        self.__version__ = version
         folder = Path(__file__).parent.parent
         config = configparser.ConfigParser()
         config.optionxform = str # to perserve cases in option names.

diff --git a/runApp.py → app.py b/runApp.py → app.py
diff --git a/app.sh b/app.sh
diff --git a/defaultConfig.ini b/defaultConfig.ini
@@ -85,7 +85,7 @@ LOGLEVEL = 'debug'
 
 [firebaseConfig]
 ; producttion URL
-firebaseURL = ""
+firebaseURL = "https://us-central1-ams-clia.cloudfunctions.net/api"
 ; firebaseURL = 'http://localhost:5000/ams-clia/us-central1/api'
-firebaseToken = ''
-firebaseKey = ''
+firebaseToken = 'w557wrnDlMOaw5bDiMOFwrPDksKYbsKYw6DDnMOGwqzDpcOWwp3Co8ObwoHClcKmwqjClMOKwqTDlsKFwoVmw5HDlsOXw43Dm8K1w5_DmlbCsMKQw6fDhMK6w6jDmcKjwqbDkWPCsQ=='
+firebaseKey = 'cYDaudZdFmv4vnwcGub44mA495fg5i'