Skip to content

v3.0.2 20240227 [Hotfix issue] #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2024
Merged

v3.0.2 20240227 [Hotfix issue] #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d491b1
kao-logic: Misc fixes with embedded item
Nicklas373 Feb 27, 2024
de73fed
resources: errors: Fix onclick issue
Nicklas373 Feb 27, 2024
9008a46
resources: Update static library
Nicklas373 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions public/build/assets/kao-logic-B_ZIctFK.js
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions public/build/assets/kao-logic-CPjYiSmx.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion public/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
},
"resources/js/kao-logic.js": {
"file": "assets/kao-logic-CPjYiSmx.js",
"file": "assets/kao-logic-B_ZIctFK.js",
"src": "resources/js/kao-logic.js",
"isEntry": true,
"imports": [
Expand Down
4 changes: 0 additions & 4 deletions public/ext-js/kao-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,3 @@ function wmLayout_TextInputRestore() {
wmRadioRotationD.checked = true
}
}

function returnToHome() {
window.location.href = "/";
}
18 changes: 12 additions & 6 deletions resources/js/kao-logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var uploadDropzoneSingle = document.getElementById("dropzoneAreaSingle")
var adobeClientID = '16199e0c9a4042f0969ea2ed591c547b'
var googleViewerUrl = 'https://docs.google.com/viewerng/viewer?url='
var uploadPath = '/storage/upload/'
var uploadUrl = 'http://pdf.hana-ci.com/storage/upload/'
var uploadUrl = 'https://pdf.hana-ci.com/storage/upload/'

if (procBtn) {
remainingBalance().then(function () {
Expand Down Expand Up @@ -147,7 +147,7 @@ if (uploadDropzone) {
button.addEventListener("click", function(event) {
var parentContainer = event.target.closest('.dz-file-preview')
var filenameElement = parentContainer.querySelector('.dz-filename span')
var uploadedFile1 = filenameElement.innerText.trim()
var uploadedFile1 = fileNameFormat(filenameElement.innerText)
var newUrl = uploadUrl+uploadedFile1
var adobeDCView = new AdobeDC.View(
{
Expand Down Expand Up @@ -344,9 +344,9 @@ if (uploadDropzoneAlt) {
button.addEventListener("click", function(event) {
var parentContainer = event.target.closest('.dz-preview')
var filenameElement = parentContainer.querySelector('.dz-filename span')
var uploadedFile1 = filenameElement.innerText.trim()
var uploadedFile1 = fileNameFormat(filenameElement.innerText)
var imageUrl = uploadUrl+uploadedFile1
var documentUrl = googleViewerUrl+uploadUrl+uploadedFile1
var documentUrl = googleViewerUrl+uploadUrl+uploadedFile1+'&embedded=true'
if (file.type.startsWith('image/')) {
document.getElementById('imgPrv').src = imageUrl
previewImageModal.show()
Expand Down Expand Up @@ -538,7 +538,7 @@ if (uploadDropzoneSingle) {
button.addEventListener("click", function(event) {
var parentContainer = event.target.closest('.dz-file-preview')
var filenameElement = parentContainer.querySelector('.dz-filename span')
var uploadedFile1 = filenameElement.innerText.trim()
var uploadedFile1 = fileNameFormat(filenameElement.innerText)
var newUrl = uploadUrl+uploadedFile1
var adobeDCView = new AdobeDC.View(
{
Expand Down Expand Up @@ -1123,7 +1123,7 @@ function submit(event) {
} else {
toPage = false
}
getTotalPages(uploadUrl+getUploadedFileName()[0].replace(/\s/g, '_'))
getTotalPages(uploadUrl+fileNameFormat(getUploadedFileName()[0]))
.then((totalPages) => {
if (totalPages == null) {
totalPage = null
Expand Down Expand Up @@ -1700,6 +1700,12 @@ function autoDownload(url, filename) {
document.body.removeChild(link)
}

function fileNameFormat(fileName) {
let trimmedFileName = fileName.trim()
let newFileName = trimmedFileName.replace(/\s+/g, '_')

return newFileName;
}

function generateMesssage(subMessage) {
var ul = document.getElementById("err-list")
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/401.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">You are not authorized to access this page.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/402.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">PLACEHOLDER</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/403.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">You do not have access this for this page.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/404.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">It may already move or deleted permanently.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/419.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">Please wait and try again later.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/429.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">Please wait and try again later.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/500.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">It may already move or deleted permanently.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/errors/503.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h2 class="text-xs lg:text-lg text-center font-medium font-quicksand text-lt4">Please wait and try again later.</h3>
</div>
<div class="mt-10 px-4">
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="returnToHome()" data-ripple-light="true">Go Back Home</button>
<button type="button" id="submitBtn_1" class="p-4 font-quicksand font-medium bg-rt1 text-lt1 rounded-lg cursor-pointer w-full h-14" onclick="window.location.href='/'" data-ripple-light="true">Go Back Home</button>
</div>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/alternate-layout.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div id="content" class="flex flex-col min-h-screen justify-between">
@yield('content')
</div>
<script async type="module" src="/build/assets/kao-logic-CPjYiSmx.js"></script>
<script async type="module" src="/build/assets/kao-logic-B_ZIctFK.js"></script>
<script async type="module" src="https://unpkg.com/[email protected]/build/pdf.mjs"></script>
<script async type="module" src="https://unpkg.com/[email protected]/build/pdf.worker.mjs"></script>
<script async type="text/javascript" src="/ext-js/kao-controller.js"></script>
Expand Down
2 changes: 0 additions & 2 deletions resources/views/layouts/clean-layout.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
</head>
<body class="bg-origin-padding bg-top bg-scroll bg-dt1 bg-no-repeat min-h-screen grid grid-cols-1 lg:grid-cols-2" style="background-image: url('{{ asset('assets/home.avif') }}');">
@yield('content')
<script async type="text/javascript" src="/ext-js/kao-controller.js"></script>
<script async type="text/javascript" src="/ext-js/kao-main.js"></script>
<script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion resources/views/layouts/main-layout.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div id="content" class="flex flex-col min-h-screen justify-between">
@yield('content')
</div>
<script async type="module" src="/build/assets/kao-logic-CKUGkD5x.js"></script>
<script async type="module" src="/build/assets/kao-logic-B_ZIctFK.js"></script>
<script async type="text/javascript" src="/ext-js/kao-controller.js"></script>
<script async type="text/javascript" src="/ext-js/kao-main.js"></script>
<script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script>
Expand Down