Update route handling to use configurable route files and add new routes for log…

…o upload and Google OAuth2

opensipkd/base/__init__.py

@@ -7,8 +7,6 @@ import re
 import datetime
 import datetime
 import deform
 import deform
 import decimal
 import decimal
-import xlsx_dict_reader
-from openpyxl import load_workbook
 from opensipkd.tools import get_settings, DefaultTimeZone, dmy, dmyhms, get_ext
 from opensipkd.tools import get_settings, DefaultTimeZone, dmy, dmyhms, get_ext
 from pkg_resources import resource_filename
 from pkg_resources import resource_filename
 from pyramid.renderers import JSON
 from pyramid.renderers import JSON
@@ -321,8 +319,8 @@ def main(global_config, **settings):
 
 
     init_db(settings=settings)
     init_db(settings=settings)
     config = get_config(settings=settings)
     config = get_config(settings=settings)
-
-    BASE_CLASS.route_from_csv(config, filename="routes.xlsx")
+    routes_file = settings.get("route_files") or "routes.csv"
+    BASE_CLASS.route_from_csv(config, filename=routes_file)
     BASE_CLASS.route_from_list(config)
     BASE_CLASS.route_from_list(config)
     BASE_CLASS.static_view(config, settings=settings)
     BASE_CLASS.static_view(config, settings=settings)
     config.scan()
     config.scan()
@@ -526,6 +524,8 @@ class BaseApp():
                 self.route_from_csv_(config, paket, rows=rows)
                 self.route_from_csv_(config, paket, rows=rows)
             
             
         else:
         else:
+            import xlsx_dict_reader
+            from openpyxl import load_workbook
             wb= load_workbook(fullpath, data_only=True)
             wb= load_workbook(fullpath, data_only=True)
             ws = wb.active
             ws = wb.active
             rows = xlsx_dict_reader.DictReader(ws) #skip_blank=True
             rows = xlsx_dict_reader.DictReader(ws) #skip_blank=True

opensipkd/base/scripts/data/routes.csv

@@ -36,3 +36,6 @@ base-groups-edit,/groups/{id}/edit,base,groups,,,,admin,base-groups,Groups Edit,
 base-groups-view,/groups/{id}/view,base,groups,,,,admin,base-groups,Groups View,1,0,,,form6.pt,
 base-groups-view,/groups/{id}/view,base,groups,,,,admin,base-groups,Groups View,1,0,,,form6.pt,
 base-groups-delete,/groups/{id}/delete,base,groups,,,,admin,base-groups,Groups Delete,1,0,,,form6.pt,
 base-groups-delete,/groups/{id}/delete,base,groups,,,,admin,base-groups,Groups Delete,1,0,,,form6.pt,
 base-groups-upload,/groups/upload,base,groups,,,,admin,base-groups,Groups Uload,1,0,,,form6.pt,
 base-groups-upload,/groups/upload,base,groups,,,,admin,base-groups,Groups Uload,1,0,,,form6.pt,
+base-upload-logo,/upload/logo,,,,,,admin,base-admin,Upload Logo,1,0,,1,upload.pt,1
+googleOauth2,/googleOauth2,,,,,,,,Google Oauth2,1,1,,0,json,
+googlesignin,/googlesignin,base,,,,1,,,GoogleSignIn,1,1,,0,json,