Skip to content

Feature/ui #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Roger-Wu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/ui #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302c661
change color, font-size
Roger-Wu Aug 20, 2016
f44f917
ui almost done
Roger-Wu Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/components/home/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="topPanel">
<div class="diamondCount">
<div class="diamondCountWrap">
<i class="ui diamond icon diamondIcon"></i>
<i class="ui diamond icon diamondIcon" style="color: #5cbcff;"></i>
<div>{{homeCtrl.diamondCount | number: 0}}</div>
</div>
<div>
<div style="color: rgba(255, 255, 255, 0.5); font-size: 24px;">
Rate: {{homeCtrl.diamondRate | number: 1}}
</div>
</div>
Expand All @@ -20,7 +20,7 @@
<div class="thunder-wrap">
<div class="thunder"></div>
</div>

<div class="moon"></div>
<div class="moon2"></div>
<div class="stars"></div>
Expand Down
1 change: 1 addition & 0 deletions app/components/home/home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@
.diamondIcon {
position: relative;
top: -2px;
color: #5cbcff;
}

.diamondCount {
Expand Down
14 changes: 7 additions & 7 deletions app/components/leftPanel/leftPanel.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ export default class LeftPanelController {
},
data: { "type": animal.code }
};

this.fetch(req).then(function(response){
alert(response);

}, function(){
alert('error');
});
//
// this.fetch(req).then(function(response){
// alert(response);
//
// }, function(){
// alert('error');
// });
// fetch({
// method: 'POST',
// url: 'http://hackntu-nodered.mybluemix.net/start-talking'
Expand Down
87 changes: 52 additions & 35 deletions app/components/leftPanel/leftPanel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,75 @@
<img class="zooImg" ng-src="{{item.img}}" alt="{{item.name}}">
<p>{{item.name}}</p>
</a> -->
<div class="animalWrap top">
</div>
<div class="animalWrap" ng-repeat="animal in leftPanelCtrl.ownAnimals" ng-click="leftPanelCtrl.openUpgradeModal(animal)">
<div class="leftPanelImageWrap" style="background: url('images/{{animal.img}}')">
</div>
<div class="leftPhotoWrap">
<div class="header">
{{animal.name}}
<div class="animalList">
<div class="animalWrap" ng-repeat="animal in leftPanelCtrl.ownAnimals" ng-click="leftPanelCtrl.openUpgradeModal(animal)">
<div class="leftPanelImageWrap" style="background-image: url('images/{{animal.img}}')">
</div>
<div class="attribute">
<span><img class="attr-icon" src="//i.imgur.com/7XAsKFu.png" alt="">: 0</span>
<span><img class="attr-icon" src="//i.imgur.com/ztfDn80.png" alt="">: 10</span>
<span><img class="attr-icon" src="//i.imgur.com/qJHPUlh.png" alt="">: 20</span>
<div class="leftPhotoWrap">
<div class="header">
{{animal.name}}
</div>
<div class="attribute">
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/7XAsKFu.png" alt="">
<span class="left-attr-number">0</span>
</span>
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/ztfDn80.png" alt="">
<span class="left-attr-number">10</span>
</span>
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/qJHPUlh.png" alt="">
<span class="left-attr-number">20</span>
</span>
</div>
</div>
</div>
</div>
<div class="ui modal" id="upgradeModal">
<i class="close icon"></i>
<div class="header">
<div class="header upgrade-modal-header">
動物護照
</div>
<div class="image content">
<div class="image content upgrade-modal-content">
<div class="ui medium image">
<img ng-src="images/{{leftPanelCtrl.currentAnimal.img}}">
</div>
<div class="description">
<div class="ui header">{{leftPanelCtrl.currentAnimal.name}}</div>
<div class="attribute inner">
<span><img class="attr-icon big" src="//i.imgur.com/7XAsKFu.png" alt="">: 0</span>
<span><img class="attr-icon big" src="//i.imgur.com/ztfDn80.png" alt="">: 10</span>
<span><img class="attr-icon big" src="//i.imgur.com/qJHPUlh.png" alt="">: 20</span>
</div>
<div class="ui segment">
<p>Hi 小魯～</p>
<p>嘻嘻</p>
<p>哈囉</p>
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/7XAsKFu.png" alt="">
<span class="left-attr-number">0</span>
</span>
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/ztfDn80.png" alt="">
<span class="left-attr-number">10</span>
</span>
<span class="left-attr-column">
<img class="attr-icon" src="//i.imgur.com/qJHPUlh.png" alt="">
<span class="left-attr-number">20</span>
</span>
</div>
<form class="ui reply form">
<div class="field">
<div class="ui input">
<input type="text" placeholder="Type here...">
</div>
</div>
<div class="ui primary submit button">
<!-- <i class="icon edit"></i> -->
Enter
</div>
</form>
</div>
<!-- <div class="ui segment">
<p>Hi 小魯～</p>
<p>嘻嘻</p>
<p>哈囉</p>
</div>
<form class="ui reply form">
<div class="field">
<div class="ui input">
<input type="text" placeholder="Type here...">
</div>
</div>
<div class="ui primary submit button">
Enter
</div>
</form> -->
</div>
<!-- <div class="actions">
</div>
<!-- <div class="actions">
<div class="ui black deny button">
Nope
</div>
Expand All @@ -67,6 +85,5 @@
<i class="checkmark icon"></i>
</div>
</div> -->
</div>
</div>
</div>
41 changes: 31 additions & 10 deletions app/components/leftPanel/leftPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
margin: auto;
}

.panelTitle {
display: flex;
padding: 30px 0;
background-color: #183a5d;
position: absolute;
top: 0;
width: 100%;
}
// defined in rightPanel.scss
// .panelTitle {
// display: flex;
// background-color: #183a5d;
// height: 80px;
// }

.leftPanelImageWrap {
width: 75px;
Expand All @@ -24,7 +22,8 @@
background-repeat: no-repeat !important;
margin: auto 10px;
border-radius: 75px;
border: 2px solid;
border: 2px solid $text-white;
background-position: center;
}

.leftPhotoName {
Expand All @@ -41,7 +40,8 @@
}

.leftPhotoWrap .header {
font-size: 20px;
font-size: 18px;
color: $text-white;
}

.leftPhotoWrap .attribute {
Expand Down Expand Up @@ -73,3 +73,24 @@
.zooImg {
width: 100px !important;
}

.left-attr-column {
margin-right: 8px;
}

.left-attr-number {
color: $text-gray;
}

#upgradeModal.modal {
.upgrade-modal-header {
background-color: #183a5d;
color: $text-white;
}
.upgrade-modal-content {
background-color: #0a2232;
.ui.header {
color: $text-white;
}
}
}
14 changes: 7 additions & 7 deletions app/components/rightPanel/rightPanel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@
<div class="rightTitle">SHOP</div>
</div>
<div class="animalList">
<div class="animalWrap top">
</div>
<!-- <div class="animalWrap top"></div> -->
<div class="animalWrap" ng-repeat="animal in rightPanelCtrl.animals" ng-click="rightPanelCtrl.buyAnimal(animal)">
<div class="rightPanelImageWrap" style="background: url('images/{{animal.img}}')">
<div class="rightPanelImageWrap" style="background-image: url('images/{{animal.img}}')">
</div>
<div class="rightPhotoWrap">
<div class="rightPhotoName">
{{animal.name}}
</div>
<div class="description">
<p><i class="diamond icon white"></i>{{animal.cost}}</p>
<i class="diamond icon right-animal-diamond"></i>
<span class="right-animal-cost">{{animal.cost}}</span>
</div>
</div>
<div class="rightActionBtnWrap">
<i class="ui circle info icon cursor big" ng-click="rightPanelCtrl.checkInfo(animal); $event.stopPropagation();"></i>
<i class="ui circle info icon cursor big right-animal-info" ng-click="rightPanelCtrl.checkInfo(animal); $event.stopPropagation();"></i>
</div>
</div>
<div class="ui modal" id="infoModal">
<i class="close icon"></i>
<div class="header">
<div class="header info-modal-header">
動物護照
</div>
<div class="image content">
<div class="image content info-modal-content">
<div class="ui medium image">
<img ng-src="images/{{rightPanelCtrl.currentAnimal.img}}">
</div>
Expand Down
55 changes: 45 additions & 10 deletions app/components/rightPanel/rightPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
.rightIcons {
margin: 10px 0;
cursor: pointer;
color: $text-gray;
}

.rightIcons:hover {
opacity: 0.6;
color: $text-white;
}

.closeBtn {
Expand All @@ -17,11 +18,15 @@
left: 10px;
}

.animalList {}
.animalList {
height: calc(100% - 80px);
overflow: scroll;
background-color: #0a2232;
}

.animalWrap {
display: flex;
margin: 10px 0;
padding: 8px 0;
}

.animalWrap.top {
Expand Down Expand Up @@ -59,7 +64,9 @@
}

.rightPhotoName {
font-size: 20px
font-size: 18px;
line-height: 24px;
color: $text-white;
}

.rightPhotoWrap .header {
Expand All @@ -68,7 +75,8 @@
}

.rightPhotoWrap .description {
font-size: 20px;
font-size: 18px;
line-height: 24px;
}

.rightPanelWrap {
Expand All @@ -78,11 +86,9 @@

.panelTitle {
display: flex;
padding: 30px 0;
background-color: #183a5d;
position: absolute;
top: 0;
width: 100%;
height: 80px;
color: $text-white;
}

.rightActionBtnWrap {
Expand All @@ -107,5 +113,34 @@
background-repeat: no-repeat !important;
margin: auto 10px;
border-radius: 75px;
border: 2px solid;
border: 2px solid $text-white;
background-position: center;
}

.right-animal-diamond {
color: #5cbcff;
}

.right-animal-cost {
color: #5cbcff;
}

.right-animal-info {
color: $text-dark;
&:hover {
color: $text-white;
}
}

#infoModal {
.info-modal-header {
background-color: #183a5d;
color: $text-white;
}
.info-modal-content {
background-color: #0a2232;
.ui.header {
color: $text-white;
}
}
}
2 changes: 1 addition & 1 deletion app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Animax</title>
<link href="https://fonts.googleapis.com/css?family=Baloo+Bhaina" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Baloo+Paaji" rel="stylesheet">
<link rel="stylesheet" href="statics/semantic.min.css">
</head>
<body ng-app="app">
Expand Down
Loading