Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit

Permalink
conflict res
Browse files Browse the repository at this point in the history
  • Loading branch information
@mohit5540
mohit5540 committed Sep 27, 2018
2 parents 03d718d + f359ed3 commit 5cdbc04
Show file tree
Hide file tree
Showing 18 changed files with 59 additions and 525 deletions.
31 changes: 16 additions & 15 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<link rel="icon" href="https://res.cloudinary.com/flowz/raw/upload/v1521729139/flowz-dashboard/favicon.ico" type="image/x-icon" />
<link href="images/ico.png" rel="shortcut icon">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
<!-- <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">

<!-- <link rel="stylesheet" href="bower_components/BigVideo/css/bigvideo.css"> -->
<link href="https://res.cloudinary.com/flowz/raw/upload/v1515762659/flowz-dashboard/bigvideo.css" rel="stylesheet"/>
Expand All @@ -25,37 +26,37 @@
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected]/js/dist/raphael.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected]/js/dist/wheelnav.min.js"></script>
<!--script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script-->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/psl/1.1.20/psl.min.js"></script>
<!-- <script type="text/javascript" src="http://www.walterzorn.de/en/scripts/wz_jsgraphics.js"></script> -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> -->
<!-- <script src="scripts/socialCircle.js"></script> -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>

<!-- <style>
<style>
body {
font-family: 'Noto Serif', serif;
font-family: 'Lobster', serif;
font-size: 48px;
/* background-image: url("./src/assets/images/BoraBora-min.jpeg"); */
background-color: #c6ecf5 !important;
}
</style> -->
</style>

</head>
<body>

<div id="app"></div>
<!-- built files will be auto injected -->

<!-- BigVideo Dependencies -->
<script>window.jQuery || document.write('<script src="/bower_components/jquery/jquery.min.js"><\/script>')</script>
<!-- <script>window.jQuery || document.write('<script src="/bower_components/jquery/jquery.min.js"><\/script>')</script> -->
<!--script src="/bower_components/jquery-ui/ui/jquery-ui.js"></script-->
<script src="/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script>
<script src="https://vjs.zencdn.net/4.3/video.js"></script>
<!-- <script src="/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script> -->
<!-- <script src="https://vjs.zencdn.net/4.3/video.js"></script> -->

<!-- BigVideo -->
<script src="/bower_components/BigVideo/lib/bigvideo.js"></script>
<!-- <script src="/bower_components/BigVideo/lib/bigvideo.js"></script> -->

<!-- Demo -->
<script>
<!--<script>
$(function() {
var BV = new $.BigVideo({useFlashForFirefox:false});
var vids = [
Expand Down Expand Up @@ -104,6 +105,6 @@
BV.init();
BV.showPlaylist(vids,{ambient:true, doLoop:true});
});
</script>
</script> -->
</body>
</html>
8 changes: 2 additions & 6 deletions netlify.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[Settings]
ID = "Staging-I"
ID = "Staging-I"

[build]
# This will be your default build command
command = "npm run build"
Expand All @@ -22,8 +23,3 @@ ID = "Staging-I"
to = "/index.html"
status = 200
force = true


[build.environment]
domainkey = "flowzdigital.com"
gatewayid = "gw_2smoc98yQqJksAPR6T"
Binary file added src/assets/images/Bora Bora.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/BoraBora-min.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/BoraBora.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 11 additions & 20 deletions src/components/Header.vue
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<template>
<Menu mode="horizontal" theme="primary" style="background:#c5cee74b;">
<Row type="flex">
<!-- <Col :span="1">
<Row type="flex" justify="end" align="middle">
</Row>
</Col> -->
<i-col :span="5">
<div class="f-logo">
<a @click="mainPage()">
Expand All @@ -20,12 +15,6 @@
<Icon type="person" :size="16"></Icon>
{{email}}
</template>
<!-- MenuItem name="1-1">
<a @click="settings()">
<Icon type="ios-locked-settings" :size="16"></Icon>
ACL
</a>
</MenuItem -->
<MenuItem name="1-2">
<a @click="subscriptionList()">
<Icon type="ios-list-outline" :size="16"></Icon>
Expand All @@ -43,7 +32,6 @@
<Icon type="ios-locked-outline" :size="16"></Icon>
Logout
</a>
<!-- <p>csdcsscd</p> -->
</MenuItem>
</Submenu>
</div>
Expand All @@ -68,11 +56,6 @@ let location = psl.parse(window.location.hostname)
},
methods: {
// logout () {
// this.$session.destroy('auth_token');
// this.$router.push('/login');
// }
logout: function () {
this.$store.commit('FB_SIGN_IN', false)
this.$store.commit('GOOGLE_SIGN_IN', false)
Expand All @@ -87,17 +70,17 @@ let location = psl.parse(window.location.hostname)
// this.$session.destroy('auth_token');
// his.$router.push('/acl');
let routeData = this.$router.resolve({name: 'acl'})
window.open(routeData.href, '_blank')
window.open(routeData.href, '_self')
},
subscriptionList: function () {
// this.$router.push('/subscription-list');
let routeData = this.$router.resolve({name: 'subscriptionList'})
window.open(routeData.href, '_blank')
window.open(routeData.href, '_self')
},
planList: function () {
// this.$router.push('/plan-details');
let routeData = this.$router.resolve({name: 'planDetails'})
window.open(routeData.href, '_blank')
window.open(routeData.href, '_self')
},
mainPage: function () {
this.$router.push('/')
Expand All @@ -124,4 +107,12 @@ let location = psl.parse(window.location.hostname)
.ivu-menu-item-selected {
background: transparent !important;
}
.ivu-menu-primary {
/* background: #2BC0E4 !important; */
background: rgb(18, 180, 219) !important;
}
/* .ivu-menu-primary.ivu-menu-horizontal .ivu-menu-item-active, .ivu-menu-primary.ivu-menu-horizontal .ivu-menu-item:hover, .ivu-menu-primary.ivu-menu-horizontal .ivu-menu-submenu-active, .ivu-menu-primary.ivu-menu-horizontal .ivu-menu-submenu:hover {
background: #00d2ff !important;
} */
.ivu-menu-primary.ivu-menu-horizontal .ivu-menu-submenu:hover{background: rgb(31, 174, 209)!important;}
</style>
42 changes: 10 additions & 32 deletions src/components/Vuetable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Vue.use(VueWidgets)
}).then(function (response) {
if (response.data.data.length > 0) {
self.count++
console.log('Count:', self.count, totalApps)
// console.log('Count:', self.count, totalApps)
self.permissionsAll = _.union(self.permissionsAll, response.data.data)
self.permissionsAll = _.map(self.permissionsAll, o => _.extend({app: appName}, o))
Expand All @@ -115,7 +115,7 @@ Vue.use(VueWidgets)
return response.data.data
})
.catch(function (error) {
console.log('Get all permission error:', error)
// console.log('Get all permission error:', error)
console.log(error)
})
},
Expand All @@ -127,7 +127,7 @@ Vue.use(VueWidgets)
}
}).then(function (response) {
// console.log("Get all roles:",_.groupBy(response.data.data, 'module'));
console.log('all roles:', response)
// console.log('all roles:', response)
if (response.data.data.length > 0) {
var arrRoles = _.groupBy(response.data.data, 'module')
for (var tblData in arrRoles) {
Expand All @@ -137,7 +137,7 @@ Vue.use(VueWidgets)
sortField: 'name'
}
arrRoles[tblData].splice(0, 0, obj)
console.log('arraData', arrRoles)
// console.log('arraData', arrRoles)
}
self.fields = arrRoles
self.callTaskList()
Expand Down Expand Up @@ -175,36 +175,14 @@ Vue.use(VueWidgets)
let arrResources = _.groupBy(response.data.data, 'module')
self.tableData = _.extend(self.tableData, arrResources)
}).catch(function (error) {
console.log('Get role permissions error:', error)
// console.log('Get role permissions error:', error)
console.log(error)
})
}
self.loading = false
for (var tblData in self.tableData) {
await self.getAllPermissions(tblData, Object.keys(self.tableData).length)
}
// axios.get(config.subscriptionUrl+'register-resource', {
// headers: {
// 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
// },
// }).then(function (response) {
// console.log("Get resources:",response.data.data);
// if(response.data.data.length > 0){
// let arrResources = _.groupBy(response.data.data, 'module');
// self.tableData = arrResources;
// //console.log("Table rows:",Object.keys(self.tableData));
// for (var tblData in arrResources){
// console.log("arrResources:",tblData)
// self.getAllPermissions(tblData, Object.keys(self.tableData).length)
// }
// }
// return response.data.data
// })
// .catch(function (error) {
// console.log("Get role permissions error:",error);
// console.log(error);
// })
},
getCheckboxValue: function (role, resources, action, appName) {
let resID = resources.id + '_' + action
Expand All @@ -223,7 +201,7 @@ Vue.use(VueWidgets)
if (event.target.checked) {
accessVal = 1
}
console.log('Set permission params 1:', event.target.checked)
// console.log('Set permission params 1:', event.target.checked)
let updateValue = {
resourceId: item.id + '_' + action, // resourceid_action
Expand All @@ -233,18 +211,18 @@ Vue.use(VueWidgets)
app: moduleName
}
console.log('Set permission params: 2', item)
// console.log('Set permission params: 2', item)
axios.post(config.setPermissionUrl, updateValue, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
}
})
.then(function (response) {
console.log('Set permission response:', response)
// console.log('Set permission response:', response)
let resID = item.id + '_' + action
let index = _.findIndex(self.permissionsAll, function (d) { return (d.roleId === roleField.id) && (d.resourceId === resID) })
console.log('Set permission response index:', index)
// console.log('Set permission response index:', index)
if (index > -1) {
if (self.permissionsAll[index].access_value === '1') { self.permissionsAll.splice(index, 1) } else {
self.permissionsAll[index].access_value = '1'
Expand All @@ -267,7 +245,7 @@ Vue.use(VueWidgets)
})
.catch(function (error) {
self.showOverlay = false
console.log('Set permission error:', error)
// console.log('Set permission error:', error)
console.log(error)
})
},
Expand Down
Loading

0 comments on commit 5cdbc04

Please sign in to comment.