Skip to content

Commit c257625

Browse files
degratnikdegratnik
authored
Merge pull request #166 from ticketmaster-api/odev05122016
Odev05122016
2 parents e82806e + bfe56a1 commit c257625

246 files changed

Lines changed: 8388 additions & 14058 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.babelrc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
{ "presets": ["es2015"] }
1+
{
2+
"presets": ["es2015", "stage-0"],
3+
"plugins": ["transform-decorators-legacy"]
4+
}

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace 'travis' do
1717
result = 0
1818
if ENV['TRAVIS_BRANCH'] == 'master'
1919
puts "Test serenity"
20-
resultS = system("mvn verify -f ./tests/serenity/pom.xml")
20+
resultS = system("mvn verify -f ./tests/serenity/pom.xml -Dmetafilter=\"-prod -NotImplemented\"")
2121
puts resultS
2222
puts "Test galen"
2323
resultG = system("sh ./tests/run-test-dispatch.sh")

‎_config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,8 @@ production_url : http://developers.ticketmaster.com/
2929
gems:
3030
- jekyll-redirect-from
3131

32+
sass:
33+
style: compressed
34+
35+
webserver_headers:
36+
"X-Frame-Options": "Deny"

‎_data/gitcommit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
info: prev_commit='fe86d9affeb3119c2f970e35729d562aa34484aa' date=2016-10-20 12:50:57 +0300
1+
info: prev_commit='8751f95447efb992e77ac626b4796d02154250a7' date=2016-12-05 13:11:16 +0200

‎_data/orgs/discovery-api/v2/api.json‎

Lines changed: 69 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@
6060
"pattern" : "^\\s*|yes|no|only$",
6161
"enum" : [ "yes", " no", " only" ],
6262
"x-example" : ""
63-
}, {
64-
"name" : "locale",
65-
"in" : "query",
66-
"description" : "Locale the response content will be returned",
67-
"required" : false,
68-
"type" : "string",
69-
"default" : "en",
70-
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
71-
"x-example" : ""
7263
}, {
7364
"name" : "page",
7465
"in" : "query",
@@ -88,6 +79,15 @@
8879
"maximum" : 500.0,
8980
"minimum" : 1.0,
9081
"x-example" : ""
82+
}, {
83+
"name" : "locale",
84+
"in" : "query",
85+
"description" : "Locale the response content will be returned",
86+
"required" : false,
87+
"type" : "string",
88+
"default" : "en",
89+
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
90+
"x-example" : ""
9191
} ],
9292
"responses" : {
9393
"200" : {
@@ -182,15 +182,6 @@
182182
"pattern" : "^\\s*|yes|no|only$",
183183
"enum" : [ "yes", " no", " only" ],
184184
"x-example" : ""
185-
}, {
186-
"name" : "locale",
187-
"in" : "query",
188-
"description" : "Locale the response content will be returned",
189-
"required" : false,
190-
"type" : "string",
191-
"default" : "en",
192-
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
193-
"x-example" : ""
194185
}, {
195186
"name" : "page",
196187
"in" : "query",
@@ -210,6 +201,15 @@
210201
"maximum" : 500.0,
211202
"minimum" : 1.0,
212203
"x-example" : ""
204+
}, {
205+
"name" : "locale",
206+
"in" : "query",
207+
"description" : "Locale the response content will be returned",
208+
"required" : false,
209+
"type" : "string",
210+
"default" : "en",
211+
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
212+
"x-example" : ""
213213
} ],
214214
"responses" : {
215215
"200" : {
@@ -570,15 +570,6 @@
570570
"pattern" : "^\\s*|yes|no|only$",
571571
"enum" : [ "yes", " no", " only" ],
572572
"x-example" : ""
573-
}, {
574-
"name" : "locale",
575-
"in" : "query",
576-
"description" : "Locale the response content will be returned",
577-
"required" : false,
578-
"type" : "string",
579-
"default" : "en",
580-
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
581-
"x-example" : ""
582573
}, {
583574
"name" : "page",
584575
"in" : "query",
@@ -598,6 +589,15 @@
598589
"maximum" : 500.0,
599590
"minimum" : 1.0,
600591
"x-example" : ""
592+
}, {
593+
"name" : "locale",
594+
"in" : "query",
595+
"description" : "Locale the response content will be returned",
596+
"required" : false,
597+
"type" : "string",
598+
"default" : "en",
599+
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
600+
"x-example" : ""
601601
} ],
602602
"responses" : {
603603
"200" : {
@@ -739,15 +739,6 @@
739739
"pattern" : "^\\s*|yes|no|only$",
740740
"enum" : [ "yes", " no", " only" ],
741741
"x-example" : ""
742-
}, {
743-
"name" : "locale",
744-
"in" : "query",
745-
"description" : "Locale the response content will be returned",
746-
"required" : false,
747-
"type" : "string",
748-
"default" : "en",
749-
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
750-
"x-example" : ""
751742
}, {
752743
"name" : "page",
753744
"in" : "query",
@@ -767,6 +758,15 @@
767758
"maximum" : 500.0,
768759
"minimum" : 1.0,
769760
"x-example" : ""
761+
}, {
762+
"name" : "locale",
763+
"in" : "query",
764+
"description" : "Locale the response content will be returned",
765+
"required" : false,
766+
"type" : "string",
767+
"default" : "en",
768+
"pattern" : "(?i)^\\s*$|^\\s*[a-z]{2}(-[a-z]{2})?(\\s*,\\s*[a-z]{2}(-[a-z]{2})?)*\\s*$",
769+
"x-example" : ""
770770
} ],
771771
"responses" : {
772772
"200" : {
@@ -987,6 +987,16 @@
987987
"position" : 3,
988988
"description" : "Tertiary Genre for additional detail when describring an entity (Alternative Rock, Ambient Pop, etc)",
989989
"$ref" : "#/definitions/Level"
990+
},
991+
"type" : {
992+
"position" : 5,
993+
"description" : "A Type represents a kind or group of people. (Donation, Group, Individual, Merchandise, Event Style, etc)",
994+
"$ref" : "#/definitions/Level"
995+
},
996+
"subType" : {
997+
"position" : 6,
998+
"description" : "Secondary Type to further categorize an entity (Band, Choir, Chorus, etc)",
999+
"$ref" : "#/definitions/Level"
9901000
}
9911001
},
9921002
"description" : "Classification"
@@ -1013,15 +1023,12 @@
10131023
"type" : "boolean",
10141024
"default" : false
10151025
},
1016-
"leapDurationField" : {
1026+
"rangeDurationField" : {
10171027
"$ref" : "#/definitions/DurationField"
10181028
},
10191029
"durationField" : {
10201030
"$ref" : "#/definitions/DurationField"
10211031
},
1022-
"rangeDurationField" : {
1023-
"$ref" : "#/definitions/DurationField"
1024-
},
10251032
"minimumValue" : {
10261033
"type" : "integer",
10271034
"format" : "int32"
@@ -1030,6 +1037,9 @@
10301037
"type" : "integer",
10311038
"format" : "int32"
10321039
},
1040+
"leapDurationField" : {
1041+
"$ref" : "#/definitions/DurationField"
1042+
},
10331043
"name" : {
10341044
"type" : "string"
10351045
},
@@ -1045,10 +1055,10 @@
10451055
"DateTimeFieldType" : {
10461056
"type" : "object",
10471057
"properties" : {
1048-
"durationType" : {
1058+
"rangeDurationType" : {
10491059
"$ref" : "#/definitions/DurationFieldType"
10501060
},
1051-
"rangeDurationType" : {
1061+
"durationType" : {
10521062
"$ref" : "#/definitions/DurationFieldType"
10531063
},
10541064
"name" : {
@@ -1170,6 +1180,16 @@
11701180
"description" : "Type of the entity",
11711181
"enum" : [ "event", "venue", "attraction" ]
11721182
},
1183+
"distance" : {
1184+
"type" : "number",
1185+
"format" : "double"
1186+
},
1187+
"units" : {
1188+
"type" : "string"
1189+
},
1190+
"location" : {
1191+
"$ref" : "#/definitions/Location"
1192+
},
11731193
"id" : {
11741194
"type" : "string",
11751195
"position" : 1,
@@ -1944,6 +1964,13 @@
19441964
"description" : "Type of the entity",
19451965
"enum" : [ "event", "venue", "attraction" ]
19461966
},
1967+
"distance" : {
1968+
"type" : "number",
1969+
"format" : "double"
1970+
},
1971+
"units" : {
1972+
"type" : "string"
1973+
},
19471974
"id" : {
19481975
"type" : "string",
19491976
"position" : 1,

‎_includes/classification-selector-modal.html‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<div class="modal modal-common fade" id="js_ls-modal-classification" tabindex="-1" role="dialog">
2+
<div class="modal-dialog">
3+
<div class="modal-content">
4+
<div class="modal-header">
5+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"></button>
6+
<div class="row">
7+
<h3 class="modal-title col-lg-12">Classification Selection</h3>
8+
</div>
9+
</div>
10+
<div class="modal-body">
11+
<div class="row">
12+
<form id="js_lazy-sel_form" accept-charset="UTF-8" method="GET">
13+
<div class="col-sm-9 clear-padding-right">
14+
<input id="keyword" placeholder="keyword" autofocus class="search-input"/>
15+
</div>
16+
<div class="col-sm-3 text-right">
17+
<button id="js_classification-modal_btn" type="button" class="btn btn-transparent">GET</button>
18+
</div>
19+
</form>
20+
</div>
21+
<div id="spinner-ls" style="display: none;"></div>
22+
<div class="top-hr"></div>
23+
<div id="classification-jstree"></div>
24+
</div><!-- /.modal-content -->
25+
</div><!-- /.modal-dialog -->
26+
</div><!-- /.modal -->
27+
</div>
28+

‎_includes/feedback.html‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3 class="modal-title col-lg-12">Leave Your Feedback</h3>
4747

4848
</div>
4949
<div class="modal-footer">
50-
<button id="js_feedback_btn" type="button" class="btn btn-submit">send</button>
50+
<button id="js_feedback_btn" type="button" class="btn btn-submit" >send</button>
5151
</div>
5252

5353

@@ -80,3 +80,22 @@ <h3 class="modal-title col-lg-12 text-center">Thank you for contacting us!</h3>
8080
</div>
8181
</div>
8282
<!-- Modal alert end-->
83+
84+
<!-- Modal alert Error-->
85+
<div id="feedback-alert-modal-error" class="modal modal-common modal-common-sm fade" role="dialog">
86+
<div class="modal-dialog">
87+
88+
<!-- Modal content-->
89+
<div class="modal-content">
90+
<div class="modal-body">
91+
<h3 class="modal-title col-lg-12 text-center text-overflow-message__red">Error</h3>
92+
<p id="text-overflow-message" class="text-center">The maximum length of description can be 3000 characters.</p>
93+
<div class="modal-footer">
94+
<button id="js_feedback_btn_alert_ok-error" type="button" class="btn btn-submit text-center">Ok</button>
95+
</div>
96+
</div>
97+
</div>
98+
99+
</div>
100+
</div>
101+
<!-- Modal alert end-->

‎_includes/lazy-selector-modal.html‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ <h3 class="modal-title col-lg-12">Find <span>event</span> by keyword</h3>
2323

2424
<div id="spinner-ls" style="display: none;"></div>
2525
<div class="ms-selection" style="display: none;">
26-
<div class="col-xs-9">
26+
<div class="col-sm-9 col-xs-12">
2727
<ul class="ms-list">
2828
</ul>
2929
</div>
30-
<div class="col-xs-3 text-right">
30+
<div class="col-sm-3 col-xs-12 text-right">
3131
<button id="js_ms-use-btn" type="button" class="btn btn-submit">Use</button>
3232
</div>
3333
</div>
@@ -53,22 +53,3 @@ <h3 class="modal-title col-lg-12">Find <span>event</span> by keyword</h3>
5353
</div><!-- /.modal-dialog -->
5454
</div><!-- /.modal -->
5555

56-
57-
<!-- Modal alert-->
58-
<!--<div id="get-eventId-alert-modal" class="modal modal-common modal-common-sm fade" role="dialog">
59-
<div class="modal-dialog">
60-
61-
&lt;!&ndash; Modal content&ndash;&gt;
62-
<div class="modal-content">
63-
<div class="modal-body">
64-
<h3 class="modal-title col-lg-12 text-center">Thank you for contacting us!</h3>
65-
<p class="text-center">We will review and respond promptly.</p>
66-
<div class="modal-footer">
67-
<button id="js_get-eventId_btn_alert_ok" type="button" class="btn btn-submit text-center">Ok</button>
68-
</div>
69-
</div>
70-
</div>
71-
72-
</div>
73-
</div>-->
74-
<!-- Modal alert end-->

‎_includes/partials/expanded-menu-header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ <h4>APIs</h4>
99
<li>
1010
<a href="/products-and-docs/apis/getting-started/">Getting started</a>
1111
</li>
12-
<li>
12+
<!--<li>
1313
<a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a>
14-
</li>
14+
</li>-->
1515
<li>
1616
<a href="/api-explorer/">API Explorer</a>
1717
</li>

‎_includes/pd-side-menu.html‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -74,36 +74,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
7474

7575
{% endif %}
7676
</li>
77-
<!--
78-
<li><a href="/products-and-docs/apis/discovery-api/v2/">Discovery API</a>
79-
{% if page.categories[0] == "documentation" and page.categories[2] == "discovery-api" and page.categories[3] == "v2" %}
80-
<ul class="sections menu-highlight">
81-
<li><a href="#overview">Overview</a></li>
82-
<li><a href="#search-attractions-v2">Search Attractions</a></li>
83-
<li><a href="#attraction-details-v2">Get Attraction Details</a></li>
84-
<li><a href="#search-classifications-v2">Search Classifications</a></li>
85-
<li><a href="#genre-details-v2">Get Genre Details</a></li>
86-
<li><a href="#segment-details-v2">Get Segment Details</a></li>
87-
<li><a href="#subgenre-details-v2">Get Subgenre Details</a></li>
88-
<li><a href="#classification-details-v2">Get Classification Details</a></li>
89-
<li><a href="#search-events-v2">Search Events</a></li>
90-
<li><a href="#event-details-v2">Get Event Details</a></li>
91-
<li><a href="#event-images-v2">Get Event Images</a></li>
92-
<li><a href="#search-venues-v2">Search Venues</a></li>
93-
<li><a href="#venue-details-v2">Get Venue Details</a></li>
94-
<li><a href="#supported-country-codes">Supported Country Codes</a></li>
95-
<li><a href="#supported-markets">Supported Markets</a></li>
96-
<li><a href="#supported-sources">Supported Sources</a></li>
97-
<li><a href="#supported-locales">Supported Locales</a></li>
98-
<li><a href="#supported-dma">Supported DMA</a></li>
99-
{% include partials/changelog-apis.html%}
100-
<li><a href="#disqus_thread">Disqus</a></li>
101-
</ul>
102-
{% endif %}
10377

104-
105-
</li>
106-
-->
10778
<li><a href="/products-and-docs/apis/commerce/">Commerce API</a>
10879
{% if page.categories[0] == "documentation" and page.categories[1] == "commerce" %}
10980
<ul class="sections menu-highlight">
@@ -286,7 +257,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
286257
</ul>
287258
{% endif %}
288259
</li>
289-
<li><a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a></li>
260+
<!--<li><a href="/products-and-docs/apis/interactive-console/">Interactive Docs</a></li>-->
290261
<li><a href="/api-explorer/">API Explorer</a></li>
291262
<li><a href="/products-and-docs/apis/changelog/">Changelog</a></li>
292263
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}

0 commit comments

Comments
 (0)