v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-17 04:40:08 -07:00
Code Issues Projects Releases Wiki Activity

Update views

Browse Source
This commit is contained in:
David Hübner 2017-04-24 11:33:54 +02:00
parent 0b0f840408
commit de81b5888f
8 changed files with 199 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
app/Resources/assets/style/colors.scss Normal file
View File

@ -0,0 +1,139 @@
$alpha = 0.7;
$colors: (
-1: #0033B2,
0: #05131D,
1: #0055BF,
2: #237841,
3: #008F9B,
4: #C91A09,
5: #C870A0,
6: #583927,
7: #9BA19D,
8: #6D6E5C,
9: #B4D2E3,
10: #4B9F4A,
11: #55A5AF,
12: #F2705E,
13: #FC97AC,
14: #F2CD37,
15: #FFFFFF,
17: #C2DAB8,
18: #FBE696,
19: #E4CD9E,
20: #C9CAE2,
21: #D4D5C9,
22: #81007B,
23: #2032B0,
25: #FE8A18,
26: #923978,
27: #BBE90B,
28: #958A73,
29: #E4ADC8,
30: #AC78BA,
31: #E1D5ED,
32: transparentize(#635F52,$alpha),
33: transparentize(#0020A0,$alpha),
34: transparentize(#84B68D,$alpha),
35: transparentize(#D9E4A7,$alpha),
36: transparentize(#C91A09,$alpha),
40: transparentize(#635F52,$alpha),
41: transparentize(#AEEFEC,$alpha),
42: transparentize(#F8F184,$alpha),
43: transparentize(#C1DFF0,$alpha),
45: transparentize(#DF6695,$alpha),
46: transparentize(#F5CD2F,$alpha),
47: transparentize(#FCFCFC,$alpha),
52: transparentize(#A5A5CB,$alpha),
54: transparentize(#DAB000,$alpha),
57: transparentize(#FF800D,$alpha),
60: #645A4C,
61: #6C96BF,
62: #3CB371,
63: #AA4D8E,
64: #1B2A34,
68: #F3CF9B,
69: #CD6298,
70: #582A12,
71: #A0A5A9,
72: #6C6E68,
73: #5A93DB,
74: #73DCA1,
75: #000000,
76: #635F61,
77: #FECCCF,
78: #F6D7B3,
79: #FFFFFF,
80: #A5A9B4,
81: #899B5F,
82: #DBAC34,
84: #CC702A,
85: #3F3691,
86: #7C503A,
89: #4C61DB,
92: #D09168,
100: #FEBABD,
110: #4354A3,
112: #6874CA,
114: transparentize(#DF6695,$alpha),
115: #C7D23C,
117: transparentize(#FFFFFF,$alpha),
118: #B3D7D1,
120: #D9E4A7,
125: #F9BA61,
129: transparentize(#A5A5CB,$alpha),
132: #000000,
133: #000000,
134: #AE7A59,
135: #9CA3A8,
137: #7988A1,
142: #DCBC81,
143: transparentize(#CFE2F7,$alpha),
148: #575857,
150: #ABADAC,
151: #E6E3E0,
158: #DFEEA5,
178: #B48455,
179: #898788,
182: transparentize(#F08F1C,$alpha),
183: #F2F3F2,
191: #F8BB3D,
212: #9FC3E9,
216: #B31004,
226: #FFF03A,
230: transparentize(#E4ADC8,$alpha),
232: #7DBFDD,
236: transparentize(#96709F,$alpha),
272: #0A3463,
288: #184632,
294: transparentize(#BDC6AD,$alpha),
297: #AA7F2E,
308: #352100,
313: #3592C3,
320: #720E0F,
321: #078BC9,
322: #36AEBF,
323: #ADC3C0,
326: #9B9A5A,
334: #BBA53D,
335: #D67572,
351: #F785B1,
366: #FA9C1C,
373: #845E84,
378: #A0BCAC,
379: #6074A1,
383: #E0E0E0,
450: #B67B50,
462: #FFA70B,
484: #A95500,
503: #E6E3DA,
1000: #D9D9D9,
1001: #9391E4,
1002: transparentize(#C0F500,$alpha),
1003: transparentize(#68BCC5,$alpha),
1004: transparentize(#FCB76D,$alpha),
1005: transparentize(#FBE890,$alpha),
1006: transparentize(#B4D4F7,$alpha),
1007: #8E5597,
9999: #05131D,
);

6
app/Resources/assets/style/main.scss
View File

@ -6,11 +6,15 @@
box-shadow: none;
}
.ui.menu .ui.search .prompt {
border-radius: 0;
}
.item-info {
min-height: 300px;
}
.ui.fixed + .ui.main {
.ui.fixed + .ui.header {
margin-top: 3em;
padding-bottom: 4em;
}

7
app/Resources/views/macros/elements.html.twig
View File

@ -2,11 +2,8 @@
<div class="column">
<div class="ui bordered fluid image">
<a href="{{ url('model_detail', {'number': model.number})}}">
<div class="image">
<img src="{{ asset('/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" data-src="{{ asset('/ldraw/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
{#<div class="image load">#}
{#<img src="{{ model.number|partImage|imagine_filter('rebrickable_part_min') }}" data-src="{{ model.number|partImage|imagine_filter('rebrickable_part_min') }}" class="transition visible">#}
{#</div>#}
<div class="image load">
<img src="{{ asset('resources/images/unknown_image.png') }}" data-src="{{ asset('/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
</div>
<div class="ui bottom attached label {% if model.parts|length == 0 %}black{% endif %}">{{ model.number }}</div>
</a>

4
app/Resources/views/menu/knp_menu.html.twig
View File

@ -22,9 +22,9 @@
{% block list %}
{% if item.hasChildren and options.depth is not same as(0) and item.displayChildren %}
{% import _self as knp_menu %}
<div class="ui container" {{ knp_menu.attributes(listAttributes) }}>
{#<div {{ knp_menu.attributes(listAttributes) }}>#}
{{ block('children') }}
</div>
{#</div>#}
{% endif %}
{% endblock %}

16
app/Resources/views/model/detail.html.twig
View File

@ -26,6 +26,9 @@
<tr>
<th>author</th><td>{{ model.author.name }}</td>
</tr>
<tr>
<th>sets</th><td>{{ sets|length }}</td>
</tr>
</table>
<dl>
@ -43,22 +46,11 @@
</dd>
<dd>Download:</dd>
<dt><a href="{{ url('media_file', {'path': model.path}) }}">{{ model.number }}</a></dt>
<dt>rebrickable parts ({{ rbParts|length }}):</dt>
<dd>
{#<p>#}
{#<div class="ui eight doubling cards">#}
{#{% for alias in rbParts %}#}
{#<a href="{{ url('reb_part_detail', {number:alias.number}) }}" class="ui label">{{ alias.number }}</a>#}
{#{% endfor %}#}
{#</div>#}
{#</p>#}
</dd>
</dl>
</div>
</div>
</div>
<h4 class="ui horizontal divider header">
Related Models
</h4>
@ -72,6 +64,8 @@
{% for subpart in model.subparts %}
<div class="column">
{{ elements.part(subpart.subpart) }}
<p>{{ subpart.count }}</p>
<p style="border-bottom: 2px solid #{{ subpart.color.rgb }}">color: {{ subpart.color.name }}</p>
</div>
{% endfor %}
</div>

20
app/Resources/views/model/index.html.twig
View File

@ -7,7 +7,8 @@
{% block header %}{{ 'page.model.index' | trans }}{% endblock %}
{% block content %}
<div class="ui container stackable grid">
<div class="ui container divided stackable grid">
<div class="row">
<div class="column four wide">
<form method="get" action="" class="ui form">
{{ form_start(form) }}
@ -24,15 +25,24 @@
</form>
</div>
<div class="column twelve wide">
{{ knp_pagination_render(models) }}
<p>{{ models.getTotalItemCount }}</p>
<div class="ui eight column grid">
<div class="ui eight column doubling grid">
{% for model in models %}
{{ elements.part(model) }}
<div class="column">
<div class="ui bordered fluid image">
<a href="{{ url('model_detail', {'number': model.number})}}">
<div class="image load">
<img src="{{ asset('resources/images/unknown_image.png') }}" data-src="{{ asset('/images/-1/'~model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
</div>
<div class="ui bottom attached label {% if model.parts|length == 0 %}black{% endif %}">{{ model.number }}</div>
</a>
</div>
</div>
{% endfor %}
</div>
{{ knp_pagination_render(models) }}
<p>{{ models.getTotalItemCount }}</p>
</div>
</div>
</div>
{% endblock %}

11
app/Resources/views/rebrickable/part/detail.html.twig
View File

@ -17,7 +17,12 @@
{% endif %}
{% if part.model %}
{{ elements.part(part.model) }}
<a href="{{ url('model_detail', {'number': part.model.number})}}">
<div class="image load">
<img src="{{ asset('resources/images/unknown_image.png') }}" data-src="{{ asset('/images/-1/'~part.model.number~'.png') | imagine_filter('model_min') }}" class="transition visible">
</div>
<div class="ui bottom attached label">{{ part.model.number }}</div>
</a>
{% endif %}
<h4 class="ui horizontal divider header">
@ -29,7 +34,9 @@
<div class="column">
<div class="ui fluid bordered image">
<a href="{{ url('set_detail', {number:set.number}) }}">
<img class="ui bordered image" src="{{ set.number|setImage|imagine_filter('rebrickable_set_min') }}">
<div class="image load">
<img class="ui bordered" src="{{ asset('resources/images/unknown_image.png') }}" data-src="{{ set.number|setImage|imagine_filter('rebrickable_set_min') }}">
</div>
<div class="ui bottom attached label">{{ set.number }}<br></div>
</a>
</div>

22
src/AppBundle/Controller/Rebrickable/PartController.php
View File

@ -18,28 +18,6 @@ use Symfony\Component\HttpFoundation\Request;
*/
class PartController extends Controller
{
/**
* @Route("/", name="part_index")
*/
public function indexAction(Request $request)
{
$em = $this->getDoctrine()->getManager();
$queryBuilder = $em->getRepository(Part::class)->createQueryBuilder('part');
$queryBuilder->where('part.category = 17');
$paginator = $this->get('knp_paginator');
$sets = $paginator->paginate(
$queryBuilder->getQuery(),
$request->query->getInt('page', 1)/*page number*/,
$request->query->getInt('limit', 30)/*limit per page*/
);
return $this->render(':rebrickable/part:index.html.twig', [
'parts' => $sets,
]);
}
/**
* Finds and displays a part entity.
*