displaying vimeos
This commit is contained in:
+1
-1
@@ -51,7 +51,7 @@ section[role="main-content"]{
|
|||||||
|
|
||||||
>.wrapper{
|
>.wrapper{
|
||||||
position: relative;
|
position: relative;
|
||||||
margin:5% 10%;
|
margin:5% 20%;
|
||||||
padding:1em;
|
padding:1em;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
|
||||||
|
// TODO: make this one as settings (or find an other solution)
|
||||||
|
// https://dev.to/sanfra1407/how-to-use-env-file-in-javascript-applications-with-webpack-18df
|
||||||
|
// switch (app_env) {
|
||||||
|
// case 'dev':
|
||||||
|
// let path = `http://${window.location.hostname}:8984`
|
||||||
|
// break;
|
||||||
|
// case 'prod':
|
||||||
|
// let path = `http://${window.location.hostname}/api`
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// let path = 'http://dev.api.gdp.fr'
|
||||||
|
// let path = 'http://localhost:8984'
|
||||||
|
// const
|
||||||
|
// let path = 'http://' + window.location.hostname + (window.env === 'prod' ? '/api' : ':8984')
|
||||||
|
|
||||||
|
// contact@anarchive.net
|
||||||
|
// anarchive_9
|
||||||
|
// b2dbd10a42860e5540fa9f211f39e160
|
||||||
|
|
||||||
|
export const VIMEO = axios.create({
|
||||||
|
// withCredentials: true,
|
||||||
|
baseURL: 'https://vimeo.com/api/oembed.json',
|
||||||
|
crossorigin: true,
|
||||||
|
headers: {
|
||||||
|
'Accept': 'application/json'
|
||||||
|
// 'Authorization': `bearer b2dbd10a42860e5540fa9f211f39e160`,
|
||||||
|
// 'Access-Control-Allow-Origin': '*'
|
||||||
|
// 'Access-Control-Allow-Credentials':
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
<div v-if="data.Text" class="text">
|
<div v-if="data.Text" class="text">
|
||||||
{{ data.Text }}
|
{{ data.Text }}
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="data.Vimeo" class="vimeo" v-html="data.Vimeo.html"/>
|
||||||
<ul v-if="data.Media && data.Media.length">
|
<ul v-if="data.Media && data.Media.length">
|
||||||
<li v-for="(item, index) in data.Media" :key="index">
|
<li v-for="(item, index) in data.Media" :key="index">
|
||||||
<img :src="'https://api.anarchive-muntadas.figli.io'+item.url" alt="">
|
<img :src="'https://api.anarchive-muntadas.figli.io'+item.url" alt="">
|
||||||
|
|||||||
@@ -44,6 +44,9 @@
|
|||||||
import { mapInstanceState, mapInstanceMutations } from '@urbn/vuex-helpers'
|
import { mapInstanceState, mapInstanceMutations } from '@urbn/vuex-helpers'
|
||||||
// import { mapState, mapGetters } from 'vuex'
|
// import { mapState, mapGetters } from 'vuex'
|
||||||
|
|
||||||
|
// import { VIMEO } from 'api/vimeo-axios'
|
||||||
|
// import qs from 'querystring'
|
||||||
|
|
||||||
import * as THREE from 'three'
|
import * as THREE from 'three'
|
||||||
import mixins from 'components/mixins'
|
import mixins from 'components/mixins'
|
||||||
|
|
||||||
@@ -86,6 +89,7 @@ export default {
|
|||||||
// label_position: { x: 5, y: 5, z: 6 },
|
// label_position: { x: 5, y: 5, z: 6 },
|
||||||
// label_canvas: null,
|
// label_canvas: null,
|
||||||
// label_size: null,
|
// label_size: null,
|
||||||
|
preview_img_url: null,
|
||||||
img_canvas: null,
|
img_canvas: null,
|
||||||
img_size: { x: 0, y: 0 },
|
img_size: { x: 0, y: 0 },
|
||||||
img_position: { x: 0, y: 0, z: 0 },
|
img_position: { x: 0, y: 0, z: 0 },
|
||||||
@@ -138,113 +142,118 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
this.size.x = this.projWall.winW * this.contents_size_factor
|
if (this.data.Vimeo) {
|
||||||
this.size.y = this.projWall.winY * this.contents_size_factor
|
this.preview_img_url = this.data.Vimeo.thumbnail_url_with_play_button
|
||||||
// console.log('ContentBlock created', this.data)
|
} else if (this.data.Media && this.data.Media.length) {
|
||||||
// let txtcolor = '#000000'
|
this.preview_img_url = `https://api.anarchive-muntadas.figli.io${this.data.Media[0].url}`
|
||||||
// switch (this.type) {
|
|
||||||
// case 'visible':
|
|
||||||
// txtcolor = '#0000ff'
|
|
||||||
// break
|
|
||||||
// case 'context':
|
|
||||||
// txtcolor = '#ff0000'
|
|
||||||
// break
|
|
||||||
// case 'process':
|
|
||||||
// txtcolor = '#00ff00'
|
|
||||||
// break
|
|
||||||
// default:
|
|
||||||
// }
|
|
||||||
|
|
||||||
// this.label_canvas = this.createLabelCanvas(this.data.Name.replace(/ /g, '\n').toUpperCase(), 60, 150, txtcolor)
|
|
||||||
//
|
|
||||||
// this.size.x = this.label_size.x + 0.2
|
|
||||||
// this.size.y = this.label_size.y + 0.2
|
|
||||||
|
|
||||||
// let y = 0
|
|
||||||
// let top = this.projPos.y + this.projSize.y / 2
|
|
||||||
// let floor = this.projPos.y - this.projSize.y / 2
|
|
||||||
// switch (this.type) {
|
|
||||||
// case 'visible':
|
|
||||||
// y = top * Math.random()
|
|
||||||
// break
|
|
||||||
// case 'context':
|
|
||||||
// y = floor / 3 * Math.random()
|
|
||||||
// break
|
|
||||||
// case 'process':
|
|
||||||
// y = floor / 3 + floor / 3 * Math.random()
|
|
||||||
// break
|
|
||||||
// case 'concept':
|
|
||||||
// y = (floor / 3) * 2 + floor / 3 * Math.random()
|
|
||||||
// break
|
|
||||||
// }
|
|
||||||
// this.position.y = y
|
|
||||||
|
|
||||||
let face = Math.random()
|
|
||||||
// // USES 4 FACES
|
|
||||||
// if (face < 0.25) {
|
|
||||||
// // gauche
|
|
||||||
// this.face = 'left'
|
|
||||||
// this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
|
||||||
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
|
||||||
// this.rotation.y = 90
|
|
||||||
// } else if (face >= 0.25 && face < 0.5) {
|
|
||||||
// // fond
|
|
||||||
// this.face = 'back'
|
|
||||||
// this.position.z = this.projPos.z - this.projSize.z / 2 + 0.1
|
|
||||||
// this.position.x = this.projPos.x - this.projSize.x / 2 + this.size.x / 2 + Math.random() * (this.projSize.x - this.size.x / 2)
|
|
||||||
// } else if (face >= 0.5 && face < 0.75) {
|
|
||||||
// // droite
|
|
||||||
// this.face = 'right'
|
|
||||||
// this.position.x = this.projPos.x + this.projSize.x / 2 - 0.1
|
|
||||||
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
|
||||||
// this.rotation.y = -90
|
|
||||||
// } else {
|
|
||||||
// // face
|
|
||||||
// this.face = 'front'
|
|
||||||
// this.position.z = this.projPos.z + this.projSize.z / 2 - 0.1
|
|
||||||
// this.position.x = this.projPos.x - this.projSize.x / 2 + this.size.x / 2 + Math.random() * (this.projSize.x - this.size.x / 2)
|
|
||||||
// this.rotation.y = 180
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // USES 2 FACES
|
|
||||||
if (face < 0.5) {
|
|
||||||
// gauche
|
|
||||||
this.face = 'left'
|
|
||||||
this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
|
||||||
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
|
||||||
this.rotation.y = 90
|
|
||||||
} else {
|
|
||||||
// droite
|
|
||||||
this.face = 'right'
|
|
||||||
this.position.x = this.projPos.x + this.projSize.x / 2 - 0.1
|
|
||||||
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
|
||||||
this.rotation.y = -90
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// With GRID
|
if (this.preview_img_url) {
|
||||||
// this.face = 'left'
|
this.size.x = this.projWall.winW * this.contents_size_factor
|
||||||
// this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
this.size.y = this.projWall.winY * this.contents_size_factor
|
||||||
// this.rotation.y = 90
|
// console.log('ContentBlock created', this.data)
|
||||||
if (typeof this.gridContentPlaced[this.type] === 'undefined' ||
|
// let txtcolor = '#000000'
|
||||||
typeof this.gridContentPlaced[this.type][this.id] === 'undefined') {
|
// switch (this.type) {
|
||||||
// First shift grid place (will transfer it from free places to occupied places)
|
// case 'visible':
|
||||||
this.shiftGrid({ type: this.type, id: this.id })
|
// txtcolor = '#0000ff'
|
||||||
}
|
// break
|
||||||
// Then get the right place for the current content
|
// case 'context':
|
||||||
let pos = this.gridContentPlaced[this.type][this.id]
|
// txtcolor = '#ff0000'
|
||||||
console.log('pos', pos)
|
// break
|
||||||
this.position.z = this.projPos.z - this.projSize.z / 2 + pos.z
|
// case 'process':
|
||||||
this.position.y = this.projPos.y - this.projSize.y / 2 + pos.y
|
// txtcolor = '#00ff00'
|
||||||
|
// break
|
||||||
|
// default:
|
||||||
|
// }
|
||||||
|
|
||||||
// this.label_position.x = this.position.x - this.size.x / 2 + this.label_size.x / 2 + 0.1
|
// this.label_canvas = this.createLabelCanvas(this.data.Name.replace(/ /g, '\n').toUpperCase(), 60, 150, txtcolor)
|
||||||
// this.label_position.y = this.position.y + this.size.y / 2 - this.label_size.y / 2 - 0.1
|
//
|
||||||
// this.label_position.z = this.position.z + this.size.z / 2 + 0.01
|
// this.size.x = this.label_size.x + 0.2
|
||||||
|
// this.size.y = this.label_size.y + 0.2
|
||||||
|
|
||||||
|
// let y = 0
|
||||||
|
// let top = this.projPos.y + this.projSize.y / 2
|
||||||
|
// let floor = this.projPos.y - this.projSize.y / 2
|
||||||
|
// switch (this.type) {
|
||||||
|
// case 'visible':
|
||||||
|
// y = top * Math.random()
|
||||||
|
// break
|
||||||
|
// case 'context':
|
||||||
|
// y = floor / 3 * Math.random()
|
||||||
|
// break
|
||||||
|
// case 'process':
|
||||||
|
// y = floor / 3 + floor / 3 * Math.random()
|
||||||
|
// break
|
||||||
|
// case 'concept':
|
||||||
|
// y = (floor / 3) * 2 + floor / 3 * Math.random()
|
||||||
|
// break
|
||||||
|
// }
|
||||||
|
// this.position.y = y
|
||||||
|
|
||||||
|
let face = Math.random()
|
||||||
|
// // USES 4 FACES
|
||||||
|
// if (face < 0.25) {
|
||||||
|
// // gauche
|
||||||
|
// this.face = 'left'
|
||||||
|
// this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
||||||
|
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
||||||
|
// this.rotation.y = 90
|
||||||
|
// } else if (face >= 0.25 && face < 0.5) {
|
||||||
|
// // fond
|
||||||
|
// this.face = 'back'
|
||||||
|
// this.position.z = this.projPos.z - this.projSize.z / 2 + 0.1
|
||||||
|
// this.position.x = this.projPos.x - this.projSize.x / 2 + this.size.x / 2 + Math.random() * (this.projSize.x - this.size.x / 2)
|
||||||
|
// } else if (face >= 0.5 && face < 0.75) {
|
||||||
|
// // droite
|
||||||
|
// this.face = 'right'
|
||||||
|
// this.position.x = this.projPos.x + this.projSize.x / 2 - 0.1
|
||||||
|
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
||||||
|
// this.rotation.y = -90
|
||||||
|
// } else {
|
||||||
|
// // face
|
||||||
|
// this.face = 'front'
|
||||||
|
// this.position.z = this.projPos.z + this.projSize.z / 2 - 0.1
|
||||||
|
// this.position.x = this.projPos.x - this.projSize.x / 2 + this.size.x / 2 + Math.random() * (this.projSize.x - this.size.x / 2)
|
||||||
|
// this.rotation.y = 180
|
||||||
|
// }
|
||||||
|
|
||||||
|
// // USES 2 FACES
|
||||||
|
if (face < 0.5) {
|
||||||
|
// gauche
|
||||||
|
this.face = 'left'
|
||||||
|
this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
||||||
|
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
||||||
|
this.rotation.y = 90
|
||||||
|
} else {
|
||||||
|
// droite
|
||||||
|
this.face = 'right'
|
||||||
|
this.position.x = this.projPos.x + this.projSize.x / 2 - 0.1
|
||||||
|
// this.position.z = this.projPos.z - this.projSize.z / 2 + this.size.x / 2 + Math.random() * (this.projSize.z - this.size.x / 2)
|
||||||
|
this.rotation.y = -90
|
||||||
|
}
|
||||||
|
|
||||||
|
// With GRID
|
||||||
|
// this.face = 'left'
|
||||||
|
// this.position.x = this.projPos.x - this.projSize.x / 2 + 0.1
|
||||||
|
// this.rotation.y = 90
|
||||||
|
if (typeof this.gridContentPlaced[this.type] === 'undefined' ||
|
||||||
|
typeof this.gridContentPlaced[this.type][this.id] === 'undefined') {
|
||||||
|
// First shift grid place (will transfer it from free places to occupied places)
|
||||||
|
this.shiftGrid({ type: this.type, id: this.id })
|
||||||
|
}
|
||||||
|
// Then get the right place for the current content
|
||||||
|
let pos = this.gridContentPlaced[this.type][this.id]
|
||||||
|
console.log('pos', pos)
|
||||||
|
this.position.z = this.projPos.z - this.projSize.z / 2 + pos.z
|
||||||
|
this.position.y = this.projPos.y - this.projSize.y / 2 + pos.y
|
||||||
|
|
||||||
|
// this.label_position.x = this.position.x - this.size.x / 2 + this.label_size.x / 2 + 0.1
|
||||||
|
// this.label_position.y = this.position.y + this.size.y / 2 - this.label_size.y / 2 - 0.1
|
||||||
|
// this.label_position.z = this.position.z + this.size.z / 2 + 0.01
|
||||||
|
|
||||||
// console.log()
|
|
||||||
if (this.data.Media && this.data.Media.length) {
|
|
||||||
// console.log(this.data.Media[0].url)
|
// console.log(this.data.Media[0].url)
|
||||||
// create image object with a promise (async img loading)
|
// create image object with a promise (async img loading)
|
||||||
this.createImgCanvas(`https://api.anarchive-muntadas.figli.io${this.data.Media[0].url}`)
|
this.createImgCanvas(this.preview_img_url)
|
||||||
.then(({ img, canvas }) => {
|
.then(({ img, canvas }) => {
|
||||||
// console.log('THEN img loaded ok', this, img, canvas)
|
// console.log('THEN img loaded ok', this, img, canvas)
|
||||||
let f = this.size.x / canvas.width
|
let f = this.size.x / canvas.width
|
||||||
@@ -282,7 +291,6 @@ export default {
|
|||||||
console.warn('CATCH img load ERROR')
|
console.warn('CATCH img load ERROR')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// this.img_position = { ...this.position }
|
// this.img_position = { ...this.position }
|
||||||
// this.img_position.y -= this.size.y
|
// this.img_position.y -= this.size.y
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapInstanceActions(getModuleName, {
|
...mapInstanceActions(getModuleName, {
|
||||||
loadContents: 'loadContents'
|
getContents: 'getContents'
|
||||||
}),
|
}),
|
||||||
...mapInstanceMutations(getModuleName, {
|
...mapInstanceMutations(getModuleName, {
|
||||||
setActiveLevel: 'setActiveLevel'
|
setActiveLevel: 'setActiveLevel'
|
||||||
@@ -187,7 +187,7 @@ export default {
|
|||||||
open () {
|
open () {
|
||||||
if (!this.isOpened) {
|
if (!this.isOpened) {
|
||||||
this.isOpened = true
|
this.isOpened = true
|
||||||
this.loadContents()
|
this.getContents()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onClickLevel (level, e) {
|
onClickLevel (level, e) {
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
// import { REST } from 'api/rest-axios'
|
// import { REST } from 'api/rest-axios'
|
||||||
import { GRAPHQL } from 'api/graphql-axios'
|
import { GRAPHQL } from 'api/graphql-axios'
|
||||||
import Query from 'graphql-query-builder'
|
import Query from 'graphql-query-builder'
|
||||||
|
import { VIMEO } from 'api/vimeo-axios'
|
||||||
|
import qs from 'querystring'
|
||||||
|
|
||||||
import * as THREE from 'three'
|
import * as THREE from 'three'
|
||||||
import { ThreeBSP } from 'three-js-csg-es6'
|
import { ThreeBSP } from 'three-js-csg-es6'
|
||||||
@@ -41,7 +43,7 @@ export default {
|
|||||||
paddingZ: 0
|
paddingZ: 0
|
||||||
},
|
},
|
||||||
contents: {},
|
contents: {},
|
||||||
contents_size_factor: 2, // factor to get the contents (grid) size proportional to windows
|
contents_size_factor: 1, // factor to get the contents (grid) size proportional to windows
|
||||||
contentTypes: ['visible', 'context', 'process', 'concept'],
|
contentTypes: ['visible', 'context', 'process', 'concept'],
|
||||||
grid: { visible: [], context: [], process: [], concept: [] },
|
grid: { visible: [], context: [], process: [], concept: [] },
|
||||||
gridContentPlaced: {},
|
gridContentPlaced: {},
|
||||||
@@ -351,6 +353,24 @@ export default {
|
|||||||
// repMesh.position = { ...state.position, ...{ y: 0 } }
|
// repMesh.position = { ...state.position, ...{ y: 0 } }
|
||||||
// commit('setRep3dObj', levelsMesh)
|
// commit('setRep3dObj', levelsMesh)
|
||||||
},
|
},
|
||||||
|
getContents ({ dispatch, commit, state }) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
// get the list of corpuses (aka authors)
|
||||||
|
dispatch('loadContents')
|
||||||
|
.then(({ data: { data: { project } = null } }) => {
|
||||||
|
console.log('graphql contents', project)
|
||||||
|
dispatch('computeContents', project)
|
||||||
|
.then((contents) => {
|
||||||
|
console.log('computed contents', contents)
|
||||||
|
commit('setContents', project)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.warn('Issue with getContents', error)
|
||||||
|
Promise.reject(error)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
loadContents ({ dispatch, commit, state }) {
|
loadContents ({ dispatch, commit, state }) {
|
||||||
console.log('loadContents')
|
console.log('loadContents')
|
||||||
let contentsQuery = new Query('project', { id: state.id })
|
let contentsQuery = new Query('project', { id: state.id })
|
||||||
@@ -360,7 +380,7 @@ export default {
|
|||||||
contentsQuery.find([visiblesQuery])
|
contentsQuery.find([visiblesQuery])
|
||||||
console.log('contentsQuery', `${contentsQuery}`)
|
console.log('contentsQuery', `${contentsQuery}`)
|
||||||
|
|
||||||
GRAPHQL.post('', { query: `query {
|
return GRAPHQL.post('', { query: `query {
|
||||||
project(id: "${state.id}") {
|
project(id: "${state.id}") {
|
||||||
visibles(where: { Published: "true" }){
|
visibles(where: { Published: "true" }){
|
||||||
id
|
id
|
||||||
@@ -408,15 +428,49 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}` })
|
}` })
|
||||||
.then(({ data: { data: { project } = null } }) => {
|
},
|
||||||
console.log('graphql contents', project)
|
computeContents ({ dispatch, commit, state }, contents) {
|
||||||
commit('setContents', project)
|
console.log('computeContents')
|
||||||
// dispatch('computeProjects', projects)
|
return Promise.all(Object.keys(contents).map(function (key) {
|
||||||
})
|
return Promise.all(contents[key].map(function (content) {
|
||||||
.catch((error) => {
|
if (content.Vimeo) {
|
||||||
console.warn('Issue with getProjects', error)
|
console.log('Vimeo', content.Vimeo)
|
||||||
Promise.reject(error)
|
// GET https://vimeo.com/api/oembed.json?url=https%3A//vimeo.com/286898202&width=480&height=360
|
||||||
|
let params = {
|
||||||
|
url: content.Vimeo,
|
||||||
|
width: 1280,
|
||||||
|
height: 720,
|
||||||
|
responsive: true
|
||||||
|
}
|
||||||
|
let q = qs.stringify(params)
|
||||||
|
return VIMEO.get('?' + q, {})
|
||||||
|
.then(({ data }) => {
|
||||||
|
console.log('Vimeo data', data)
|
||||||
|
content.Vimeo = data// thumbnail_url_with_play_button
|
||||||
|
return content
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.warn('Issue with vimeo', error)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return content
|
||||||
|
}
|
||||||
|
})).then((cts) => {
|
||||||
|
// return an object with the right key (visible, etc, ...)
|
||||||
|
console.log(`${key} cts`, cts)
|
||||||
|
let o = {}
|
||||||
|
o[key] = cts
|
||||||
|
return o
|
||||||
})
|
})
|
||||||
|
})).then((a) => {
|
||||||
|
// return an object with the right keys (visible, etc, ...)
|
||||||
|
console.log('a', a)
|
||||||
|
let o = {}
|
||||||
|
for (var i = 0; i < a.length; i++) {
|
||||||
|
o = { ...o, ...a[i] }
|
||||||
|
}
|
||||||
|
return o
|
||||||
|
})
|
||||||
}
|
}
|
||||||
// getGridPos ({ state, commit }) {
|
// getGridPos ({ state, commit }) {
|
||||||
// let p = state.grid[0]
|
// let p = state.grid[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user