Skip to content

Commit 296941e

Browse files
author
Dayana
committed
step2
1 parent e8d787b commit 296941e

14 files changed

Lines changed: 113 additions & 133 deletions

‎www/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="js/controllers.js"></script>
2121
</head>
2222

23-
<body ng-app="starter">
23+
<body ng-app="jsconfuy">
2424
<ion-nav-view></ion-nav-view>
2525
</body>
2626
</html>

‎www/js/app.js‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
// 'starter' is the name of this angular module example (also set in a <body> attribute in index.html)
55
// the 2nd parameter is an array of 'requires'
66
// 'starter.controllers' is found in controllers.js
7-
angular.module('starter', ['ionic', 'starter.controllers'])
7+
angular.module('jsconfuy', [
8+
'ionic',
9+
'jsconfuy.controllers'
10+
])
811

912
.run(function($ionicPlatform) {
1013
$ionicPlatform.ready(function() {
@@ -22,50 +25,54 @@ angular.module('starter', ['ionic', 'starter.controllers'])
2225

2326
.config(function($stateProvider, $urlRouterProvider) {
2427
$stateProvider
25-
28+
2629
.state('app', {
2730
url: "/app",
2831
abstract: true,
2932
templateUrl: "templates/menu.html",
3033
controller: 'AppCtrl'
3134
})
3235

33-
.state('app.search', {
34-
url: "/search",
36+
.state('app.speakers', {
37+
url: "/speakers",
3538
views: {
3639
'menuContent': {
37-
templateUrl: "templates/search.html"
40+
templateUrl: "templates/speakers.html",
41+
controller: 'SpeakersCtrl'
3842
}
3943
}
4044
})
4145

42-
.state('app.browse', {
43-
url: "/browse",
46+
.state('app.venue', {
47+
url: "/venue",
4448
views: {
4549
'menuContent': {
46-
templateUrl: "templates/browse.html"
50+
templateUrl: "templates/venue.html",
51+
controller: 'VenueCtrl'
4752
}
4853
}
4954
})
50-
.state('app.playlists', {
51-
url: "/playlists",
52-
views: {
53-
'menuContent': {
54-
templateUrl: "templates/playlists.html",
55-
controller: 'PlaylistsCtrl'
56-
}
55+
56+
.state('app.agenda', {
57+
url: "/agenda",
58+
views: {
59+
'menuContent': {
60+
templateUrl: "templates/agenda.html",
61+
controller: 'AgendaCtrl'
5762
}
58-
})
63+
}
64+
})
5965

60-
.state('app.single', {
61-
url: "/playlists/:playlistId",
66+
.state('app.event', {
67+
url: "/event/:eventId",
6268
views: {
6369
'menuContent': {
64-
templateUrl: "templates/playlist.html",
65-
controller: 'PlaylistCtrl'
70+
templateUrl: "templates/event.html",
71+
controller: 'EventCtrl'
6672
}
6773
}
6874
});
75+
6976
// if none of the above states are matched, use this as the fallback
70-
$urlRouterProvider.otherwise('/app/playlists');
77+
$urlRouterProvider.otherwise('/app/agenda');
7178
});

‎www/js/controllers.js‎

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,23 @@
1-
angular.module('starter.controllers', [])
2-
3-
.controller('AppCtrl', function($scope, $ionicModal, $timeout) {
4-
// Form data for the login modal
5-
$scope.loginData = {};
6-
7-
// Create the login modal that we will use later
8-
$ionicModal.fromTemplateUrl('templates/login.html', {
9-
scope: $scope
10-
}).then(function(modal) {
11-
$scope.modal = modal;
12-
});
13-
14-
// Triggered in the login modal to close it
15-
$scope.closeLogin = function() {
16-
$scope.modal.hide();
17-
};
18-
19-
// Open the login modal
20-
$scope.login = function() {
21-
$scope.modal.show();
22-
};
23-
24-
// Perform the login action when the user submits the login form
25-
$scope.doLogin = function() {
26-
console.log('Doing login', $scope.loginData);
27-
28-
// Simulate a login delay. Remove this and replace with your login
29-
// code if using a login system
30-
$timeout(function() {
31-
$scope.closeLogin();
32-
}, 1000);
33-
};
1+
angular.module('jsconfuy.controllers', [])
2+
3+
.controller('AppCtrl', function($scope) {
4+
5+
})
6+
7+
.controller('SpeakersCtrl', function($scope) {
8+
9+
})
10+
11+
.controller('VenueCtrl', function($scope) {
12+
13+
})
14+
15+
.controller('AgendaCtrl', function($scope) {
16+
3417
})
3518

36-
.controller('PlaylistsCtrl', function($scope) {
37-
$scope.playlists = [
38-
{ title: 'Reggae', id: 1 },
39-
{ title: 'Chill', id: 2 },
40-
{ title: 'Dubstep', id: 3 },
41-
{ title: 'Indie', id: 4 },
42-
{ title: 'Rap', id: 5 },
43-
{ title: 'Cowbell', id: 6 }
44-
];
19+
.controller('EventCtrl', function($scope, $stateParams) {
20+
$scope.eventId = $stateParams.eventId;
4521
})
4622

47-
.controller('PlaylistCtrl', function($scope, $stateParams) {
48-
});
23+
;

‎www/templates/agenda.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<ion-view class="agenda-view">
2+
<ion-nav-title>
3+
<span>Agenda</span>
4+
</ion-nav-title>
5+
<ion-content>
6+
<h1>Agenda</h1>
7+
<a ui-sref="app.event({eventId: 1})">This is an event</a>
8+
<a ui-sref="app.event({eventId: 2})">This is other event</a>
9+
</ion-content>
10+
</ion-view>

‎www/templates/browse.html‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎www/templates/event.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<ion-view class="event-view">
2+
<ion-nav-title>
3+
<span>Event</span>
4+
</ion-nav-title>
5+
<ion-content>
6+
<h1>Event {{eventId}}</h1>
7+
</ion-content>
8+
</ion-view>

‎www/templates/login.html‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎www/templates/menu.html‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<ion-side-menus enable-menu-with-back-views="false">
22
<ion-side-menu-content>
3-
<ion-nav-bar class="bar-stable">
4-
<ion-nav-back-button>
5-
</ion-nav-back-button>
6-
3+
<ion-nav-bar class="bar app-top-bar bar-positive">
4+
<ion-nav-back-button></ion-nav-back-button>
75
<ion-nav-buttons side="left">
86
<button class="button button-icon button-clear ion-navicon" menu-toggle="left">
97
</button>
@@ -12,23 +10,20 @@
1210
<ion-nav-view name="menuContent"></ion-nav-view>
1311
</ion-side-menu-content>
1412

15-
<ion-side-menu side="left">
16-
<ion-header-bar class="bar-stable">
17-
<h1 class="title">Left</h1>
18-
</ion-header-bar>
19-
<ion-content>
13+
<ion-side-menu class="main-menu" side="left">
14+
<ion-content scroll="false">
2015
<ion-list>
21-
<ion-item nav-clear menu-close ng-click="login()">
22-
Login
23-
</ion-item>
24-
<ion-item nav-clear menu-close href="#/app/search">
25-
Search
16+
<ion-item class="item item-icon-left" nav-clear menu-close ui-sref="app.agenda">
17+
<i class="icon ion-calendar"></i>
18+
<h2 class="menu-text">Agenda</h2>
2619
</ion-item>
27-
<ion-item nav-clear menu-close href="#/app/browse">
28-
Browse
20+
<ion-item class="item item-icon-left" nav-clear menu-close ui-sref="app.speakers">
21+
<i class="icon ion-speakerphone"></i>
22+
<h2 class="menu-text">Speakers</h2>
2923
</ion-item>
30-
<ion-item nav-clear menu-close href="#/app/playlists">
31-
Playlists
24+
<ion-item class="item item-icon-left" nav-clear menu-close ui-sref="app.venue">
25+
<i class="icon ion-ios-location"></i>
26+
<h2 class="menu-text">Venue</h2>
3227
</ion-item>
3328
</ion-list>
3429
</ion-content>

‎www/templates/partials/agenda-event.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<div class="row">
2+
<div class="col event-time">
3+
<span class="time-from">{{event.time_from}}</span>
4+
<span ng-show="event.time_to" class="time-to">to {{event.time_to}}</span>
5+
</div>
6+
<a ng-if="event.type !== 'global'" class="col col-75 event-content {{event.type}}" style="background-image:url({{event.background_img}})" ui-sref="app.event({eventId: event.id})">
7+
<p class="event-title" ng-bind-html="event.title"></p>
8+
<p class="event-speakers" ng-show="{{ event.speakers }}">
9+
<span ng-repeat="speaker in event.speakers">{{speaker.name}}{{$last ? '' : ', '}}</span>
10+
</p>
11+
<p class="event-room" ng-show="event.room">{{event.room}}</p>
12+
<div class="event-type-tag {{event.type+'-event'}}">{{event.type}}</div>
13+
</a>
14+
<div ng-if="event.type === 'global'" class="col col-75 event-content {{event.type}}">
15+
<p class="event-title" ng-bind-html="event.title"></p>
16+
<p class="event-room">{{event.room}}</p>
17+
</div>
18+
</div>

‎www/templates/playlist.html‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)