Adapt to accept other themes

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 This change log is started in 0.0.9;
 
+## 0.0.17 (2016-04-29)
+- Adapt to accept other themes
+
 ## 0.0.16 (2016-04-27)
 - Fixes main path
 

bin/basel-init.js

@@ -11,6 +11,7 @@ program
   .option('-t, --title <title>', 'Application title')
   .option('-e, --description <description>', 'Application description')
   .option('-u, --url <url>', 'URL of Git repository')
+  .option('-b, --base <base>', 'Base app for BASEL')
   .parse(process.argv);
 
 var options = {
@@ -23,7 +24,8 @@ var options = {
   cipher: program.cipher,
   passowrd: program.passowrd,
   algorithm: program.algorithm,
-  url: program.url
+  url: program.url,
+  base: program.base
 };
 
 wizard(options);

lib/crud.js

@@ -104,7 +104,7 @@ function view(options, done){
 	        var $ = require('jquery')(window);
 
 	        $('.basel-controller').attr('ng-controller',options.controller);
-	        $('.modal-title').text(options.name_)
+	        $('.modal-title').text(options.name_);
 
 	        var headTable = $('.basel-table-head').append($('<tr/>')).find('tr');
 	        var bodyTable = $('.basel-table-body').append($('<tr/>').attr('dir-paginate','item in items | filter: search | itemsPerPage: 10')).find('tr');
@@ -138,9 +138,12 @@ function view(options, done){
 	        	"ng-click":'delete(item)'
 	        }).html('<span class="glyphicon glyphicon-trash"></span> Delete');
 
-	        bodyTable.append($('<td/>').append(btnEdit).append(btnDelete))
+	        bodyTable.append($('<td/>').append(btnEdit).append(btnDelete));
 
-	        fs.writeFile(path.join(process.cwd(),'views',options.view), window.document.documentElement.outerHTML, function (error){
+	        var data = $('div').first().parent().html();
+	        data = data.split('CONTROLLER_NAME').join(options.controller);
+
+	        fs.writeFile(path.join(process.cwd(),'views',options.view), data, function (error){
 	            if (error) throw error;
 	            console.log("View created!")
 	            done();
@@ -183,7 +186,11 @@ function index(options){
 	    jsdom.env(data, function (errors, window) {
 	        var $ = require('jquery')(window);
 	        if( ! $('script[src="controllers/'+options.controller+'.js"]').length){
-	        	$('head').append('<script src="controllers/'+options.controller+'.js" />')
+	        	if($('script[src="controllers/mainController.js"]').length > 0){
+	        		$( '<script src="controllers/'+options.controller+'.js" />' ).insertAfter( $('script[src="controllers/mainController.js"]') );
+	        	}else{
+	        		$('head').append('<script src="controllers/'+options.controller+'.js" />')	
+	        	}
 	        }
 	        db.insert('crud',{
 	        	name: options.name_,

lib/install.js

@@ -21,7 +21,17 @@ exports.init = function(options) {
 }
 
 var clone = function(options, done){
-	var url = options.url ? options.url : "https://github.com/ClubeDosGeeksCoding/basel-app.git";
+	var url = "https://github.com/baseljs/basel-app.git";
+	if(options.url){
+		url = options.url;
+	}else if(options.base){
+		var valids_base = ['tabs'];
+		if(valids_base.indexOf(options.base) >= 0){
+			url = "https://github.com/baseljs/basel-app-"+options.base+".git";
+		}else{
+			throw "This base is not valid! The valids are: "+valids_base.join(',');
+		}
+	}
 	var gitCmd = 'git clone '+url+' "'+options.name+'"';
 	console.log('Cloning into destination folder:' +options.name);
 	console.log(gitCmd);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "basel",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "Framework for Bootstrap, AngularJS, SQLite, Electron",
   "author": "Jayr Alencar <http://github.com/jayralencar>",
   "readmeFilename": "README.md" ,

templates/controller.js

@@ -17,32 +17,32 @@ app.controller("CONTROLLER_NAME", function($scope, $location){
 			//Edit
 			var id = $scope.form[$scope.primary_key];
 			delete $scope.form[$scope.primary_key];
-			delete $scope.form.$$hashKey; 
-			basel.database.update($scope.table_name, $scope.form, {$scope.primary_key: id}); 
+			delete $scope.form.$$hashKey; //Apaga elemento $$hashKey do objeto
+			basel.database.update($scope.table_name, $scope.form, {PRIMARY_KEY: id}); //entidade, dados, where
 		}else{
 			//new
-			basel.database.insert($scope.table_name, $scope.form); 
+			basel.database.insert($scope.table_name, $scope.form); // entidade, dados
 		}
 		$scope.form = {};
 		$scope.list();
-		$('#modalNew').modal('hide');
+		$('#CONTROLLER_NAME').modal('hide');
 	}
 
 	// Cancel form
 	$scope.cancel = function(){
 		$scope.form = {};
 	}
 
-	//Open to edit
+	//Abrindo para editar
 	$scope.edit = function(data){
 		$scope.form = data;
-		$('#modalNew').modal('show');
+		$('#CONTROLLER_NAME').modal('show');
 	}
 
-	//Delete
+	//Excluindo
 	$scope.delete = function(data){
 		if(confirm("Are you sure?")){
-			basel.database.delete($scope.table_name, {$scope.primary_key: data[$scope.primary_key]});
+			basel.database.delete($scope.table_name, {PRIMARY_KEY: data[$scope.primary_key]});
 			$scope.list();
 		}
 	}

templates/crud.html

@@ -1,7 +1,7 @@
-<div class="basel-controller">
+<div ng-controller="CONTROLLER_NAME">
 	<div class="row">
 		<div class="col-md-8">
-			<button class="btn btn-primary" data-toggle="modal" data-target="#modalNew"><span class="glyphicon glyphicon-plus"></span> New</button>
+			<button class="btn btn-primary" data-toggle="modal" data-target="#CONTROLLER_NAME"><span class="glyphicon glyphicon-plus"></span> New</button>
 		</div>
 		<div class="col-md-4">
 			<input class="form-control" placeholder="Search" ng-model="search">
@@ -20,32 +20,30 @@
 			</table>
 		</div>
 	</div>
-	<!-- Paginação -->
 	<div class="row">
 		<div class="col-md-12 text-center">
 			<dir-pagination-controls>
 			</dir-pagination-controls>
 		</div>
 	</div>
 
-	<!-- Modal Cadastro e Edição -->
-	<div class="modal fade" id="modalNew" tabindex="-1" role="dialog" >
+	<div class="modal fade" id="CONTROLLER_NAME" tabindex="-1" role="dialog" >
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">{{}}</h4>
+					<h4 class="modal-title" id="myModalLabel"></h4>
 				</div>
 				<div class="modal-body">
 					<form class="basel-form">
 
 					</form>
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-default basel-btn-cancel" ng-click="cancel()" data-dismiss="modal">Cancelar</button>
-					<button type="button" class="btn btn-primary basel-btn-save" ng-click="save()">Salvar</button>
+					<button type="button" class="btn btn-default basel-btn-cancel" ng-click="cancel()" data-dismiss="modal">Cancel</button>
+					<button type="button" class="btn btn-primary basel-btn-save" ng-click="save()">Save</button>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
+</div>