diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 8c58c8efc9..0000000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "app/bower_components" -} \ No newline at end of file diff --git a/.gitignore b/.gitignore index b702acc68f..bcecdc7669 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ logs/* !.gitkeep node_modules/ -bower_components/ +app/lib/ tmp .DS_Store .idea \ No newline at end of file diff --git a/.jshintrc b/.jshintrc index 60f49fd369..6550a823c3 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,10 +1,10 @@ { "strict": "global", "globals": { - // Angular + // AngularJS "angular": false, - // Angular mocks + // AngularJS mocks "module": false, "inject": false, diff --git a/.travis.yml b/.travis.yml index 78680206f9..464c52d2ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,19 @@ -sudo: required dist: trusty language: node_js node_js: - - '4.5' + - 10 -install: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' - - sudo apt-get update -q - - sudo apt-get install -q google-chrome-stable +addons: + chrome: stable + +cache: + directories: + - "$HOME/.npm" -before_script: +install: - npm install script: - - npm run test-single-run - - (npm start > /dev/null &) && (npm run protractor) + - npm run test-single-run -- --browsers ChromeHeadless + - (npm start > /dev/null &) && npm run protractor -- --capabilities.chromeOptions.args headless diff --git a/README.md b/README.md index 21b73ef3c4..2898d89b5f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -# angular-seed — the seed for AngularJS apps +# `angular-seed` — the seed for AngularJS apps -This project is an application skeleton for a typical [AngularJS](http://angularjs.org/) web app. -You can use it to quickly bootstrap your angular webapp projects and dev environment for these -projects. +This project is an application skeleton for a typical [AngularJS][angularjs] web app. You can use it +to quickly bootstrap your angular webapp projects and dev environment for these projects. -The seed contains a sample AngularJS application and is preconfigured to install the Angular +The seed contains a sample AngularJS application and is preconfigured to install the AngularJS framework and a bunch of development and testing tools for instant web development gratification. The seed app doesn't do much, just shows how to wire two controllers and views together. @@ -12,28 +11,27 @@ The seed app doesn't do much, just shows how to wire two controllers and views t ## Getting Started -To get you started you can simply clone the angular-seed repository and install the dependencies: +To get you started you can simply clone the `angular-seed` repository and install the dependencies: ### Prerequisites -You need git to clone the angular-seed repository. You can get git from -[http://git-scm.com/](http://git-scm.com/). +You need git to clone the `angular-seed` repository. You can get git from [here][git]. -We also use a number of node.js tools to initialize and test angular-seed. You must have node.js and -its package manager (npm) installed. You can get them from [http://nodejs.org/](http://nodejs.org/). +We also use a number of Node.js tools to initialize and test `angular-seed`. You must have Node.js +and its package manager (npm) installed. You can get them from [here][node]. -### Clone angular-seed +### Clone `angular-seed` -Clone the angular-seed repository using [git][git]: +Clone the `angular-seed` repository using git: ``` git clone https://github.com/angular/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: +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 ``` @@ -41,47 +39,49 @@ The `depth=1` tells git to only pull down one commit worth of historical data. ### Install Dependencies -We have two kinds of dependencies in this project: tools and angular framework code. The tools help -us manage and test the application. +We have two kinds of dependencies in this project: tools and AngularJS framework code. The tools +help us manage and test the application. -* We get the tools we depend upon via `npm`, the [node package manager][npm]. -* We get the angular code via `bower`, a [client-side code package manager][bower]. +* We get the tools we depend upon and the AngularJS code via `npm`, the [Node package manager][npm]. +* In order to run the end-to-end tests, you will also need to have the + [Java Development Kit (JDK)][jdk] installed on your machine. Check out the section on + [end-to-end testing](#e2e-testing) for more info. -We have preconfigured `npm` to automatically run `bower` so we can simply do: +We have preconfigured `npm` to automatically copy the downloaded AngularJS files to `app/lib` so we +can simply do: ``` npm install ``` -Behind the scenes this will also call `bower install`. You should find that you have two new -folders in your project. +Behind the scenes this will also call `npm run copy-libs`, which copies the AngularJS files and +other front end dependencies. After that, you should find out that you have two new directories in +your project. * `node_modules` - contains the npm packages for the tools we need -* `app/bower_components` - contains the angular framework files +* `app/lib` - contains the AngularJS framework files and other front end dependencies -*Note that the `bower_components` folder would normally be installed in the root folder but -angular-seed changes this location through the `.bowerrc` file. Putting it in the app folder makes -it easier to serve the files by a webserver.* +*Note copying the AngularJS files from `node_modules` to `app/lib` makes it easier to serve the +files by a web server.* ### Run the Application -We have preconfigured the project with a simple development web server. The simplest way to start +We have preconfigured the project with a simple development web server. The simplest way to start this server is: ``` npm start ``` -Now browse to the app at `http://localhost:8000/index.html`. - +Now browse to the app at [`localhost:8000/index.html`][local-app-url]. ## Directory Layout ``` -app/ --> all of the source files for the application +app/ --> all of the source files for the application app.css --> default stylesheet - components/ --> all app specific modules + core/ --> 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 @@ -100,24 +100,27 @@ app/ --> all of the source files for the application 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 +karma.conf.js --> config file for running unit tests with Karma +package.json --> Node.js specific metadata, including development tools dependencies +package-lock.json --> Npm specific metadata, including versions of installed development tools dependencies ``` + ## Testing -There are two kinds of tests in the angular-seed application: Unit tests and end-to-end tests. +There are two kinds of tests in the `angular-seed` application: Unit tests and end-to-end tests. ### Running Unit Tests -The angular-seed app comes preconfigured with unit tests. These are written in -[Jasmine][jasmine], which we run with the [Karma Test Runner][karma]. We provide a Karma -configuration file to run them. +The `angular-seed` app comes preconfigured with unit tests. These are written in [Jasmine][jasmine], +which we run with the [Karma][karma] test runner. We provide a Karma configuration file to run them. -* the configuration is found at `karma.conf.js` -* the unit tests are found next to the code they are testing and are named as `..._test.js`. +* The configuration is found at `karma.conf.js`. +* The unit tests are found next to the code they are testing and have a `.spec.js` suffix (e.g. + `view1.spec.js`). The easiest way to run the unit tests is to use the supplied npm script: @@ -125,13 +128,14 @@ The easiest way to run the unit tests is to use the supplied npm script: npm test ``` -This script will start the Karma test runner to execute the unit tests. Moreover, Karma will sit and -watch the source and test files for changes and then re-run the tests whenever any of them change. +This script will start the Karma test runner to execute the unit tests. Moreover, Karma will start +watching the source and test files for changes and then re-run the tests whenever any of them +changes. This is the recommended strategy; if your unit tests are being run every time you save a file then you receive instant feedback on any changes that break the expected code functionality. -You can also ask Karma to do a single run of the tests and then exit. This is useful if you want to -check that a particular version of the code is operating as expected. The project contains a +You can also ask Karma to do a single run of the tests and then exit. This is useful if you want to +check that a particular version of the code is operating as expected. The project contains a predefined script to do this: ``` @@ -139,34 +143,37 @@ npm run test-single-run ``` -### End to end testing + +### Running End-to-End Tests -The angular-seed app comes with end-to-end tests, again written in [Jasmine][jasmine]. These tests -are run with the [Protractor][protractor] End-to-End test runner. It uses native events and has -special features for Angular applications. +The `angular-seed` app comes with end-to-end tests, again written in [Jasmine][jasmine]. These tests +are run with the [Protractor][protractor] End-to-End test runner. It uses native events and has +special features for AngularJS applications. -* the configuration is found at `e2e-tests/protractor-conf.js` -* the end-to-end tests are found in `e2e-tests/scenarios.js` +* The configuration is found at `e2e-tests/protractor-conf.js`. +* The end-to-end tests are found in `e2e-tests/scenarios.js`. Protractor simulates interaction with our web app and verifies that the application responds -correctly. Therefore, our web server needs to be serving up the application, so that Protractor -can interact with it. +correctly. Therefore, our web server needs to be serving up the application, so that Protractor can +interact with it. + +**Before starting Protractor, open a separate terminal window and run:** ``` npm start ``` -In addition, since Protractor is built upon WebDriver we need to install this. The angular-seed -project comes with a predefined script to do this: +In addition, since Protractor is built upon WebDriver, we need to ensure that it is installed and +up-to-date. The `angular-seed` project is configured to do this automatically before running the +end-to-end tests, so you don't need to worry about it. If you want to manually update the WebDriver, +you can run: ``` npm run update-webdriver ``` -This will download and install the latest version of the stand-alone WebDriver tool. - -Once you have ensured that the development web server hosting our application is up and running -and WebDriver is updated, you can run the end-to-end tests using the supplied npm script: +Once you have ensured that the development web server hosting our application is up and running, you +can run the end-to-end tests using the supplied npm script: ``` npm run protractor @@ -176,132 +183,115 @@ This script will execute the end-to-end tests against the application being host development server. **Note:** -Under the hood, Protractor uses the [Selenium Stadalone Server][selenium], which in turn requires -the [Java Development Kit (JDK)][jdk] to be installed on your local machine. Check this by running +Under the hood, Protractor uses the [Selenium Standalone Server][selenium], which in turn requires +the [Java Development Kit (JDK)][jdk] to be installed on your local machine. Check this by running `java -version` from the command line. If JDK is not already installed, you can download it [here][jdk-download]. -## Updating Angular - -Previously we recommended that you merge in changes to angular-seed into your own fork of the project. -Now that the angular framework library code and tools are acquired through package managers (npm and -bower) you can use these tools instead to update the dependencies. +## Updating AngularJS and other dependencies -You can update the tool dependencies by running: +Since the AngularJS framework library code and tools are acquired through package managers (e.g. +npm) you can use these tools to easily update the dependencies. Simply run the preconfigured script: ``` -npm update +npm run update-deps ``` -This will find the latest versions that match the version ranges specified in the `package.json` file. +This will call `npm update` and `npm run copy-libs`, which in turn will find and install the latest +versions that match the version ranges specified in the `package.json` file. -You can update the Angular dependencies by running: +If you want to update a dependency to a version newer than what the specificed range would permit, +you can change the version range in `package.json` and then run `npm run update-deps` as usual. -``` -bower update -``` -This will find the latest versions that match the version ranges specified in the `bower.json` file. +## Loading AngularJS Asynchronously - -## Loading Angular Asynchronously - -The angular-seed project supports loading the framework and application scripts asynchronously. The -special `index-async.html` is designed to support this style of loading. For it to work you must -inject a piece of Angular JavaScript into the HTML page. The project has a predefined script to help -do this. +The `angular-seed` project supports loading the framework and application scripts asynchronously. +The special `index-async.html` is designed to support this style of loading. For it to work you must +inject a piece of AngularJS JavaScript into the HTML page. The project has a predefined script to help +do this: ``` npm run update-index-async ``` -This will copy the contents of the `angular-loader.js` library file into the `index-async.html` page. -You can run this every time you update the version of Angular that you are using. +This will copy the contents of the `angular-loader.js` library file into the `index-async.html` +page. You can run this every time you update the version of AngularJS that you are using. ## Serving the Application Files -While angular is client-side-only technology and it's possible to create angular webapps that -don't require a backend server at all, we recommend serving the project files using a local -webserver during development to avoid issues with security restrictions (sandbox) in browsers. The -sandbox implementation varies between browsers, but quite often prevents things like cookies, xhr, -etc to function properly when an html page is opened via `file://` scheme instead of `http://`. - +While AngularJS is client-side-only technology and it is possible to create AngularJS web apps that +do not require a backend server at all, we recommend serving the project files using a local +web server during development to avoid issues with security restrictions (sandbox) in browsers. The +sandbox implementation varies between browsers, but quite often prevents things like cookies, XHR, +etc to function properly when an HTML page is opened via the `file://` scheme instead of `http://`. ### Running the App during Development -The angular-seed project comes preconfigured with a local development webserver. It is a node.js -tool called [http-server][http-server]. You can start this webserver with `npm start` but you may choose to -install the tool globally: +The `angular-seed` project comes preconfigured with a local development web server. It is a Node.js +tool called [http-server][http-server]. You can start this web server with `npm start`, but you may +choose to install the tool globally: ``` sudo npm install -g http-server ``` -Then you can start your own development web server to serve static files from a folder by -running: +Then you can start your own development web server to serve static files from any folder by running: ``` http-server -a localhost -p 8000 ``` -Alternatively, you can choose to configure your own webserver, such as apache or nginx. Just +Alternatively, you can choose to configure your own web server, such as Apache or Nginx. Just configure your server to serve the files under the `app/` directory. - ### Running the App in Production This really depends on how complex your app is and the overall infrastructure of your system, but -the general rule is that all you need in production are all the files under the `app/` directory. +the general rule is that all you need in production are the files under the `app/` directory. Everything else should be omitted. -Angular apps are really just a bunch of static html, css and js files that just need to be hosted -somewhere they can be accessed by browsers. +AngularJS apps are really just a bunch of static HTML, CSS and JavaScript files that need to be +hosted somewhere they can be accessed by browsers. -If your Angular app is talking to the backend server via xhr or other means, you need to figure +If your AngularJS app is talking to the backend server via XHR or other means, you need to figure out what is the best way to host the static files to comply with the same origin policy if applicable. Usually this is done by hosting the files by the backend server or through -reverse-proxying the backend server(s) and webserver(s). +reverse-proxying the backend server(s) and web server(s). ## Continuous Integration ### Travis CI -[Travis CI][travis] is a continuous integration service, which can monitor GitHub for new commits -to your repository and execute scripts such as building the app or running tests. The angular-seed +[Travis CI][travis] is a continuous integration service, which can monitor GitHub for new commits to +your repository and execute scripts such as building the app or running tests. The `angular-seed` project contains a Travis configuration file, `.travis.yml`, which will cause Travis to run your tests when you push to GitHub. -You will need to enable the integration between Travis and GitHub. See the Travis website for more -instruction on how to do this. - -### CloudBees - -CloudBees have provided a CI/deployment setup: - - - - -If you run this, you will get a cloned version of this repo to start working on in a private git repo, -along with a CI service (in Jenkins) hosted that will run unit and end to end tests in both Firefox and Chrome. +You will need to enable the integration between Travis and GitHub. See the +[Travis website][travis-docs] for instructions on how to do this. ## Contact -For more information on AngularJS please check out http://angularjs.org/ +For more information on AngularJS please check out [angularjs.org][angularjs]. + -[bower]: http://bower.io -[git]: http://git-scm.com/ -[http-server]: https://github.com/nodeapps/http-server -[jasmine]: https://jasmine.github.io -[jdk]: https://en.wikipedia.org/wiki/Java_Development_Kit -[jdk-download]: http://www.oracle.com/technetwork/java/javase/downloads/index.html -[karma]: https://karma-runner.github.io -[node]: https://nodejs.org +[angularjs]: https://angularjs.org/ +[git]: https://git-scm.com/ +[http-server]: https://github.com/indexzero/http-server +[jasmine]: https://jasmine.github.io/ +[jdk]: https://wikipedia.org/wiki/Java_Development_Kit +[jdk-download]: http://www.oracle.com/technetwork/java/javase/downloads +[karma]: https://karma-runner.github.io/ +[local-app-url]: http://localhost:8000/index.html +[node]: https://nodejs.org/ [npm]: https://www.npmjs.org/ -[protractor]: https://github.com/angular/protractor +[protractor]: http://www.protractortest.org/ [selenium]: http://docs.seleniumhq.org/ [travis]: https://travis-ci.org/ +[travis-docs]: https://docs.travis-ci.com/user/getting-started diff --git a/app/app.css b/app/app.css index c92524070a..48e881d4ec 100644 --- a/app/app.css +++ b/app/app.css @@ -19,12 +19,7 @@ display: inline; } -.menu > li:before { +.menu > li + li:before { content: "|"; padding-right: 0.3em; } - -.menu > li:nth-child(1):before { - content: ""; - padding: 0; -} diff --git a/app/app.js b/app/app.js index 6ea2401bcd..3a0ca2557e 100644 --- a/app/app.js +++ b/app/app.js @@ -1,6 +1,6 @@ 'use strict'; -// Declare app level module which depends on views, and components +// Declare app level module which depends on views, and core components angular.module('myApp', [ 'ngRoute', 'myApp.view1', diff --git a/app/components/version/interpolate-filter.js b/app/core/version/interpolate-filter.js similarity index 100% rename from app/components/version/interpolate-filter.js rename to app/core/version/interpolate-filter.js diff --git a/app/components/version/interpolate-filter_test.js b/app/core/version/interpolate-filter.spec.js similarity index 100% rename from app/components/version/interpolate-filter_test.js rename to app/core/version/interpolate-filter.spec.js diff --git a/app/components/version/version-directive.js b/app/core/version/version-directive.js similarity index 100% rename from app/components/version/version-directive.js rename to app/core/version/version-directive.js diff --git a/app/components/version/version-directive_test.js b/app/core/version/version-directive.spec.js similarity index 100% rename from app/components/version/version-directive_test.js rename to app/core/version/version-directive.spec.js diff --git a/app/components/version/version.js b/app/core/version/version.js similarity index 100% rename from app/components/version/version.js rename to app/core/version/version.js diff --git a/app/components/version/version_test.js b/app/core/version/version.spec.js similarity index 100% rename from app/components/version/version_test.js rename to app/core/version/version.spec.js diff --git a/app/index-async.html b/app/index-async.html index 281254ed11..e66b69c302 100644 --- a/app/index-async.html +++ b/app/index-async.html @@ -2,18 +2,18 @@ - - + + - + @@ -52,7 +52,7 @@
-
Angular seed app: v
+
AngularJS seed app: v
diff --git a/app/index.html b/app/index.html index ec9da03650..091d5a2df5 100644 --- a/app/index.html +++ b/app/index.html @@ -9,10 +9,10 @@ My AngularJS App - - + + - +