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.

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

Jump to bottom

Wizard Finish style changed #2997

Merged
merged 9 commits into from
Jul 3, 2023
Merged

Wizard Finish style changed #2997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ce1193
Wizard slip on steps in tabs
mervekaraman Apr 25, 2023
b374555
Wizard slip problem update
mervekaraman Apr 25, 2023
8771f99
Merge branch 'akaunting:master' into master
mervekaraman Jun 19, 2023
ff9a24e
Notification does not appear
mervekaraman Jun 20, 2023
ac75c3e
Merge branch 'master' of github.com:mervekaraman/akaunting
mervekaraman Jun 20, 2023
df95c10
Merge branch 'master' of github.com:mervekaraman/akaunting
mervekaraman Jun 23, 2023
0f32db0
Self-Hosted Wizard Finish
mervekaraman Jun 23, 2023
b2f446b
Merge branch 'akaunting:master' into master
mervekaraman Jul 3, 2023
606c31a
Wizard Finish stlye changed
mervekaraman Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions resources/assets/js/components/NotificationPlugin/Notification.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
]"
role="alert"
:style="customPosition"
style="z-index: 100;"
data-notify-position="top-center"
>
<div class="flex items-center ltr:pr-3 rtl:pl-3">
Expand Down
74 changes: 44 additions & 30 deletions resources/assets/js/views/wizard/Finish.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:p-10 full-height-mobile overflow-hidden">
<WizardSteps :active_state="active"></WizardSteps>

<div class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:565px;">
<div class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:523px;">
<div v-if="pageLoad" class="absolute left-0 right-0 top-0 bottom-0 w-full h-full bg-white rounded-lg flex items-center justify-center z-50">
<span class="material-icons form-spin text-lg animate-spin text-9xl">data_usage</span>
<span class="material-icons form-spin animate-spin text-9xl">data_usage</span>
</div>

<div class="flex flex-col lg:flex-row mt-6">
<div class="flex flex-col lg:flex-row mt-4">
<div class="w-full lg:w-1/2 ltr:pr-10 rtl:pl-10 mt-3">
<div class="grid sm:grid-cols-6">
<h1 class="sm:col-span-6 text-black-300 mb-2">
<div class="grid sm:grid-cols-6 overflow-y-scroll lg:overflow-hidden scroll">
<h1 class="sm:col-span-6 text-black-300 mb-2 text-lg font-light">
{{ translations.finish.recommended_apps }}
</h1>

<div v-for="(item, index) in modules" :key="index" class="sm:col-span-6 mb-6">
<a :href="route_url + '/apps/' + item.slug" class="flex items-center">
<div v-for="(item, index) in modules" :key="index" class="sm:col-span-6 mb-3">
<a :href="route_url + '/apps/' + item.slug" class="flex items-center space-x-4 bg-purple-50 rounded-md p-2">
<div class="w-1/4">
<img v-for="(file, indis) in item.files" :key="indis" v-if="file.media_type == 'image' && file.pivot.zone == 'thumbnail'"
:src="file.path_string"
Expand All @@ -24,46 +24,56 @@
/>
</div>

<div class="w-3/4 ltr:pl-8 rtl:pr-8">
<span class="font-medium">
<div class="w-3/4 ltr:pl-2 rtl:pr-2">
<span class="font-medium text-sm">
{{ item.name }}
</span>

<div class="text-black-300 text-sm my-2 line-clamp-2 h-10" v-html="item.description"></div>
<div class="text-black-300 text-sm mt-1 line-clamp-2 h-10" v-html="item.description"></div>
</div>
</a>
</div>
</div>

<div class="lg:hidden">
<base-button class="btn flex items-center justify-center text-base disabled:opacity-50 relative mt-5 mx-auto bg-green hover:bg-gray-100 text-white rounded-md py-3 px-5 font-semibold" @click="finish()">
<base-button class="btn flex items-center justify-center text-base disabled:opacity-50 relative mt-5 mx-auto bg-green hover:bg-gray-100 text-white rounded-md py-3 px-5 font-medium" @click="finish()">
{{ translations.finish.create_first_invoice }}
</base-button>
</div>
</div>

<div class="absolute w-1/2 right-0 ltr:pl-10 rtl:pr-10 mt-3 hidden lg:flex lg:flex-col">
<div class="flex flex-col ltr:items-start rtl:items-end bg-purple ltr:rounded-tl-lg ltr:rounded-bl-lg rtl:rounded-tr-lg rtl:rounded-br-lg p-6">
<div class="w-48 text-white text-left text-2xl font-semibold leading-9">
{{ translations.finish.apps_managing }}
</div>

<div style="width:372px; height:372px;"></div>

<img :src="image_src" class="absolute top-3 right-2" alt="Akaunting" />
<div class="flex">
<img :src="image_src" class="absolute top-12 right-2 w-10/12 p-3 -mt-12" alt="Akaunting" />
</div>

<base-button
class="relative flex items-center justify-center text-base rounded-lg m-auto bottom-48 bg-white hover:bg-gray-100 text-purple py-3 px-5 font-semibold disabled:bg-gray-100 "
:disabled="anchor_loading"
@click="finish()"
>
<i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
<div class="flex">
<base-button
class="relative flex items-center justify-center text-base rounded-lg m-auto mt-96 hover:underline py-1.5 -right-20 font-semibold disabled:bg-gray-100 "
:disabled="anchor_loading"
@click="finish()"
style="top: 5.9rem"
>
<i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>

<span :class="[{'opacity-0': anchor_loading}]">
{{ translations.company.skip }}
</span>
</base-button>

<span :class="[{'opacity-0': anchor_loading}]">
{{ translations.finish.create_first_invoice }}
</span>
</base-button>
<base-button
class="relative flex items-center justify-center text-base rounded-lg m-auto mt-96 bg-default hover:bg-default-hover text-white py-1.5 px-7 font-medium"
:disabled="anchor_loading"
@click="finish()"
style="top: 5.9rem; right: -0.6rem;"
>
<i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>

<span :class="[{'opacity-0': anchor_loading}]">
{{ translations.finish.create_first_invoice }}
</span>
</base-button>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -98,7 +108,7 @@ export default {
return {
active: 3,
route_url: url,
image_src: app_url + "/public/img/wizard-modules.png",
image_src: app_url + "/public/img/wizard-rocket.gif",
anchor_loading: false
};
},
Expand Down Expand Up @@ -144,5 +154,9 @@ export default {
[modal-container] {
height: 100% !important;
}

.scroll{
height:450px;
}
}
</style>
2 changes: 1 addition & 1 deletion resources/assets/js/views/wizard/Steps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</li>

<li class="w-1/3">
<span class="pl-6 flex flex-col">
<span class="ltr:pl-6 ltr:pr-9 rtl:pl-3 flex flex-col">
<span
:class="[{'bg-purple': active_state == 2}]"
class="w-full h-1 bg-gray-300 rounded-xl text-transparent"
Expand Down