Resolve merge conflicts on update from upstream

This commit is contained in:
andrew.greene
2022-01-20 16:23:46 -07:00
parent f8354f7bc0
commit c8a2bd6143
352 changed files with 1 additions and 71171 deletions

View File

@@ -1,135 +0,0 @@
[
{
"id": "9b2d7459.8dd598",
"type": "http in",
"z": "d41b4dd3.ecd6a",
"name": "",
"url": "/hello-param/:name",
"method": "get",
"upload": false,
"swaggerDoc": "",
"x": 290,
"y": 900,
"wires": [
[
"83753c80.5e271"
]
]
},
{
"id": "7fe50f46.46209",
"type": "http response",
"z": "d41b4dd3.ecd6a",
"name": "",
"statusCode": "",
"headers": {},
"x": 590,
"y": 900,
"wires": []
},
{
"id": "6e88d2b.828a92c",
"type": "comment",
"z": "d41b4dd3.ecd6a",
"name": "Handle URL parameters in an HTTP endpoint",
"info": "Named path parameters (e.g. `:name`) in the URL property can be used to identify parts of the path that can vary between requests.\n\nThe `msg.req.params` property is an object of key/value pairs for each path parameter.",
"x": 290,
"y": 860,
"wires": []
},
{
"id": "214bc398.b3482c",
"type": "http request",
"z": "d41b4dd3.ecd6a",
"name": "",
"method": "GET",
"ret": "txt",
"paytoqs": "ignore",
"url": "http://localhost:1880/hello-param/Nick",
"tls": "",
"persist": false,
"proxy": "",
"authType": "",
"x": 390,
"y": 1000,
"wires": [
[
"70c0eba4.5f0dc4"
]
]
},
{
"id": "70c0eba4.5f0dc4",
"type": "debug",
"z": "d41b4dd3.ecd6a",
"name": "",
"active": true,
"tosidebar": true,
"console": false,
"tostatus": false,
"complete": "false",
"statusVal": "",
"statusType": "auto",
"x": 550,
"y": 1000,
"wires": []
},
{
"id": "83753c80.5e271",
"type": "template",
"z": "d41b4dd3.ecd6a",
"name": "page",
"field": "payload",
"fieldType": "msg",
"format": "html",
"syntax": "mustache",
"template": "<html>\n <head></head>\n <body>\n <h1>Hello {{req.params.name}}!</h1>\n </body>\n</html>",
"output": "str",
"x": 470,
"y": 900,
"wires": [
[
"7fe50f46.46209"
]
]
},
{
"id": "89523bfe.6e5c18",
"type": "inject",
"z": "d41b4dd3.ecd6a",
"name": "",
"props": [
{
"p": "payload"
},
{
"p": "topic",
"vt": "str"
}
],
"repeat": "",
"crontab": "",
"once": false,
"onceDelay": 0.1,
"topic": "",
"payload": "",
"payloadType": "date",
"x": 240,
"y": 1000,
"wires": [
[
"214bc398.b3482c"
]
]
},
{
"id": "6276a6cd.5c3b18",
"type": "comment",
"z": "d41b4dd3.ecd6a",
"name": "Send HTTP GET request: http://localhost:1880/hello-param/Nick",
"info": "`http request` node can be used to send **HTTP GET** request.",
"x": 350,
"y": 960,
"wires": []
}
]

View File

@@ -1,126 +0,0 @@
[
{
"id": "59760c9d.172d94",
"type": "http in",
"z": "d41b4dd3.ecd6a",
"name": "",
"url": "/hello-upload",
"method": "post",
"upload": true,
"swaggerDoc": "",
"x": 270,
"y": 1980,
"wires": [
[
"e30073f3.ad429"
]
]
},
{
"id": "d0b3e8b4.2cfde8",
"type": "comment",
"z": "d41b4dd3.ecd6a",
"name": "Post file to a flow",
"info": "The `HTTP In` node can listen for POST requests for file upload. Information for uploaded files can be accessed from `msg.req.files`.\n",
"x": 200,
"y": 1760,
"wires": []
},
{
"id": "a888a043.ebb72",
"type": "http in",
"z": "d41b4dd3.ecd6a",
"name": "",
"url": "/hello-upload",
"method": "get",
"upload": false,
"swaggerDoc": "",
"x": 270,
"y": 1880,
"wires": [
[
"14b950b.0ed5aaf"
]
]
},
{
"id": "2ccb67c7.02c568",
"type": "http response",
"z": "d41b4dd3.ecd6a",
"name": "",
"statusCode": "",
"headers": {},
"x": 590,
"y": 1880,
"wires": []
},
{
"id": "14b950b.0ed5aaf",
"type": "template",
"z": "d41b4dd3.ecd6a",
"name": "",
"field": "payload",
"fieldType": "msg",
"format": "html",
"syntax": "mustache",
"template": "<html>\n <head></head>\n <body>\n <form method=\"POST\" enctype=\"multipart/form-data\">\n <div>\n <label for=\"file\">Select file to upload:</label>\n <input type=\"file\" id=\"file\" name=\"file\"/>\n </div>\n <div>\n <button type=\"submit\">OK</button>\n </div>\n </form>\n </body>\n</html>",
"output": "str",
"x": 440,
"y": 1880,
"wires": [
[
"2ccb67c7.02c568"
]
]
},
{
"id": "54f2edb5.62fca4",
"type": "http response",
"z": "d41b4dd3.ecd6a",
"name": "",
"statusCode": "",
"headers": {},
"x": 590,
"y": 1980,
"wires": []
},
{
"id": "e30073f3.ad429",
"type": "template",
"z": "d41b4dd3.ecd6a",
"name": "",
"field": "payload",
"fieldType": "msg",
"format": "html",
"syntax": "mustache",
"template": "<html>\n <head></head>\n <body>\n <h1>Hello {{req.files.0.originalname}}</h1>\n </body>\n</html>",
"output": "str",
"x": 440,
"y": 1980,
"wires": [
[
"54f2edb5.62fca4"
]
]
},
{
"id": "6c3c1bf.48cc2e4",
"type": "comment",
"z": "d41b4dd3.ecd6a",
"name": "Create HTTP page for file upload: open http://localhost:1880/hello-upload \\n from Web browser. Then upload a file.",
"info": "",
"x": 440,
"y": 1820,
"wires": []
},
{
"id": "c6242caa.8ec63",
"type": "comment",
"z": "d41b4dd3.ecd6a",
"name": "Serve POST request for file upload",
"info": "",
"x": 320,
"y": 1940,
"wires": []
}
]