Skip to content

Commit 0dd44d3

Browse files
KomendaPKomendaP
authored
Merge pull request #1095 from ticketmaster-api-staging/TKMDPA-1321-new
[TKMDPA-1321][js/html/scss] Pages temporary
2 parents 686fabc + d5ee194 commit 0dd44d3

17 files changed

Lines changed: 686 additions & 88 deletions

‎_layouts/api-explorer-v2.html‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ <h4 class="title">Request list</h4>
163163
<button data-bind="click: onClearRequests" class="btn btn-icon btn-clear" type="button"></button>
164164
</div>
165165
</section>
166+
166167
<!--requests-->
167168
<section>
168169
<ul data-bind="foreach: viewModel"
@@ -172,7 +173,6 @@ <h4 class="title">Request list</h4>
172173
aria-multiselectable="true">
173174

174175
<li data-bind="css: {active: active}" class="panel panel-default api-exp-request-list-item clearfix">
175-
176176
<section class="row-container request"
177177
data-bind="attr: {id: $parent.getStr('heading', $index)}"
178178
role="tab">
@@ -199,33 +199,42 @@ <h4 class="title">Request list</h4>
199199
<span data-bind="css: color" class="color-indicator view-control"></span>
200200
<p data-bind="text: req" class="item_text"></p>
201201
</section>
202+
202203
<section class="response collapse"
203204
data-bind="attr: {id: $parent.getStr('collapse', $index), 'aria-labelledby': $parent.getStr('heading', $index)}"
204205
role="tabpanel">
205-
<div class="container">
206-
<!-- Nav tabs -->
207-
<ul class="nav nav-tabs" role="tablist">
208-
<li role="presentation" class="tab">
209-
<a data-bind="attr: {href: '#json-' + $index(), 'aria-controls': 'json-' + $index()}" class="tab-btn" href="#json" aria-controls="json" role="tab" data-toggle="tab">Json</a>
210-
</li>
211-
<li role="presentation" class="tab active">
212-
<a data-bind="attr: {href: '#blocks-' + $index(), 'aria-controls': 'blocks-' + $index()}" class="tab-btn" href="#blocks" aria-controls="blocks" role="tab" data-toggle="tab">Blocks</a>
213-
</li>
214-
<li class="tab">
215-
<span class="tab-label">Structure</span>
216-
</li>
217-
<li class="tab">
218-
<span class="breadcrumbs truncate">… Events /er.com/discovery/v1/events/1D004F92642F0C7D.json?{apikey} / https://app.ticketmaster.com/discovery/v1/events/1D004F926</span>
219-
</li>
220-
</ul>
221-
222-
<!-- Tab panes -->
223-
<div class="tab-content col-xs-12">
224-
<div data-bind="scroll: {x:false, y:true}, attr: {id: 'json-' + $index()}" role="tabpanel" class="tab-pane prety-json" id="json">
225-
<p data-bind="html: resHTML"></p>
206+
<div class="row">
207+
<div class="container">
208+
<div class="row">
209+
<!-- Nav tabs -->
210+
<ul class="nav nav-tabs" role="tablist">
211+
<li role="presentation" class="tab">
212+
<a data-bind="attr: {href: '#json-' + $index(), 'aria-controls': 'json-' + $index()}" class="tab-btn" href="#json" aria-controls="json" role="tab" data-toggle="tab">Json</a>
213+
</li>
214+
<li role="presentation" class="tab active">
215+
<a data-bind="attr: {href: '#blocks-' + $index(), 'aria-controls': 'blocks-' + $index()}" class="tab-btn" href="#blocks" aria-controls="blocks" role="tab" data-toggle="tab">Blocks</a>
216+
</li>
217+
<li class="tab">
218+
<span class="tab-label">Structure</span>
219+
</li>
220+
<li class="tab">
221+
<span class="breadcrumbs truncate">… Events /er.com/discovery/v1/events/1D004F92642F0C7D.json?{apikey} / https://app.ticketmaster.com/discovery/v1/events/1D004F926</span>
222+
</li>
223+
</ul>
226224
</div>
227-
<div data-bind="attr: {id: 'blocks-' + $index()}" role="tabpanel" class="tab-pane blocks active" id="blocks">
228-
<section data-bind="component: {name: 'cardGroup', params: { data: blocks, color: color, index: $index(), getMore: $parent.getMore}}"></section>
225+
226+
<!-- Tab panes -->
227+
<div class="row">
228+
<div class="tab-content col-xs-12">
229+
<div data-bind="scroll: {x:false, y:true}, attr: {id: 'json-' + $index()}" role="tabpanel" class="tab-pane prety-json" id="json">
230+
<p data-bind="html: resHTML"></p>
231+
</div>
232+
<div data-bind="attr: {id: 'blocks-' + $index()}" role="tabpanel" class="tab-pane blocks active" id="blocks">
233+
<div class="slider">
234+
<section data-bind="component: {name: 'cardGroup', params: { data: blocks, color: color, index: $index(), getMore: $parent.getMore, url: $parent.url}}"></section>
235+
</div>
236+
</div>
237+
</div>
229238
</div>
230239
</div>
231240
</div>
@@ -248,23 +257,18 @@ <h4 class="title">Request list</h4>
248257
<a href="#"><span></span></a>
249258
</div>
250259
<script async src="https://maps.googleapis.com/maps/api/js?key=AIzaSyB3-oFbQWw_jEcG7r7WGdi99jNT3DqvRas&libraries=visualization"></script>
251-
<!--<script src="{{'/config.js' | prepend: site.baseurl }}"></script>-->
252260
<script src="{{'/scripts/vendors/jquery-1.11.3.min.js' | prepend: site.baseurl }}"></script>
253-
<!--<script src="https://code.jquery.com/jquery-migrate-1.3.0.min.js"></script>-->
254261
<script src="{{'/scripts/vendors/jquery-migrate-1.3.0.js' | prepend: site.baseurl }}"></script>
255-
<script src="{{'/scripts/components/intro.js' | prepend: site.baseurl }}"></script>
256262
<script src="{{'/scripts/vendors/bootstrap.min.js' | prepend: site.baseurl }}"></script>
257-
<script src="{{'/scripts/vendors/slick.min.js' | prepend: site.baseurl }}"></script>
263+
<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.slick/1.6.0/slick.min.js"></script>
264+
<!--<script src="{{'/scripts/vendors/slick.min.js' | prepend: site.baseurl }}"></script>-->
258265
<script src="{{'/scripts/vendors/knockout-3.3.0.js' | prepend: site.baseurl }}"></script>
259266
<script src="{{'/scripts/vendors/knockout-scrollbar.js' | prepend: site.baseurl }}"></script>
260267
<script src="{{'/scripts/api-explorer/v2/script.js' | prepend: site.baseurl }}"></script>
261-
262268
<script src="{{'/scripts/components/scroll-top.js' | prepend: site.baseurl }}"></script>
263269
{% include feedback.html %}
264270
<script src="{{'/scripts/components/custom-select.js' | prepend: site.baseurl }}"></script>
265-
<script src="{{'/scripts/components/feedback.js' | prepend: site.baseurl }}"></script>
266271
<script src="{{'/scripts/load-api-key.js' | prepend: site.baseurl }}"></script>
267272
<script src="{{'/scripts/components/apikey-check.js' | prepend: site.baseurl }}"></script>
268-
<script src="{{'/scripts/components/feedback.js' | prepend: site.baseurl }}"></script>
269273
</body>
270274
</html>

‎_sass/explorer/api-explorer-v2.0.scss‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ $img-calendar: '../assets/img/api-explorer/ic-calendar.svg';
2121
$img-id: '../assets/img/api-explorer/ic-id.svg';
2222
$img-share: '../assets/img/api-explorer/ic-share.svg';
2323
$img-raw: '../assets/img/api-explorer/ic-view-in-raw.svg';
24-
24+
$img-arrows-left: '../assets/img/arrows-left-small.svg';
25+
$img-arrows-right: '../assets/img/arrows-right-small.svg';
2526
.truncate {
2627
display: inline-block;
2728
white-space: nowrap;
@@ -39,7 +40,10 @@ $img-raw: '../assets/img/api-explorer/ic-view-in-raw.svg';
3940
}
4041

4142
#api-explorer-v2.api-explorer-v2 {
42-
43+
.row {
44+
margin-left: -15px;
45+
margin-right: -15px;
46+
}
4347

4448

4549
.row-container {
@@ -574,6 +578,44 @@ $img-raw: '../assets/img/api-explorer/ic-view-in-raw.svg';
574578
color: #768692;
575579
}
576580
}
581+
.slick-slider {
582+
.slick-slide {
583+
outline: none;
584+
}
585+
.slick-arrow {
586+
background: none;
587+
width: 20px;
588+
height: 40px;
589+
opacity: 0.4;
590+
border-radius: 4px;
591+
background: {
592+
color: #768692;
593+
repeat: no-repeat;
594+
position: 50% 50%;
595+
}
596+
padding: 2px;
597+
&:before {
598+
display: none;
599+
}
600+
&:active,
601+
&:hover {
602+
opacity: 1;
603+
}
604+
&.slick-prev {
605+
background-image: url($img-arrows-left);
606+
&:hover {
607+
left: -45px;
608+
}
609+
}
610+
&.slick-next {
611+
background-image: url($img-arrows-right);
612+
&:hover {
613+
right: -45px;
614+
}
615+
}
616+
617+
}
618+
}
577619
.response {
578620
overflow: hidden;
579621
background-color: rgba(183, 201, 211, 0.1);

‎_sass/explorer/components/accordion.component.scss‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $img: './../assets/img/ic-shevron-right-white.svg';
33
.tab-content {
44
.panel-group {
55
.panel {
6-
max-width: 555px;
6+
width: 370px;
77
margin: auto;
88
border-color: transparent;
99
& + .panel {
@@ -54,11 +54,39 @@ $img: './../assets/img/ic-shevron-right-white.svg';
5454
color: #fff;
5555
}
5656
}
57+
.navigation {
58+
width: 0;
59+
height: 0;
60+
border-style: solid;
61+
background: none;
62+
outline: none;
63+
&[disabled]{
64+
opacity: 0.3;
65+
}
66+
&-wrapper {
67+
float: right;
68+
margin: 3px 3px 0;
69+
}
70+
&.prev {
71+
border: {
72+
width: 7.5px 8px 7.5px 0;
73+
color: transparent #fff transparent transparent
74+
}
75+
margin-right: 15px;
76+
}
77+
&.next {
78+
border:{
79+
width: 7.5px 0 7.5px 8px;
80+
color: transparent transparent transparent #fff;
81+
}
82+
}
83+
}
5784
}
5885

5986
.panel-body {
6087
border-top: none !important;
6188
padding: 0;
89+
overflow: hidden;
6290
.list-group {
6391
margin: 0;
6492
.list-group-item {
@@ -83,6 +111,8 @@ $img: './../assets/img/ic-shevron-right-white.svg';
83111
stretch: normal;
84112
}
85113
line-height: 1.57;
114+
width: 230px;
115+
padding: 0 10px 0 0;
86116
}
87117

88118
.additional-info {
@@ -142,11 +172,15 @@ $img: './../assets/img/ic-shevron-right-white.svg';
142172
font-stretch: normal;
143173
line-height: 1.57;
144174
color: #768692;
175+
overflow-wrap: break-word;
145176
}
146177
.key {
147178
@extend .value;
148179
font-weight: bold;
149180
}
181+
* {
182+
margin: 0 0 5px;
183+
}
150184
}
151185
}
152186

‎_sass/explorer/style.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@
639639
transform: inherit;
640640
&:before{
641641
content: '';
642-
background: url('../../assets/img/arrows.svg');
642+
background: url('../../assets/img/arrows-left.svg');
643643
position: absolute;
644644
width: 23px;
645645
height: 25px;

‎apidescription.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<param name="size" required="false" style="query" type="xsd:integer" default="20">
8282
<doc>The number of events returned in the API response.</doc>
8383
</param>
84-
<param name="page" required="false" style="query" type="xsd:integer" default="1">
84+
<param name="page" required="false" style="query" type="xsd:integer" default="0">
8585
<doc>The page for paginating through the results.</doc>
8686
</param>
8787
<param name="sort" required="false" style="query" type="xsd:string" default="none">

assets/img/arrows.svg renamed to assets/img/arrows-left-small.svg

Lines changed: 2 additions & 2 deletions
Loading

‎assets/img/arrows-left.svg‎

Lines changed: 14 additions & 0 deletions
Loading

‎assets/img/arrows-right-small.svg‎

Lines changed: 14 additions & 0 deletions
Loading

‎assets/img/arrows-right.svg‎

Lines changed: 14 additions & 0 deletions
Loading

‎scripts/api-explorer/script.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ Object.byString = function(o, s) {
541541
// column constructor
542542
var Column = function(configObject, responseObject, index, guId) {
543543
var self = this;
544-
544+
console.log('config',configObject);
545545
self.guId = guId;
546546
self.responseObject = responseObject;
547547
self.destinationObject = {};

0 commit comments

Comments
 (0)