Skip to content

Commit

Permalink
step4
Browse files Browse the repository at this point in the history
  • Loading branch information
Dayana committed Apr 20, 2015
1 parent fb02948 commit 7bfcf29
Show file tree
Hide file tree
Showing 344 changed files with 65,048 additions and 692 deletions.
1 change: 1 addition & 0 deletions scss/ionic.app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ $ionicons-font-path: "../lib/ionic/fonts" !default;
@import "www/lib/ionic/scss/ionic";

@import "speakers.scss";
@import "venue.scss";
Empty file added scss/venue.scss
Empty file.
4 changes: 4 additions & 0 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
<!-- ionic/angularjs js -->
<script src="lib/ionic/js/ionic.bundle.js"></script>

<!-- show venu map -->
<script src="http://maps.google.com/maps/api/js"></script>
<script src="lib/ngmap/build/scripts/ng-map.min.js"></script>

<!-- cordova script (this will be a 404 during development) -->
<script src="cordova.js"></script>

Expand Down
5 changes: 3 additions & 2 deletions www/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
// 'starter.controllers' is found in controllers.js
angular.module('jsconfuy', [
'ionic',
'jsconfuy.controllers'
'jsconfuy.controllers',
'ngMap'
])

.run(function($ionicPlatform) {
Expand All @@ -25,7 +26,7 @@ angular.module('jsconfuy', [

.config(function($stateProvider, $urlRouterProvider) {
$stateProvider

.state('app', {
url: "/app",
abstract: true,
Expand Down
10 changes: 9 additions & 1 deletion www/js/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ angular.module('jsconfuy.controllers', [])
})

.controller('VenueCtrl', function($scope) {

//map with venue position
$scope.position = {
lat: -34.892589,
lng: -56.194638
};

$scope.$on('mapInitialized', function(event, map) {
$scope.map = map;
});
})

.controller('AgendaCtrl', function($scope) {
Expand Down
19 changes: 19 additions & 0 deletions www/lib/angular-animate/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "angular-animate",
"version": "1.3.13",
"main": "./angular-animate.js",
"ignore": [],
"dependencies": {
"angular": "1.3.13"
},
"homepage": "https://github.com/angular/bower-angular-animate",
"_release": "1.3.13",
"_resolution": {
"type": "version",
"tag": "v1.3.13",
"commit": "f18cb98590471ad9c1e5ae0e57178e9ecb8d384c"
},
"_source": "git://github.com/angular/bower-angular-animate.git",
"_target": "1.3.13",
"_originalSource": "angular-animate"
}
77 changes: 77 additions & 0 deletions www/lib/angular-animate/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# packaged angular-animate

This repo is for distribution on `npm` and `bower`. The source for this module is in the
[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
Please file issues and pull requests against that repo.

## Install

You can install this package either with `npm` or with `bower`.

### npm

```shell
npm install angular-animate
```

Add a `<script>` to your `index.html`:

```html
<script src="/node_modules/angular-animate/angular-animate.js"></script>
```

Then add `ngAnimate` as a dependency for your app:

```javascript
angular.module('myApp', ['ngAnimate']);
```

Note that this package is not in CommonJS format, so doing `require('angular-animate')` will
return `undefined`.

### bower

```shell
bower install angular-animate
```

Then add a `<script>` to your `index.html`:

```html
<script src="/bower_components/angular-animate/angular-animate.js"></script>
```

Then add `ngAnimate` as a dependency for your app:

```javascript
angular.module('myApp', ['ngAnimate']);
```

## Documentation

Documentation is available on the
[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate).

## License

The MIT License

Copyright (c) 2010-2012 Google, Inc. http://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
File renamed without changes.
8 changes: 8 additions & 0 deletions www/lib/angular-animate/angular-animate.min.js.map

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions www/lib/angular-animate/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "angular-animate",
"version": "1.3.13",
"main": "./angular-animate.js",
"ignore": [],
"dependencies": {
"angular": "1.3.13"
}
}
26 changes: 26 additions & 0 deletions www/lib/angular-animate/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "angular-animate",
"version": "1.3.13",
"description": "AngularJS module for animations",
"main": "angular-animate.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/angular/angular.js.git"
},
"keywords": [
"angular",
"framework",
"browser",
"animation",
"client-side"
],
"author": "Angular Core Team <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/angular.js/issues"
},
"homepage": "http://angularjs.org"
}
19 changes: 19 additions & 0 deletions www/lib/angular-sanitize/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "angular-sanitize",
"version": "1.3.13",
"main": "./angular-sanitize.js",
"ignore": [],
"dependencies": {
"angular": "1.3.13"
},
"homepage": "https://github.com/angular/bower-angular-sanitize",
"_release": "1.3.13",
"_resolution": {
"type": "version",
"tag": "v1.3.13",
"commit": "ee7a595d32ae566701da29873eb1dfb466e3cfef"
},
"_source": "git://github.com/angular/bower-angular-sanitize.git",
"_target": "1.3.13",
"_originalSource": "angular-sanitize"
}
77 changes: 77 additions & 0 deletions www/lib/angular-sanitize/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# packaged angular-sanitize

This repo is for distribution on `npm` and `bower`. The source for this module is in the
[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngSanitize).
Please file issues and pull requests against that repo.

## Install

You can install this package either with `npm` or with `bower`.

### npm

```shell
npm install angular-sanitize
```

Add a `<script>` to your `index.html`:

```html
<script src="/node_modules/angular-sanitize/angular-sanitize.js"></script>
```

Then add `ngSanitize` as a dependency for your app:

```javascript
angular.module('myApp', ['ngSanitize']);
```

Note that this package is not in CommonJS format, so doing `require('angular-sanitize')` will
return `undefined`.

### bower

```shell
bower install angular-sanitize
```

Add a `<script>` to your `index.html`:

```html
<script src="/bower_components/angular-sanitize/angular-sanitize.js"></script>
```

Then add `ngSanitize` as a dependency for your app:

```javascript
angular.module('myApp', ['ngSanitize']);
```

## Documentation

Documentation is available on the
[AngularJS docs site](http://docs.angularjs.org/api/ngSanitize).

## License

The MIT License

Copyright (c) 2010-2012 Google, Inc. http://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
8 changes: 8 additions & 0 deletions www/lib/angular-sanitize/angular-sanitize.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions www/lib/angular-sanitize/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "angular-sanitize",
"version": "1.3.13",
"main": "./angular-sanitize.js",
"ignore": [],
"dependencies": {
"angular": "1.3.13"
}
}
26 changes: 26 additions & 0 deletions www/lib/angular-sanitize/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "angular-sanitize",
"version": "1.3.13",
"description": "AngularJS module for sanitizing HTML",
"main": "angular-sanitize.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/angular/angular.js.git"
},
"keywords": [
"angular",
"framework",
"browser",
"html",
"client-side"
],
"author": "Angular Core Team <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/angular/angular.js/issues"
},
"homepage": "http://angularjs.org"
}
33 changes: 33 additions & 0 deletions www/lib/angular-ui-router/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name": "angular-ui-router",
"version": "0.2.13",
"main": "./release/angular-ui-router.js",
"dependencies": {
"angular": ">= 1.0.8"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"component.json",
"package.json",
"lib",
"config",
"sample",
"test",
"tests",
"ngdoc_assets",
"Gruntfile.js",
"files.js"
],
"homepage": "https://github.com/angular-ui/ui-router",
"_release": "0.2.13",
"_resolution": {
"type": "version",
"tag": "0.2.13",
"commit": "c3d543aae43d4600512520a0d70723ac31f2cb62"
},
"_source": "git://github.com/angular-ui/ui-router.git",
"_target": "0.2.13",
"_originalSource": "angular-ui-router"
}
Loading

0 comments on commit 7bfcf29

Please sign in to comment.