Skip to content

Commit

Permalink
Merge branch '2.x-release/v2.1.4' into 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@themodernpk
themodernpk committed Sep 29, 2023
2 parents 01eeeca + d743894 commit df6512a
Show file tree
Hide file tree
Showing 12 changed files with 225 additions and 44 deletions.
2 changes: 1 addition & 1 deletion Config/vaahcms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
$settings = [
'app_name' => 'VaahCMS',
'app_slug' => 'vaahcms',
'version' => '2.1.3',
'version' => '2.1.4',
'php_version_required' => '8.1',
'get_config_version' => false,
'website' => 'https://vaah.dev/cms',
Expand Down
2 changes: 1 addition & 1 deletion Resources/assets/backend/vaahtwo/build/index.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Resources/assets/backend/vaahtwo/build/main.js
View file

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions Vue/vaahtwo/pages/public/ForgotPassword.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ onMounted(async () => {
<template #title>
<div class="content text-center">
<Logo class="mt-3" />
<h4 class="text-xl font-semibold mb-1">Forgot password?</h4>
<p class="text-xs text-gray-600 font-normal">You can recover your password from here.</p>
<h4 class="text-xl font-semibold mb-1"
data-testid="forgot_password-heading_text">Forgot password?</h4>
<p class="text-xs text-gray-600 font-normal"
data-testid="forgot_password-description_text">You can recover your password from here.</p>

</div>
</template>
Expand All @@ -40,6 +42,7 @@ onMounted(async () => {
id="email"
class="w-full"
type="text"/>

<div class="w-full flex justify-content-between align-items-center">
<Button
label="Send Code"
Expand All @@ -48,7 +51,12 @@ onMounted(async () => {
class="p-button-sm"
native-type="submit"
@click="auth.sendCode()"
:loading="auth.is_forgot_password_btn_loading"/>
:loading="auth.is_forgot_password_btn_loading"
:pt="{
label: {
'data-testid': `forgot_password-send_code_btn_text`
}
}"/>
<router-link :to="{name:'sign.in'}">
<Button label="Sign In" class="p-button-text p-button-sm"/>
</router-link>
Expand Down
13 changes: 10 additions & 3 deletions Vue/vaahtwo/pages/public/Signin.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ onMounted(async () => {
<template #title>
<div class="content text-center">
<Logo class="mt-3" />
<h4 class="text-xl font-semibold mb-1">{{ auth.title.heading }}</h4>
<p class="text-xs text-gray-600 font-normal">{{ auth.title.description }}</p>
<h4 class="text-xl font-semibold mb-1"
data-testid="signin-heading_text">{{ auth.title.heading }}</h4>
<p class="text-xs text-gray-600 font-normal"
data-testid="signin-description_text">{{ auth.title.description }}</p>

</div>
</template>
Expand Down Expand Up @@ -107,7 +109,12 @@ onMounted(async () => {
class="w-full" inputClass="w-full"
:feedback="false"
toggleMask
id="password"></Password>
id="password"
:pt="{
showicon: {
'data-testid': `signin-password_eye`
}
}"></Password>

</div>
</div>
Expand Down
55 changes: 47 additions & 8 deletions Vue/vaahtwo/pages/public/setup/intall/Account.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@ onMounted(async () => {
<div v-if="store && store.assets">
<div class="p-card">
<div class="p-card-content p-4 border-round-xl">
<Message severity="info" :closable="true" class="is-small">
<Message severity="info" :closable="true" class="is-small"
:pt="{
text: {
'data-testid': `account-message_text`
},
closebutton:{
'data-testid': `account-message_close_btn`
}
}">
Create first account,this account will have super administrator
role and will have all the permissions.
</Message>
Expand All @@ -31,7 +39,8 @@ onMounted(async () => {
name="account-first_name"
data-testid="account-first_name"
placeholder="Enter first name"
class="p-inputtext-sm"/>
class="p-inputtext-sm"
/>
</div>
</div>
<div class="col-12 md:col-3">
Expand Down Expand Up @@ -90,7 +99,12 @@ onMounted(async () => {
data-testid="account-password"
:feedback="false"
toggleMask input-class="w-full p-inputtext-sm"
placeholder="Enter password"/>
placeholder="Enter password"
:pt="{
showicon: {
'data-testid': `account-password_eye`
}
}"/>
</div>
</div>
<div class="col-12 md:col-3">
Expand Down Expand Up @@ -130,7 +144,12 @@ onMounted(async () => {
icon="pi pi-check"
label="Create Account"
class="p-button-success p-button-sm w-auto is-small"
:loading="store.config.btn_is_account_creating"/>
:loading="store.config.btn_is_account_creating"
:pt="{
label: {
'data-testid': `account-create_account_btn_text`
}
}"/>
<Button
v-else
name="account-create_account_btn"
Expand All @@ -139,7 +158,12 @@ onMounted(async () => {
label="Create Account"
class="p-button-sm w-auto is-small"
:loading="store.config.btn_is_account_creating"
@click="store.createAccount()"/>
@click="store.createAccount()"
:pt="{
label: {
'data-testid': `account-create_account_btn_text`
}
}"/>

</div>
<div class="col-12">
Expand All @@ -149,23 +173,38 @@ onMounted(async () => {
name="account-back_btn"
data-testid="account-back_btn"
class="p-button-sm w-auto"
@click="$router.push('/setup/install/dependencies')"></Button>
@click="$router.push('/setup/install/dependencies')"
:pt="{
label: {
'data-testid': `account-back_btn_text`
}
}"></Button>
<Button
v-if="store.config.is_account_created"
name="account-back_to_sign_in_btn"
data-testid="account-back_to_sign_in_btn"
icon="pi pi-external-link"
label="Go to Backend Sign in"
class="p-button-success p-button-sm w-auto"
@click="store.validateAccountCreation()"></Button>
@click="store.validateAccountCreation()"
:pt="{
label: {
'data-testid': `account-back_to_sign_in_btn_text`
}
}"></Button>
<Button
v-else
name="account-back_to_sign_in_btn"
data-testid="account-back_to_sign_in_btn"
icon="pi pi-external-link"
label="Go to Backend Sign in"
class="p-button-sm w-auto"
@click="store.validateAccountCreation()"></Button>
@click="store.validateAccountCreation()"
:pt="{
label: {
'data-testid': `account-back_to_sign_in_btn_text`
}
}"></Button>
</div>
</div>
</div>
Expand Down
42 changes: 36 additions & 6 deletions Vue/vaahtwo/pages/public/setup/intall/Configuration.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,24 @@ onMounted(async () => {
:loading="store.is_btn_loading_db_connection"
icon="pi pi-check"
class="p-button-sm mt-2 mb-3" severity="success"
data-testid="configuration-test_db_connection"/>
data-testid="configuration-test_db_connection"
:pt="{
label: {
'data-testid': `configuration-test_db_connection_btn_text`
}
}"/>

<Button v-else
@click="store.testDatabaseConnection()"
label="Test Database connection"
:loading="store.is_btn_loading_db_connection"
icon="pi pi-database" class="p-button-sm mt-2 mb-3" outlined
data-testid="configuration-test_db_connection"/>
data-testid="configuration-test_db_connection"
:pt="{
label: {
'data-testid': `configuration-test_db_connection_btn_text`
}
}"/>



Expand Down Expand Up @@ -290,14 +300,24 @@ onMounted(async () => {
label="Test Mail Configuration"
icon="pi pi-check"
class="p-button-sm mt-2 mb-3" severity="success"
data-testid="configuration-test_mail"/>
data-testid="configuration-test_mail"
:pt="{
label: {
'data-testid': `configuration-test_mail_btn_text`
}
}"/>

<Button v-else
@click="$event => $refs.op.toggle($event)"
label="Test Mail Configuration"
icon="pi pi-envelope"
class="p-button-sm mt-2 mb-3" outlined
data-testid="configuration-test_mail"/>
data-testid="configuration-test_mail"
:pt="{
label: {
'data-testid': `configuration-test_mail_btn_text`
}
}"/>

<OverlayPanel ref="op" appendTo="body"
:showCloseIcon="true" id="overlay_panel"
Expand All @@ -317,7 +337,12 @@ onMounted(async () => {
@click="store.testMailConfiguration"
label="Send Email"
class="p-button-sm is-small"
data-testid="configuration-send_mail"/>
data-testid="configuration-send_mail"
:pt="{
label: {
'data-testid': `configuration-send_mail_btn_text`
}
}"/>
</div>
</div>
</OverlayPanel>
Expand All @@ -329,7 +354,12 @@ onMounted(async () => {
<Button label="Save & Next" :loading="store.is_btn_loading_config"
:disabled="!store.config.env.db_is_valid"
class="p-button-sm w-auto" @click="store.validateConfigurations"
data-testid="configuration-save"></Button>
data-testid="configuration-save_btn"
:pt="{
label: {
'data-testid': `configuration-save_btn_text`
}
}"></Button>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit df6512a

Please sign in to comment.