marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor app drag calculation changes

Browse Source
This commit is contained in:
frikky
2021-05-25 21:22:42 +02:00
parent c64e24aca9
commit f0065eaa11
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
-10
View File
@@ -100,10 +100,6 @@ services:
- 9200:9200 - 9200:9200
networks: networks:
- shuffle - shuffle
#volumes:
# #- ${DB_LOCATION}/opensearch:/usr/share/opensearch/data
# #- tmp/opensearch:/usr/share/opensearch/data
# - ${DB_LOCATION}:/usr/share/opensearch/data
#database: #database:
# #build: ./backend/database # #build: ./backend/database
# image: frikky/shuffle:database # image: frikky/shuffle:database
@@ -122,9 +118,3 @@ services:
networks: networks:
shuffle: shuffle:
driver: bridge driver: bridge
#volumes:
# opensearch-data1:
# driver: local
# driver_opts:
# type: nfs
# device: ${DB_LOCATION}
frontend/package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"name": "shuffler", "name": "shuffler",
"homepage": "https://shuffler.io", "homepage": "https://shuffler.io",
"version": "0.8.76", "version": "0.8.92",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@babel/helper-regex": "^7.10.5", "@babel/helper-regex": "^7.10.5",
@@ -46,7 +46,7 @@
"react-cytoscapejs": "^1.2.0", "react-cytoscapejs": "^1.2.0",
"react-device-detect": "^1.9.10", "react-device-detect": "^1.9.10",
"react-dom": "^16.14.0", "react-dom": "^16.14.0",
"react-draggable": "^3.3.2", "react-draggable": "4.4.3",
"react-dropzone": "^10.1.10", "react-dropzone": "^10.1.10",
"react-ga": "^2.7.0", "react-ga": "^2.7.0",
"react-iframe": "^1.8.0", "react-iframe": "^1.8.0",
frontend/src/views/AngularWorkflow.jsx
+2 -13
View File
@@ -3400,9 +3400,6 @@ const AngularWorkflow = (props) => {
const handleAppDrag = (e, app) => { const handleAppDrag = (e, app) => {
const cycontainer = cy.container() const cycontainer = cy.container()
console.log("X: ", e.pageX)
console.log("Y: ", e.pageY)
console.log("Height: ", cycontainer.offsetHeight)
// Chrome lol // Chrome lol
//if (e.srcElement !== undefined && e.srcElement.localName === "canvas") { //if (e.srcElement !== undefined && e.srcElement.localName === "canvas") {
@@ -3413,8 +3410,6 @@ const AngularWorkflow = (props) => {
return return
} }
console.log("RENDEREDX: ", e.pageX-cycontainer.offsetLeft)
console.log("RENDEREDY: ", e.pageY-cycontainer.offsetTop)
currentnode[0].renderedPosition("x", e.pageX-cycontainer.offsetLeft) currentnode[0].renderedPosition("x", e.pageX-cycontainer.offsetLeft)
currentnode[0].renderedPosition("y", e.pageY-cycontainer.offsetTop) currentnode[0].renderedPosition("y", e.pageY-cycontainer.offsetTop)
} else{ } else{
@@ -3480,14 +3475,8 @@ const AngularWorkflow = (props) => {
// FIXME: overwrite category if the ACTION chosen has a different category // FIXME: overwrite category if the ACTION chosen has a different category
// const image = "url("+app.large_image+")" // const image = "url("+app.large_image+")"
// FIXME - find the cytoscape offset position // FIXME - find the cytoscape offset position
// Can this be done with zoom calculations? // Can this be done with zoom calculations?
console.log("LAYERX: ", e.layerX)
console.log("LAYERY: ", e.layerY)
console.log("RENDEREDX: ", e.pageX-cycontainer.offsetLeft)
console.log("RENDEREDY: ", e.pageY-cycontainer.offsetTop)
console.log("E: ", e)
const nodeToBeAdded = { const nodeToBeAdded = {
group: "nodes", group: "nodes",
data: newAppData, data: newAppData,
@@ -3593,8 +3582,8 @@ const AngularWorkflow = (props) => {
newAppData.selectedAuthentication = {} newAppData.selectedAuthentication = {}
} }
workflow.actions.push(newAppData) //workflow.actions.push(newAppData)
setWorkflow(workflow) //setWorkflow(workflow)
if (newAppPopup) { if (newAppPopup) {
//alert.error("SHOULD MAKE USER AUTHENTICATE THE APP OR SET hasError") //alert.error("SHOULD MAKE USER AUTHENTICATE THE APP OR SET hasError")