diff --git a/README.md b/README.md index e7aece1083..e2bf4a3884 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# Kipucolva! +Hozzáadva a bootstrap, jquery + +Kiszedve a boiler + +Magyarítva + +A további részek az eredetiből vannak # angular-seed — the seed for AngularJS apps This project is an application skeleton for a typical [AngularJS](http://angularjs.org/) web app. @@ -27,14 +35,14 @@ its package manager (npm) installed. You can get them from [http://nodejs.org/] Clone the angular-seed repository using [git][git]: ``` -git clone https://github.com/angular/angular-seed.git +git clone https://github.com/sajt/angular-seed.git cd angular-seed ``` If you just want to start a new project without the angular-seed commit history then you can do: ```bash -git clone --depth=1 https://github.com/angular/angular-seed.git +git clone --depth=1 https://github.com/sajt/angular-seed.git ``` The `depth=1` tells git to only pull down one commit worth of historical data. @@ -74,38 +82,6 @@ npm start Now browse to the app at `http://localhost:8000/app/index.html`. - - -## Directory Layout - -``` -app/ --> all of the source files for the application - app.css --> default stylesheet - components/ --> all app specific modules - version/ --> version related components - version.js --> version module declaration and basic "version" value service - version_test.js --> "version" value service tests - version-directive.js --> custom directive that returns the current app version - version-directive_test.js --> version directive tests - interpolate-filter.js --> custom interpolation filter - interpolate-filter_test.js --> interpolate filter tests - view1/ --> the view1 view template and logic - view1.html --> the partial template - view1.js --> the controller logic - view1_test.js --> tests of the controller - view2/ --> the view2 view template and logic - view2.html --> the partial template - view2.js --> the controller logic - view2_test.js --> tests of the controller - app.js --> main application module - index.html --> app layout file (the main html template file of the app) - index-async.html --> just like index.html, but loads js files asynchronously -karma.conf.js --> config file for running unit tests with Karma -e2e-tests/ --> end-to-end tests - protractor-conf.js --> Protractor config file - scenarios.js --> end-to-end scenarios to be run by Protractor -``` - ## Testing There are two kinds of tests in the angular-seed application: Unit tests and End to End tests. diff --git a/app/app.js b/app/app.js deleted file mode 100644 index 21eccdb8ea..0000000000 --- a/app/app.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -// Declare app level module which depends on views, and components -angular.module('myApp', [ - 'ngRoute', - 'myApp.view1', - 'myApp.view2', - 'myApp.version' -]). -config(['$routeProvider', function($routeProvider) { - $routeProvider.otherwise({redirectTo: '/view1'}); -}]); diff --git a/app/components/version/interpolate-filter.js b/app/components/version/interpolate-filter.js deleted file mode 100644 index 03bb1987df..0000000000 --- a/app/components/version/interpolate-filter.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -angular.module('myApp.version.interpolate-filter', []) - -.filter('interpolate', ['version', function(version) { - return function(text) { - return String(text).replace(/\%VERSION\%/mg, version); - }; -}]); diff --git a/app/components/version/interpolate-filter_test.js b/app/components/version/interpolate-filter_test.js deleted file mode 100644 index ff56c529eb..0000000000 --- a/app/components/version/interpolate-filter_test.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('interpolate filter', function() { - beforeEach(module(function($provide) { - $provide.value('version', 'TEST_VER'); - })); - - it('should replace VERSION', inject(function(interpolateFilter) { - expect(interpolateFilter('before %VERSION% after')).toEqual('before TEST_VER after'); - })); - }); -}); diff --git a/app/components/version/version-directive.js b/app/components/version/version-directive.js deleted file mode 100644 index 74088f8add..0000000000 --- a/app/components/version/version-directive.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -angular.module('myApp.version.version-directive', []) - -.directive('appVersion', ['version', function(version) { - return function(scope, elm, attrs) { - elm.text(version); - }; -}]); diff --git a/app/components/version/version-directive_test.js b/app/components/version/version-directive_test.js deleted file mode 100644 index 4a59e1193a..0000000000 --- a/app/components/version/version-directive_test.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('app-version directive', function() { - it('should print current version', function() { - module(function($provide) { - $provide.value('version', 'TEST_VER'); - }); - inject(function($compile, $rootScope) { - var element = $compile('')($rootScope); - expect(element.text()).toEqual('TEST_VER'); - }); - }); - }); -}); diff --git a/app/components/version/version.js b/app/components/version/version.js deleted file mode 100644 index cb7a10f9db..0000000000 --- a/app/components/version/version.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -angular.module('myApp.version', [ - 'myApp.version.interpolate-filter', - 'myApp.version.version-directive' -]) - -.value('version', '0.1'); diff --git a/app/components/version/version_test.js b/app/components/version/version_test.js deleted file mode 100644 index 4ca6880dab..0000000000 --- a/app/components/version/version_test.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -describe('myApp.version module', function() { - beforeEach(module('myApp.version')); - - describe('version service', function() { - it('should return current version', inject(function(version) { - expect(version).toEqual('0.1'); - })); - }); -}); diff --git a/app/css/.gitkeep b/app/css/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/app.css b/app/css/app.css similarity index 100% rename from app/app.css rename to app/css/app.css diff --git a/app/img/.gitkeep b/app/img/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/index-async.html b/app/index-async.html deleted file mode 100644 index a559b7168e..0000000000 --- a/app/index-async.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - My AngularJS App - - - - - -
- -
Angular seed app: v
- - - diff --git a/app/index.html b/app/index.html index d0aacaaac4..539e3d044f 100644 --- a/app/index.html +++ b/app/index.html @@ -1,43 +1,25 @@ - - - - - + + - - My AngularJS App - - - - - - + Google Phone Gallery + + + + + + + + + - - - - -
-
Angular seed app: v
- - - - - - - - - - +
+ date: {{input | date:"medium"}}
+ date: {{input | date:"longDate"}}
+ number: {{input | number}}
+ currency: {{input | currency }} +
diff --git a/app/js/.gitkeep b/app/js/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/js/app.js b/app/js/app.js new file mode 100644 index 0000000000..1195ecbe6a --- /dev/null +++ b/app/js/app.js @@ -0,0 +1,7 @@ +'use strict'; + +// Declare app level module which depends on views, and components +angular.module('myApp', [ + 'ngRoute', +]). + diff --git a/app/js/controller.js b/app/js/controller.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/partials/.gitkeep b/app/partials/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/view1/view1.html b/app/view1/view1.html deleted file mode 100644 index 89459a65ca..0000000000 --- a/app/view1/view1.html +++ /dev/null @@ -1 +0,0 @@ -

This is the partial for view 1.

diff --git a/app/view1/view1.js b/app/view1/view1.js deleted file mode 100644 index 4ce0b4f118..0000000000 --- a/app/view1/view1.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -angular.module('myApp.view1', ['ngRoute']) - -.config(['$routeProvider', function($routeProvider) { - $routeProvider.when('/view1', { - templateUrl: 'view1/view1.html', - controller: 'View1Ctrl' - }); -}]) - -.controller('View1Ctrl', [function() { - -}]); \ No newline at end of file diff --git a/app/view1/view1_test.js b/app/view1/view1_test.js deleted file mode 100644 index 14ba79b48f..0000000000 --- a/app/view1/view1_test.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -describe('myApp.view1 module', function() { - - beforeEach(module('myApp.view1')); - - describe('view1 controller', function(){ - - it('should ....', inject(function($controller) { - //spec body - var view1Ctrl = $controller('View1Ctrl'); - expect(view1Ctrl).toBeDefined(); - })); - - }); -}); \ No newline at end of file diff --git a/app/view2/view2.html b/app/view2/view2.html deleted file mode 100644 index b6503ee11a..0000000000 --- a/app/view2/view2.html +++ /dev/null @@ -1,5 +0,0 @@ -

This is the partial for view 2.

-

- Showing of 'interpolate' filter: - {{ 'Current version is v%VERSION%.' | interpolate }} -

diff --git a/app/view2/view2.js b/app/view2/view2.js deleted file mode 100644 index a0ff97dbd7..0000000000 --- a/app/view2/view2.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -angular.module('myApp.view2', ['ngRoute']) - -.config(['$routeProvider', function($routeProvider) { - $routeProvider.when('/view2', { - templateUrl: 'view2/view2.html', - controller: 'View2Ctrl' - }); -}]) - -.controller('View2Ctrl', [function() { - -}]); \ No newline at end of file diff --git a/app/view2/view2_test.js b/app/view2/view2_test.js deleted file mode 100644 index 07b34d6bb3..0000000000 --- a/app/view2/view2_test.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -describe('myApp.view2 module', function() { - - beforeEach(module('myApp.view2')); - - describe('view2 controller', function(){ - - it('should ....', inject(function($controller) { - //spec body - var view2Ctrl = $controller('View2Ctrl'); - expect(view2Ctrl).toBeDefined(); - })); - - }); -}); \ No newline at end of file diff --git a/bower.json b/bower.json index 19e683e032..974f57a0d3 100644 --- a/bower.json +++ b/bower.json @@ -2,14 +2,18 @@ "name": "angular-seed", "description": "A starter project for AngularJS", "version": "0.0.0", - "homepage": "https://github.com/angular/angular-seed", + "homepage": "https://github.com/sajt/angular-seed", "license": "MIT", "private": true, "dependencies": { - "angular": "1.2.x", - "angular-route": "1.2.x", - "angular-loader": "1.2.x", - "angular-mocks": "~1.2.x", - "html5-boilerplate": "~4.3.0" + "angular": "1.3.x", + "angular-i18n": "1.3.x", + "angular-route": "1.3.x", + "angular-loader": "1.3.x", + "angular-mocks": "~1.3.x", + "angular-animate": "~1.3.x", + "angular-resource": "~1.3.x", + "jquery": "1.10.2", + "bootstrap": "~3.1.1" } }