Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feature: add search and ordering to dropdowns
  • Loading branch information
@usmannasir
usmannasir committed Feb 19, 2021
1 parent 982627f commit a333adc
Show file tree
Hide file tree
Showing 11 changed files with 219 additions and 242 deletions.
17 changes: 17 additions & 0 deletions baseTemplate/static/baseTemplate/custom-js/system-status.js
View file
Expand Up @@ -98,6 +98,23 @@ app.filter('getwebsitename', function () {
};
});

function getWebsiteName(domain){
if (domain !== undefined) {

domain = domain.replace(/-/g, '');

var domainName = domain.split(".");

var finalDomainName = domainName[0];

if (finalDomainName.length > 5) {
finalDomainName = finalDomainName.substring(0, 4);
}

return finalDomainName;
}
}

app.controller('systemStatusInfo', function ($scope, $http, $timeout) {

//getStuff();
Expand Down
3 changes: 2 additions & 1 deletion baseTemplate/templates/baseTemplate/index.html
View file
Expand Up @@ -98,7 +98,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}">
<link rel="stylesheet" type="text/css" href="https://www.jsdelivr.com/package/npm/fontawesome">
<link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}">

<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
{% block styles %}
{% endblock %}

Expand Down Expand Up @@ -963,6 +963,7 @@

<!-- Sparklines charts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/qrious/4.0.2/qrious.js"></script>
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
<script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
<script src="{% static 'baseTemplate/custom-js/system-status.js' %}"></script>
<script src="{% static 'packages/packages.js' %}"></script>
Expand Down
92 changes: 46 additions & 46 deletions databases/static/databases/databases.js
View file
Expand Up @@ -6,25 +6,31 @@
/* Java script code to create database */
app.controller('createDatabase', function ($scope, $http) {

$scope.createDatabaseLoading = true;
$scope.dbDetails = true;
$scope.databaseCreationFailed = true;
$scope.databaseCreated = true;
$scope.couldNotConnect = true;
$scope.generatedPasswordView = true;
$(document).ready(function () {
$(".dbDetails").hide();
$(".generatedPasswordDetails").hide();
$('#create-database-select').select2();
});

$('#create-database-select').on('select2:select', function (e) {
var data = e.params.data;
$scope.databaseWebsite = data.text;
$(".dbDetails").show();
$("#domainDatabase").text(getWebsiteName(data.text));
$("#domainUsername").text(getWebsiteName(data.text));
});


$scope.showDetailsBoxes = function () {
$scope.dbDetails = false;
};
}

$scope.createDatabaseLoading = true;

$scope.createDatabase = function () {

$scope.createDatabaseLoading = false;
$scope.dbDetails = false;
$scope.databaseCreationFailed = true;
$scope.databaseCreated = true;
$scope.couldNotConnect = true;


var databaseWebsite = $scope.databaseWebsite;
Expand Down Expand Up @@ -65,26 +71,24 @@ app.controller('createDatabase', function ($scope, $http) {
function ListInitialDatas(response) {


if (response.data.createDBStatus == 1) {
if (response.data.createDBStatus === 1) {

$scope.createDatabaseLoading = true;
$scope.dbDetails = false;
$scope.databaseCreationFailed = true;
$scope.databaseCreated = false;
$scope.couldNotConnect = true;


}

else {

new PNotify({
title: 'Success!',
text: 'Database successfully created.',
type: 'success'
});
} else {

$scope.createDatabaseLoading = true;
$scope.dbDetails = false;
$scope.databaseCreationFailed = false;
$scope.databaseCreated = true;
$scope.couldNotConnect = true;
$scope.errorMessage = response.data.error_message;
new PNotify({
title: 'Operation Failed!',
text: response.data.error_message,
type: 'error'
});


}
Expand All @@ -96,21 +100,23 @@ app.controller('createDatabase', function ($scope, $http) {

$scope.createDatabaseLoading = true;
$scope.dbDetails = true;
$scope.databaseCreationFailed = true;
$scope.databaseCreated = true;
$scope.couldNotConnect = false;
new PNotify({
title: 'Operation Failed!',
text: 'Could not connect to server, please refresh this page',
type: 'error'
});
}


};

$scope.generatePassword = function () {
$scope.generatedPasswordView = false;
$(".generatedPasswordDetails").show();
$scope.dbPassword = randomPassword(16);
};

$scope.usePassword = function () {
$scope.generatedPasswordView = true;
$(".generatedPasswordDetails").hide();
};

});
Expand Down Expand Up @@ -170,9 +176,7 @@ app.controller('deleteDatabase', function ($scope, $http) {
$scope.couldNotConnect = true;


}

else {
} else {
$scope.deleteDatabaseLoading = true;
$scope.fetchedDatabases = true;
$scope.databaseDeletionFailed = false;
Expand Down Expand Up @@ -240,9 +244,7 @@ app.controller('deleteDatabase', function ($scope, $http) {
$scope.couldNotConnect = true;


}

else {
} else {
$scope.deleteDatabaseLoading = true;
$scope.fetchedDatabases = true;
$scope.databaseDeletionFailed = false;
Expand Down Expand Up @@ -344,8 +346,7 @@ app.controller('listDBs', function ($scope, $http) {
$scope.dbLoading = true;
$scope.domainFeteched = $scope.selectedDomain;

}
else {
} else {
$scope.notificationsBox = false;
$scope.canNotChangePassword = false;
$scope.dbLoading = true;
Expand Down Expand Up @@ -411,8 +412,7 @@ app.controller('listDBs', function ($scope, $http) {

$scope.domainFeteched = $scope.selectedDomain;

}
else {
} else {
$scope.recordsFetched = true;
$scope.passwordChanged = true;
$scope.canNotChangePassword = true;
Expand Down Expand Up @@ -481,8 +481,7 @@ app.controller('listDBs', function ($scope, $http) {

$scope.dbHost = response.data.dbHost;

}
else {
} else {
new PNotify({
title: 'Operation Failed!',
text: response.data.error_message,
Expand Down Expand Up @@ -537,8 +536,7 @@ app.controller('listDBs', function ($scope, $http) {
type: 'success'
});

}
else {
} else {
new PNotify({
title: 'Operation Failed!',
text: response.data.error_message,
Expand Down Expand Up @@ -570,7 +568,7 @@ app.controller('listDBs', function ($scope, $http) {
app.controller('phpMyAdmin', function ($scope, $http, $window) {
$scope.cyberPanelLoading = true;

$scope.generateAccess = function() {
$scope.generateAccess = function () {

$scope.cyberPanelLoading = false;

Expand All @@ -593,12 +591,14 @@ app.controller('phpMyAdmin', function ($scope, $http, $window) {
if (response.data.status === 1) {
var rUrl = '/phpmyadmin/phpmyadminsignin.php?username=' + response.data.username + '&token=' + response.data.token;
$window.location.href = rUrl;
} else {
}
else {}

}

function cantLoadInitialDatas(response) {$scope.cyberPanelLoading = true;}
function cantLoadInitialDatas(response) {
$scope.cyberPanelLoading = true;
}

}

Expand Down
41 changes: 8 additions & 33 deletions databases/templates/databases/createDatabase.html
View file
Expand Up @@ -25,7 +25,7 @@ <h3 class="content-box-header">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Website" %}</label>
<div class="col-sm-6">
<select ng-change="showDetailsBoxes()" ng-model="databaseWebsite" class="form-control">
<select id="create-database-select" ng-model="databaseWebsite" class="form-control">
{% for items in websitesList %}
<option>{{ items }}</option>
{% endfor %}
Expand All @@ -35,24 +35,23 @@ <h3 class="content-box-header">




<div ng-hide="dbDetails" class="form-group">
<div class="form-group dbDetails">
<label class="col-sm-3 control-label">{% trans "Database Name" %}</label>
<div class="col-sm-6">
<input name="dom" type="text" class="form-control" ng-model="dbName" required>
</div>
<div class="current-pack">{$databaseWebsite|getwebsitename$}_{$ dbName $}</div>
<div class="current-pack"><span id="domainDatabase"></span>_{$ dbName $}</div>
</div>

<div ng-hide="dbDetails" class="form-group">
<div class="form-group dbDetails">
<label class="col-sm-3 control-label">{% trans "User Name" %}</label>
<div class="col-sm-6">
<input type="text" name="email" class="form-control" ng-model="dbUsername" required>
</div>
<div class="current-pack">{$databaseWebsite|getwebsitename$}_{$ dbUsername $}</div>
<div class="current-pack"><span id="domainUsername"></span>_{$ dbUsername $}</div>
</div>

<div ng-hide="dbDetails" class="form-group">
<div class="form-group dbDetails">
<label class="col-sm-3 control-label">{% trans "Password" %}</label>
<div class="col-sm-6">
<input type="password" name="email" class="form-control" ng-model="dbPassword" required>
Expand All @@ -62,7 +61,7 @@ <h3 class="content-box-header">
</div>
</div>

<div ng-hide="generatedPasswordView" class="form-group">
<div class="form-group generatedPasswordDetails">
<label class="col-sm-3 control-label">{% trans "Generated Password" %}</label>
<div class="col-sm-6">
<input type="text" name="email" class="form-control" ng-model="dbPassword" required>
Expand All @@ -73,37 +72,13 @@ <h3 class="content-box-header">
</div>


<div ng-hide="dbDetails" class="form-group">
<div class="form-group dbDetails">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<button type="button" ng-click="createDatabase()" class="btn btn-primary btn-lg">{% trans "Create Database" %}</button>
</div>
</div>



<div class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
<div ng-hide="databaseCreationFailed" class="alert alert-danger">
<p>{% trans "Cannot create database. Error message:" %} {$ errorMessage $}</p>
</div>

<div ng-hide="databaseCreated" class="alert alert-success">
<p>{% trans "Database created successfully." %}</p>
</div>


<div ng-hide="couldNotConnect" class="alert alert-danger">
<p>{% trans "Could not connect to server. Please refresh this page." %}</p>
</div>
</div>



</div>


</form>


Expand Down

0 comments on commit a333adc

Please sign in to comment.