ff-attic/tcrud
2
0
Fork 0
Code Activity

Make js work agian

Browse source
This commit is contained in:
Willem 2017-12-23 22:45:27 +01:00
parent 63a761bbc0
commit 3f929f9607
16 changed files with 4258 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/backend/database.js
View file

@ -5,8 +5,8 @@ module.exports = {
loadModule: function(key,dbModule) {
tcrudSetup.pluginLoad(new DatabasePlugin(key,dbModule));
},
loadPostgres: function(key,dbUri,pgDB,pgDBNamed) {
tcrudSetup.pluginLoad(new DatabasePlugin(key,new PostgresModule(dbUri,pgDB,pgDBNamed)));
loadPostgres: function(key,dbPool,pgDBNamed) {
tcrudSetup.pluginLoad(new DatabasePlugin(key,new PostgresModule(dbPool,pgDBNamed)));
},
loadMysql2: function(key,pool) {
tcrudSetup.pluginLoad(new DatabasePlugin(key,new Mysql2Module(pool)));
@ -18,14 +18,13 @@ module.exports = {
//------- PostgresModule Object
function PostgresModule(dbUri,pgDB,pgDBNamed) {
this.dbUri = dbUri;
this.pgDB = pgDB;
function PostgresModule(dbPool,pgDBNamed) {
this.dbPool = dbPool;
this.pgDBNamed = pgDBNamed;
}
PostgresModule.prototype.query = function(sqlQuery,params, cb) {
var self = this;
self.pgDB.connect(self.dbUri, function(err, client, done) {
self.dbPool.connect(function(err, client, done) {
self.pgDBNamed.patch(client);
client.query(sqlQuery, params, function(err, result) {
done(); // release client from pool

4
lib/plugin/ui/lib/ui-lib-bootswatch.js
View file

@ -18,10 +18,10 @@ module.exports = (function () {
'(^|\\s\\/\\/.*)': '', // rm comment lines
'(\\/\\*[\\s\\*\\!][\\s\\S]*?\\*\\/)': '', // rm comment blocks
};
ctx.hostFileCSSNodeModule({file: 'bootstrap.css', path: 'bootswatch/paper', filterRegex: filter});
ctx.hostFileCSSNodeModule({file: 'bootstrap.css', path: 'bootswatch/dist/darkly', filterRegex: filter});
ctx.hostFileJSNodeModule({file: 'bootstrap.js', path: 'bootstrap/dist/js'});
ctx.hostFileCSSFontNodeModule({file: 'glyphicons-halflings-regular.ttf', path: 'bootswatch/fonts/', fontFamily: 'Glyphicons Halflings'});
ctx.hostFileCSSFontNodeModule({file: 'glyphicons-halflings-regular.ttf', path: 'bootstrap/fonts/', fontFamily: 'Glyphicons Halflings'});
};
};
})();

4
lib/plugin/ui/spa/ui-spa-style.js
View file

@ -10,8 +10,8 @@ module.exports = (function () {
};
this.configServer = function(ctx) {
ctx.hostTemplateCSS('css/flot');
ctx.hostTemplateCSS('css/panel');
//ctx.hostTemplateCSS('css/flot');
//ctx.hostTemplateCSS('css/panel');
ctx.hostTemplateCSS('css/style');
};
};

11
lib/www_views/node-ff-tcrud/angular/js/application-controller.ejs
View file

@ -3,12 +3,15 @@
tcrudUI.controller('ApplicationController',function($scope,$http,$location,navigationService) {
console.log('start menu controller');
$scope.goLink = function ( path ) {
$location.path( path );
$location.path( path );
console.log('goto link3: '+path);
return false;
};
$scope.navigationService = navigationService;
$scope.applicationMenu = {};
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/config/menu').success(function(data, status, headers, config) {
$scope.applicationMenu = data.data;
$scope.applicationMenuKeys = Object.keys(data.data);
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/config/menu').then(function ok(response) {
$scope.applicationMenu = response.data.data;
$scope.applicationMenuKeys = Object.keys(response.data.data);
console.log('Menu keys',$scope.applicationMenuKeys);
});
});

9
lib/www_views/node-ff-tcrud/angular/js/application.ejs
View file

@ -11,14 +11,19 @@ $(document.createElement('div')).attr('ng-include','\''+serverUrl+'/api/plugin/a
var tcrudUI = angular.module('tcrudUI', ['ngRoute','ngTouch','ngAnimate', 'ui.grid', 'ui.grid.pagination','ui.grid.cellNav', 'ui.grid.edit', 'ui.grid.resizeColumns', 'ui.grid.pinning', 'ui.grid.selection', 'ui.grid.moveColumns', 'ui.grid.exporter', 'ui.grid.importer', 'ui.grid.grouping', 'ui.grid.autoResize']).
config(['$routeProvider', '$locationProvider', '$sceDelegateProvider', function($routeProvider, $locationProvider, $sceDelegateProvider) {
console.log('config angular...');
console.log('config serverUrl: ', serverUrl);
// init routes
pageRouteInit.forEach(function(init) { init($routeProvider, $locationProvider); });
crudRouteInit.forEach(function(init) { init($routeProvider, $locationProvider); });
$sceDelegateProvider.resourceUrlWhitelist(['self',serverUrl+'/**']);
$routeProvider.otherwise({ redirectTo: '/ui' });
$locationProvider.html5Mode({requireBase: false});
$locationProvider.html5Mode({requireBase: false});
console.log('config angular done.');
}]);
tcrudUI.run(['$route', function($route) {

28
lib/www_views/node-ff-tcrud/angular/js/crud/controller.ejs
View file

@ -56,8 +56,8 @@ function <%= tview.tlist.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
};
var fetchData = function() {
$http.get('<%= tapiPrefix %>/<%= tview.tlist.tplugin.formatJSON.tslug %>').success(function(data, status, headers, config) {
$scope.uiTableMain.data = data.data;
$http.get('<%= tapiPrefix %>/<%= tview.tlist.tplugin.formatJSON.tslug %>').then(function(response) {
$scope.uiTableMain.data = response.data.data;
});
};
@ -71,8 +71,8 @@ function <%= tview.tlist.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
$location.url('<%= tview.tmeta.tplugin.angular.tbase %>/<%= tview.tslug %>/<%= tview.tedit.tplugin.angular.tslug %>/'+$scope.gridApi.selection.getSelectedRows()[0].country_id);
};
$http.get('<%= tapiPrefix2 %>').success(function(data, status, headers, config) {
var tview = data.data.tview;
$http.get('<%= tapiPrefix2 %>').then(function(response) {
var tview = response.data.data.tview;
tview.tlist.tfields.forEach(function (fieldKey) {
var field = tview.tmeta.tfields[fieldKey];
$scope.uiTableMain.columnDefs.push({
@ -91,7 +91,7 @@ function <%= tview.tlist.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
function <%= tview.tcreate.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%= tview.tcreate.tplugin.angular.tcontroller.postfix %>(<%= tview.tcreate.tplugin.angular.tcontroller.argu %>) {
$scope.data = {};
$scope.tcreateData = function () {
$http.post('<%= tapiPrefix %>/<%= tview.tcreate.tplugin.formatJSON.tslug %>', $scope.data).success(function(data) {
$http.post('<%= tapiPrefix %>/<%= tview.tcreate.tplugin.formatJSON.tslug %>', $scope.data).then(function(response) {
<% if (tview.tlist) { %>
$location.url('<%= tview.tmeta.tplugin.angular.tbase %>/<%= tview.tslug %>/<%= tview.tlist.tplugin.angular.tslug %>');
<% } else { %>
@ -106,8 +106,8 @@ function <%= tview.tcreate.tplugin.angular.tcontroller.prefix %><%= tviewCode %>
<% if (tview.tread) { %>
function <%= tview.tread.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%= tview.tread.tplugin.angular.tcontroller.postfix %>(<%= tview.tread.tplugin.angular.tcontroller.argu %>) {
$scope.data = {};
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).success(function(data) {
$scope.data = data.data;
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).then(function(response) {
$scope.data = response.data.data;
});
<%- include('controller-action-none', {tview: tview,taction: 'tread'}); %>
}
@ -117,14 +117,14 @@ function <%= tview.tread.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
function <%= tview.tedit.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%= tview.tedit.tplugin.angular.tcontroller.postfix %>(<%= tview.tedit.tplugin.angular.tcontroller.argu %>) {
$scope.data = {};
var fetchData = function() {
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).success(function(data) {
$scope.data = data.data;
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).then(function(response) {
$scope.data = response.data.data;
});
};
fetchData();
$scope.teditData = function () {
$http.put('<%= tapiPrefix %>/<%= tview.tedit.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>, $scope.data ).success(function(data) {
$http.put('<%= tapiPrefix %>/<%= tview.tedit.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>, $scope.data ).then(function(response) {
<% if (tview.tread) { %>
$location.url('<%= tview.tmeta.tplugin.angular.tbase %>/<%= tview.tslug %>/<%= tview.tread.tplugin.angular.tslug %>/' + <%= ejsRouteParams %>);
<% } else { %>
@ -133,7 +133,7 @@ function <%= tview.tedit.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
});
}
$scope.tdeleteData = function () {
$http.delete('<%= tapiPrefix %>/<%= tview.tdelete.tplugin.formatJSON.tslug %>/'+ <%= ejsRouteParams %>, $scope.data).success(function(data) {
$http.delete('<%= tapiPrefix %>/<%= tview.tdelete.tplugin.formatJSON.tslug %>/'+ <%= ejsRouteParams %>, $scope.data).then(function(response) {
<% if (tview.tlist) { %>
$location.url('<%= tview.tmeta.tplugin.angular.tbase %>/<%= tview.tslug %>/<%= tview.tlist.tplugin.angular.tslug %>');
<% } else { %>
@ -155,12 +155,12 @@ function <%= tview.tedit.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%
<% if (tview.tdelete) { %>
function <%= tview.tdelete.tplugin.angular.tcontroller.prefix %><%= tviewCode %><%= tview.tdelete.tplugin.angular.tcontroller.postfix %>(<%= tview.tdelete.tplugin.angular.tcontroller.argu %>) {
$scope.data = {};
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).success(function(data) {
$scope.data = data.data;
$http.get('<%= tapiPrefix %>/<%= tview.tread.tplugin.formatJSON.tslug %>/' + <%= ejsRouteParams %>).then(function(response) {
$scope.data = response.data.data;
console.log('delete obj: '+JSON.stringify(data.data));
});
$scope.tdeleteData = function () {
$http.delete('<%= tapiPrefix %>/<%= tview.tdelete.tplugin.formatJSON.tslug %>/'+ <%= ejsRouteParams %>, $scope.data).success(function(data) {
$http.delete('<%= tapiPrefix %>/<%= tview.tdelete.tplugin.formatJSON.tslug %>/'+ <%= ejsRouteParams %>, $scope.data).then(function(response) {
<% if (tview.tlist) { %>
$location.url('<%= tview.tmeta.tplugin.angular.tbase %>/<%= tview.tslug %>/<%= tview.tlist.tplugin.angular.tslug %>');
<% } else { %>

83
lib/www_views/node-ff-tcrud/angular/thtml/application-top.ejs
View file

@ -1,49 +1,43 @@
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary" role="navigation">
<div class="container">
<button type="button" class="navbar-menu" ng-click="isMenuExpanded = !isMenuExpanded;isExpanded = false">
<span class="sr-only">Toggle menu</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<a href="." class="navbar-brand">TCrud</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse navbar-header-left" ng-include="'/api/plugin/angular/thtml/application-top-action'"></div>
<div class="navbar-collapse navbar-header-left" ng-include="'/api/plugin/angular/thtml/application-top-tabs'"></div>
<button type="button" class="navbar-toggle navbar-header-right" ng-click="isExpanded = !isExpanded;isMenuExpanded = false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="for-sm-view-hide">
<div class="navbar-collapse">
<div class="navbar-right">
<ul class="nav navbar-nav navbar-right"><li><a href="/">Logout</a></li></ul>
</div>
</div>
</div>
</div>
<div class="container">
<div class="for-lg-view-hide">
<div class="navbar-collapse" ng-show="isExpanded" ng-click="isExpanded = false">
<div class="navbar-right">
<ul class="nav navbar-nav navbar-right"><li><a href="/">Logout</a></li></ul>
</div>
</div>
</div>
<div class="for-menu-view-hide">
<div class="navbar-collapse" ng-show="isMenuExpanded" ng-click="isMenuExpanded = false">
<ul class="nav navbar-nav-menu" ng-repeat="menuKey in applicationMenuKeys">
<li>
<ul class="nav navbar-nav">
<li class="navbar-nav-menu-group"><i class="{{applicationMenu[menuKey].icon}}"></i>&nbsp;{{applicationMenu[menuKey].name}}</li>
<li class="" ng-repeat="item in applicationMenu[menuKey].items">
<a href="{{item.link}}" ng-click="goLink('{{item.link}}')"><i class="{{item.icon}}"></i>&nbsp;{{item.name}}</a>
</li>
</ul>
</li>
<br/>
</ul>
</div>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="themes">Themes <span class="caret"></span></a>
<div class="dropdown-menu" aria-labelledby="themes">
<a class="dropdown-item" href="../default/">Default</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="../cerulean/">Cerulean</a>
<a class="dropdown-item" href="../yeti/">Yeti</a>
</div>
</li>
<li class="nav-item">
<a class="nav-link" href="../help/">Help</a>
<div class="navbar-collapse navbar-header-left" ng-include="'/api/plugin/angular/thtml/application-top-action'"></div>
<div class="navbar-collapse navbar-header-left" ng-include="'/api/plugin/angular/thtml/application-top-tabs'"></div>
</li>
</ul>
<ul class="nav navbar-nav ml-auto">
<li class="nav-item">
<a href="/">Logout</a>
</li>
</ul>
<ul class="nav navbar-nav-menu" ng-repeat="menuKey in applicationMenuKeys">
<li>
<ul class="nav navbar-nav">
<li class="navbar-nav-menu-group"><i class="{{applicationMenu[menuKey].icon}}"></i>&nbsp;{{applicationMenu[menuKey].name}}</li>
<li class="" ng-repeat="item in applicationMenu[menuKey].items">
<a ng-click="goLink(item.link)"><i class="{{item.icon}}"></i>&nbsp;{{item.name}}</a>
</li>
</ul>
</li>
<br/>
</ul>
</div>
</div>
<p>{{navigationService.pageTitle}}</p>
@ -65,5 +59,4 @@
</div>
</div>
</div>

4
lib/www_views/node-ff-tcrud/uiAngularServerPlugins/js/server-plugins.ejs
View file

@ -39,7 +39,7 @@ function XPageServerPlugins($scope, $http) {
});
};
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/<%= troot.tmeta.tplugin.serverInfoPlugins.tslug %>').success(function(data, status, headers, config) {
$scope.serverPlugins = data.data;
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/<%= troot.tmeta.tplugin.serverInfoPlugins.tslug %>').then(function(response) {
$scope.serverPlugins = response.data.data;
});
}

8
lib/www_views/node-ff-tcrud/uiAngularServerRoutes/js/server-routes.ejs
View file

@ -19,13 +19,13 @@ crudRouteInit.push(function ($routeProvider, $locationProvider) {
});
function XPageServerTechRoutes($scope, $http) {
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/<%= troot.tmeta.tplugin.serverConfigRoutes.tslug %>?groups=api/server,api/plugin,tentity/json,tentity/xml,tentity/rss,tentity/csv,tentity/angular,tentity/config').success(function(data, status, headers, config) {
$scope.serverRoutes = data.data;
$http.get('<%= troot.tmeta.tserver.tslugs.tbase %>/<%= troot.tmeta.tserver.tslugs.tserver %>/<%= troot.tmeta.tplugin.serverConfigRoutes.tslug %>?groups=api/server,api/plugin,tentity/json,tentity/xml,tentity/rss,tentity/csv,tentity/angular,tentity/config').then(function(response) {
$scope.serverRoutes = response.data.data;
});
}
function XPageServerModelRoutes($scope, $http) {
$http.get('<%= troot.tmeta.tserver.tslug %>/json/server/routes?groups=moviedb,pagila').success(function(data, status, headers, config) {
$scope.serverRoutes = data.data;
$http.get('<%= troot.tmeta.tserver.tslug %>/json/server/routes?groups=moviedb,pagila').then(function(response) {
$scope.serverRoutes = response.data.data;
});
}