Skip to content

Commit a5972bd

Browse files
committed
Added adjustments and roadmap route.
1 parent f1ae552 commit a5972bd

File tree

19 files changed

+75
-50
lines changed

19 files changed

+75
-50
lines changed

MarvelWorld-Cli/app/controllers/application.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export default Ember.Controller.extend(Base, {
88
},
99
goToGithub:function(){
1010
window.open('https://github.com/kilisoria','_blank');
11+
},
12+
goToRoadMap: function(){
13+
this.transitionToRoute('roadmap');
1114
}
1215
}
1316
});

MarvelWorld-Cli/app/mixins/base-controller.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Ember from 'ember';
2+
13

24
export default Ember.Mixin.create({
35
total:function(){

MarvelWorld-Cli/app/router.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ Router.map(function() {
1616
this.route("view", {path:"view/:game_id"});
1717
});
1818

19-
this.resource("events", function(){
20-
this.route("view", {path:"view/:event_id"});
21-
this.route("new");
22-
});
23-
19+
this.resource("events", function(){
20+
this.route("view", {path:"view/:event_id"});
21+
this.route("new");
22+
});
23+
2424
this.route("tv");
2525
this.route("event");
2626
this.route("training");
27+
this.route("roadmap");
2728
});
2829

2930
export default Router;
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import Ember from 'ember';
22

33
export default Ember.Route.extend({
4+
setLanguage: function(language){
5+
var set = Ember.set;
6+
var application = this.get('container').lookup('application:main');
7+
set(application, 'defaultLocale', language);
8+
this.transitionTo('index');
9+
},
410
actions: {
511
openModal: function(controller, model) {
612
this.controllerFor(controller).set('model', model);
@@ -16,17 +22,10 @@ export default Ember.Route.extend({
1622
});
1723
},
1824
setSpainLanguage: function(){
19-
console.log("0001");
25+
this.setLanguage('es');
2026
},
2127
setEnglishLanguage: function(){
22-
var set = Ember.set;
23-
var application = this.get('container').lookup('application:main');
24-
set(application, 'defaultLocale', 'en');
25-
26-
console.log(this.get('container').lookup('application:main'));
27-
28-
this.transitionTo('index');
29-
28+
this.setLanguage('en');
3029
}
3130
}
3231
});
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import Ember from 'ember';
2+
3+
export default Ember.Route.extend({
4+
5+
});

MarvelWorld-Cli/app/styles/app.css

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,11 @@ textarea{
414414
cursor: pointer;
415415
}
416416

417+
.app-version a:nth-child(4){
418+
color:#818181;
419+
float: right;
420+
}
421+
417422
.app-version a:nth-child(3){
418423
float: right;
419424
}
@@ -493,4 +498,19 @@ textarea{
493498
font-weight: bold;
494499
width: 102px;
495500
clear: both;
496-
}
501+
}
502+
503+
.roadmap-container{
504+
color: #000;
505+
font-size: 16px;
506+
padding: 10px;
507+
}
508+
509+
.roadmap-container ul{
510+
color:#fff;
511+
font-weight: bold;
512+
}
513+
514+
.roadmap-container div:nth-child(1){
515+
font-size: 26px;
516+
};

MarvelWorld-Cli/app/templates/application.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<span>App Version:{{version}}</span>
88
<a {{action "goToFeaturesUsed"}}>Features used!</a>
99
<a {{action "goToGithub"}}>@kilisoria</a>
10+
<a {{action "goToRoadMap"}}>Roadmap</a>
1011
</div>
1112
</div>

MarvelWorld-Cli/app/templates/movies/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{{/if}}
2020
</div>
2121
<div class="movie-watches">
22-
<input type="button" {{action "openModal" 'modal' this}} {{bind-attr value=i18n.current.movie.allActors}} class="btn btn-default">
22+
<input type="button" {{action "openModal" 'modal' this}} {{bind-attr value=i18n.current.movie.allActors}} class="btn btn-success">
2323
</div>
2424
</div>
2525
</div>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="roadmap-container">
2+
<div>ROAD MAP for this application:</div>
3+
<ul>
4+
<li>MOVIE: Add filter for the status.</li>
5+
<li>CORE: Update the refresh for the total.</li>
6+
</ul>
7+
</div>
8+
{{#link-to "movies" class="btn btn-success"}}
9+
Okay
10+
{{/link-to}}
11+
12+
13+
14+

MarvelWorld-Cli/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function(environment) {
1414
},
1515

1616
APP: {
17-
defaultLocale: 'es',
17+
defaultLocale: 'en',
1818
awardRate: 10
1919
// Here you can pass flags/options to your application instance
2020
// when it is created

0 commit comments

Comments
 (0)