Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@muhtasimhafiz
muhtasimhafiz committed Sep 27, 2024
2 parents 33e94f1 + 4a902c2 commit c8541e0
Show file tree
Hide file tree
Showing 13 changed files with 216 additions and 145 deletions.
4 changes: 1 addition & 3 deletions app/Core/Providers/RouteServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ public function boot(): void
return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
});

Route::any('{moduleName}', function (IncomingRequest $request, $moduleName, $actionName) use ($frontController) {
app('debugbar')->disable();

Route::any('{moduleName}', function (IncomingRequest $request, $moduleName) use ($frontController) {
$httpMethod = Str::lower($request->getMethod());
$controllerParts = $frontController->getValidControllerCall($moduleName, "index", $httpMethod, "Controllers");
return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
Expand Down
127 changes: 67 additions & 60 deletions app/Domain/Auth/Templates/includes/loginInfo.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,73 @@
@dispatchEvent('beforeUserinfoMenuOpen')

<div class="userinfo">
@dispatchEvent('afterUserinfoMenuOpen')
@if(session()->exists("companysettings.logoPath") && session("companysettings.logoPath") !== false)
<a href='{{ BASE_URL }}/users/editOwn/' class="dropdown-toggle profileHandler includeLogo" data-toggle="dropdown">
<img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
<img src="{{ session("companysettings.logoPath") }}" class="logo"/>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
@else
<a href='{{ BASE_URL }}/users/editOwn/' class="dropdown-toggle profileHandler" data-toggle="dropdown">
<img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
@endif
<ul class="dropdown-menu">
@dispatchEvent('afterUserinfoDropdownMenuOpen')
<li>
<a href='{{ BASE_URL }}/users/editOwn/'>
{!! __("menu.my_profile") !!}
</a>
</li>
<li>
<a href='{{ BASE_URL }}/users/editOwn#theme'>
{!! __("menu.theme") !!}
</a>
</li>
<li>
<a href='{{ BASE_URL }}/users/editOwn#settings'>
{!! __("menu.settings") !!}
</a>
</li>

<li class="nav-header border">{!! __("menu.help_support") !!}</li>
<li>
<a href='javascript:void(0);'
onclick="leantime.helperController.showHelperModal('{{ $modal }}', 300, 500);">
{!! __("menu.what_is_this_page") !!}
</a>
</li>
<li>
<a href='https://leantime.io/knowledge-base' target="_blank">
{!! __("menu.knowledge_base") !!}
</a>
</li>
<li>
<a href='https://discord.gg/4zMzJtAq9z' target="_blank">
{!! __("menu.community") !!}
</a>
</li>
<li>
<a href='https://leantime.io/contact-us' target="_blank">
{!! __("menu.contact_us") !!}
</a>
</li>
<li class="border">
<a href='{{ BASE_URL }}/auth/logout'>
{!! __("menu.sign_out") !!}
</a>
</li>
@dispatchEvent('beforeUserinfoDropdownMenuClose')
</ul>
@dispatchEvent('beforeUserinfoMenuClose')
<x-global::actions.dropdown contentRole='ghost' position="left">
<x-slot:labelText>
@if(session()->exists("companysettings.logoPath") && session("companysettings.logoPath") !== false)
<a href="{{ BASE_URL }}/users/editOwn/" class="profileHandler includeLogo">
<img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
<img src="{{ session("companysettings.logoPath") }}" class="logo"/>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
@else
<a href="{{ BASE_URL }}/users/editOwn/" class="profileHandler">
<img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
<i class="fa fa-caret-down" aria-hidden="true"></i>
</a>
@endif
</x-slot:labeltext>

<x-slot:menu>
<x-global::actions.dropdown.item>
<a href='{{ BASE_URL }}/users/editOwn/'>
{!! __("menu.my_profile") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='{{ BASE_URL }}/users/editOwn#theme'>
{!! __("menu.theme") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='{{ BASE_URL }}/users/editOwn#settings'>
{!! __("menu.settings") !!}
</a>
</x-global::actions.dropdown.item>

<x-global::actions.dropdown.item class="nav-header border">
{!! __("menu.help_support") !!}
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='javascript:void(0);' onclick="leantime.helperController.showHelperModal('{{ $modal }}', 300, 500);">
{!! __("menu.what_is_this_page") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='https://leantime.io/knowledge-base' target="_blank">
{!! __("menu.knowledge_base") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='https://discord.gg/4zMzJtAq9z' target="_blank">
{!! __("menu.community") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item>
<a href='https://leantime.io/contact-us' target="_blank">
{!! __("menu.contact_us") !!}
</a>
</x-global::actions.dropdown.item>
<x-global::actions.dropdown.item class="border">
<a href='{{ BASE_URL }}/auth/logout'>
{!! __("menu.sign_out") !!}
</a>
</x-global::actions.dropdown.item>
</x-slot:menu>

</x-global::actions.dropdown>

@dispatchEvent('beforeUserinfoMenuClose')
</div>

@dispatchEvent('afterUserinfoMenuClose')
13 changes: 8 additions & 5 deletions app/Domain/Auth/Templates/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
labelText="Email"
placeholder="{{ $tpl->language->__($tpl->get('inputPlaceholder')) }}"
value=""
variant="fullWidth"
/>
</div>

Expand All @@ -44,6 +45,7 @@
labelText="Password"
placeholder="{{ $tpl->language->__('input.placeholders.enter_password') }}"
value=""
variant="fullWidth"
/>

<div class="forgotPwContainer">
Expand All @@ -56,7 +58,7 @@
<?php $tpl->dispatchTplEvent('beforeSubmitButton'); ?>

<div class="">
<x-global::forms.button type="submit" content-role="primary" name="login">
<x-global::forms.button type="submit" content-role="primary" name="login" class="w-full" >
{{ $tpl->language->__('buttons.login') }}
</x-global::forms.button>
</div>
Expand All @@ -72,10 +74,11 @@
<?php if ($tpl->get('oidcEnabled')) { ?>
<?php $tpl->dispatchTplEvent('beforeOidcButton'); ?>
<div class="">
<center class="uppercase"><?php echo $tpl->language->__("label.or"); ?></center><br />
<a href="{{ BASE_URL }}/oidc/login" style="width:100%;" class="btn btn-primary">
<?php echo $tpl->language->__("buttons.oidclogin"); ?>
</a>
<br /><center class="uppercase"><?php echo $tpl->language->__("label.or"); ?></center><br />

<x-global::forms.button onclick="window.location.href = '{{ BASE_URL }}/oidc/login'" content-role="primary" name="oidclogin" class="w-full">
{{ $tpl->language->__('buttons.oidclogin') }}
</x-global::forms.button>
</div>
<?php } ?>
<?php $tpl->dispatchTplEvent('beforeRegcontentClose'); ?>
Expand Down
5 changes: 3 additions & 2 deletions app/Domain/Auth/Templates/requestPwLink.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@
name="username"
id="username"
placeholder="{{ $tpl->language->__('input.placeholders.enter_email') }}"
variant="fullWidth"
/>
</div>
<div class="">
<div class="forgotPwContainer">
<a href="{{ BASE_URL }}/" class="forgotPw"><?php echo $tpl->language->__("links.back_to_login"); ?></a>
<a href="{{ BASE_URL }}/auth/login" class="forgotPw"><?php echo $tpl->language->__("links.back_to_login"); ?></a>
</div>
<?php $tpl->dispatchTplEvent('beforeSubmitButton'); ?>
<x-global::forms.button type="submit" name="resetPassword">
<x-global::forms.button type="submit" name="resetPassword" class="w-full" >
{{ __('buttons.reset_password') }}
</x-global::forms.button>
</div>
Expand Down
5 changes: 0 additions & 5 deletions app/Domain/Dashboard/Templates/show.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@ class="delete">
</x-global::content.card>

<x-global::content.card variation="content">
<x-slot:card-context-buttons>
<x-global::forms.button href="#/tickets/newTicket" content-role="tertiary">
<i class="fa fa-plus"></i> Create To-Do
</x-global::forms.button>
</x-slot:card-context-buttons>

<x-slot:card-title>{{ __('headlines.latest_todos') }}</x-slot:card-title>

Expand Down
79 changes: 65 additions & 14 deletions app/Domain/Install/Templates/new.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,71 @@
<?php echo $tpl->displayInlineNotification(); ?>

<form action="{{ BASE_URL }}/install" method="post" class="registrationForm">
<h3 class="subtitle"><?=$tpl->language->__("subtitles.login_info");?></h3>
<input type="email" name="email" class="form-control" placeholder="<?=$tpl->language->__("label.email");?>" value=""/><br />
<input type="password" name="password" class="form-control" placeholder="<?=$tpl->language->__("label.password");?>" />
<br /><br />
<h3 class="subtitle"><?=$tpl->language->__("subtitles.user_info");?></h3>
<x-global::forms.text-input
type="text"
id="projectName"
name="projectname"
value=""
placeholder=""
variant="title"
class="w-full"
/>
@csrf <!-- Include CSRF token for security -->

<h3 class="subtitle">{{ __('subtitles.login_info') }}</h3>

<x-global::forms.text-input
type="email"
name="email"
class="form-control"
:value="old('email')"
caption="{{ __('label.email') }}"
placeholder="{{ __('label.email') }}"
/><br />

<x-global::forms.text-input
type="password"
name="password"
class="form-control"
caption="{{ __('label.password') }}"
placeholder="{{ __('label.password') }}"
/><br /><br />

<h3 class="subtitle">{{ __('subtitles.user_info') }}</h3>

<x-global::forms.text-input
type="text"
name="firstname"
class="form-control"
:value="old('firstname')"
caption="{{ __('label.firstname') }}"
placeholder="{{ __('label.firstname') }}"
/><br />

<x-global::forms.text-input
type="text"
name="lastname"
class="form-control"
:value="old('lastname')"
caption="{{ __('label.lastname') }}"
placeholder="{{ __('label.lastname') }}"
/><br />

<x-global::forms.text-input
type="text"
name="company"
class="form-control"
:value="old('company')"
caption="{{ __('label.company_name') }}"
placeholder="{{ __('label.company_name') }}"
/><br /><br />

<input type="hidden" name="install" value="Install" />

<p>
<x-global::forms.button
type="submit"
name="installAction"
class="btn btn-primary"
:value="__('buttons.install')"
onClick="this.form.submit(); this.disabled=true; this.value='{{ __('buttons.install') }}';"
>
{{ __('buttons.install') }}
</x-global::forms.button>
</p>
</form>

<br />
<br /><br />
<input type="hidden" name="install" value="Install" />
Expand Down
14 changes: 7 additions & 7 deletions app/Domain/Tickets/Templates/showKanban.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@
<?php foreach ($tpl->get('allKanbanColumns') as $key => $statusRow) { ?>
<div class="column">

<h4 class="widgettitle title-primary title-border-<?php echo $statusRow['class']; ?>">
<h4 class="flex justify-between items-center widgettitle title-primary title-border-<?php echo $statusRow['class']; ?>">
<div>
<strong class="count">0</strong>
<?php $tpl->e($statusRow['name']); ?>
</div>

<?php if ($login::userIsAtLeast($roles::$manager)) { ?>
<!-- Determine Label Text for the Dropdown -->
Expand All @@ -74,8 +78,7 @@
@endphp

<!-- Context Menu Component -->
<x-global::content.context-menu :label-text="$labelText" contentRole="link" position="bottom"
align="start">
<x-global::content.context-menu :label-text="$labelText" contentRole="link" position="bottom" align="end">
<!-- Dropdown Items -->
<x-global::actions.dropdown.item
href="#/setting/editBoxLabel?module=ticketlabels&label={{ $key }}"
Expand All @@ -90,9 +93,6 @@ class="editLabelModal">

<?php } ?>

<strong class="count">0</strong>
<?php $tpl->e($statusRow['name']); ?>

</h4>

<div class="">
Expand All @@ -109,7 +109,6 @@ class="editLabelModal">
name="headline"
placeholder="Enter To-Do Title"
title="{!! $tpl->__('label.headline') !!}"
variant="title"
/>

<input type="hidden" name="milestone" value="{!! $searchCriteria['milestone'] !!}" />
Expand All @@ -126,6 +125,7 @@ class="editLabelModal">
<x-global::forms.button
tag="a"
class="btn btn-default"
content-role="secondary"
href="javascript:void(0);"
onclick="jQuery('#ticket_new_{!! $key !!}, #ticket_new_link_{!! $key !!}').toggle('fast');"
>
Expand Down
Loading

0 comments on commit c8541e0

Please sign in to comment.