website v2issue

This commit is contained in:
Hassan Hashmi 2024-01-22 14:43:29 +05:00
parent 102a9a1c36
commit cc4e1f61e7
4 changed files with 173 additions and 124 deletions

View File

@ -73,135 +73,182 @@
ng-hide="record.allowFullDomain">Disabled</span>
</td>
<td class="flex gap-1 px-6 py-4">
<div>
<button ng-click="editInitial(record.package, record.diskSpace, record.bandwidth,
<button ng-click="editInitial(record.package, record.diskSpace, record.bandwidth,
record.emailAccounts, record.dataBases, record.ftpAccounts, record.allowedDomains, record.allowFullDomain, record.enforceDiskLimits)"
data-modal-target="EditListUser"
data-modal-toggle="EditListUser"
class="bg-orange-500 px-2 py-1 text-white"
type="button">
Edit
</button>
<div id="EditListUser" tabindex="-1"
class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div>
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<h2 class="px-4 py-4 font-bold text-xl">Edit Users</h2>
<button type="button" data-modal-toggle="EditListUser"
class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
data-modal-hide="EditListUser">
<svg class="w-3 h-3" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
</svg>
<span class="sr-only">Close modal</span>
</button>
<div class="p-4">
<div ng-hide="installationDetailsForm" class="flex mt-4 py-2 px-6">
<div>
<p class="font-semibold w-60">Name</p>
</div>
<div>
<input name="name" type="text"
class="w-80 bg-gray-100 rounded px-2 py-1"
ng-model="name" readonly>
</div>
data-modal-target="EditListUser_{$$index$}"
data-modal-toggle="EditListUser_{$$index$}"
class="bg-orange-500 px-2 py-1 text-white"
type="button">
Edit
</button>
<div id="EditListUser_{$$index$}" tabindex="-1"
class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div>
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<h2 class="px-4 py-4 font-bold text-xl">Edit Users</h2>
<button type="button" data-modal-toggle="EditListUser_{$$index$}"
class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
data-modal-hide="EditListUser">
<svg class="w-3 h-3" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
</svg>
<span class="sr-only">Close modal</span>
</button>
<div class="p-4">
<div ng-hide="installationDetailsForm" class="flex mt-4 py-2 px-6">
<div>
<p class="font-semibold w-60">Name</p>
</div>
<div class="flex py-2 px-6">
<div>
<p class="font-semibold w-60">New Owner</p>
</div>
<div>
<select ng-change="saveResellerChanges()"
ng-model="$parent.newOwner"
class="w-80 bg-gray-100 rounded px-2 py-1">
{% for items in resellerPrivUsers %}
<option>{{ items }}</option>
{% endfor %}
</select>
</div>
<div>
<input name="name" type="text"
class="w-80 bg-gray-100 rounded px-2 py-1"
ng-model="name" readonly>
</div>
<div class="flex py-2 px-6">
<div>
<p class="font-semibold w-60">Select ACL</p>
</div>
<div>
<select ng-change="changeACLFunc()"
ng-model="$parent.selectedACL"
class="w-80 bg-gray-100 rounded px-2 py-1">
{% for items in aclNames %}
<option>{{ items }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="flex py-2 px-6">
<div>
<p class="font-semibold w-60">New Owner</p>
</div>
<div>
<select ng-change="saveResellerChanges()"
ng-model="$parent.newOwner"
class="w-80 bg-gray-100 rounded px-2 py-1">
{% for items in resellerPrivUsers %}
<option>{{ items }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="flex py-2 px-6">
<div>
<p class="font-semibold w-60">Select ACL</p>
</div>
<div>
<select ng-change="changeACLFunc()"
ng-model="$parent.selectedACL"
class="w-80 bg-gray-100 rounded px-2 py-1">
{% for items in aclNames %}
<option>{{ items }}</option>
{% endfor %}
</select>
</div>
</div>
</div>
</div>
</div>
</div>
<div>
<button ng-click="deletePackageFinal(record.package)" data-modal-target="DeleteListUser"
data-modal-toggle="DeleteListUser"
class="bg-orange-500 px-2 py-1 text-white"
type="button">
Delete
</button>
<div id="DeleteListUser" tabindex="-1"
class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative p-4 w-full max-w-md max-h-full">
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<button type="button" data-modal-toggle="DeleteListUser"
class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
data-modal-hide="DeleteListUser">
<svg class="w-3 h-3" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
</svg>
<span class="sr-only">Close modal</span>
<button ng-click="deletePackageFinal(record.package)" data-modal-target="DeleteListUser_{$$index$}"
data-modal-toggle="DeleteListUser_{$$index$}"
class="bg-orange-500 px-2 py-1 text-white"
type="button">
Delete
</button>
<div id="DeleteListUser_{$$index$}" tabindex="-1"
class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative p-4 w-full max-w-md max-h-full">
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<button type="button" data-modal-toggle="DeleteListUser"
class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
data-modal-hide="DeleteListUser">
<svg class="w-3 h-3" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
</svg>
<span class="sr-only">Close modal</span>
</button>
<div class="p-4 md:p-5 text-center">
<svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
</svg>
<h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">
Are you sure you want to
delete this user {$ UserToDelete $} ?</h3>
<button ng-click="deleteUserFinal()" data-modal-hide="DeleteListUser"
type="button"
data-modal-toggle="DeleteListUser"
class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">
Yes, I'm sure
</button>
<button data-modal-hide="DeleteListUser" type="button"
data-modal-toggle="DeleteListUser"
class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
No, cancel
</button>
<div class="p-4 md:p-5 text-center">
<svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
</svg>
<h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">
Are you sure you want to
delete this user {$ UserToDelete $} ?</h3>
<button ng-click="deleteUserFinal()" data-modal-hide="DeleteListUser"
type="button"
data-modal-toggle="DeleteListUser"
class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">
Yes, I'm sure
</button>
<button data-modal-hide="DeleteListUser" type="button"
data-modal-toggle="DeleteListUser"
class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
No, cancel
</button>
</div>
</div>
</div>
</div>
</div>
</td>
</tr>
</tbody>
<button class="btn btn-danger" data-modal-target="habitetest" data-modal-toggle="habitetest">check moda</button>
<div id="habitetest" tabindex="-1"
class="hidden overflow-y-auto overflow-x-hidden fixed top-0 right-0 left-0 z-50 justify-center items-center w-full md:inset-0 h-[calc(100%-1rem)] max-h-full">
<div class="relative p-4 w-full max-w-md max-h-full">
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<button type="button" data-modal-toggle="habitetest"
class="absolute top-3 end-2.5 text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:hover:bg-gray-600 dark:hover:text-white"
data-modal-hide="habitetest">
<svg class="w-3 h-3" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6"/>
</svg>
<span class="sr-only">Close modal</span>
</button>
<div class="p-4 md:p-5 text-center">
<svg class="mx-auto mb-4 text-gray-400 w-12 h-12 dark:text-gray-200"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" fill="none"
viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2"
d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"/>
</svg>
<h3 class="mb-5 text-lg font-normal text-gray-500 dark:text-gray-400">
Are you sure you want to
delete this user {$ UserToDelete $} ?</h3>
<button ng-click="deleteUserFinal()" data-modal-hide="DeleteListUser"
type="button"
data-modal-toggle="DeleteListUser"
class="text-white bg-red-600 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:focus:ring-red-800 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">
Yes, I'm sure
</button>
<button data-modal-hide="DeleteListUser" type="button"
data-modal-toggle="DeleteListUser"
class="text-gray-500 bg-white hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 rounded-lg border border-gray-200 text-sm font-medium px-5 py-2.5 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600">
No, cancel
</button>
</div>
</div>
</div>
</div>
</table>
</div>
</div>
{# <div>#}
{# <button ng-click="deleteUserInitial(record.name)" data-modal-target="DeleteListUser"#}
{# data-modal-toggle="DeleteListUser"#}

View File

@ -463,15 +463,15 @@ newapp.controller('websitePagesV2', function ($scope, $http, $timeout, $window)
$scope.hideLogs = true;
};
$scope.fileManagerURL = "/filemanager/" + $("#domainNamePage").text();
$scope.fileManagerURLV2 = "/filemanager/" + $("#domainNamePageV2").text();
$scope.wordPressInstallURLV2 = $("#domainNamePageV2").text() + "/wordpressInstallV2";
$scope.joomlaInstallURL = $("#domainNamePage").text() + "/joomlaInstall";
$scope.setupGit = $("#domainNamePage").text() + "/setupGit";
$scope.installPrestaURL = $("#domainNamePage").text() + "/installPrestaShop";
$scope.installMagentoURL = $("#domainNamePage").text() + "/installMagento";
$scope.installMauticURL = $("#domainNamePage").text() + "/installMautic";
$scope.domainAliasURL = "/websites/" + $("#domainNamePage").text() + "/domainAlias";
$scope.previewUrl = "/preview/" + $("#domainNamePage").text() + "/";
$scope.joomlaInstallURLV2 = $("#domainNamePageV2").text() + "/joomlaInstallV2";
$scope.setupGitV2 = $("#domainNamePageV2").text() + "/setupGitV2";
$scope.installPrestaURLV2 = $("#domainNamePageV2").text() + "/installPrestaShopV2";
$scope.installMagentoURLV2 = $("#domainNamePageV2").text() + "/installMagentoV2";
$scope.installMauticURLV2 = $("#domainNamePageV2").text() + "/installMauticV2";
$scope.domainAliasURLV2 = "/websites/" + $("#domainNamePageV2").text() + "/domainAliasV2";
$scope.previewUrl = "/preview/" + $("#domainNamePageV2").text() + "/";
var logType = 0;
$scope.pageNumber = 1;

View File

@ -799,7 +799,7 @@
</div>
<div>
<ul class="flex w-full grid lg:grid-cols-4">
<a href="{% url 'FilemanagerV2' %}" class="px-3 py-3">
<a href="{$ fileManagerURLV2 $}" class="px-3 py-3">
<div class="flex items-center">
<div>
<svg width="20" height="20" viewBox="0 0 40 40" fill="none"
@ -1079,7 +1079,7 @@
</div>
</div>
</a>
<a href="/websites/{{ domain }}/manageGITV2" class="px-3 py-3">
<a href="{$ setupGitV2 $}" class="px-3 py-3">
<div class="flex items-center">
<div>
<svg width="20" height="20" viewBox="0 0 40 40" fill="none"
@ -1097,7 +1097,7 @@
</div>
</div>
</a>
<a href="{$ installPrestaURL $}" class="px-3 py-3">
<a href="{$ installPrestaURLV2 $}" class="px-3 py-3">
<div class="flex items-center">
<div>
<svg width="20" height="20" viewBox="0 0 40 40" fill="none"
@ -1119,7 +1119,7 @@
</div>
</div>
</a>
<a href="{$ installMauticURL $}" class="px-3 py-3">
<a href="{$ installMauticURLV2 $}" class="px-3 py-3">
<div class="flex items-center">
<div>

View File

@ -16,7 +16,10 @@ urlpatterns = [
url(r'^createWebsiteV2$', views.createWebsiteV2, name='createWebsiteV2'),
url(r'^listWebsitesV2$', views.listWebsitesV2, name='listWebsitesV2'),
url(r'^V2/(?P<domain>(.*))$', views.domainV2, name='domainv2'),
url(r'^V2/(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
url(r'^V3/(?P<domain>(.*))/wordpressInstallV2$', views.wordpressInstallV2, name='wordpressInstallV2'),
url(r'^V3/(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
url(r'^V3/(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
url(r'^V3/(?P<domain>(.*))/manageGITV2$', views.manageGITV2, name='manageGITV2'),
url(r'^CreateNewDomain$', views.CreateNewDomain, name='CreateNewDomain'),
url(r'^CreateNewDomainV2$', views.CreateNewDomainV2, name='CreateNewDomainV2'),
@ -151,7 +154,7 @@ urlpatterns = [
url(r'^prestaShopInstall$', views.prestaShopInstall, name='prestaShopInstall'),
url(r'^(?P<domain>(.*))/installPrestaShop$', views.installPrestaShop, name='installPrestaShop'),
url(r'^V2/(?P<domain>(.*))/installPrestaShopV2$', views.installPrestaShopV2, name='installPrestaShopV2'),
## magento
@ -161,7 +164,7 @@ urlpatterns = [
## mautic
url(r'^(?P<domain>(.*))/installMautic$', views.installMautic, name='installMautic'),
url(r'^V2/(?P<domain>(.*))/installMauticV2$', views.installMauticV2, name='installMauticV2'),
url(r'^mauticInstall$', views.mauticInstall, name='mauticInstall'),
## Git
@ -186,7 +189,6 @@ urlpatterns = [
### Manage GIT
url(r'^(?P<domain>(.*))/manageGIT$', views.manageGIT, name='manageGIT'),
url(r'^V2/(?P<domain>(.*))/manageGITV2$', views.manageGITV2, name='manageGITV2'),
url(r'^(?P<domain>(.*))/webhook$', views.webhook, name='webhook'),
url(r'^fetchFolderDetails$', views.fetchFolderDetails, name='fetchFolderDetails'),
url(r'^initRepo$', views.initRepo, name='initRepo'),