Skip to content

feature -> develop | Fixes #3

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

Merged
merged 3 commits into from
Dec 23, 2021
Merged

feature -> develop | Fixes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68fd150
Updated: title and change status button on list
we-vikram-wri231 Dec 22, 2021
8bbed48
Added: note for cpanel host type
we-vikram-wri231 Dec 22, 2021
3fac524
Updated: npm production
we-vikram-wri231 Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/assets/build/app.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Vue/pages/apps/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@
<div class="block" style="margin-bottom: 0px;" >

<div v-if="page.list_view == 'large'">
<ListLargeView/>
<ListLargeView @eReloadList="getList" />
</div>

<div v-else>
<ListSmallView/>
<ListSmallView @eReloadList="getList" />
</div>

</div>
Expand Down
1 change: 1 addition & 0 deletions Vue/pages/apps/ListJs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export default {

},
mounted() {
document.title = "Apps";
//----------------------------------------------------
this.onLoad();
//----------------------------------------------------
Expand Down
13 changes: 13 additions & 0 deletions Vue/pages/apps/partials/ListLargeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@
</b-tooltip>
</b-table-column>

<b-table-column v-slot="props" width="10%" field="is_active" label="Is Active">
<b-tooltip label="Change Status" type="is-dark">
<b-button v-if="props.row.is_active === 1" rounded size="is-small"
type="is-success" :disabled="props.row.deleted_at ? true : false" @click="changeStatus(props.row.id)">
Yes
</b-button>
<b-button v-else rounded size="is-small" type="is-danger"
:disabled="props.row.deleted_at ? true : false" @click="changeStatus(props.row.id)">
No
</b-button>
</b-tooltip>
</b-table-column>




Expand Down
1 change: 1 addition & 0 deletions Vue/pages/servers/ListJs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export default {

},
mounted() {
document.title = "Servers";
//----------------------------------------------------
this.onLoad();
//----------------------------------------------------
Expand Down
19 changes: 18 additions & 1 deletion Vue/pages/servers/View.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@
</TableTrStatus>
</template>

<template v-if="label == 'username'">
<tr>
<th align="right"><span v-if="label">{{$vaah.toLabel(label)}}</span></th>
<td colspan="2">
<p v-if="item.host_type !== 'CPanel-MySql'" >
{{ value }}
</p>

<p class="has-text-danger" v-else>
These detail are stored in <strong class="has-text-danger">meta</strong>
</p>

</td>
</tr>
</template>

<template v-if="label == 'avatar'">
<TableTrUrl :value="value"
:label="label">
Expand Down Expand Up @@ -150,7 +166,8 @@


<template v-else-if="label == 'created_by_user'
|| label == 'updated_by_user' || label == 'deleted_by_user' || label == 'name' || label == 'thumbnail' ">
|| label == 'updated_by_user' || label == 'deleted_by_user'
|| label == 'name' || label == 'thumbnail' || label == 'username' ">

</template>

Expand Down
1 change: 1 addition & 0 deletions Vue/pages/tenantapps/ListJs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default {

},
mounted() {
document.title = "Tenant's Apps";
//----------------------------------------------------
this.onLoad();
//----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions Vue/pages/tenants/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,11 @@
<div class="block" style="margin-bottom: 0px;" >

<div v-if="page.list_view == 'large'">
<ListLargeView/>
<ListLargeView @eReloadList="getList" />
</div>

<div v-else>
<ListSmallView/>
<ListSmallView @eReloadList="getList" />
</div>

</div>
Expand Down
1 change: 1 addition & 0 deletions Vue/pages/tenants/ListJs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export default {

},
mounted() {
document.title = "Tenants";
//----------------------------------------------------
this.onLoad();
//----------------------------------------------------
Expand Down
13 changes: 13 additions & 0 deletions Vue/pages/tenants/partials/ListLargeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@
</b-tooltip>
</b-table-column>

<b-table-column v-slot="props" width="10%" field="is_active" label="Is Active">
<b-tooltip label="Change Status" type="is-dark">
<b-button v-if="props.row.is_active === 1" rounded size="is-small"
type="is-success" :disabled="props.row.deleted_at ? true : false" @click="changeStatus(props.row.id)">
Yes
</b-button>
<b-button v-else rounded size="is-small" type="is-danger"
:disabled="props.row.deleted_at ? true : false" @click="changeStatus(props.row.id)">
No
</b-button>
</b-tooltip>
</b-table-column>

<b-table-column v-slot="props" width="15%" field="updated_at" label="Updated At">
{{ $vaah.fromNow(props.row.updated_at) }}
</b-table-column>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"resolve-url-loader": "^3.1.0",
"sass": "^1.35.0",
"sass-loader": "^7.3.1",
"vue-loader": "^15.9.7",
"vue-loader": "^15.9.8",
"vue-template-compiler": "^2.6.10",
"webpack-visualizer-plugin": "^0.1.11"
},
Expand Down