From 38866ca1e245195c1606ce44a20cca6ba0d79f9f Mon Sep 17 00:00:00 2001 From: elnzv Date: Wed, 25 May 2016 16:51:02 +0300 Subject: [PATCH 001/106] added node modules to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index be4600b691..ce48a7e5d6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ settings.json .idea/ uploads/ mup.json +/node_modules/ From 9cb4f9416eb5b141e5b1ff1085a443729e3cbf64 Mon Sep 17 00:00:00 2001 From: elnzv Date: Wed, 25 May 2016 16:51:27 +0300 Subject: [PATCH 002/106] documentation viewer template with swagger --- documentationViewer/client/documentationViewer.html | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 documentationViewer/client/documentationViewer.html diff --git a/documentationViewer/client/documentationViewer.html b/documentationViewer/client/documentationViewer.html new file mode 100644 index 0000000000..cdd0fb38f3 --- /dev/null +++ b/documentationViewer/client/documentationViewer.html @@ -0,0 +1,3 @@ + From 65941dea7e3246d5dfc1a5b83e7ba0808eb17023 Mon Sep 17 00:00:00 2001 From: elnzv Date: Wed, 25 May 2016 16:59:37 +0300 Subject: [PATCH 003/106] navigation tab for documentation --- .../navigation/navigation.html | 6 +++ .../view_api_backend/view_api_backend.html | 48 ++++++++++--------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/client/views/api_backends/view_api_backend/navigation/navigation.html b/client/views/api_backends/view_api_backend/navigation/navigation.html index 2259d0537a..4a3fb300e2 100644 --- a/client/views/api_backends/view_api_backend/navigation/navigation.html +++ b/client/views/api_backends/view_api_backend/navigation/navigation.html @@ -13,6 +13,12 @@ Metadata +
  • + + + Documentation + +
  • diff --git a/client/views/api_backends/view_api_backend/view_api_backend.html b/client/views/api_backends/view_api_backend/view_api_backend.html index db8eb3522d..17be388f3a 100644 --- a/client/views/api_backends/view_api_backend/view_api_backend.html +++ b/client/views/api_backends/view_api_backend/view_api_backend.html @@ -1,33 +1,37 @@ From eb43e3ecc23f6275b2cf0b7ae19bbb5806fc8f32 Mon Sep 17 00:00:00 2001 From: elnzv Date: Wed, 25 May 2016 17:00:26 +0300 Subject: [PATCH 004/106] added Swagger Petstore json localy --- public/swagger/swagger.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 public/swagger/swagger.json diff --git a/public/swagger/swagger.json b/public/swagger/swagger.json new file mode 100644 index 0000000000..5965256517 --- /dev/null +++ b/public/swagger/swagger.json @@ -0,0 +1 @@ +{"swagger":"2.0","info":{"description":"This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.","version":"1.0.0","title":"Swagger Petstore","termsOfService":"http://swagger.io/terms/","contact":{"email":"apiteam@swagger.io"},"license":{"name":"Apache 2.0","url":"http://www.apache.org/licenses/LICENSE-2.0.html"}},"host":"petstore.swagger.io","basePath":"/v2","tags":[{"name":"pet","description":"Everything about your Pets","externalDocs":{"description":"Find out more","url":"http://swagger.io"}},{"name":"store","description":"Access to Petstore orders"},{"name":"user","description":"Operations about user","externalDocs":{"description":"Find out more about our store","url":"http://swagger.io"}}],"schemes":["http"],"paths":{"/pet":{"post":{"tags":["pet"],"summary":"Add a new pet to the store","description":"","operationId":"addPet","consumes":["application/json","application/xml"],"produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Pet object that needs to be added to the store","required":true,"schema":{"$ref":"#/definitions/Pet"}}],"responses":{"405":{"description":"Invalid input"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]},"put":{"tags":["pet"],"summary":"Update an existing pet","description":"","operationId":"updatePet","consumes":["application/json","application/xml"],"produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Pet object that needs to be added to the store","required":true,"schema":{"$ref":"#/definitions/Pet"}}],"responses":{"400":{"description":"Invalid ID supplied"},"404":{"description":"Pet not found"},"405":{"description":"Validation exception"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/findByStatus":{"get":{"tags":["pet"],"summary":"Finds Pets by status","description":"Multiple status values can be provided with comma separated strings","operationId":"findPetsByStatus","produces":["application/xml","application/json"],"parameters":[{"name":"status","in":"query","description":"Status values that need to be considered for filter","required":true,"type":"array","items":{"type":"string","enum":["available","pending","sold"],"default":"available"},"collectionFormat":"multi"}],"responses":{"200":{"description":"successful operation","schema":{"type":"array","items":{"$ref":"#/definitions/Pet"}}},"400":{"description":"Invalid status value"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/findByTags":{"get":{"tags":["pet"],"summary":"Finds Pets by tags","description":"Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.","operationId":"findPetsByTags","produces":["application/xml","application/json"],"parameters":[{"name":"tags","in":"query","description":"Tags to filter by","required":true,"type":"array","items":{"type":"string"},"collectionFormat":"multi"}],"responses":{"200":{"description":"successful operation","schema":{"type":"array","items":{"$ref":"#/definitions/Pet"}}},"400":{"description":"Invalid tag value"}},"security":[{"petstore_auth":["write:pets","read:pets"]}],"deprecated":true}},"/pet/{petId}":{"get":{"tags":["pet"],"summary":"Find pet by ID","description":"Returns a single pet","operationId":"getPetById","produces":["application/xml","application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet to return","required":true,"type":"integer","format":"int64"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Pet"}},"400":{"description":"Invalid ID supplied"},"404":{"description":"Pet not found"}},"security":[{"api_key":[]}]},"post":{"tags":["pet"],"summary":"Updates a pet in the store with form data","description":"","operationId":"updatePetWithForm","consumes":["application/x-www-form-urlencoded"],"produces":["application/xml","application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet that needs to be updated","required":true,"type":"integer","format":"int64"},{"name":"name","in":"formData","description":"Updated name of the pet","required":false,"type":"string"},{"name":"status","in":"formData","description":"Updated status of the pet","required":false,"type":"string"}],"responses":{"405":{"description":"Invalid input"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]},"delete":{"tags":["pet"],"summary":"Deletes a pet","description":"","operationId":"deletePet","produces":["application/xml","application/json"],"parameters":[{"name":"api_key","in":"header","required":false,"type":"string"},{"name":"petId","in":"path","description":"Pet id to delete","required":true,"type":"integer","format":"int64"}],"responses":{"400":{"description":"Invalid ID supplied"},"404":{"description":"Pet not found"}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/pet/{petId}/uploadImage":{"post":{"tags":["pet"],"summary":"uploads an image","description":"","operationId":"uploadFile","consumes":["multipart/form-data"],"produces":["application/json"],"parameters":[{"name":"petId","in":"path","description":"ID of pet to update","required":true,"type":"integer","format":"int64"},{"name":"additionalMetadata","in":"formData","description":"Additional data to pass to server","required":false,"type":"string"},{"name":"file","in":"formData","description":"file to upload","required":false,"type":"file"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/ApiResponse"}}},"security":[{"petstore_auth":["write:pets","read:pets"]}]}},"/store/inventory":{"get":{"tags":["store"],"summary":"Returns pet inventories by status","description":"Returns a map of status codes to quantities","operationId":"getInventory","produces":["application/json"],"parameters":[],"responses":{"200":{"description":"successful operation","schema":{"type":"object","additionalProperties":{"type":"integer","format":"int32"}}}},"security":[{"api_key":[]}]}},"/store/order":{"post":{"tags":["store"],"summary":"Place an order for a pet","description":"","operationId":"placeOrder","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"order placed for purchasing the pet","required":true,"schema":{"$ref":"#/definitions/Order"}}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Order"}},"400":{"description":"Invalid Order"}}}},"/store/order/{orderId}":{"get":{"tags":["store"],"summary":"Find purchase order by ID","description":"For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions","operationId":"getOrderById","produces":["application/xml","application/json"],"parameters":[{"name":"orderId","in":"path","description":"ID of pet that needs to be fetched","required":true,"type":"integer","maximum":10.0,"minimum":1.0,"format":"int64"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/Order"}},"400":{"description":"Invalid ID supplied"},"404":{"description":"Order not found"}}},"delete":{"tags":["store"],"summary":"Delete purchase order by ID","description":"For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors","operationId":"deleteOrder","produces":["application/xml","application/json"],"parameters":[{"name":"orderId","in":"path","description":"ID of the order that needs to be deleted","required":true,"type":"integer","minimum":1.0,"format":"int64"}],"responses":{"400":{"description":"Invalid ID supplied"},"404":{"description":"Order not found"}}}},"/user":{"post":{"tags":["user"],"summary":"Create user","description":"This can only be done by the logged in user.","operationId":"createUser","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"Created user object","required":true,"schema":{"$ref":"#/definitions/User"}}],"responses":{"default":{"description":"successful operation"}}}},"/user/createWithArray":{"post":{"tags":["user"],"summary":"Creates list of users with given input array","description":"","operationId":"createUsersWithArrayInput","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"List of user object","required":true,"schema":{"type":"array","items":{"$ref":"#/definitions/User"}}}],"responses":{"default":{"description":"successful operation"}}}},"/user/createWithList":{"post":{"tags":["user"],"summary":"Creates list of users with given input array","description":"","operationId":"createUsersWithListInput","produces":["application/xml","application/json"],"parameters":[{"in":"body","name":"body","description":"List of user object","required":true,"schema":{"type":"array","items":{"$ref":"#/definitions/User"}}}],"responses":{"default":{"description":"successful operation"}}}},"/user/login":{"get":{"tags":["user"],"summary":"Logs user into the system","description":"","operationId":"loginUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"query","description":"The user name for login","required":true,"type":"string"},{"name":"password","in":"query","description":"The password for login in clear text","required":true,"type":"string"}],"responses":{"200":{"description":"successful operation","schema":{"type":"string"},"headers":{"X-Rate-Limit":{"type":"integer","format":"int32","description":"calls per hour allowed by the user"},"X-Expires-After":{"type":"string","format":"date-time","description":"date in UTC when token expires"}}},"400":{"description":"Invalid username/password supplied"}}}},"/user/logout":{"get":{"tags":["user"],"summary":"Logs out current logged in user session","description":"","operationId":"logoutUser","produces":["application/xml","application/json"],"parameters":[],"responses":{"default":{"description":"successful operation"}}}},"/user/{username}":{"get":{"tags":["user"],"summary":"Get user by user name","description":"","operationId":"getUserByName","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"The name that needs to be fetched. Use user1 for testing. ","required":true,"type":"string"}],"responses":{"200":{"description":"successful operation","schema":{"$ref":"#/definitions/User"}},"400":{"description":"Invalid username supplied"},"404":{"description":"User not found"}}},"put":{"tags":["user"],"summary":"Updated user","description":"This can only be done by the logged in user.","operationId":"updateUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"name that need to be updated","required":true,"type":"string"},{"in":"body","name":"body","description":"Updated user object","required":true,"schema":{"$ref":"#/definitions/User"}}],"responses":{"400":{"description":"Invalid user supplied"},"404":{"description":"User not found"}}},"delete":{"tags":["user"],"summary":"Delete user","description":"This can only be done by the logged in user.","operationId":"deleteUser","produces":["application/xml","application/json"],"parameters":[{"name":"username","in":"path","description":"The name that needs to be deleted","required":true,"type":"string"}],"responses":{"400":{"description":"Invalid username supplied"},"404":{"description":"User not found"}}}}},"securityDefinitions":{"petstore_auth":{"type":"oauth2","authorizationUrl":"http://petstore.swagger.io/oauth/dialog","flow":"implicit","scopes":{"write:pets":"modify pets in your account","read:pets":"read your pets"}},"api_key":{"type":"apiKey","name":"api_key","in":"header"}},"definitions":{"Order":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"petId":{"type":"integer","format":"int64"},"quantity":{"type":"integer","format":"int32"},"shipDate":{"type":"string","format":"date-time"},"status":{"type":"string","description":"Order Status","enum":["placed","approved","delivered"]},"complete":{"type":"boolean","default":false}},"xml":{"name":"Order"}},"User":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"username":{"type":"string"},"firstName":{"type":"string"},"lastName":{"type":"string"},"email":{"type":"string"},"password":{"type":"string"},"phone":{"type":"string"},"userStatus":{"type":"integer","format":"int32","description":"User Status"}},"xml":{"name":"User"}},"Category":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"}},"xml":{"name":"Category"}},"Tag":{"type":"object","properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"}},"xml":{"name":"Tag"}},"Pet":{"type":"object","required":["name","photoUrls"],"properties":{"id":{"type":"integer","format":"int64"},"category":{"$ref":"#/definitions/Category"},"name":{"type":"string","example":"doggie"},"photoUrls":{"type":"array","xml":{"name":"photoUrl","wrapped":true},"items":{"type":"string"}},"tags":{"type":"array","xml":{"name":"tag","wrapped":true},"items":{"$ref":"#/definitions/Tag"}},"status":{"type":"string","description":"pet status in the store","enum":["available","pending","sold"]}},"xml":{"name":"Pet"}},"ApiResponse":{"type":"object","properties":{"code":{"type":"integer","format":"int32"},"type":{"type":"string"},"message":{"type":"string"}}}},"externalDocs":{"description":"Find out more about Swagger","url":"http://swagger.io"}} From ec1796ae74ad48d810244820d7c12c7059c0341a Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 13:50:18 +0300 Subject: [PATCH 005/106] changed panels width --- .../api_backends/view_api_backend/details/details.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/views/api_backends/view_api_backend/details/details.html b/client/views/api_backends/view_api_backend/details/details.html index 670720ebb1..5e1bc25c3d 100644 --- a/client/views/api_backends/view_api_backend/details/details.html +++ b/client/views/api_backends/view_api_backend/details/details.html @@ -12,7 +12,7 @@ - + {{_ "view_ApiBackend_Details_editButtonText" }} @@ -24,10 +24,10 @@

    -
    +
    {{> viewApiBackendStatus apiBackend=apiBackend }}
    -
    +
    {{> viewApiBackendServers apiBackend=apiBackend }}
    From 4a83223b7befb3b07df18e65493ad2c8afd21e77 Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 13:56:13 +0300 Subject: [PATCH 006/106] panel layout for documentation view --- .../client/documentationViewer.html | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/documentationViewer/client/documentationViewer.html b/documentationViewer/client/documentationViewer.html index cdd0fb38f3..b1045f2c18 100644 --- a/documentationViewer/client/documentationViewer.html +++ b/documentationViewer/client/documentationViewer.html @@ -1,3 +1,31 @@ From 62739d356a8b6782575e4764403afc317592ddf2 Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 13:56:58 +0300 Subject: [PATCH 007/106] moved link --- .../view_api_backend/navigation/navigation.html | 12 ++++++------ .../view_api_backend/view_api_backend.html | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/views/api_backends/view_api_backend/navigation/navigation.html b/client/views/api_backends/view_api_backend/navigation/navigation.html index 4a3fb300e2..d01b708ef2 100644 --- a/client/views/api_backends/view_api_backend/navigation/navigation.html +++ b/client/views/api_backends/view_api_backend/navigation/navigation.html @@ -7,18 +7,18 @@ Details

    • -
  • - - - Metadata - -
  • Documentation
    • +
  • + + + Metadata + +
  • diff --git a/client/views/api_backends/view_api_backend/view_api_backend.html b/client/views/api_backends/view_api_backend/view_api_backend.html index 17be388f3a..b02c16bdc8 100644 --- a/client/views/api_backends/view_api_backend/view_api_backend.html +++ b/client/views/api_backends/view_api_backend/view_api_backend.html @@ -10,14 +10,14 @@ {{> viewApiBackendDetails apiBackend=apiBackend }} -
    - {{> viewApiBackendMetadata apiBackend=apiBackend metadata=metadata }} -
    -
    {{> documentationViewer }}
    +
    + {{> viewApiBackendMetadata apiBackend=apiBackend metadata=metadata }} +
    +
    {{> feedbackList apiBackend=apiBackend }}
    From c94a39bdffca414647ad2b37e5ea2bf5c24b2129 Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 13:57:55 +0300 Subject: [PATCH 008/106] changed titles --- documentationViewer/client/documentationViewer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentationViewer/client/documentationViewer.html b/documentationViewer/client/documentationViewer.html index b1045f2c18..5224798cfe 100644 --- a/documentationViewer/client/documentationViewer.html +++ b/documentationViewer/client/documentationViewer.html @@ -9,7 +9,7 @@

    -

    Documentation Link

    +

    Link

    @@ -20,7 +20,7 @@

    Documentation Link

    -

    Documentation Viewer

    +

    Viewer

    From 552e45122e9b1a021eeda828910a2897b918b99f Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 14:03:43 +0300 Subject: [PATCH 009/106] renamed --- documentation/client/documentation.html | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 documentation/client/documentation.html diff --git a/documentation/client/documentation.html b/documentation/client/documentation.html new file mode 100644 index 0000000000..cc741ef544 --- /dev/null +++ b/documentation/client/documentation.html @@ -0,0 +1,31 @@ + From 4951105141cc60ffcc635437ae73187bc482301c Mon Sep 17 00:00:00 2001 From: Brylie Christopher Oxley Date: Thu, 26 May 2016 14:04:15 +0300 Subject: [PATCH 010/106] Reorganize files --- client/views/documentation/select/select.html | 15 ----- client/views/documentation/select/select.js | 19 ------ .../documentation/view/documentation.css | 10 ---- .../documentation/view/documentation.html | 4 -- .../views/documentation/view/documentation.js | 59 ------------------- .../collection}/apiDocs.js | 0 .../edit/client}/documentation-editor.html | 0 .../edit/client}/documentation-editor.js | 0 8 files changed, 107 deletions(-) delete mode 100644 client/views/documentation/select/select.html delete mode 100644 client/views/documentation/select/select.js delete mode 100644 client/views/documentation/view/documentation.css delete mode 100644 client/views/documentation/view/documentation.html delete mode 100644 client/views/documentation/view/documentation.js rename {both/collections => documentation/collection}/apiDocs.js (100%) rename {client/views/documentation/documentation-editor => documentation/edit/client}/documentation-editor.html (100%) rename {client/views/documentation/documentation-editor => documentation/edit/client}/documentation-editor.js (100%) diff --git a/client/views/documentation/select/select.html b/client/views/documentation/select/select.html deleted file mode 100644 index e0c6efe478..0000000000 --- a/client/views/documentation/select/select.html +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/client/views/documentation/select/select.js b/client/views/documentation/select/select.js deleted file mode 100644 index a31f0009f6..0000000000 --- a/client/views/documentation/select/select.js +++ /dev/null @@ -1,19 +0,0 @@ -Template.apiDocumentationSelect.created = function () { - // Get reference to template instance - var instance = this; - - // Subscribe to All API Documentation - instance.subscribe('allApiDocs'); - - // Subscribe to API backends with Docs - instance.subscribe('apiBackendsWithDocs'); -}; - -Template.apiDocumentationSelect.helpers({ - "apiDocumentation": function () { - // Get API Documentation - var apiDocumentationArray = ApiDocs.find().fetch(); - - return apiDocumentationArray; - } -}); diff --git a/client/views/documentation/view/documentation.css b/client/views/documentation/view/documentation.css deleted file mode 100644 index 802694d554..0000000000 --- a/client/views/documentation/view/documentation.css +++ /dev/null @@ -1,10 +0,0 @@ -/* - Make sure iframe is full height and width - source: http://stackoverflow.com/a/27853830/1191545 -*/ -iframe { - display: block; /* iframes are inline by default */ - border: none; /* Reset default border */ - width: 100%; - height: 100vh; -} diff --git a/client/views/documentation/view/documentation.html b/client/views/documentation/view/documentation.html deleted file mode 100644 index 760f1dac5c..0000000000 --- a/client/views/documentation/view/documentation.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/client/views/documentation/view/documentation.js b/client/views/documentation/view/documentation.js deleted file mode 100644 index da799755e3..0000000000 --- a/client/views/documentation/view/documentation.js +++ /dev/null @@ -1,59 +0,0 @@ -Template.documentation.created = function () { - // Get reference to template instance - var instance = this; - - // Create Reactive Variable for selected documentation - instance.swaggerDocumentUrl = new ReactiveVar(); -}; - -Template.documentation.rendered = function () { - $(function() { - // Pass window url parameters into documentation IFRAME - // http://stackoverflow.com/a/12944835/1191545 - - // Get search parameter(s) from window location - var search = window.location.search; - - // Create new iframe src by appending search parameter(s) - var newSrc = $("#documentation").attr("src") + search; - - // Update iframe src attribute with new source - $("#documentation").attr("src", newSrc); - }); -}; - -Template.documentation.events({ - "change [name='selected-documentation']": function (event) { - // Get reference to template instance - var instance = Template.instance(); - - // Set Swagger document URL to selected value - instance.swaggerDocumentUrl.set(event.target.value); - }, - "load #documentation": function () { - - // gets current users object - var user = Meteor.user(); - - // gets current user's apiKey - var apiKey = user.profile.apiKey; - - // passes api key to iFrame once it is loaded - $("#documentation").contents().find("#input_apiKey").val(apiKey); - - // Click Explore to attach API key to "Try out" request - $("#documentation").contents().find("#explore").click(); - } -}); - -Template.documentation.helpers({ - "swaggerDocumentUrl": function () { - // Get reference to template instance - var instance = Template.instance(); - - // Get the Swagger document URL - var swaggerDocumentUrl = instance.swaggerDocumentUrl.get(); - - return swaggerDocumentUrl; - } -}); diff --git a/both/collections/apiDocs.js b/documentation/collection/apiDocs.js similarity index 100% rename from both/collections/apiDocs.js rename to documentation/collection/apiDocs.js diff --git a/client/views/documentation/documentation-editor/documentation-editor.html b/documentation/edit/client/documentation-editor.html similarity index 100% rename from client/views/documentation/documentation-editor/documentation-editor.html rename to documentation/edit/client/documentation-editor.html diff --git a/client/views/documentation/documentation-editor/documentation-editor.js b/documentation/edit/client/documentation-editor.js similarity index 100% rename from client/views/documentation/documentation-editor/documentation-editor.js rename to documentation/edit/client/documentation-editor.js From 646031eefd1d61d0da38640de4aaffe1d8fb7d49 Mon Sep 17 00:00:00 2001 From: Brylie Christopher Oxley Date: Thu, 26 May 2016 14:05:02 +0300 Subject: [PATCH 011/106] Reorganize --- .../collections => documentation/collection}/apiDocumentation.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {both/collections => documentation/collection}/apiDocumentation.js (100%) diff --git a/both/collections/apiDocumentation.js b/documentation/collection/apiDocumentation.js similarity index 100% rename from both/collections/apiDocumentation.js rename to documentation/collection/apiDocumentation.js From 05771bbcf5428459501f2e12261ec2acac1a794b Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 14:05:19 +0300 Subject: [PATCH 012/106] cleaned up --- documentation/client/documentation.html | 31 ------------------------- 1 file changed, 31 deletions(-) delete mode 100644 documentation/client/documentation.html diff --git a/documentation/client/documentation.html b/documentation/client/documentation.html deleted file mode 100644 index cc741ef544..0000000000 --- a/documentation/client/documentation.html +++ /dev/null @@ -1,31 +0,0 @@ - From 54b12d2b9566ee48b83d2ba821dac55f6c89b875 Mon Sep 17 00:00:00 2001 From: elnzv Date: Thu, 26 May 2016 14:12:57 +0300 Subject: [PATCH 013/106] renamed template --- .../view_api_backend/view_api_backend.html | 2 +- .../documentation/view/documentation.css | 10 ---- .../documentation/view/documentation.html | 4 -- .../views/documentation/view/documentation.js | 59 ------------------- .../view/client/documentation.html | 2 +- 5 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 client/views/documentation/view/documentation.css delete mode 100644 client/views/documentation/view/documentation.html delete mode 100644 client/views/documentation/view/documentation.js rename documentationViewer/client/documentationViewer.html => documentation/view/client/documentation.html (96%) diff --git a/client/views/api_backends/view_api_backend/view_api_backend.html b/client/views/api_backends/view_api_backend/view_api_backend.html index b02c16bdc8..8acbc1cb9d 100644 --- a/client/views/api_backends/view_api_backend/view_api_backend.html +++ b/client/views/api_backends/view_api_backend/view_api_backend.html @@ -11,7 +11,7 @@
    - {{> documentationViewer }} + {{> documentation }}
    diff --git a/client/views/documentation/view/documentation.css b/client/views/documentation/view/documentation.css deleted file mode 100644 index 802694d554..0000000000 --- a/client/views/documentation/view/documentation.css +++ /dev/null @@ -1,10 +0,0 @@ -/* - Make sure iframe is full height and width - source: http://stackoverflow.com/a/27853830/1191545 -*/ -iframe { - display: block; /* iframes are inline by default */ - border: none; /* Reset default border */ - width: 100%; - height: 100vh; -} diff --git a/client/views/documentation/view/documentation.html b/client/views/documentation/view/documentation.html deleted file mode 100644 index 760f1dac5c..0000000000 --- a/client/views/documentation/view/documentation.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/client/views/documentation/view/documentation.js b/client/views/documentation/view/documentation.js deleted file mode 100644 index da799755e3..0000000000 --- a/client/views/documentation/view/documentation.js +++ /dev/null @@ -1,59 +0,0 @@ -Template.documentation.created = function () { - // Get reference to template instance - var instance = this; - - // Create Reactive Variable for selected documentation - instance.swaggerDocumentUrl = new ReactiveVar(); -}; - -Template.documentation.rendered = function () { - $(function() { - // Pass window url parameters into documentation IFRAME - // http://stackoverflow.com/a/12944835/1191545 - - // Get search parameter(s) from window location - var search = window.location.search; - - // Create new iframe src by appending search parameter(s) - var newSrc = $("#documentation").attr("src") + search; - - // Update iframe src attribute with new source - $("#documentation").attr("src", newSrc); - }); -}; - -Template.documentation.events({ - "change [name='selected-documentation']": function (event) { - // Get reference to template instance - var instance = Template.instance(); - - // Set Swagger document URL to selected value - instance.swaggerDocumentUrl.set(event.target.value); - }, - "load #documentation": function () { - - // gets current users object - var user = Meteor.user(); - - // gets current user's apiKey - var apiKey = user.profile.apiKey; - - // passes api key to iFrame once it is loaded - $("#documentation").contents().find("#input_apiKey").val(apiKey); - - // Click Explore to attach API key to "Try out" request - $("#documentation").contents().find("#explore").click(); - } -}); - -Template.documentation.helpers({ - "swaggerDocumentUrl": function () { - // Get reference to template instance - var instance = Template.instance(); - - // Get the Swagger document URL - var swaggerDocumentUrl = instance.swaggerDocumentUrl.get(); - - return swaggerDocumentUrl; - } -}); diff --git a/documentationViewer/client/documentationViewer.html b/documentation/view/client/documentation.html similarity index 96% rename from documentationViewer/client/documentationViewer.html rename to documentation/view/client/documentation.html index 5224798cfe..cc741ef544 100644 --- a/documentationViewer/client/documentationViewer.html +++ b/documentation/view/client/documentation.html @@ -1,4 +1,4 @@ -