Skip to content
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.

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

blade conversion #2602

Merged
merged 7 commits into from
Aug 14, 2024
Merged

blade conversion #2602

merged 7 commits into from
Aug 14, 2024

Conversation

muhtasimhafiz
Copy link
Contributor

Link to ticket

Please add a link to the GitHub issue being addressed by this change.

Description

Please include a short description of the suggested change and the reasoning behind the approach you have chosen.

Screenshot of the result

If your change affects the user interface, you should include a screenshot of the result with the pull request.

Checklist

  • My code passes all test cases.
  • My code passes our static analysis suite.
  • My code passes our continuous integration process.

If your code does not pass the requirements on the checklist, you should add a comment explaining why this change
should be exempt from the list.

Additional comments or questions

If you have any further comments or questions for the reviewer, please add them here.

@muhtasimhafiz muhtasimhafiz requested a review from a team as a code owner August 8, 2024 19:47
@muhtasimhafiz muhtasimhafiz requested review from broskees and removed request for a team August 8, 2024 19:47
@CLAassistant
Copy link

CLAassistant commented Aug 8, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@marcelfolaron marcelfolaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job. A few comments (most of them are the same thing just trying to find all locations).

app/Domain/Goalcanvas/Controllers/Dashboard.php Outdated Show resolved Hide resolved
@@ -25,10 +25,11 @@
<script>
jQuery(document).ready(function(){

@if (isset($_GET['closeModal']))
<?php if (isset($_GET['closeModal'])): ?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not @if ? This should be blade

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was getting syntax error in the editor, while using @if inside the script tag, might be vs setting issue

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

solved

app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/delCanvasItem.blade.php Outdated Show resolved Hide resolved
<small class="align-center">{{ $disclaimer }}</small>
@endif

{!! $tpl->viewFactory->make($tpl->getTemplatePath('canvas', 'modals'), $__data)->render() !!}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is required anymore.

});
}

leantime.<?= $canvasName ?>CanvasController.setRowHeights();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace with blade syntax

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or I guess only "goal" since this should be replaced anyways

<?php } ?>


<?php if (isset($_GET['showModal'])) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update to use blade syntax

Copy link
Contributor Author

@muhtasimhafiz muhtasimhafiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i implemented the changes

app/Domain/Goalcanvas/Templates/canvasComment.blade.php Outdated Show resolved Hide resolved
@@ -25,10 +25,11 @@
<script>
jQuery(document).ready(function(){

@if (isset($_GET['closeModal']))
<?php if (isset($_GET['closeModal'])): ?>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

solved

app/Domain/Goalcanvas/Templates/canvasComment.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/canvasComment.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/canvasComment.blade.php Outdated Show resolved Hide resolved
window.onloa39d = function() {
if (!window.jQuery) {
//It's not a modal
location.href = "<?= BASE_URL ?>/<?= $canvasName ?>canvas/showCanvas?showModal=<?= $canvasItem['id']; ?>";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaace with "goal" in url

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also replace <?= with blade syntax

window.onload = function() {
if (!window.jQuery) {
//It's not a modal
location.href = "<?= BASE_URL ?>/goalcanvas/showCanvas?showModal=<?php echo $canvasItem['id']; ?>";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace php with blade

app/Domain/Goalcanvas/Templates/canvasDialog.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/showCanvas.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/showCanvas.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/showCanvas.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/showCanvas.blade.php Outdated Show resolved Hide resolved
app/Domain/Goalcanvas/Templates/showCanvas.blade.php Outdated Show resolved Hide resolved
Copy link
Contributor Author

@muhtasimhafiz muhtasimhafiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

variable name update

@marcelfolaron marcelfolaron merged commit 3d1ce99 into master Aug 14, 2024
5 checks passed
@marcelfolaron marcelfolaron deleted the goalCanvas-blade-conversion branch August 14, 2024 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants