ngohungcuong.windy@gmail.com / T-Shats Frontend

Download as
Browse Code »

Commit 19a5416862fe17c5be7f8ecff2b70c62af569ed0

Authored by TRUONG
1 parent ba689b493b
Exists in master and in 1 other branch develop

restruct + fix style

Showing 12 changed files with 56 additions and 16 deletions Side-by-side Diff

app/images/layer-icon-1.png
Diff comments   View file @ 19a5416

1.31 KB
app/images/layer-icon-2.png
Diff comments   View file @ 19a5416

1.3 KB
app/images/layer-icon-3.png
Diff comments   View file @ 19a5416

1.38 KB
app/images/layer-icon-4.png
Diff comments   View file @ 19a5416

1.38 KB
... ... @@ -46,7 +46,7 @@
46 46 <script src="bower_components/json3/lib/json3.min.js"></script>
47 47 <![endif]-->
48 48 <script type="text/javascript">
49   - var VERSION = '15-11_01';
  49 + var VERSION = new Date().getTime();
50 50 var require = {
51 51 urlArgs: "ver="+VERSION,
52 52 };
... ... @@ -47,7 +47,7 @@
47 47 if (configRoutes.routes !== undefined){
48 48 angular.forEach(configRoutes.routes, function(route, path)
49 49 {
50   - $routeProvider.when(path, {templateUrl: route.templateUrl, resolve: resolveController(route.dependencies)});
  50 + $routeProvider.when(path, {templateUrl: route.templateUrl+'?ver='+VERSION, resolve: resolveController(route.dependencies)});
51 51 });
52 52 }
53 53  
app/scripts/controllers/main.js
Diff comments   View file @ 19a5416
... ... @@ -3,6 +3,9 @@
3 3 app.controller('MainCtrl', function ($rootScope, $scope, $illustration, $t_shirt) {
4 4 $scope.designFrameView = 'views/tshirt-design.html?ver='+VERSION;
5 5 $scope.designPartIllustration = 'views/design_part/illustration.html?ver='+VERSION;
  6 + $scope.designPartImage = 'views/design_part/image.html?ver='+VERSION;
  7 + $scope.designPartText = 'views/design_part/text.html?ver='+VERSION;
  8 + $scope.designPartDefault = 'views/design_part/default.html?ver='+VERSION;
6 9  
7 10 //Action T-Shirt choice color and Back or Front
8 11 $scope.tShirtColor = $t_shirt.getTShirtColor(0);
... ... @@ -38,7 +41,7 @@
38 41 };
39 42  
40 43  
41   - $scope.showIllustration = function(tab){
  44 + $scope.showDesignTab = function(tab){
42 45 $rootScope.isShowLeftPanel = tab;
43 46 switch (tab) {
44 47 case 'illustration': {
... ... @@ -73,7 +76,7 @@
73 76 keyboard: false
74 77 }
75 78 );
76   - $scope.showIllustration('default');
  79 + $scope.showDesignTab('default');
77 80 };
78 81 $scope.modalClose = function(){
79 82 $('#tshirt-design').modal('hide');
app/scripts/routes.js
Diff comments   View file @ 19a5416
... ... @@ -5,7 +5,7 @@
5 5 routes: {
6 6 /* add more routes */
7 7 '/': {
8   - templateUrl: 'views/main.html?ver='+VERSION,
  8 + templateUrl: 'views/main.html',
9 9 dependencies: [
10 10 'scripts/controllers/main.js',
11 11 'scripts/controllers/tshirtdesign.js',
... ... @@ -453,10 +453,16 @@
453 453 }
454 454  
455 455 .aside #choice-illustration li .content .illustration-list .illstration-item{
456   - height: 65px;
  456 + height: 60px;
457 457 overflow: hidden;
458 458 float: left;
459   - margin-left: 5px;
  459 + margin-left: 6px;
  460 + margin-top: 5px;
  461 + margin-bottom: 5px;
  462 + padding: 2px;
  463 + background: #e2e2e2;
  464 + border: solid 2px #d7d7d7;
  465 + overflow: pointer;
460 466 }
461 467  
462 468 .aside #choice-illustration li .content .illustration-list .illstration-item:hover {
... ... @@ -464,7 +470,7 @@
464 470 }
465 471  
466 472 .aside #choice-illustration li .content .illustration-list .illstration-item img {
467   - width: 62px;
  473 + width: 50px;
468 474 cursor: pointer;
469 475 }
470 476  
app/views/design_part/default.html
Diff comments   View file @ 19a5416
1   -<li>
  1 +<li ng-click="showDesignTab('text')">
2 2 <div class="hover"></div>
3 3 <div class="title">
4 4 <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
... ... @@ -13,7 +13,7 @@
13 13 </div>
14 14 </div>
15 15 </li>
16   -<li>
  16 +<li ng-click="showDesignTab('illustration')">
17 17 <div class="hover"></div>
18 18 <div class="title">
19 19 <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
... ... @@ -28,7 +28,7 @@
28 28 </div>
29 29 </div>
30 30 </li>
31   -<li>
  31 +<li ng-click="showDesignTab('image')">
32 32 <div class="hover"></div>
33 33 <div class="title">
34 34 <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
app/views/design_part/image.html
Diff comments   View file @ 19a5416
  1 +<li>
  2 + <div class="title">
  3 + <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
  4 + イラスト・イメージ選択
  5 + </div>
  6 + <div class="content clearfix">
  7 +
  8 + </div>
  9 +</li>
  10 +<li>
  11 + <div class="title">
  12 + <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
  13 + カラー変更
  14 + <div class="pull-right">元の色に戻す</div>
  15 + </div>
  16 + <div class="content clearfix">
  17 +
  18 + </div>
  19 +</li>
  20 +<li>
  21 + <div class="title">
  22 + <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
  23 + 重ね順変更
  24 + </div>
  25 + <div class="content clearfix">
  26 +
  27 + </div>
  28 +</li>
app/views/tshirt-design.html
Diff comments   View file @ 19a5416
... ... @@ -10,13 +10,13 @@
10 10 <div class="modal-body">
11 11 <header class="clearfix">
12 12 <ul class="nav pull-left">
13   - <li ng-class="{'active': isShowLeftPanel=='text'}" ng-click="showIllustration('text')">
  13 + <li ng-class="{'active': isShowLeftPanel=='text'}" ng-click="showDesignTab('text')">
14 14 <i class="fa fa-jpy" aria-hidden="true"></i> 文字
15 15 </li>
16   - <li ng-class="{'active': isShowLeftPanel=='illustration'}" ng-click="showIllustration('illustration')">
  16 + <li ng-class="{'active': isShowLeftPanel=='illustration'}" ng-click="showDesignTab('illustration')">
17 17 <i class="fa fa-btc" aria-hidden="true"></i> イラスト・イメージ
18 18 </li>
19   - <li>
  19 + <li ng-class="{'active': isShowLeftPanel=='image'}" ng-click="showDesignTab('image')">
20 20 <i class="fa fa-money" aria-hidden="true"></i> 自分の画像・写真
21 21 </li>
22 22 <li>
23 23  
24 24  
... ... @@ -35,13 +35,16 @@
35 35 <section class="tshirt-design-container clearfix">
36 36 <div class="aside col-xs-4">
37 37 <!-- Default-->
38   - <ul class="box-design-option" id="choice-design-option" ng-show="isShowLeftPanel=='default' " ng-include="'views/design_part/default.html'">
  38 + <ul class="box-design-option" id="choice-design-option" ng-show="isShowLeftPanel=='default' " ng-include="designPartDefault">
39 39 </ul>
40 40 <!-- Illustration design-->
41 41 <ul class="box-design-option" id="choice-illustration" ng-show="isShowLeftPanel=='illustration'" ng-include="designPartIllustration">
42 42 </ul>
  43 + <!-- Custom image design-->
  44 + <ul class="box-design-option" id="choice-image" ng-show="isShowLeftPanel=='image'" ng-include="designPartImage">
  45 + </ul>
43 46 <!-- Text design-->
44   - <ul class="box-design-option" id="choice-text" ng-show="isShowLeftPanel=='text'" ng-include="'views/design_part/text.html'">
  47 + <ul class="box-design-option" id="choice-text" ng-show="isShowLeftPanel=='text'" ng-include="designPartText">
45 48 </ul>
46 49 </div>
47 50 <div class="design-content col-xs-8">