Release v0.3.1

* devel:
  Bump version to v0.3.1
  Fix copying .htaccess to dist folder
  Remove unused links from user menu
  NERD,FTAS: fix when configuration is empty
  API: check if config file was loaded
  API: just log failure while connecting to mongo

Author: petrstehlik

api/liberouterapi/__init__.py

@@ -24,7 +24,14 @@
 """
 Load user config specified by an argument or in default path.
 """
-config = Config()
+
+
+try:
+	config = Config()
+except KeyError as e:
+	import sys
+	print("Missing item in config %s" % e)
+	sys.exit()
 
 from .dbConnector import dbConnector
 from .session import SessionManager

api/liberouterapi/configurator.py

@@ -5,6 +5,9 @@
 import sys
 import os
 from liberouterapi import app
+import logging
+
+log = logging.getLogger(__name__)
 
 import unittest
 class Config(object):
@@ -29,6 +32,10 @@ def __init__(self):
 
 		self.config.read(args['config'])
 
+		# Check if config was loaded successfully, api section must be there
+		if "api" not in self.config:
+			log.error("Missing config file")
+
 		self.DEBUG = self.config["api"].getboolean("debug", True)
 		self.HOST = self.config["api"].get("host", "localhost")
 		self.PORT = self.config["api"].getint("port", 8000)

api/liberouterapi/dbConnector.py

@@ -90,8 +90,6 @@ def mongodb(self):
 			# Small trick to catch exception for unavailable database
 			except pymongo.errors.ServerSelectionTimeoutError as err:
 				app.logger.error("Failed to connect to database: " + str(err))
-				print(err)
-				exit(1)
 
 		def sqlite(self):
 			from flask_sqlalchemy import SQLAlchemy

www/.gitignore

@@ -40,3 +40,4 @@ testem.log
 Thumbs.db
 
 config.json
+./.htaccess

www/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liberouter-gui",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "license": "MIT",
   "angular-cli": {},
   "scripts": {

www/.htaccess renamed to www/src/.htaccess

@@ -11,8 +11,6 @@ <h1 class="user-area">
 					{{ user?.user?.username }}
 				</a>
 				<div class="dropdown-menu" aria-labelledby="userActions">
-					<button class="dropdown-item">Action - 1</button>
-					<button class="dropdown-item" routerLink='["users", user["user"]["_id"]["$oid"]]'>Profile</button>
 					<button class="dropdown-item" routerLink="logout">
 						Logout
 					</button>

www/src/app/app.component.html

@@ -47,7 +47,7 @@ export class FtasComponent implements OnInit {
     params : Object;
 
     // Configuration fetched froms backend
-    config : Object;
+    config : Object = {};
 
     // Output ID
     output : number;
@@ -116,9 +116,11 @@ export class FtasComponent implements OnInit {
             this.baseUrl += this.config['url'] + "/ftas/stat.pl";
         }
 
-        this.output = +this.config['output'] || -1;
+        this.output = +this.config['output'];
 
-        if (this.output == -1 || this.baseUrl == "https://") {
+        console.log(this.baseUrl, this.output)
+
+        if (isNaN(this.output) || this.baseUrl == "https://") {
             console.warn("FTAS output or URL isn't set.");
 
 			// Open modal window

www/src/app/modules/ftas/ftas.component.ts

@@ -106,7 +106,7 @@ export class NerdComponent implements OnInit {
 			this.openSettings();
         }
 
-		if (!this.params["ip"])
+		if (!this.params || !this.params["ip"])
 			this.url = this.baseUrl;
 		else {
 			this.url = this.baseUrl + "/ip/" + this.params["ip"];