omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'too/frontend-notification' into 'master'

Browse Source 
Too/frontend notification

See merge request CIEFWorldwideSdnBhd/exchange!72
This commit is contained in:
Jack Goh
2018-07-16 14:03:10 +00:00
parent dcca2d62f6 1474f87488
commit 934de5d7a2
6 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/Navbar.vue
+31 -2
View File
@@ -19,7 +19,25 @@
<ul class="navbar-nav ml-auto">
<!-- Authenticated -->
<li v-if="user" class="nav-item dropdown">
<template v-if="user">
<!-- <el-badge :value="12" class="item">
<el-button size="share-button"><i class="el-icon-bell"></i></el-button>
</el-badge> -->
<el-dropdown trigger="click">
<el-badge :value="12" class="item">
<el-button icon="el-icon-bell" circle></el-button>
</el-badge>
<el-dropdown-menu slot="dropdown" style="max-width: 30%" id="notification">
<a v-for="item in notification" :href="item.link">
<el-dropdown-item>
{{item.message}}
</el-dropdown-item>
</a>
</el-dropdown-menu>
</el-dropdown>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle text-dark"
href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img :src="user.photo_url" class="rounded-circle profile-photo mr-1">
@@ -38,6 +56,8 @@
</a>
</div>
</li>
</template>
</li>
<!-- Guest -->
<template v-else>
<li class="nav-item">
@@ -67,7 +87,16 @@ export default {
},
data: () => ({
appName: window.config.appName
appName: window.config.appName,
notification:[{
message : "You have an unread message",
link : "http://www.google.com"
},
{
message : "There are 10 booking for your approval",
link : "http://www.yahoo.com"
}]
}),
computed: mapGetters({
resources/assets/js/pages/settings/admin-bank-setting.vue
+7 -10
View File
@@ -44,10 +44,7 @@
</template>
<script type="text/javascript">
var axios = require('axios');
var client = axios.create({
baseURL: 'http://localhost:8000'
});
import axios from 'axios'
export default {
// TODO : update credit limit and timeout
@@ -71,12 +68,12 @@ export default {
methods :{
UpdateMalaysiaBankOption : function(){
var malaysiaBankData;
client.get('api/setting-malaysia-bank')
axios.get('/api/setting-malaysia-bank')
.then((response) => {
malaysiaBankData = response.data;
this.options_CIEF = malaysiaBankData.map(function(item){
return {
value : item.acc_no,
value : item.id,
label : item.acc_no,
};
});
@@ -93,12 +90,12 @@ export default {
},
UpdateChinaBankOption : function(){
var chinaBankData;
client.get('api/setting-beneficiary')
axios.get('/api/setting-beneficiary')
.then((response) => {
chinaBankData = response.data;
this.options_china_bank = chinaBankData.map(function(item){
return {
value : item.acc_no,
value : item.id,
label : item.acc_no,
};
});
@@ -114,7 +111,7 @@ export default {
});
},
UpdateActiveBankSetting : function(){
client.get('api/setting-active-bank')
axios.get('/api/setting-active-bank')
.then((response) => {
this.active_bank_setting = response.data;
})
@@ -130,7 +127,7 @@ export default {
},
EditActiveBankSetting : function(){
this.loading_btn = true;
client.put('/api/setting-active-bank', this.active_bank_setting)
axios.put('/api/setting-active-bank', this.active_bank_setting)
.then((response) => {
this.loading_btn = false;
this.$message({
resources/assets/js/pages/settings/admin-china-bank.vue
+5 -8
View File
@@ -125,10 +125,7 @@
</template>
<script>
var axios = require('axios');
var client = axios.create({
baseURL: 'http://localhost:8000'
});
import axios from 'axios'
export default {
data() {
@@ -157,7 +154,7 @@
methods: {
CreateBeneficiaries : function(){
this.AddDatadialogVisible = false;
client.post('api/setting-beneficiary', this.beneficiariesForm)
axios.post('/api/setting-beneficiary', this.beneficiariesForm)
.then((response) => {
this.DoneAddDatadialogVisible = true;
this.ClearBeneficiariesForm();
@@ -175,7 +172,7 @@
});
},
UpdateTableData : function(){
client.get('api/setting-beneficiary', this.beneficiariesForm)
axios.get('/api/setting-beneficiary', this.beneficiariesForm)
.then((response) => {
this.tableData = response.data;
})
@@ -191,7 +188,7 @@
},
DeleteBeneficiaries : function(beneficiaries_id){
this.DeleteAdddialogVisible = true;
client.delete('api/setting-beneficiary/' + beneficiaries_id)
axios.delete('/api/setting-beneficiary/' + beneficiaries_id)
.then((response) => {
this.UpdateTableData();
})
@@ -209,7 +206,7 @@
this.EditDatadialogVisible = false;
this.DoneUpdateDatadialogVisible = true;
client.put('api/setting-beneficiary/' + this.currentEdit, this.beneficiariesForm)
axios.put('/api/setting-beneficiary/' + this.currentEdit, this.beneficiariesForm)
.then((response) => {
this.UpdateTableData();
})
resources/assets/js/pages/settings/admin-malaysia-bank.vue
+5 -8
View File
@@ -125,10 +125,7 @@
</template>
<script>
var axios = require('axios');
var client = axios.create({
baseURL: 'http://localhost:8000'
});
import axios from 'axios'
export default {
data() {
@@ -157,7 +154,7 @@
methods: {
CreateMalaysiaBank : function(){
this.AddDatadialogVisible = false;
client.post('api/setting-malaysia-bank', this.malaysiaBankForm)
axios.post('/api/setting-malaysia-bank', this.malaysiaBankForm)
.then((response) => {
this.DoneAddDatadialogVisible = true;
this.ClearMalaysiaBankForm();
@@ -175,7 +172,7 @@
});
},
UpdateTableData : function(){
client.get('api/setting-malaysia-bank', this.malaysiaBankForm)
axios.get('/api/setting-malaysia-bank', this.malaysiaBankForm)
.then((response) => {
this.tableData = response.data;
})
@@ -191,7 +188,7 @@
},
DeleteMalaysiaBank : function(malaysiaBank_id){
this.DeleteAdddialogVisible = true;
client.delete('api/setting-malaysia-bank/' + malaysiaBank_id)
axios.delete('/api/setting-malaysia-bank/' + malaysiaBank_id)
.then((response) => {
this.UpdateTableData();
})
@@ -208,7 +205,7 @@
EditMalaysiaBank : function(){
this.EditDatadialogVisible = false;
this.DoneUpdateDatadialogVisible = true;
client.put('api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm)
axios.put('/api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm)
.then((response) => {
this.UpdateTableData();
})
resources/assets/js/pages/settings/admin-marking-setting.vue
+2 -5
View File
@@ -18,10 +18,7 @@
</template>
<script>
var axios = require('axios');
var client = axios.create({
baseURL: 'http://localhost:8000'
});
import axios from 'axios'
export default {
data() {
@@ -35,7 +32,7 @@
},
methods: {
CreateMarking : function(){
client.post('api/setting-marking', this.markingForm)
axios.post('/api/setting-marking', this.markingForm)
.then((response) => {
this.loading_btn = false
this.$message({
resources/assets/js/pages/settings/admin-supplier.vue
+1 -4
View File
@@ -101,10 +101,7 @@
</template>
<script>
var axios = require('axios');
var client = axios.create({
baseURL: 'http://localhost:8000'
});
import axios from 'axios'
export default {
data() {