diff --git a/modules/account/.prettierrc b/modules/account/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/account/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js index 950bf65719..164399e4ce 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/LoggedOut.js @@ -1,5 +1,7 @@ -document.addEventListener("DOMContentLoaded", function (event) { - setTimeout(function () { - window.location = document.getElementById("redirectButton").getAttribute("href"); - }, 3000) -}); +document.addEventListener('DOMContentLoaded', function (event) { + setTimeout(function () { + window.location = document + .getElementById('redirectButton') + .getAttribute('href'); + }, 3000); +}); diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js index 844151c71b..68109eb6da 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js @@ -1,20 +1,23 @@ (function ($) { - var l = abp.localization.getResource('AbpAccount'); var _profileService = volo.abp.identity.profile; - $("#ChangePasswordForm").submit(function (e) { + $('#ChangePasswordForm').submit(function (e) { e.preventDefault(); - if (!$("#ChangePasswordForm").valid()) { + if (!$('#ChangePasswordForm').valid()) { return false; } - var input = $("#ChangePasswordForm").serializeFormToObject().changePasswordInfoModel; + var input = $('#ChangePasswordForm').serializeFormToObject() + .changePasswordInfoModel; - if (input.newPassword != input.newPasswordConfirm || input.currentPassword == '') { - abp.message.error(l("NewPasswordConfirmFailed")); + if ( + input.newPassword != input.newPasswordConfirm || + input.currentPassword == '' + ) { + abp.message.error(l('NewPasswordConfirmFailed')); return; } @@ -22,29 +25,23 @@ return; } - _profileService.changePassword( - input - ).then(function (result) { - abp.message.success(l("PasswordChanged")); + _profileService.changePassword(input).then(function (result) { + abp.message.success(l('PasswordChanged')); }); - }); - $("#PersonalSettingsForm").submit(function (e) { + $('#PersonalSettingsForm').submit(function (e) { e.preventDefault(); - if (!$("#PersonalSettingsForm").valid()) { + if (!$('#PersonalSettingsForm').valid()) { return false; } - var input = $("#PersonalSettingsForm").serializeFormToObject().personalSettingsInfoModel; + var input = $('#PersonalSettingsForm').serializeFormToObject() + .personalSettingsInfoModel; - _profileService.update( - input - ).then(function (result) { - abp.notify.success(l("PersonalSettingsSaved")); + _profileService.update(input).then(function (result) { + abp.notify.success(l('PersonalSettingsSaved')); }); - }); - -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/audit-logging/.prettierrc b/modules/audit-logging/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/audit-logging/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/background-jobs/.prettierrc b/modules/background-jobs/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/background-jobs/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/blob-storing-database/.prettierrc b/modules/blob-storing-database/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/blob-storing-database/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/blogging/.prettierrc b/modules/blogging/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/blogging/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/create.js b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/create.js index 276523c14d..599b2ad1f2 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/create.js +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/create.js @@ -3,12 +3,10 @@ $(function () { abp.modals.blogCreate = function () { var initModal = function (publicApi, args) { var $form = publicApi.getForm(); - - }; return { - initModal: initModal - } + initModal: initModal, + }; }; -}); \ No newline at end of file +}); diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/edit.js b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/edit.js index 8d3cffb6c8..a459f7ff09 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/edit.js +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/edit.js @@ -3,12 +3,10 @@ $(function () { abp.modals.blogEdit = function () { var initModal = function (publicApi, args) { var $form = publicApi.getForm(); - - }; return { - initModal: initModal - } + initModal: initModal, + }; }; -}); \ No newline at end of file +}); diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js index 74ca458614..fe1da6c3a9 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Pages/Blogging/Admin/Blogs/index.js @@ -1,73 +1,84 @@ $(function () { - var l = abp.localization.getResource('Blogging'); - var _createModal = new abp.ModalManager(abp.appPath + 'Blogging/Admin/Blogs/Create'); - var _editModal = new abp.ModalManager(abp.appPath + 'Blogging/Admin/Blogs/Edit'); + var _createModal = new abp.ModalManager( + abp.appPath + 'Blogging/Admin/Blogs/Create' + ); + var _editModal = new abp.ModalManager( + abp.appPath + 'Blogging/Admin/Blogs/Edit' + ); - var _dataTable = $('#BlogsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - paging: false, - info: false, - scrollX: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - order: [[3, "desc"]], - ajax: abp.libs.datatables.createAjax(volo.blogging.admin.blogManagement.getList), - columnDefs: [ - { - rowAction: { - items: - [ + var _dataTable = $('#BlogsTable').DataTable( + abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + paging: false, + info: false, + scrollX: true, + searching: false, + autoWidth: false, + scrollCollapse: true, + order: [[3, 'desc']], + ajax: abp.libs.datatables.createAjax( + volo.blogging.admin.blogManagement.getList + ), + columnDefs: [ + { + rowAction: { + items: [ { text: l('Edit'), - visible: abp.auth.isGranted('Blogging.Blog.Update'), + visible: abp.auth.isGranted( + 'Blogging.Blog.Update' + ), action: function (data) { _editModal.open({ - blogId: data.record.id + blogId: data.record.id, }); - } + }, }, { text: l('Delete'), - visible: abp.auth.isGranted('Blogging.Blog.Delete'), - confirmMessage: function (data) { return l('BlogDeletionWarningMessage') }, + visible: abp.auth.isGranted( + 'Blogging.Blog.Delete' + ), + confirmMessage: function (data) { + return l('BlogDeletionWarningMessage'); + }, action: function (data) { volo.blogging.admin.blogManagement .delete(data.record.id) .then(function () { _dataTable.ajax.reload(); }); - } - } - ] - } - }, - { - target: 1, - data: "name" - }, - { - target: 2, - data: "shortName" - }, - { - target: 3, - data: "creationTime", - render: function (date) { - return date; - } - }, - { - target: 4, - data: "description" - } - ] - })); - + }, + }, + ], + }, + }, + { + target: 1, + data: 'name', + }, + { + target: 2, + data: 'shortName', + }, + { + target: 3, + data: 'creationTime', + render: function (date) { + return date; + }, + }, + { + target: 4, + data: 'description', + }, + ], + }) + ); - $("#CreateNewBlogButtonId").click(function () { + $('#CreateNewBlogButtonId').click(function () { _createModal.open(); }); @@ -78,5 +89,4 @@ _editModal.onResult(function () { _dataTable.ajax.reload(); }); - }); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js index 571484bdac..debd2941c9 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js @@ -1,32 +1,47 @@ (function ($) { - var l = abp.localization.getResource('Blogging'); var initSocialShareLinks = function () { - var re = new RegExp(/^.*\//); var rootUrl = re.exec(window.location.href); - var pageHeader = $("#PostTitle").text(); + var pageHeader = $('#PostTitle').text(); var blogName = $('#BlogFullName').attr('name'); - $('#TwitterShareLink').attr('href', - 'https://twitter.com/intent/tweet?text=' + encodeURI(pageHeader + " | " + blogName + " | " + window.location.href) + $('#TwitterShareLink').attr( + 'href', + 'https://twitter.com/intent/tweet?text=' + + encodeURI( + pageHeader + ' | ' + blogName + ' | ' + window.location.href + ) ); - $('#LinkedinShareLink').attr('href', - 'https://www.linkedin.com/shareArticle?' - + 'url=' + encodeURI(window.location.href) + '&' - + 'mini=true&' - + "summary=" + encodeURI(blogName) + '&' - + "title=" + encodeURI(pageHeader) + '&' - + "source=" + encodeURI(rootUrl) + $('#LinkedinShareLink').attr( + 'href', + 'https://www.linkedin.com/shareArticle?' + + 'url=' + + encodeURI(window.location.href) + + '&' + + 'mini=true&' + + 'summary=' + + encodeURI(blogName) + + '&' + + 'title=' + + encodeURI(pageHeader) + + '&' + + 'source=' + + encodeURI(rootUrl) ); - $('#EmailShareLink').attr('href', - 'mailto:?' - + 'body=' + encodeURI('I want you to look at ' + window.location.href) + '&' - + "subject=" + encodeURI(pageHeader + ' | ' + blogName) + '&' + $('#EmailShareLink').attr( + 'href', + 'mailto:?' + + 'body=' + + encodeURI('I want you to look at ' + window.location.href) + + '&' + + 'subject=' + + encodeURI(pageHeader + ' | ' + blogName) + + '&' ); }; @@ -39,18 +54,18 @@ var form = $(this).serializeFormToObject(); $.ajax({ - type: "POST", - url: "/Blog/Comments/Update", + type: 'POST', + url: '/Blog/Comments/Update', data: { id: form.commentId, commentDto: { - text: form.text - } + text: form.text, + }, }, success: function (response) { $('div .editForm').hide(); $('#' + form.commentId).text(form.text); - } + }, }); }); @@ -73,7 +88,7 @@ if (replyCommentId != '' && replyCommentId !== undefined) { var div = linkElement.parent().next(); - if (div.is(":hidden")) { + if (div.is(':hidden')) { $('div .replyForm').hide(); div.show(); } else { @@ -95,12 +110,12 @@ function (isConfirmed) { if (isConfirmed) { $.ajax({ - type: "POST", - url: "/Blog/Comments/Delete", + type: 'POST', + url: '/Blog/Comments/Delete', data: { id: deleteCommentId }, success: function (response) { linkElement.parent().parent().parent().remove(); - } + }, }); } } @@ -121,14 +136,16 @@ function (isConfirmed) { if (isConfirmed) { $.ajax({ - type: "POST", - url: "/Blog/Posts/Delete", + type: 'POST', + url: '/Blog/Posts/Delete', data: { id: deleteCommentId }, success: function () { var url = window.location.pathname; var postNameBeginning = url.lastIndexOf('/'); - window.location.replace(url.substring(0, postNameBeginning)); - } + window.location.replace( + url.substring(0, postNameBeginning) + ); + }, }); } } @@ -144,10 +161,9 @@ var updateCommentId = $(this).attr('data-updateid'); if (updateCommentId != '' && updateCommentId !== undefined) { - var div = linkElement.parent().next().next(); - if (div.is(":hidden")) { + if (div.is(':hidden')) { $('div .editForm').hide(); div.show(); } else { @@ -158,13 +174,16 @@ }); if ($('#FocusCommentId').val() != '00000000-0000-0000-0000-000000000000') { - $('html, body').animate({ - scrollTop: ($('#' + $('#FocusCommentId').val()).offset().top - 150) - }, 500); + $('html, body').animate( + { + scrollTop: + $('#' + $('#FocusCommentId').val()).offset().top - 150, + }, + 500 + ); } $(".post-content a[href^='http']").attr('target', '_blank'); initSocialShareLinks(); - })(jQuery); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js index 8d668019c3..718d5c4bc4 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js @@ -1,22 +1,21 @@ $(function () { - - var $container = $("#edit-post-container"); - var $editorContainer = $container.find(".edit-post-editor"); - var $submitButton = $container.find("button[type=submit]"); - var $form = $container.find("form#edit-post-form"); - var editorDataKey = "tuiEditor"; - var $titleLengthWarning = $("#title-length-warning"); - var maxTitleLength = parseInt($titleLengthWarning.data("max-length")); + var $container = $('#edit-post-container'); + var $editorContainer = $container.find('.edit-post-editor'); + var $submitButton = $container.find('button[type=submit]'); + var $form = $container.find('form#edit-post-form'); + var editorDataKey = 'tuiEditor'; + var $titleLengthWarning = $('#title-length-warning'); + var maxTitleLength = parseInt($titleLengthWarning.data('max-length')); var $title = $('#Post_Title'); - var $coverImage = $("#CoverImage"); + var $coverImage = $('#CoverImage'); var $postCoverImage = $('#Post_CoverImage'); var $coverImageFile = $('#CoverImageFile'); var $postFormSubmitButton = $('#PostFormSubmitButton'); var setCoverImage = function (file) { $postCoverImage.val(file.fileUrl); - $coverImage.attr("src", file.fileUrl); + $coverImage.attr('src', file.fileUrl); $postFormSubmitButton.removeAttr('disabled'); }; @@ -25,14 +24,14 @@ formData.append('file', file); $.ajax({ - type: "POST", - url: "/api/blogging/files/images/upload", + type: 'POST', + url: '/api/blogging/files/images/upload', data: formData, contentType: false, processData: false, success: function (response) { setCoverImage(response); - } + }, }); }; @@ -48,7 +47,7 @@ checkTitleLength(); - $title.on("change paste keyup", function () { + $title.on('change paste keyup', function () { checkTitleLength(); }); @@ -57,55 +56,55 @@ return; } - $postFormSubmitButton.attr('disabled',true); + $postFormSubmitButton.attr('disabled', true); var file = $coverImageFile.prop('files')[0]; uploadCoverImage(file); }); - var uploadImage = function (file, callbackFn) { var formData = new FormData(); formData.append('file', file); $.ajax({ - type: "POST", - url: "/api/blogging/files/images/upload", + type: 'POST', + url: '/api/blogging/files/images/upload', data: formData, contentType: false, processData: false, success: function (response) { callbackFn(response.fileUrl); - } + }, }); }; - var newPostEditor = $editorContainer.tuiEditor({ - usageStatistics: false, - initialEditType: 'markdown', - previewStyle: 'tab', - height: "auto", - initialValue: $form.find("input[name='Post.Content']").val(), - hooks: { - addImageBlobHook: function (blob, callback, source) { - var imageAltText = blob.name; - - uploadImage(blob, - function (fileUrl) { + var newPostEditor = $editorContainer + .tuiEditor({ + usageStatistics: false, + initialEditType: 'markdown', + previewStyle: 'tab', + height: 'auto', + initialValue: $form.find("input[name='Post.Content']").val(), + hooks: { + addImageBlobHook: function (blob, callback, source) { + var imageAltText = blob.name; + + uploadImage(blob, function (fileUrl) { callback(fileUrl, imageAltText); }); - } - }, - events: { - load: function () { - $editorContainer.find(".loading-cover").remove(); - $submitButton.prop("disabled", false); - $form.data("validator").settings.ignore = '.ignore'; - $editorContainer.find(':input').addClass('ignore'); - } - } - }).data(editorDataKey); - - $container.find("form#edit-post-form").submit(function (e) { + }, + }, + events: { + load: function () { + $editorContainer.find('.loading-cover').remove(); + $submitButton.prop('disabled', false); + $form.data('validator').settings.ignore = '.ignore'; + $editorContainer.find(':input').addClass('ignore'); + }, + }, + }) + .data(editorDataKey); + + $container.find('form#edit-post-form').submit(function (e) { var $postTextInput = $form.find("input[name='Post.Content']"); var postText = newPostEditor.getMarkdown(); @@ -122,6 +121,4 @@ $(this).off('submit').submit(); return true; }); - }); - diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js index 798430f6cd..6b8c827722 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js @@ -1,22 +1,21 @@ $(function () { - - var $container = $("#qa-new-post-container"); - var $editorContainer = $container.find(".new-post-editor"); - var $submitButton = $container.find("button[type=submit]"); - var $form = $container.find("form#new-post-form"); - var editorDataKey = "tuiEditor"; - var $titleLengthWarning = $("#title-length-warning"); - var maxTitleLength = parseInt($titleLengthWarning.data("max-length")); + var $container = $('#qa-new-post-container'); + var $editorContainer = $container.find('.new-post-editor'); + var $submitButton = $container.find('button[type=submit]'); + var $form = $container.find('form#new-post-form'); + var editorDataKey = 'tuiEditor'; + var $titleLengthWarning = $('#title-length-warning'); + var maxTitleLength = parseInt($titleLengthWarning.data('max-length')); var $title = $('#Post_Title'); var $url = $('#Post_Url'); - var $coverImage = $("#CoverImage"); + var $coverImage = $('#CoverImage'); var $postCoverImage = $('#Post_CoverImage'); var $coverImageFile = $('#CoverImageFile'); var $postFormSubmitButton = $('#PostFormSubmitButton'); var setCoverImage = function (file) { $postCoverImage.val(file.fileUrl); - $coverImage.attr("src", file.fileUrl); + $coverImage.attr('src', file.fileUrl); $coverImage.show(); $postFormSubmitButton.removeAttr('disabled'); }; @@ -26,14 +25,14 @@ formData.append('file', file); $.ajax({ - type: "POST", - url: "/api/blogging/files/images/upload", + type: 'POST', + url: '/api/blogging/files/images/upload', data: formData, contentType: false, processData: false, success: function (response) { setCoverImage(response); - } + }, }); }; @@ -41,7 +40,7 @@ if (!$coverImageFile.prop('files').length) { return; } - $postFormSubmitButton.attr('disabled',true); + $postFormSubmitButton.attr('disabled', true); var file = $coverImageFile.prop('files')[0]; uploadCoverImage(file); }); @@ -51,43 +50,44 @@ formData.append('file', file); $.ajax({ - type: "POST", - url: "/api/blogging/files/images/upload", + type: 'POST', + url: '/api/blogging/files/images/upload', data: formData, contentType: false, processData: false, success: function (response) { callbackFn(response.fileUrl); - } + }, }); }; - var newPostEditor = $editorContainer.tuiEditor({ - usageStatistics: false, - initialEditType: 'markdown', - previewStyle: 'tab', - height: "auto", - hooks: { - addImageBlobHook: function (blob, callback, source) { - var imageAltText = blob.name; - - uploadImage(blob, - function (fileUrl) { + var newPostEditor = $editorContainer + .tuiEditor({ + usageStatistics: false, + initialEditType: 'markdown', + previewStyle: 'tab', + height: 'auto', + hooks: { + addImageBlobHook: function (blob, callback, source) { + var imageAltText = blob.name; + + uploadImage(blob, function (fileUrl) { callback(fileUrl, imageAltText); }); - } - }, - events: { - load: function () { - $editorContainer.find(".loading-cover").remove(); - $submitButton.prop("disabled", false); - $form.data("validator").settings.ignore = '.ignore'; - $editorContainer.find(':input').addClass('ignore'); - } - } - }).data(editorDataKey); - - $container.find("form#new-post-form").submit(function (e) { + }, + }, + events: { + load: function () { + $editorContainer.find('.loading-cover').remove(); + $submitButton.prop('disabled', false); + $form.data('validator').settings.ignore = '.ignore'; + $editorContainer.find(':input').addClass('ignore'); + }, + }, + }) + .data(editorDataKey); + + $container.find('form#new-post-form').submit(function (e) { var $postTextInput = $form.find("input[name='Post.Content']"); var postText = newPostEditor.getMarkdown(); @@ -108,7 +108,7 @@ var urlEdited = false; var reflectedChange = false; - $title.on("change paste keyup", function () { + $title.on('change paste keyup', function () { if (urlEdited) { return; } @@ -137,5 +137,4 @@ urlEdited = true; } }); - }); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js index b78c8132aa..ca0b21d203 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js @@ -1,9 +1,9 @@ -(function() { +(function () { function handleArrows() { - var herosWidth = $(".hero-articles").width(); - var arrowsPosition = (herosWidth / 2 - 90); - $(".owl-next").css("right", arrowsPosition); - $(".owl-prev").css("left", arrowsPosition); + var herosWidth = $('.hero-articles').width(); + var arrowsPosition = herosWidth / 2 - 90; + $('.owl-next').css('right', arrowsPosition); + $('.owl-prev').css('left', arrowsPosition); } function handleImages() { @@ -24,7 +24,7 @@ margin: 0, nav: false, dots: false, - //center: true, + //center: true, autoplay: true, autoHeight: true, autoplaySpeed: 1000, @@ -39,9 +39,9 @@ autoplaySpeed: 1000, responsive: { 0: { - items: 1 - } - } + items: 1, + }, + }, }); } @@ -49,7 +49,7 @@ handleImages(); handleOwlCarousel(); - $(".nav-link").on("click", function () { + $('.nav-link').on('click', function () { $(this).parent().parent(); }); @@ -64,4 +64,4 @@ handleArrows(); }, 500); }); -})(); \ No newline at end of file +})(); diff --git a/modules/client-simulation/.prettierrc b/modules/client-simulation/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/client-simulation/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js index 39a9dc61f7..7c4cf805c1 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js @@ -2,4 +2,4 @@ $(function () { SimulationArea.init($('#SimulationArea')); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js index 24a4d46460..0a404900c9 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js @@ -1,14 +1,13 @@ var SimulationArea = {}; (function ($) { - var $mainContainer = null; function refreshSimulationArea() { $.get('/ClientSimulation/SimulationArea') - .done(function(result) { + .done(function (result) { $mainContainer.html(result); }) - .always(function() { + .always(function () { setTimeout(refreshSimulationArea, 1000); }); } @@ -17,5 +16,4 @@ $mainContainer = $container; setTimeout(refreshSimulationArea, 1000); }; - -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/cms-kit/.prettierrc b/modules/cms-kit/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/cms-kit/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/docs/.prettierrc b/modules/docs/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/docs/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js index dc77bbc687..3f0f30270f 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js @@ -1,154 +1,187 @@ $(function () { - var l = abp.localization.getResource('Docs'); var service = window.volo.docs.admin.documentsAdmin; var getFormattedDate = function ($datePicker) { - return $datePicker.data().datepicker.getFormattedDate("yyyy-mm-dd"); + return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd'); }; var getFilter = function () { return { - projectId: $("#ProjectId").val(), - name: $("#Name").val(), - version: $("#Version").val(), - languageCode: $("#LanguageCode").val(), - fileName: $("#FileName").val(), - format: $("#Format").val(), - creationTimeMin: getFormattedDate($("#CreationTimeMin")), - creationTimeMax: getFormattedDate($("#CreationTimeMax")), - lastUpdatedTimeMin: getFormattedDate($("#LastUpdatedTimeMin")), - lastUpdatedTimeMax: getFormattedDate($("#LastUpdatedTimeMax")), - lastSignificantUpdateTimeMin: getFormattedDate($("#LastSignificantUpdateTimeMin")), - lastSignificantUpdateTimeMax: getFormattedDate($("#LastSignificantUpdateTimeMax")), - lastCachedTimeMin: getFormattedDate($("#LastCachedTimeMin")), - lastCachedTimeMax: getFormattedDate($("#LastCachedTimeMax")) + projectId: $('#ProjectId').val(), + name: $('#Name').val(), + version: $('#Version').val(), + languageCode: $('#LanguageCode').val(), + fileName: $('#FileName').val(), + format: $('#Format').val(), + creationTimeMin: getFormattedDate($('#CreationTimeMin')), + creationTimeMax: getFormattedDate($('#CreationTimeMax')), + lastUpdatedTimeMin: getFormattedDate($('#LastUpdatedTimeMin')), + lastUpdatedTimeMax: getFormattedDate($('#LastUpdatedTimeMax')), + lastSignificantUpdateTimeMin: getFormattedDate( + $('#LastSignificantUpdateTimeMin') + ), + lastSignificantUpdateTimeMax: getFormattedDate( + $('#LastSignificantUpdateTimeMax') + ), + lastCachedTimeMin: getFormattedDate($('#LastCachedTimeMin')), + lastCachedTimeMax: getFormattedDate($('#LastCachedTimeMax')), }; }; - var dataTable = $('#DocumentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - scrollX: true, - paging: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - ajax: abp.libs.datatables.createAjax(service.getAll, getFilter), - columnDefs: [ - { - rowAction: { - items: - [ + var dataTable = $('#DocumentsTable').DataTable( + abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + scrollX: true, + paging: true, + searching: false, + autoWidth: false, + scrollCollapse: true, + ajax: abp.libs.datatables.createAjax(service.getAll, getFilter), + columnDefs: [ + { + rowAction: { + items: [ { text: l('RemoveFromCache'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), - confirmMessage: function (data) { return l('RemoveFromCacheConfirmation'); }, + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), + confirmMessage: function (data) { + return l('RemoveFromCacheConfirmation'); + }, action: function (data) { - service.removeFromCache(data.record.id) + service + .removeFromCache(data.record.id) .then(function () { - abp.message.success(l('RemovedFromCache')); + abp.message.success( + l('RemovedFromCache') + ); dataTable.ajax.reload(); }); - } + }, }, { text: l('ReIndex'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), - confirmMessage: function (data) { return l('ReIndexDocumentConfirmation'); }, + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), + confirmMessage: function (data) { + return l('ReIndexDocumentConfirmation'); + }, action: function (data) { - service.reindex(data.record.id) + service + .reindex(data.record.id) .then(function () { - abp.message.success(l('ReindexCompleted')); + abp.message.success( + l('ReindexCompleted') + ); dataTable.ajax.reload(); }); - } + }, }, { text: l('DeleteFromDatabase'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), - confirmMessage: function (data) { return l('DeleteDocumentFromDbConfirmation'); }, + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), + confirmMessage: function (data) { + return l( + 'DeleteDocumentFromDbConfirmation' + ); + }, action: function (data) { - service.deleteFromDatabase(data.record.id) + service + .deleteFromDatabase(data.record.id) .then(function () { abp.message.success(l('Deleted')); dataTable.ajax.reload(); }); - } - } - ] - } - }, - { - target: 1, - data: "name" - }, - { - target: 2, - data: "version" - }, - { - target: 3, - data: "languageCode" - }, - { - target: 4, - data: "fileName" - }, - { - target: 5, - data: "format" - }, - { - target: 6, - data: "creationTime", - render: function (creationTime) { - if (!creationTime) { - return ""; - } + }, + }, + ], + }, + }, + { + target: 1, + data: 'name', + }, + { + target: 2, + data: 'version', + }, + { + target: 3, + data: 'languageCode', + }, + { + target: 4, + data: 'fileName', + }, + { + target: 5, + data: 'format', + }, + { + target: 6, + data: 'creationTime', + render: function (creationTime) { + if (!creationTime) { + return ''; + } - var date = Date.parse(creationTime); - return (new Date(date)).toLocaleDateString(abp.localization.currentCulture.name); - } - }, - { - target: 7, - data: "lastUpdatedTime", - render: function (lastUpdatedTime) { - if (!lastUpdatedTime) { - return ""; - } + var date = Date.parse(creationTime); + return new Date(date).toLocaleDateString( + abp.localization.currentCulture.name + ); + }, + }, + { + target: 7, + data: 'lastUpdatedTime', + render: function (lastUpdatedTime) { + if (!lastUpdatedTime) { + return ''; + } - var date = Date.parse(lastUpdatedTime); - return (new Date(date)).toLocaleDateString(abp.localization.currentCulture.name); - } - }, - { - target: 8, - data: "lastSignificantUpdateTime", - render: function (lastSignificantUpdateTime) { - if (!lastSignificantUpdateTime) { - return ""; - } + var date = Date.parse(lastUpdatedTime); + return new Date(date).toLocaleDateString( + abp.localization.currentCulture.name + ); + }, + }, + { + target: 8, + data: 'lastSignificantUpdateTime', + render: function (lastSignificantUpdateTime) { + if (!lastSignificantUpdateTime) { + return ''; + } - var date = Date.parse(lastSignificantUpdateTime); - return (new Date(date)).toLocaleDateString(abp.localization.currentCulture.name); - } - }, - { - target: 9, - data: "lastCachedTime", - render: function (lastCachedTime) { - if (!lastCachedTime) { - return ""; - } + var date = Date.parse(lastSignificantUpdateTime); + return new Date(date).toLocaleDateString( + abp.localization.currentCulture.name + ); + }, + }, + { + target: 9, + data: 'lastCachedTime', + render: function (lastCachedTime) { + if (!lastCachedTime) { + return ''; + } - var date = Date.parse(lastCachedTime); - return (new Date(date)).toLocaleDateString(abp.localization.currentCulture.name); - } - } - ] - })); + var date = Date.parse(lastCachedTime); + return new Date(date).toLocaleDateString( + abp.localization.currentCulture.name + ); + }, + }, + ], + }) + ); $("#FilterForm input[type='text']").keypress(function (e) { if (e.which === 13) { @@ -156,9 +189,8 @@ } }); - $("#SearchButton").click(function (e) { + $('#SearchButton').click(function (e) { e.preventDefault(); dataTable.ajax.reload(); }); - }); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.js index 8c62b5de34..e3f4032d18 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Pull.js @@ -4,12 +4,12 @@ $(function () { abp.modals.projectPull = function () { var initModal = function (publicApi, args) { var $form = publicApi.getForm(); - var fg = $form.find("#PullDocument_Name").parent(); + var fg = $form.find('#PullDocument_Name').parent(); var nameInput = fg.html(); - $form.find("input:checkbox").change(function() { - if ($(this).prop("checked")) { - fg.html(""); + $form.find('input:checkbox').change(function () { + if ($(this).prop('checked')) { + fg.html(''); } else { fg.html(nameInput); } @@ -17,7 +17,7 @@ $(function () { }; return { - initModal: initModal + initModal: initModal, }; }; -}); \ No newline at end of file +}); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js index bf06d0750d..c29927fde7 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/create.js @@ -3,12 +3,10 @@ $(function () { abp.modals.projectCreate = function () { var initModal = function (publicApi, args) { var $form = publicApi.getForm(); - - }; return { - initModal: initModal - } + initModal: initModal, + }; }; -}); \ No newline at end of file +}); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js index 14987552fb..7178516417 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/edit.js @@ -3,12 +3,10 @@ $(function () { abp.modals.projectEdit = function () { var initModal = function (publicApi, args) { var $form = publicApi.getForm(); - - }; return { - initModal: initModal - } + initModal: initModal, + }; }; -}); \ No newline at end of file +}); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js index baf4c6b646..45554eb356 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js @@ -1,136 +1,168 @@ $(function () { - var l = abp.localization.getResource('Docs'); var _createModal = new abp.ModalManager({ viewUrl: abp.appPath + 'Docs/Admin/Projects/Create', - modalClass: 'projectCreate' + modalClass: 'projectCreate', }); var _editModal = new abp.ModalManager({ viewUrl: abp.appPath + 'Docs/Admin/Projects/Edit', - modalClass: 'projectEdit' + modalClass: 'projectEdit', }); var _pullModal = new abp.ModalManager({ viewUrl: abp.appPath + 'Docs/Admin/Projects/Pull', - modalClass: 'projectPull' + modalClass: 'projectPull', }); - - var _dataTable = $('#ProjectsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ - processing: true, - serverSide: true, - scrollX: true, - paging: true, - searching: false, - autoWidth: false, - scrollCollapse: true, - order: [[2, "desc"]], - ajax: abp.libs.datatables.createAjax(volo.docs.admin.projectsAdmin.getList), - columnDefs: [ - { - rowAction: { - items: - [ + var _dataTable = $('#ProjectsTable').DataTable( + abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + scrollX: true, + paging: true, + searching: false, + autoWidth: false, + scrollCollapse: true, + order: [[2, 'desc']], + ajax: abp.libs.datatables.createAjax( + volo.docs.admin.projectsAdmin.getList + ), + columnDefs: [ + { + rowAction: { + items: [ { text: l('Edit'), - visible: abp.auth.isGranted('Docs.Admin.Projects.Update'), + visible: abp.auth.isGranted( + 'Docs.Admin.Projects.Update' + ), action: function (data) { _editModal.open({ - Id: data.record.id + Id: data.record.id, }); - } + }, }, { text: l('Delete'), - visible: abp.auth.isGranted('Docs.Admin.Projects.Delete'), - confirmMessage: function (data) { return l('ProjectDeletionWarningMessage') }, + visible: abp.auth.isGranted( + 'Docs.Admin.Projects.Delete' + ), + confirmMessage: function (data) { + return l('ProjectDeletionWarningMessage'); + }, action: function (data) { volo.docs.admin.projectsAdmin .delete(data.record.id) .then(function () { _dataTable.ajax.reload(); }); - } + }, }, { text: l('Pull'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), action: function (data) { _pullModal.open({ - Id: data.record.id + Id: data.record.id, }); - } + }, }, { text: l('ClearCache'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), - confirmMessage: function (data) { return l('ClearCacheConfirmationMessage', data.record.name); }, + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), + confirmMessage: function (data) { + return l( + 'ClearCacheConfirmationMessage', + data.record.name + ); + }, action: function (data) { volo.docs.admin.documentsAdmin - .clearCache({ projectId: data.record.id}) + .clearCache({ + projectId: data.record.id, + }) .then(function () { _dataTable.ajax.reload(); }); - } + }, }, { text: l('ReIndexProject'), - visible: abp.auth.isGranted('Docs.Admin.Documents'), - confirmMessage: function (data) { return l('ReIndexProjectConfirmationMessage', data.record.name); }, + visible: abp.auth.isGranted( + 'Docs.Admin.Documents' + ), + confirmMessage: function (data) { + return l( + 'ReIndexProjectConfirmationMessage', + data.record.name + ); + }, action: function (data) { volo.docs.admin.projectsAdmin - .reindex({ projectId: data.record.id}) + .reindex({ projectId: data.record.id }) .then(function () { - abp.message.success(l('SuccessfullyReIndexProject', data.record.name)); + abp.message.success( + l( + 'SuccessfullyReIndexProject', + data.record.name + ) + ); }); - } - } - ] - } - }, - { - target: 1, - data: "name" - }, - { - target: 2, - data: "shortName" - }, - { - target: 3, - data: "documentStoreType" - }, - { - target: 4, - data: "format", - render: function (data) { - if (data === 'md') { - return 'markdown'; - } - - return data; - } - } - ] - })); + }, + }, + ], + }, + }, + { + target: 1, + data: 'name', + }, + { + target: 2, + data: 'shortName', + }, + { + target: 3, + data: 'documentStoreType', + }, + { + target: 4, + data: 'format', + render: function (data) { + if (data === 'md') { + return 'markdown'; + } + return data; + }, + }, + ], + }) + ); - $("#CreateNewGithubProjectButtonId").click(function (event) { + $('#CreateNewGithubProjectButtonId').click(function (event) { event.preventDefault(); - _createModal.open({source:"GitHub"}); + _createModal.open({ source: 'GitHub' }); }); - $("#ReIndexAllProjects").click(function (event) { - abp.message.confirm(l('ReIndexAllProjectConfirmationMessage')) + $('#ReIndexAllProjects').click(function (event) { + abp.message + .confirm(l('ReIndexAllProjectConfirmationMessage')) .done(function (accepted) { if (accepted) { volo.docs.admin.projectsAdmin - .reindexAll() - .then(function () { - abp.message.success(l('SuccessfullyReIndexAllProject')); - }); + .reindexAll() + .then(function () { + abp.message.success( + l('SuccessfullyReIndexAllProject') + ); + }); } }); }); @@ -142,5 +174,4 @@ _editModal.onResult(function () { _dataTable.ajax.reload(); }); - }); diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/bootstrap-toc.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/bootstrap-toc.js index 3b92bf5e7e..1bf1d139a9 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/bootstrap-toc.js +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/bootstrap-toc.js @@ -12,12 +12,18 @@ // http://danielnouri.org/notes/2011/03/14/a-jquery-find-that-also-finds-the-root-element/ // http://stackoverflow.com/a/12731439/358804 var $descendants = $el.find(selector); - return $el.filter(selector).add($descendants).filter(':not([data-toc-skip])'); + return $el + .filter(selector) + .add($descendants) + .filter(':not([data-toc-skip])'); }, generateUniqueIdBase: function (el) { var text = $(el).text(); - var anchor = text.trim().toLowerCase().replace(/[^A-Za-z0-9]+/g, '-'); + var anchor = text + .trim() + .toLowerCase() + .replace(/[^A-Za-z0-9]+/g, '-'); return anchor || el.tagName.toLowerCase(); }, @@ -91,7 +97,10 @@ var secondaryLevel = topLevel + 1; var secondarySelector = 'h' + secondaryLevel; - return this.findOrFilter($scope, topSelector + ',' + secondarySelector); + return this.findOrFilter( + $scope, + topSelector + ',' + secondarySelector + ); }, getNavLevel: function (el) { @@ -126,14 +135,14 @@ var opts; if (arg.jquery) { opts = { - $nav: arg + $nav: arg, }; } else { opts = arg; } opts.$scope = opts.$scope || $(document.body); return opts; - } + }, }, // accepts a jQuery object, or an options object @@ -147,7 +156,7 @@ var topLevel = this.helpers.getTopLevel(opts.$scope); var $headings = this.helpers.getHeadings(opts.$scope, topLevel); this.helpers.populateNav($topContext, topLevel, $headings); - } + }, }; $(function () { @@ -156,4 +165,4 @@ Toc.init($nav); }); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js index 71fb550539..bbb97b041c 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js @@ -1,19 +1,19 @@ (function ($) { - $(function () { var initNavigationFilter = function (navigationContainerId) { - - var $navigation = $("#" + navigationContainerId); + var $navigation = $('#' + navigationContainerId); var getShownDocumentLinks = function () { - return $navigation.find(".mCSB_container > li a:visible").not(".tree-toggle"); + return $navigation + .find('.mCSB_container > li a:visible') + .not('.tree-toggle'); }; var gotoFilteredDocumentIfThereIsOnlyOne = function () { var $links = getShownDocumentLinks(); if ($links.length === 1) { - var url = $links.first().attr("href"); - if (url === "javascript:;") { + var url = $links.first().attr('href'); + if (url === 'javascript:;') { return; } @@ -22,33 +22,48 @@ }; var filterDocumentItems = function (filterText) { - $navigation.find(".mCSB_container .opened").removeClass("opened"); - $navigation.find(".mCSB_container > li, .mCSB_container > li ul").hide(); + $navigation + .find('.mCSB_container .opened') + .removeClass('opened'); + $navigation + .find('.mCSB_container > li, .mCSB_container > li ul') + .hide(); if (!filterText) { - $navigation.find(".mCSB_container > li").show(); - $navigation.find(".mCSB_container .selected-tree > ul").show(); + $navigation.find('.mCSB_container > li').show(); + $navigation + .find('.mCSB_container .selected-tree > ul') + .show(); return; } - var filteredItems = $navigation.find("li > a").filter(function () { - return $(this).text().toUpperCase().indexOf(filterText.toUpperCase()) > -1; - }); + var filteredItems = $navigation + .find('li > a') + .filter(function () { + return ( + $(this) + .text() + .toUpperCase() + .indexOf(filterText.toUpperCase()) > -1 + ); + }); filteredItems.each(function () { - var $el = $(this); $el.show(); var $parent = $el.parent(); var hasParent = true; while (hasParent) { - if ($parent.attr("id") === navigationContainerId) { + if ($parent.attr('id') === navigationContainerId) { break; } $parent.show(); - $parent.find("> li > label").not(".last-link").addClass("opened"); + $parent + .find('> li > label') + .not('.last-link') + .addClass('opened'); $parent = $parent.parent(); hasParent = $parent.length > 0; @@ -56,54 +71,75 @@ }); }; - $("#filter").keyup(function (e) { + $('#filter').keyup(function (e) { filterDocumentItems(e.target.value); - if (e.key === "Enter") { + if (e.key === 'Enter') { gotoFilteredDocumentIfThereIsOnlyOne(); } }); - $("#fullsearch").keyup(function (e) { - if (e.key === "Enter") { - window.open($(this).data("fullsearch-url") + this.value); + $('#fullsearch').keyup(function (e) { + if (e.key === 'Enter') { + window.open($(this).data('fullsearch-url') + this.value); } }); }; var initAnchorTags = function (container) { anchors.options = { - placement: 'left' + placement: 'left', }; - var anchorTags = ["h1", "h2", "h3", "h4", "h5", "h6"]; + var anchorTags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']; anchorTags.forEach(function (tag) { - anchors.add(container + " " + tag); + anchors.add(container + ' ' + tag); }); }; var initSocialShareLinks = function () { - var pageHeader = $(".docs-body").find("h1, h2").first().text(); + var pageHeader = $('.docs-body').find('h1, h2').first().text(); var projectName = $('#ProjectName')[0].innerText; - $('#TwitterShareLink').attr('href', - 'https://twitter.com/intent/tweet?text=' + encodeURI(pageHeader + " | " + projectName + " | " + window.location.href) + $('#TwitterShareLink').attr( + 'href', + 'https://twitter.com/intent/tweet?text=' + + encodeURI( + pageHeader + + ' | ' + + projectName + + ' | ' + + window.location.href + ) ); - $('#LinkedinShareLink').attr('href', - 'https://www.linkedin.com/shareArticle?' - + 'url=' + encodeURI(window.location.href) + '&' - + 'mini=true&' - + "summary=" + encodeURI(projectName) + '&' - + "title=" + encodeURI(pageHeader) + '&' - + "source=" + encodeURI($('#GoToMainWebSite').attr('href')) + $('#LinkedinShareLink').attr( + 'href', + 'https://www.linkedin.com/shareArticle?' + + 'url=' + + encodeURI(window.location.href) + + '&' + + 'mini=true&' + + 'summary=' + + encodeURI(projectName) + + '&' + + 'title=' + + encodeURI(pageHeader) + + '&' + + 'source=' + + encodeURI($('#GoToMainWebSite').attr('href')) ); - $('#EmailShareLink').attr('href', - 'mailto:?' - + 'body=' + encodeURI('I want you to look at ' + window.location.href) + '&' - + "subject=" + encodeURI(pageHeader + ' | ' + projectName) + '&' + $('#EmailShareLink').attr( + 'href', + 'mailto:?' + + 'body=' + + encodeURI('I want you to look at ' + window.location.href) + + '&' + + 'subject=' + + encodeURI(pageHeader + ' | ' + projectName) + + '&' ); }; @@ -111,15 +147,15 @@ var clearQueryString = function () { var uri = window.location.href.toString(); - if (uri.indexOf("?") > 0) { - uri = uri.substring(0, uri.indexOf("?")); + if (uri.indexOf('?') > 0) { + uri = uri.substring(0, uri.indexOf('?')); } window.history.replaceState({}, document.title, uri); }; var setQueryString = function () { - var comboboxes = $(".doc-section-combobox"); + var comboboxes = $('.doc-section-combobox'); if (comboboxes.length < 1) { return; } @@ -130,16 +166,16 @@ var uri = window.location.href.toString(); - var new_uri = uri + "?"; + var new_uri = uri + '?'; for (var i = 0; i < comboboxes.length; i++) { var key = $(comboboxes[i]).data('key'); var value = comboboxes[i].value; - new_uri += key + "=" + value; + new_uri += key + '=' + value; if (i !== comboboxes.length - 1) { - new_uri += "&"; + new_uri += '&'; } } @@ -148,19 +184,21 @@ var getTenYearsLater = function () { var tenYearsLater = new Date(); - tenYearsLater.setTime(tenYearsLater.getTime() + (365 * 10 * 24 * 60 * 60 * 1000)); + tenYearsLater.setTime( + tenYearsLater.getTime() + 365 * 10 * 24 * 60 * 60 * 1000 + ); return tenYearsLater; }; var setCookies = function () { - var cookie = abp.utils.getCookieValue("AbpDocsPreferences"); + var cookie = abp.utils.getCookieValue('AbpDocsPreferences'); if (!cookie || cookie == null || cookie === null) { - cookie = ""; + cookie = ''; } - var keyValues = cookie.split("|"); + var keyValues = cookie.split('|'); - var comboboxes = $(".doc-section-combobox"); + var comboboxes = $('.doc-section-combobox'); for (var i = 0; i < comboboxes.length; i++) { var key = $(comboboxes[i]).data('key'); @@ -169,23 +207,28 @@ var changed = false; var keyValueslength = keyValues.length; for (var k = 0; k < keyValueslength; k++) { - var splitted = keyValues[k].split("="); + var splitted = keyValues[k].split('='); if (splitted.length > 0 && splitted[0] === key) { - keyValues[k] = key + "=" + value; + keyValues[k] = key + '=' + value; changed = true; } } if (!changed) { - keyValues.push(key + "=" + value); + keyValues.push(key + '=' + value); } } - abp.utils.setCookieValue("AbpDocsPreferences", keyValues.join('|'), getTenYearsLater(), '/'); + abp.utils.setCookieValue( + 'AbpDocsPreferences', + keyValues.join('|'), + getTenYearsLater(), + '/' + ); }; - $(".doc-section-combobox").change(function () { + $('.doc-section-combobox').change(function () { setCookies(); clearQueryString(); location.reload(); @@ -195,7 +238,6 @@ }; var initCrawlerLinks = function () { - var isCrawler = function () { var crawlers = [ 'Google', @@ -227,13 +269,12 @@ 'ExaLead', 'Search Dog', 'MSN Bot', - 'BingBot' + 'BingBot', ]; var agent = navigator.userAgent; for (var i = 0; i < crawlers.length; i++) { - if (agent.indexOf(crawlers[i]) >= 0) { return true; } @@ -246,20 +287,20 @@ return; } - var comboboxes = $(".doc-section-combobox"); + var comboboxes = $('.doc-section-combobox'); if (comboboxes.length <= 0) { return; } - $("#crawler_link").show(); + $('#crawler_link').show(); var html = ''; var currentUrl = window.location.href.toString(); - if (currentUrl.indexOf("?") > 0) { - currentUrl = currentUrl.substring(0, currentUrl.indexOf("?")); + if (currentUrl.indexOf('?') > 0) { + currentUrl = currentUrl.substring(0, currentUrl.indexOf('?')); } var getQueryStringsFromComboboxes = function (x) { @@ -267,22 +308,28 @@ return []; } - var key = $(comboboxes[x]).data("key"); + var key = $(comboboxes[x]).data('key'); var queryStrings = getQueryStringsFromComboboxes(x + 1); var returnList = []; - $(comboboxes[x]).find("option").each(function () { - - if (queryStrings.length <= 0) { - returnList.push(key + "=" + $(this).val()); - - } else { - for (var k = 0; k < queryStrings.length; k++) { - returnList.push(key + "=" + $(this).val() + "&" + queryStrings[k]); + $(comboboxes[x]) + .find('option') + .each(function () { + if (queryStrings.length <= 0) { + returnList.push(key + '=' + $(this).val()); + } else { + for (var k = 0; k < queryStrings.length; k++) { + returnList.push( + key + + '=' + + $(this).val() + + '&' + + queryStrings[k] + ); + } } - } - }); + }); return returnList; }; @@ -290,22 +337,27 @@ var queryStrings = getQueryStringsFromComboboxes(0); for (var i = 0; i < queryStrings.length; i++) { - html += "" + queryStrings[i] + " " + html += + '' + + queryStrings[i] + + ' '; } - $("#crawler_link").html(html); + $('#crawler_link').html(html); }; - - initNavigationFilter("sidebar-scroll"); - initAnchorTags(".docs-page .docs-body"); + initNavigationFilter('sidebar-scroll'); + + initAnchorTags('.docs-page .docs-body'); initSocialShareLinks(); initSections(); initCrawlerLinks(); - }); - -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/ErrorComponent/error.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/ErrorComponent/error.js index edc010aa9f..e0b6f1c1e3 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/ErrorComponent/error.js +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/ErrorComponent/error.js @@ -1,20 +1,18 @@ (function ($) { - $(function () { var errorPageRedirect = function () { var second = 3; var close = setInterval(() => { - $("#ErrorRedirectSeconds").text(`(${--second})`); + $('#ErrorRedirectSeconds').text(`(${--second})`); if (second === 0) { clearInterval(close); - $("#ErrorRedirect")[0].click(); + $('#ErrorRedirect')[0].click(); } }, 1000); - } + }; - if (document.getElementById("ErrorRedirect")) { + if (document.getElementById('ErrorRedirect')) { errorPageRedirect(); } }); - })(jQuery); diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js index aaffc53ddf..32d31088b2 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js @@ -2,62 +2,71 @@ $(function () { $('li:not(.last-link) a.tree-toggle').click(function () { $(this).parent().children('ul.tree').toggle(100); - $(this).closest("li").toggleClass("selected-tree"); + $(this).closest('li').toggleClass('selected-tree'); }); - $('li:not(.last-link) span.plus-icon i.fa-chevron-right').click(function () { + $('li:not(.last-link) span.plus-icon i.fa-chevron-right').click( + function () { + var $element = $(this).parent(); - var $element = $(this).parent(); - - $element.parent().children('ul.tree').toggle(100); - $element.closest("li").toggleClass("selected-tree"); - }); + $element.parent().children('ul.tree').toggle(100); + $element.closest('li').toggleClass('selected-tree'); + } + ); - var scrollTopBtn = $(".scroll-top-btn"); - var enoughHeight = $(".docs-sidebar-wrapper > .docs-top").height() + 60; + var scrollTopBtn = $('.scroll-top-btn'); + var enoughHeight = $('.docs-sidebar-wrapper > .docs-top').height() + 60; var enoughHeightPlus = 500; $(window).scroll(function () { var topPos = $(window).scrollTop(); if (topPos > enoughHeight) { - $(scrollTopBtn).addClass("showup"); - $("body").addClass("scrolled"); + $(scrollTopBtn).addClass('showup'); + $('body').addClass('scrolled'); } else { - $(scrollTopBtn).removeClass("showup"); - $("body").removeClass("scrolled"); + $(scrollTopBtn).removeClass('showup'); + $('body').removeClass('scrolled'); } - if (topPos > enoughHeightPlus) { - $("body").addClass("scrolledMore"); - } else { - $("body").removeClass("scrolledMore"); + if (topPos > enoughHeightPlus) { + $('body').addClass('scrolledMore'); + } else { + $('body').removeClass('scrolledMore'); } }); $(scrollTopBtn).click(function () { - $('html, body').animate({ - scrollTop: 0 - }, 500); + $('html, body').animate( + { + scrollTop: 0, + }, + 500 + ); return false; }); var scrollToHashLink = function () { var hash = window.location.hash; - if (!hash || hash === "#") { + if (!hash || hash === '#') { return; } var $targetElement = $(decodeURIComponent(hash)); - $targetElement = $targetElement.length ? $targetElement : $('[name=' + this.hash.slice(1) + ']'); + $targetElement = $targetElement.length + ? $targetElement + : $('[name=' + this.hash.slice(1) + ']'); if (!$targetElement.length) { return; } - $('html,body').stop().animate({ - scrollTop: $targetElement.offset().top - }, 200); + $('html,body').stop().animate( + { + scrollTop: $targetElement.offset().top, + }, + 200 + ); return; }; @@ -65,36 +74,40 @@ $(document).ready(function () { handleCustomScrolls(); - var $myNav = $("#docs-sticky-index"); + var $myNav = $('#docs-sticky-index'); Toc.init($myNav); - $("body").scrollspy({ - target: $myNav + $('body').scrollspy({ + target: $myNav, }); - $("#docs-sticky-index a").on('click', function (event) { - if (this.hash !== "") { + $('#docs-sticky-index a').on('click', function (event) { + if (this.hash !== '') { event.preventDefault(); var hash = this.hash; - $('html, body').animate({ - scrollTop: $(decodeURIComponent(hash)).offset().top - }, 500, function () { - window.location.hash = hash; - }); + $('html, body').animate( + { + scrollTop: $(decodeURIComponent(hash)).offset().top, + }, + 500, + function () { + window.location.hash = hash; + } + ); } }); - $(".btn-toggle").on("click", function () { - $(".toggle-row").slideToggle(400); - $(this).toggleClass("less"); + $('.btn-toggle').on('click', function () { + $('.toggle-row').slideToggle(400); + $(this).toggleClass('less'); }); - $(".close-mmenu").on("click", function () { - $(".navbar-collapse").removeClass("show"); + $('.close-mmenu').on('click', function () { + $('.navbar-collapse').removeClass('show'); }); - $(".open-dmenu").on("click", function () { - $(".docs-tree-list").slideToggle(); + $('.open-dmenu').on('click', function () { + $('.docs-tree-list').slideToggle(); }); scrollToHashLink(); @@ -108,13 +121,13 @@ function handleCustomScrolls() { var wWidth = $(window).width(); if (wWidth > 766) { - $("#sidebar-scroll").mCustomScrollbar({ - theme: "minimal", + $('#sidebar-scroll').mCustomScrollbar({ + theme: 'minimal', alwaysShowScrollbar: 0, }); - $("#scroll-index").mCustomScrollbar({ - theme: "minimal-dark", + $('#scroll-index').mCustomScrollbar({ + theme: 'minimal-dark', alwaysShowScrollbar: 0, }); } @@ -139,9 +152,9 @@ return $li; }; - function docsCriteria() { - var docsContentWidth = $(".docs-content").width() - 20; - $(".alert-criteria").width(docsContentWidth); + function docsCriteria() { + var docsContentWidth = $('.docs-content').width() - 20; + $('.alert-criteria').width(docsContentWidth); } $(document).ready(function () { docsCriteria(); @@ -149,4 +162,4 @@ $(window).resize(function () { docsCriteria(); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/feature-management/.prettierrc b/modules/feature-management/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/feature-management/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js index 74b66f467d..7e4960999c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js @@ -3,15 +3,12 @@ abp.modals = abp.modals || {}; abp.modals.FeatureManagement = function () { - $('.FeatureValueCheckbox').change(function () { if (this.checked) { - $(this).val("true"); - } - else { - $(this).val("false"); + $(this).val('true'); + } else { + $(this).val('false'); } }); - }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/identity/.prettierrc b/modules/identity/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/identity/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js index 8332a95ac7..4331ab4229 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js @@ -1,81 +1,108 @@ (function ($) { - var l = abp.localization.getResource('AbpIdentity'); var _identityRoleAppService = volo.abp.identity.identityRole; - var _permissionsModal = new abp.ModalManager(abp.appPath + 'AbpPermissionManagement/PermissionManagementModal'); - var _editModal = new abp.ModalManager(abp.appPath + 'Identity/Roles/EditModal'); - var _createModal = new abp.ModalManager(abp.appPath + 'Identity/Roles/CreateModal'); + var _permissionsModal = new abp.ModalManager( + abp.appPath + 'AbpPermissionManagement/PermissionManagementModal' + ); + var _editModal = new abp.ModalManager( + abp.appPath + 'Identity/Roles/EditModal' + ); + var _createModal = new abp.ModalManager( + abp.appPath + 'Identity/Roles/CreateModal' + ); $(function () { - var _$wrapper = $('#IdentityRolesWrapper'); var _$table = _$wrapper.find('table'); - var _dataTable = _$table.DataTable(abp.libs.datatables.normalizeConfiguration({ - order: [[1, "asc"]], - searching: false, - processing: true, - serverSide: true, - scrollX: true, - paging: true, - ajax: abp.libs.datatables.createAjax(_identityRoleAppService.getList), - columnDefs: [ - { - rowAction: { - items: - [ + var _dataTable = _$table.DataTable( + abp.libs.datatables.normalizeConfiguration({ + order: [[1, 'asc']], + searching: false, + processing: true, + serverSide: true, + scrollX: true, + paging: true, + ajax: abp.libs.datatables.createAjax( + _identityRoleAppService.getList + ), + columnDefs: [ + { + rowAction: { + items: [ { text: l('Edit'), - visible: abp.auth.isGranted('AbpIdentity.Roles.Update'), + visible: abp.auth.isGranted( + 'AbpIdentity.Roles.Update' + ), action: function (data) { _editModal.open({ - id: data.record.id + id: data.record.id, }); - } + }, }, { text: l('Permissions'), - visible: abp.auth.isGranted('AbpIdentity.Roles.ManagePermissions'), + visible: abp.auth.isGranted( + 'AbpIdentity.Roles.ManagePermissions' + ), action: function (data) { _permissionsModal.open({ providerName: 'R', - providerKey: data.record.name + providerKey: data.record.name, }); - } + }, }, { text: l('Delete'), visible: function (data) { - return !data.isStatic && abp.auth.isGranted('AbpIdentity.Roles.Delete'); //TODO: Check permission + return ( + !data.isStatic && + abp.auth.isGranted( + 'AbpIdentity.Roles.Delete' + ) + ); //TODO: Check permission + }, + confirmMessage: function (data) { + return l( + 'RoleDeletionConfirmationMessage', + data.record.name + ); }, - confirmMessage: function (data) { return l('RoleDeletionConfirmationMessage', data.record.name)}, action: function (data) { _identityRoleAppService .delete(data.record.id) .then(function () { _dataTable.ajax.reload(); }); - } - } - ] - } - }, - { - data: "name", - render: function (data, type, row) { - var name = '' + data + ''; - if (row.isDefault) { - name += '' + l('DisplayName:IsDefault') + ''; - } - if (row.isPublic) { - name += '' + l('DisplayName:IsPublic') + ''; - } - return name; - } - } - ] - })); + }, + }, + ], + }, + }, + { + data: 'name', + render: function (data, type, row) { + var name = '' + data + ''; + if (row.isDefault) { + name += + '' + + l('DisplayName:IsDefault') + + ''; + } + if (row.isPublic) { + name += + '' + + l('DisplayName:IsPublic') + + ''; + } + return name; + }, + }, + ], + }) + ); _createModal.onResult(function () { _dataTable.ajax.reload(); @@ -90,5 +117,4 @@ _createModal.open(); }); }); - })(jQuery); diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js index 64505509ba..53f66ddb5e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js @@ -1,73 +1,91 @@ (function ($) { - var l = abp.localization.getResource('AbpIdentity'); var _identityUserAppService = volo.abp.identity.identityUser; - var _editModal = new abp.ModalManager(abp.appPath + 'Identity/Users/EditModal'); - var _createModal = new abp.ModalManager(abp.appPath + 'Identity/Users/CreateModal'); - var _permissionsModal = new abp.ModalManager(abp.appPath + 'AbpPermissionManagement/PermissionManagementModal'); + var _editModal = new abp.ModalManager( + abp.appPath + 'Identity/Users/EditModal' + ); + var _createModal = new abp.ModalManager( + abp.appPath + 'Identity/Users/CreateModal' + ); + var _permissionsModal = new abp.ModalManager( + abp.appPath + 'AbpPermissionManagement/PermissionManagementModal' + ); $(function () { - var _$wrapper = $('#IdentityUsersWrapper'); var _$table = _$wrapper.find('table'); - var _dataTable = _$table.DataTable(abp.libs.datatables.normalizeConfiguration({ - order: [[1, "asc"]], - processing: true, - serverSide: true, - scrollX: true, - paging: true, - ajax: abp.libs.datatables.createAjax(_identityUserAppService.getList), - columnDefs: [ - { - rowAction: { - items: - [ + var _dataTable = _$table.DataTable( + abp.libs.datatables.normalizeConfiguration({ + order: [[1, 'asc']], + processing: true, + serverSide: true, + scrollX: true, + paging: true, + ajax: abp.libs.datatables.createAjax( + _identityUserAppService.getList + ), + columnDefs: [ + { + rowAction: { + items: [ { text: l('Edit'), - visible: abp.auth.isGranted('AbpIdentity.Users.Update'), + visible: abp.auth.isGranted( + 'AbpIdentity.Users.Update' + ), action: function (data) { _editModal.open({ - id: data.record.id + id: data.record.id, }); - } + }, }, { text: l('Permissions'), - visible: abp.auth.isGranted('AbpIdentity.Users.ManagePermissions'), + visible: abp.auth.isGranted( + 'AbpIdentity.Users.ManagePermissions' + ), action: function (data) { _permissionsModal.open({ providerName: 'U', - providerKey: data.record.id + providerKey: data.record.id, }); - } + }, }, { text: l('Delete'), - visible: abp.auth.isGranted('AbpIdentity.Users.Delete'), - confirmMessage: function (data) { return l('UserDeletionConfirmationMessage', data.record.userName); }, + visible: abp.auth.isGranted( + 'AbpIdentity.Users.Delete' + ), + confirmMessage: function (data) { + return l( + 'UserDeletionConfirmationMessage', + data.record.userName + ); + }, action: function (data) { _identityUserAppService .delete(data.record.id) .then(function () { _dataTable.ajax.reload(); }); - } - } - ] - } - }, - { - data: "userName" - }, - { - data: "email" - }, - { - data: "phoneNumber" - } - ] - })); + }, + }, + ], + }, + }, + { + data: 'userName', + }, + { + data: 'email', + }, + { + data: 'phoneNumber', + }, + ], + }) + ); _createModal.onResult(function () { _dataTable.ajax.reload(); @@ -82,5 +100,4 @@ _createModal.open(); }); }); - })(jQuery); diff --git a/modules/identityserver/.prettierrc b/modules/identityserver/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/identityserver/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/permission-management/.prettierrc b/modules/permission-management/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/permission-management/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js index 860d6f8bfb..ca03b5abae 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js @@ -4,7 +4,9 @@ abp.modals.PermissionManagement = function () { function checkParents($tab, $checkBox) { - var parentName = $checkBox.closest('.custom-checkbox').attr('data-parent-name'); + var parentName = $checkBox + .closest('.custom-checkbox') + .attr('data-parent-name'); if (!parentName) { return; } @@ -20,7 +22,9 @@ } function uncheckChildren($tab, $checkBox) { - var permissionName = $checkBox.closest('.custom-checkbox').attr('data-permission-name'); + var permissionName = $checkBox + .closest('.custom-checkbox') + .attr('data-permission-name'); if (!permissionName) { return; } @@ -37,37 +41,45 @@ function handleTabCheckedCheckboxCount($tab) { var newCount = 0; - $tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').each(function () { - if ($(this).is(':checked') === true) { - newCount++; - } - }); + $tab.find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]') + .each(function () { + if ($(this).is(':checked') === true) { + newCount++; + } + }); var $tabTitle = $('#' + $tab.attr('id') + '-tab'); - var title = $tabTitle.html() - .replace('','').replace('','') - .replace('','').replace('',''); + var title = $tabTitle + .html() + .replace('', '') + .replace('', '') + .replace('', '') + .replace('', ''); var titleSplitted = title.split(' '); - if (titleSplitted[titleSplitted.length-1].startsWith('(')){ + if (titleSplitted[titleSplitted.length - 1].startsWith('(')) { titleSplitted.pop(); } var titleWithoutCount = titleSplitted.join(' '); - var newTitle = titleWithoutCount + ' (' + (newCount) + ')'; - if (newCount > 0){ - newTitle = '' + newTitle + '' - } - else { - newTitle = '' + newTitle + '' + var newTitle = titleWithoutCount + ' (' + newCount + ')'; + if (newCount > 0) { + newTitle = '' + newTitle + ''; + } else { + newTitle = '' + newTitle + ''; } - $tabTitle.html(newTitle) - }; + $tabTitle.html(newTitle); + } function handleUncheck($tab) { var $checkBox = $tab.find('input[name="SelectAllInThisTab"]'); if ($checkBox.is(':checked')) { - if ($tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').length > 1) { + if ( + $tab + .find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]').length > 1 + ) { $($checkBox).prop('indeterminate', true); } else { $checkBox.prop('checked', false); @@ -75,11 +87,13 @@ } else if ($checkBox.is(':indeterminate')) { var allUnchecked = true; - $tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').each(function () { - if ($(this).is(':checked') === true) { - allUnchecked = false; - } - }); + $tab.find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]') + .each(function () { + if ($(this).is(':checked') === true) { + allUnchecked = false; + } + }); if (allUnchecked) { $($checkBox).prop('indeterminate', false); @@ -93,11 +107,13 @@ var allChecked = true; - $tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').each(function () { - if ($(this).is(':checked') === false) { - allChecked = false; - } - }); + $tab.find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]') + .each(function () { + if ($(this).is(':checked') === false) { + allChecked = false; + } + }); if (allChecked) { $($checkBox).prop('indeterminate', false); @@ -107,7 +123,6 @@ } } - function initSelectAllInThisTab() { var tabs = $('.tab-pane'); for (var i = 0; i < tabs.length; i++) { @@ -117,13 +132,15 @@ var allChecked = true; var allUnChecked = true; - $tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').each(function () { - if ($(this).is(':checked') === true) { - allUnChecked = false; - } else { - allChecked = false; - } - }); + $tab.find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]') + .each(function () { + if ($(this).is(':checked') === true) { + allUnChecked = false; + } else { + allChecked = false; + } + }); if (allChecked) { $($checkBox).prop('checked', true); @@ -174,55 +191,65 @@ $el.find('.tab-pane').each(function () { var $tab = $(this); handleTabCheckedCheckboxCount($tab); - $tab.find('input[type="checkbox"]').not('[name="SelectAllInThisTab"]').each(function () { - var $checkBox = $(this); - $checkBox.change(function () { - if ($checkBox.is(':checked')) { - checkParents($tab, $checkBox); - handleCheck($tab); - } else { - uncheckChildren($tab, $checkBox); - handleUncheck($tab); - } - setSelectAllInAllTabs(); - handleTabCheckedCheckboxCount($tab); + $tab.find('input[type="checkbox"]') + .not('[name="SelectAllInThisTab"]') + .each(function () { + var $checkBox = $(this); + $checkBox.change(function () { + if ($checkBox.is(':checked')) { + checkParents($tab, $checkBox); + handleCheck($tab); + } else { + uncheckChildren($tab, $checkBox); + handleUncheck($tab); + } + setSelectAllInAllTabs(); + handleTabCheckedCheckboxCount($tab); + }); }); - }); }); $('input[name="SelectAllInThisTab"]').change(function () { var $checkBox = $(this); var $tab = $('#' + $checkBox.attr('data-tab-id')); if ($checkBox.is(':checked')) { - $tab.find('input[type="checkbox"]').not(':disabled').prop('checked', true); + $tab.find('input[type="checkbox"]') + .not(':disabled') + .prop('checked', true); } else { - $tab.find('input[type="checkbox"]').not(':disabled').prop('checked', false); + $tab.find('input[type="checkbox"]') + .not(':disabled') + .prop('checked', false); } $($checkBox).prop('indeterminate', false); setSelectAllInAllTabs(); - handleTabCheckedCheckboxCount($tab) + handleTabCheckedCheckboxCount($tab); }); $('input[name="SelectAllInAllTabs"]').change(function () { var $checkBox = $(this); if ($checkBox.is(':checked')) { - $('.tab-pane input[type="checkbox"]').not(':disabled').prop('checked', true); + $('.tab-pane input[type="checkbox"]') + .not(':disabled') + .prop('checked', true); } else { - $('.tab-pane input[type="checkbox"]').not(':disabled').prop('checked', false); + $('.tab-pane input[type="checkbox"]') + .not(':disabled') + .prop('checked', false); } $($checkBox).prop('indeterminate', false); $el.find('.tab-pane').each(function () { - handleTabCheckedCheckboxCount($(this)) + handleTabCheckedCheckboxCount($(this)); }); }); $(function () { - $(".custom-scroll-content").mCustomScrollbar({ - theme: "minimal-dark" + $('.custom-scroll-content').mCustomScrollbar({ + theme: 'minimal-dark', }); - $(".custom-scroll-container > .col-4").mCustomScrollbar({ - theme: "minimal-dark" + $('.custom-scroll-container > .col-4').mCustomScrollbar({ + theme: 'minimal-dark', }); }); diff --git a/modules/setting-management/.prettierrc b/modules/setting-management/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/setting-management/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index 346c2f2ce4..32ea1a27cc 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -1,7 +1,7 @@ (function ($) { var l = abp.localization.getResource('AbpSettingManagement'); - $(document).on("AbpSettingSaved", function () { - abp.notify.success(l("SuccessfullySaved")); + $(document).on('AbpSettingSaved', function () { + abp.notify.success(l('SuccessfullySaved')); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/tenant-management/.prettierrc b/modules/tenant-management/.prettierrc new file mode 100644 index 0000000000..34a0e1ecde --- /dev/null +++ b/modules/tenant-management/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js index b72d2b3505..de01d1cfdd 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.js @@ -1,20 +1,20 @@ (function ($) { - - abp.modals.TenantConnectionStringManagement = function() { - + abp.modals.TenantConnectionStringManagement = function () { var initModal = function (publicApi, args) { - publicApi.getModal() + publicApi + .getModal() .find('input[name="Tenant.UseSharedDatabase"]') .change(function () { var $this = $(this); - $("#Tenant_DefaultConnectionString_Wrap").toggleClass("d-none"); - $this.val($this.prop("checked")); + $('#Tenant_DefaultConnectionString_Wrap').toggleClass( + 'd-none' + ); + $this.val($this.prop('checked')); }); }; return { - initModal: initModal + initModal: initModal, }; }; - -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js index 0dc1861790..65fedcad23 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js @@ -1,80 +1,99 @@ (function () { - var l = abp.localization.getResource('AbpTenantManagement'); var _tenantAppService = volo.abp.tenantManagement.tenant; - var _editModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/EditModal'); - var _createModal = new abp.ModalManager(abp.appPath + 'TenantManagement/Tenants/CreateModal'); - var _featuresModal = new abp.ModalManager(abp.appPath + 'FeatureManagement/FeatureManagementModal'); + var _editModal = new abp.ModalManager( + abp.appPath + 'TenantManagement/Tenants/EditModal' + ); + var _createModal = new abp.ModalManager( + abp.appPath + 'TenantManagement/Tenants/CreateModal' + ); + var _featuresModal = new abp.ModalManager( + abp.appPath + 'FeatureManagement/FeatureManagementModal' + ); var _connectionStringsModal = new abp.ModalManager({ - viewUrl: abp.appPath + 'TenantManagement/Tenants/ConnectionStringsModal', - modalClass: 'TenantConnectionStringManagement' + viewUrl: + abp.appPath + 'TenantManagement/Tenants/ConnectionStringsModal', + modalClass: 'TenantConnectionStringManagement', }); $(function () { - var _$wrapper = $('#TenantsWrapper'); - var _dataTable = _$wrapper.find('table').DataTable(abp.libs.datatables.normalizeConfiguration({ - order: [[1, "asc"]], - processing: true, - paging: true, - scrollX: true, - serverSide: true, - ajax: abp.libs.datatables.createAjax(_tenantAppService.getList), - columnDefs: [ - { - rowAction: { - items: - [ + var _dataTable = _$wrapper.find('table').DataTable( + abp.libs.datatables.normalizeConfiguration({ + order: [[1, 'asc']], + processing: true, + paging: true, + scrollX: true, + serverSide: true, + ajax: abp.libs.datatables.createAjax(_tenantAppService.getList), + columnDefs: [ + { + rowAction: { + items: [ { text: l('Edit'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.Update'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.Update' + ), action: function (data) { _editModal.open({ - id: data.record.id + id: data.record.id, }); - } + }, }, - { + { text: l('ConnectionStrings'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.ManageConnectionStrings'), - action: function (data) { - _connectionStringsModal.open({ - id: data.record.id - }); - } - }, + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.ManageConnectionStrings' + ), + action: function (data) { + _connectionStringsModal.open({ + id: data.record.id, + }); + }, + }, { text: l('Features'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.ManageFeatures'), + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.ManageFeatures' + ), action: function (data) { _featuresModal.open({ providerName: 'T', - providerKey: data.record.id + providerKey: data.record.id, }); - } + }, }, { text: l('Delete'), - visible: abp.auth.isGranted('AbpTenantManagement.Tenants.Delete'), - confirmMessage: function (data) { return l('TenantDeletionConfirmationMessage', data.record.name)}, + visible: abp.auth.isGranted( + 'AbpTenantManagement.Tenants.Delete' + ), + confirmMessage: function (data) { + return l( + 'TenantDeletionConfirmationMessage', + data.record.name + ); + }, action: function (data) { _tenantAppService .delete(data.record.id) .then(function () { _dataTable.ajax.reload(); }); - } - } - ] - } - }, - { - data: "name" - } - ] - })); + }, + }, + ], + }, + }, + { + data: 'name', + }, + ], + }) + ); _createModal.onResult(function () { _dataTable.ajax.reload(); @@ -89,5 +108,4 @@ _createModal.open(); }); }); - })(); diff --git a/modules/users/.prettierrc b/modules/users/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/users/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/virtual-file-explorer/.prettierrc b/modules/virtual-file-explorer/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/modules/virtual-file-explorer/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/index.js b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/index.js index a67939ca43..0e05e3be4b 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/index.js +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/index.js @@ -1,7 +1,9 @@ -var _fileContentModal = new abp.ModalManager(abp.appPath + 'VirtualFileExplorer/FileContentModal'); +var _fileContentModal = new abp.ModalManager( + abp.appPath + 'VirtualFileExplorer/FileContentModal' +); function showContent(filePath) { _fileContentModal.open({ - filePath: filePath + filePath: filePath, }); } diff --git a/templates/app/aspnet-core/.prettierrc b/templates/app/aspnet-core/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/templates/app/aspnet-core/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.js b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.js index 46f089b9c7..a31bd7cc44 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.js +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.js @@ -1,3 +1,3 @@ $(function () { abp.log.debug('Index.js initialized!'); -}); \ No newline at end of file +}); diff --git a/templates/module/aspnet-core/.prettierrc b/templates/module/aspnet-core/.prettierrc new file mode 100644 index 0000000000..56af76bd94 --- /dev/null +++ b/templates/module/aspnet-core/.prettierrc @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "useTabs": false, + "tabWidth": 4 +}