Skip to content
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.

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

Exo04 #11

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion project/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"eqeqeq": true,
"eqnull": true,
"immed": true,
"indent": 2,
"latedef": "nofunc",
"newcap": true,
"noarg": true,
Expand Down
17 changes: 16 additions & 1 deletion project/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,24 @@
controller: 'HomeCtrl',
controllerAs: 'home',
})
.when('/exo03', {
templateUrl: 'src/app/exo03/exo03.html',
controller: 'Exo03Ctrl',
controllerAs: 'exo03',
})
.when('/exo03/detail-partial', {
templateUrl: 'src/app/exo03/detail-partial/detail.html',
controller: 'detailCtrl',
controllerAs: 'detail',
})
.when('/exo04', {
templateUrl: 'src/app/exo04/exo04.html',
controller: 'Exo04Ctrl',
controllerAs: 'exo04',
})
.otherwise({redirectTo:'/'});
}

function RunUtils($rootScope) {
$rootScope.safeApply = function(fn) {
var phase = $rootScope.$$phase;
Expand Down
5 changes: 5 additions & 0 deletions project/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
@import "variables.less";
/* Add App LESS files below */
@import "src/app/home/home.less";
@import "src/app/exo03/exo03.less";
@import "src/app/exo04/exo04.less";

@import "src/app/exo03/detail-partial/detail.less";


/* Add Fonts below */
@fa-font-path: "bower_components/font-awesome/fonts";
Expand Down
7 changes: 7 additions & 0 deletions project/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@
<!-- Main App JS -->
<script src="app.js"></script>
<script src="src/app/home/home.controller.js"></script>
<script src="src/app/exo03/exo03.controller.js"></script>
<script src="src/app/exo03/detail-partial/detail.controller.js"></script>
<script src="src/app/exo04/exo04.controller.js"></script>
<script src="src/components/setting/setting.service.js"></script>


<!-- Add New Component JS Above -->


<toast></toast>
<div ng-view></div>
Expand Down
15 changes: 15 additions & 0 deletions project/src/app/exo03/detail-partial/detail.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
(function() {
'use strict';

function DetailCtrl() {
var vm = this;
vm.msg = 'Welcome All!';
vm.subMsg = 'A seed Project';
}

DetailCtrl.$inject = [];

angular.module('daproject')
.controller('DetailCtrl', DetailCtrl);

})();
9 changes: 9 additions & 0 deletions project/src/app/exo03/detail-partial/detail.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div>
<div ng-controller="DetailCtrl as deail">
{{detail.msg}}
</div>
<div ng-if="UNFILMESTSELECTIONE">
<p>{{ LETITREDUFILMSELECTIONE }}<p>
<p>{{ LANNEEDUFILMSELECTIONE }}</p>
</div>
</div>
Empty file.
24 changes: 24 additions & 0 deletions project/src/app/exo03/exo03.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
(function() {
'use strict';

function Exo03Ctrl() {
var vm = this;
vm.films = [
{name: 'Fast and Furious', img: 'https://image.tmdb.org/t/p/w600_and_h900_bestv2/AkSMd8AXSpA1L1SbBPc2AfVJfmE.jpg', year: 2001, selected: false},
{name: '2 Fast 2 Furious', img: 'https://image.tmdb.org/t/p/w600_and_h900_bestv2/u1Snfl40rXmAJNiMyZUczUyFVuf.jpg', year: 2003, selected: false},
{name: 'Fast & Furious: Tokyo Drift', img: 'https://image.tmdb.org/t/p/w600_and_h900_bestv2/4ceW7kWPAc2uFG5WzYDbP8Od3gw.jpg', year: 2006, selected: false}
];
vm.clickin = clickin;
vm.saveIndex = -1;
function clickin(index){

vm.saveIndex = index;
}
}

Exo03Ctrl.$inject = [];

angular.module('daproject')
.controller('Exo03Ctrl', Exo03Ctrl);

})();
11 changes: 11 additions & 0 deletions project/src/app/exo03/exo03.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div id="pageFilms">
<div id="listeFilms" class="couleurDiv">
<li ng-repeat="film in exo03.films" class="flex-item"><img ng-class="{'selected': exo03.saveIndex === $index}" ng-click="exo03.clickin($index)" ng-src="{{film.img}}"></img></li>
</div>
<div id="detailFilm" class="couleurDiv">
<ng-include src="'src/app/exo03/detail-partial/detail.html'"></ng-include>

truc truc

</div>
</div>
29 changes: 29 additions & 0 deletions project/src/app/exo03/exo03.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@


#pageFilms {
display: flex;

}

#listeFilms {
flex-direction: row;
height: 500px;
flex-grow: 1;
}

#detailFilm {

flex-direction: row-reverse;
height: 500px;
flex-grow: 1;
}

.couleurDiv {
background-color: #6fed12

}

.selected{
border: 5px solid pink;
}

20 changes: 20 additions & 0 deletions project/src/app/exo04/exo04.controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
(function() {
'use strict';

function Exo04Ctrl($location){
var vm = this;
vm.text = 'Text';
vm.afficherText = afficherText;

function afficherText(){
console.log(vm.text)
}

}

Exo04Ctrl.$inject = [];
setting.service.settingService.$inject = [];

angular.module('daproject')
.controller('Exo04Ctrl', Exo04Ctrl);
})();
9 changes: 9 additions & 0 deletions project/src/app/exo04/exo04.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div >
<div class="centralDiv">
<form id="container">
<label class="labelSearch">search</label>
<input ng-click="exo04.afficherText()" class="buttonClick" type="button" value="click" />
<input ng-model="exo04.text" class="inputText" type="text" name="un" size="10" />
</form>
</div>
</div>
19 changes: 19 additions & 0 deletions project/src/app/exo04/exo04.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


#container {
display: flex;
justify-content: center;
margin-top: 10px;
align-items: center;
}

.buttonClick {
order: 1;
}
.inputText {
order: 2;

}
.labelSearch {
order: 3;
}
4 changes: 2 additions & 2 deletions project/src/app/home/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<div class="subTitle">{{home.subMsg}}</div>
</div>
<a class="highscoreLink" ng-click="home.goToExo(3)">Exo03</a>
<a class="highscoreLink" href="/#/exo05">Exo05</a>
<a class="highscoreLink" href="/#/exo06">Exo06</a>
<a class="highscoreLink" href="/#/exo04">Exo04</a>

</div>
</div>
</div>
17 changes: 17 additions & 0 deletions project/src/components/setting/setting.service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
(function() {
'use strict';

function settingService() {
var service = {};
service.city = '';
service.isCelsius = true;

return service;
}

settingService.$inject = [];

angular.module('daproject')
.factory('settingService', settingService);

})();