Commit d86142eb authored by Yassine Doghri's avatar Yassine Doghri
Browse files

feat(admin): update admin layout for better ux + update brand pine colors

parent 7a276764

app/Helpers/components_helper.php

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ if (! function_exists('button')) { 


        $variantClass = [

            'default' => 'text-black bg-gray-300 hover:bg-gray-400',

            'primary' => 'text-white bg-pine-700 hover:bg-pine-800',

            'primary' => 'text-white bg-pine-500 hover:bg-pine-800',

            'secondary' => 'text-white bg-gray-700 hover:bg-gray-800',

            'accent' => 'text-white bg-rose-600 hover:bg-rose-800',

            'success' => 'text-white bg-green-600 hover:bg-green-700',

app/Resources/icons/user.svg→app/Resources/icons/account-circle.svg

100755 → 100644
+6 −0
Original line number Diff line number Diff line 
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">

    <g>

        <path fill="none" d="M0 0h24v24H0z"/>

        <path d="M4 22a8 8 0 1 1 16 0H4zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6z"/>

        <path d="M12 2c5.52 0 10 4.48 10 10s-4.48 10-10 10S2 17.52 2 12 6.48 2 12 2zM6.023 15.416C7.491 17.606 9.695 19 12.16 19c2.464 0 4.669-1.393 6.136-3.584A8.968 8.968 0 0 0 12.16 13a8.968 8.968 0 0 0-6.137 2.416zM12 11a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>

    </g>

</svg>

app/Resources/styles/layout.css

+16 −9
Original line number Diff line number Diff line 
/* Admin layout */

.holy-grail-grid {

  @apply grid min-h-screen overflow-y-auto;

  grid-template: 1fr auto / auto 1fr;

  grid-template: auto 1fr auto / auto 1fr;



  & .holy-grail-sidebar {

    @apply col-start-1 col-end-2 row-start-1 row-end-3 w-80;

  & .holy-grail__header {

    @apply h-10 col-start-1 col-end-4 row-start-1 row-end-2;

  }



  & .holy-grail-main {

    @apply w-full col-start-1 col-end-3 row-start-1 row-end-2;

  & .holy-grail__sidebar {

    @apply col-start-1 col-end-2 row-start-2 row-end-4;



    width: 300px;

    max-height: calc(100vh - 2.5rem);

  }



  & .holy-grail__main {

    @apply col-start-1 col-end-3 row-start-2 row-end-3;

  }



  & .holy-grail-footer {

    @apply w-full col-start-1 col-end-3 row-start-2 row-end-3;

  & .holy-grail__footer {

    @apply col-start-1 col-end-3 row-start-3 row-end-4;

  }



  @screen md {

    & .holy-grail-main {

    & .holy-grail__main {

      @apply col-start-2;

    }



    & .holy-grail-footer {

    & .holy-grail__footer {

      @apply col-start-2;

    }

  }

app/Views/Components/Button.php

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class Button extends Component 


        $variantClass = [

            'default' => 'text-black bg-gray-300 hover:bg-gray-400',

            'primary' => 'text-white bg-pine-700 hover:bg-pine-800',

            'primary' => 'text-white bg-pine-500 hover:bg-pine-800',

            'secondary' => 'text-white bg-gray-700 hover:bg-gray-800',

            'accent' => 'text-white bg-rose-600 hover:bg-rose-800',

            'success' => 'text-white bg-green-600 hover:bg-green-700',

modules/Admin/Controllers/MyAccountController.php

+2 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ class MyAccountController extends BaseController 
{

    public function index(): string

    {

        return view('my_account\view');

        return view('my_account/view');

    }



    public function changePassword(): string

    {

        helper('form');



        return view('my_account\change_password');

        return view('my_account/change_password');

    }



    public function attemptChange(): RedirectResponse