Skip to content

Commit

Permalink
Merge pull request #166 from ticketmaster-api/odev05122016
Browse files Browse the repository at this point in the history
Odev05122016
  • Loading branch information
degratnik committed Dec 5, 2016
2 parents e82806e + bfe56a1 commit c257625
Show file tree
Hide file tree
Showing 246 changed files with 8,388 additions and 14,058 deletions.
5 changes: 4 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
{ "presets": ["es2015"] }
{
"presets": ["es2015", "stage-0"],
"plugins": ["transform-decorators-legacy"]
}
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace 'travis' do
result = 0
if ENV['TRAVIS_BRANCH'] == 'master'
puts "Test serenity"
resultS = system("mvn verify -f ./tests/serenity/pom.xml")
resultS = system("mvn verify -f ./tests/serenity/pom.xml -Dmetafilter=\"-prod -NotImplemented\"")
puts resultS
puts "Test galen"
resultG = system("sh ./tests/run-test-dispatch.sh")
Expand Down
5 changes: 5 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ production_url : http://developers.ticketmaster.com/
gems:
- jekyll-redirect-from

sass:
style: compressed

webserver_headers:
"X-Frame-Options": "Deny"
2 changes: 1 addition & 1 deletion _data/gitcommit.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
info: prev_commit='fe86d9affeb3119c2f970e35729d562aa34484aa' date=2016-10-20 12:50:57 +0300
info: prev_commit='8751f95447efb992e77ac626b4796d02154250a7' date=2016-12-05 13:11:16 +0200
111 changes: 69 additions & 42 deletions _data/orgs/discovery-api/v2/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@
"pattern" : "^\\s*|yes|no|only$",
"enum" : [ "yes", " no", " only" ],
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
}, {
"name" : "page",
"in" : "query",
Expand All @@ -88,6 +79,15 @@
"maximum" : 500.0,
"minimum" : 1.0,
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
} ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -182,15 +182,6 @@
"pattern" : "^\\s*|yes|no|only$",
"enum" : [ "yes", " no", " only" ],
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
}, {
"name" : "page",
"in" : "query",
Expand All @@ -210,6 +201,15 @@
"maximum" : 500.0,
"minimum" : 1.0,
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
} ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -570,15 +570,6 @@
"pattern" : "^\\s*|yes|no|only$",
"enum" : [ "yes", " no", " only" ],
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
}, {
"name" : "page",
"in" : "query",
Expand All @@ -598,6 +589,15 @@
"maximum" : 500.0,
"minimum" : 1.0,
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
} ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -739,15 +739,6 @@
"pattern" : "^\\s*|yes|no|only$",
"enum" : [ "yes", " no", " only" ],
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
}, {
"name" : "page",
"in" : "query",
Expand All @@ -767,6 +758,15 @@
"maximum" : 500.0,
"minimum" : 1.0,
"x-example" : ""
}, {
"name" : "locale",
"in" : "query",
"description" : "Locale the response content will be returned",
"required" : false,
"type" : "string",
"default" : "en",
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
"x-example" : ""
} ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -987,6 +987,16 @@
"position" : 3,
"description" : "Tertiary Genre for additional detail when describring an entity (Alternative Rock, Ambient Pop, etc)",
"$ref" : "#/definitions/Level"
},
"type" : {
"position" : 5,
"description" : "A Type represents a kind or group of people. (Donation, Group, Individual, Merchandise, Event Style, etc)",
"$ref" : "#/definitions/Level"
},
"subType" : {
"position" : 6,
"description" : "Secondary Type to further categorize an entity (Band, Choir, Chorus, etc)",
"$ref" : "#/definitions/Level"
}
},
"description" : "Classification"
Expand All @@ -1013,15 +1023,12 @@
"type" : "boolean",
"default" : false
},
"leapDurationField" : {
"rangeDurationField" : {
"$ref" : "#/definitions/DurationField"
},
"durationField" : {
"$ref" : "#/definitions/DurationField"
},
"rangeDurationField" : {
"$ref" : "#/definitions/DurationField"
},
"minimumValue" : {
"type" : "integer",
"format" : "int32"
Expand All @@ -1030,6 +1037,9 @@
"type" : "integer",
"format" : "int32"
},
"leapDurationField" : {
"$ref" : "#/definitions/DurationField"
},
"name" : {
"type" : "string"
},
Expand All @@ -1045,10 +1055,10 @@
"DateTimeFieldType" : {
"type" : "object",
"properties" : {
"durationType" : {
"rangeDurationType" : {
"$ref" : "#/definitions/DurationFieldType"
},
"rangeDurationType" : {
"durationType" : {
"$ref" : "#/definitions/DurationFieldType"
},
"name" : {
Expand Down Expand Up @@ -1170,6 +1180,16 @@
"description" : "Type of the entity",
"enum" : [ "event", "venue", "attraction" ]
},
"distance" : {
"type" : "number",
"format" : "double"
},
"units" : {
"type" : "string"
},
"location" : {
"$ref" : "#/definitions/Location"
},
"id" : {
"type" : "string",
"position" : 1,
Expand Down Expand Up @@ -1944,6 +1964,13 @@
"description" : "Type of the entity",
"enum" : [ "event", "venue", "attraction" ]
},
"distance" : {
"type" : "number",
"format" : "double"
},
"units" : {
"type" : "string"
},
"id" : {
"type" : "string",
"position" : 1,
Expand Down
28 changes: 28 additions & 0 deletions _includes/classification-selector-modal.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<div class="modal modal-common fade" id="js_ls-modal-classification" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"></button>
<div class="row">
<h3 class="modal-title col-lg-12">Classification Selection</h3>
</div>
</div>
<div class="modal-body">
<div class="row">
<form id="js_lazy-sel_form" accept-charset="UTF-8" method="GET">
<div class="col-sm-9 clear-padding-right">
<input id="keyword" placeholder="keyword" autofocus class="search-input"/>
</div>
<div class="col-sm-3 text-right">
<button id="js_classification-modal_btn" type="button" class="btn btn-transparent">GET</button>
</div>
</form>
</div>
<div id="spinner-ls" style="display: none;"></div>
<div class="top-hr"></div>
<div id="classification-jstree"></div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</div>

21 changes: 20 additions & 1 deletion _includes/feedback.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3 class="modal-title col-lg-12">Leave Your Feedback</h3>

</div>
<div class="modal-footer">
<button id="js_feedback_btn" type="button" class="btn btn-submit">send</button>
<button id="js_feedback_btn" type="button" class="btn btn-submit" >send</button>
</div>


Expand Down Expand Up @@ -80,3 +80,22 @@ <h3 class="modal-title col-lg-12 text-center">Thank you for contacting us!</h3>
</div>
</div>
<!-- Modal alert end-->

<!-- Modal alert Error-->
<div id="feedback-alert-modal-error" class="modal modal-common modal-common-sm fade" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<div class="modal-content">
<div class="modal-body">
<h3 class="modal-title col-lg-12 text-center text-overflow-message__red">Error</h3>
<p id="text-overflow-message" class="text-center">The maximum length of description can be 3000 characters.</p>
<div class="modal-footer">
<button id="js_feedback_btn_alert_ok-error" type="button" class="btn btn-submit text-center">Ok</button>
</div>
</div>
</div>

</div>
</div>
<!-- Modal alert end-->
23 changes: 2 additions & 21 deletions _includes/lazy-selector-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ <h3 class="modal-title col-lg-12">Find <span>event</span> by keyword</h3>

<div id="spinner-ls" style="display: none;"></div>
<div class="ms-selection" style="display: none;">
<div class="col-xs-9">
<div class="col-sm-9 col-xs-12">
<ul class="ms-list">
</ul>
</div>
<div class="col-xs-3 text-right">
<div class="col-sm-3 col-xs-12 text-right">
<button id="js_ms-use-btn" type="button" class="btn btn-submit">Use</button>
</div>
</div>
Expand All @@ -53,22 +53,3 @@ <h3 class="modal-title col-lg-12">Find <span>event</span> by keyword</h3>
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->


<!-- Modal alert-->
<!--<div id="get-eventId-alert-modal" class="modal modal-common modal-common-sm fade" role="dialog">
<div class="modal-dialog">
&lt;!&ndash; Modal content&ndash;&gt;
<div class="modal-content">
<div class="modal-body">
<h3 class="modal-title col-lg-12 text-center">Thank you for contacting us!</h3>
<p class="text-center">We will review and respond promptly.</p>
<div class="modal-footer">
<button id="js_get-eventId_btn_alert_ok" type="button" class="btn btn-submit text-center">Ok</button>
</div>
</div>
</div>
</div>
</div>-->
<!-- Modal alert end-->
4 changes: 2 additions & 2 deletions _includes/partials/expanded-menu-header.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h4>APIs</h4>
<li>
<a href="/products-and-docs/apis/getting-started/">Getting started</a>
</li>
<li>
<!--<li>
<a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a>
</li>
</li>-->
<li>
<a href="/api-explorer/">API Explorer</a>
</li>
Expand Down
31 changes: 1 addition & 30 deletions _includes/pd-side-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,36 +74,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]

{% endif %}
</li>
<!--
<li><a href="/products-and-docs/apis/discovery-api/v2/">Discovery API</a>
{% if page.categories[0] == "documentation" and page.categories[2] == "discovery-api" and page.categories[3] == "v2" %}
<ul class="sections menu-highlight">
<li><a href="#overview">Overview</a></li>
<li><a href="#search-attractions-v2">Search Attractions</a></li>
<li><a href="#attraction-details-v2">Get Attraction Details</a></li>
<li><a href="#search-classifications-v2">Search Classifications</a></li>
<li><a href="#genre-details-v2">Get Genre Details</a></li>
<li><a href="#segment-details-v2">Get Segment Details</a></li>
<li><a href="#subgenre-details-v2">Get Subgenre Details</a></li>
<li><a href="#classification-details-v2">Get Classification Details</a></li>
<li><a href="#search-events-v2">Search Events</a></li>
<li><a href="#event-details-v2">Get Event Details</a></li>
<li><a href="#event-images-v2">Get Event Images</a></li>
<li><a href="#search-venues-v2">Search Venues</a></li>
<li><a href="#venue-details-v2">Get Venue Details</a></li>
<li><a href="#supported-country-codes">Supported Country Codes</a></li>
<li><a href="#supported-markets">Supported Markets</a></li>
<li><a href="#supported-sources">Supported Sources</a></li>
<li><a href="#supported-locales">Supported Locales</a></li>
<li><a href="#supported-dma">Supported DMA</a></li>
{% include partials/changelog-apis.html%}
<li><a href="#disqus_thread">Disqus</a></li>
</ul>
{% endif %}

</li>
-->
<li><a href="/products-and-docs/apis/commerce/">Commerce API</a>
{% if page.categories[0] == "documentation" and page.categories[1] == "commerce" %}
<ul class="sections menu-highlight">
Expand Down Expand Up @@ -286,7 +257,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
</ul>
{% endif %}
</li>
<li><a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a></li>
<!--<li><a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a></li>-->
<li><a href="/api-explorer/">API Explorer</a></li>
<li><a href="/products-and-docs/apis/changelog/">Changelog</a></li>
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
Expand Down
Loading

0 comments on commit c257625

Please sign in to comment.