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

updated versions for angular and ui-router #240

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: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ node_modules
.settings
*.log
dist/
.idea/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such things should be handled by user's global gitignore.

5 changes: 2 additions & 3 deletions client/app/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import Common from './common/common';
import Components from './components/components';
import AppComponent from './app.component';
Expand All @@ -11,10 +11,9 @@ angular.module('app', [
Components
])
.config(($locationProvider) => {
"ngInject";
'ngInject';
// @see: https://github.com/angular-ui/ui-router/wiki/Frequently-Asked-Questions
// #how-to-configure-your-server-to-work-with-html5mode
$locationProvider.html5Mode(true).hashPrefix('!');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this was removed?

})

.component('app', AppComponent);
4 changes: 2 additions & 2 deletions client/app/common/hero/hero.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import heroComponent from './hero.component';

let heroModule = angular.module('hero', [
uiRouter
])

.component('hero', heroComponent)

.name;

export default heroModule;
4 changes: 2 additions & 2 deletions client/app/common/navbar/navbar.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import navbarComponent from './navbar.component';

let navbarModule = angular.module('navbar', [
uiRouter
])

.component('navbar', navbarComponent)

.name;

export default navbarModule;
24 changes: 12 additions & 12 deletions client/app/components/about/about.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import aboutComponent from './about.component';

let aboutModule = angular.module('about', [
uiRouter
])

.config(($stateProvider) => {
"ngInject";
$stateProvider
.state('about', {
url: '/about',
component: 'about'
});
})
.config(($stateProvider) => {
'ngInject';
$stateProvider
.state('about', {
url: '/about',
component: 'about'
});
})

.component('about', aboutComponent)
.name;
.component('about', aboutComponent)

.name;

export default aboutModule;
6 changes: 3 additions & 3 deletions client/app/components/home/home.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import homeComponent from './home.component';

let homeModule = angular.module('home', [
uiRouter
])

.config(($stateProvider, $urlRouterProvider) => {
"ngInject";
'ngInject';

$urlRouterProvider.otherwise('/');

Expand All @@ -19,7 +19,7 @@ let homeModule = angular.module('home', [
})

.component('home', homeComponent)

.name;

export default homeModule;
2 changes: 1 addition & 1 deletion generator/component/temp.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import angular from 'angular';
import uiRouter from 'angular-ui-router';
import uiRouter from '@uirouter/angularjs';
import <%= name %>Component from './<%= name %>.component';

let <%= name %>Module = angular.module('<%= name %>', [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "Starter for Angular + ES6 + (Webpack or JSPM)",
"main": "index.js",
"dependencies": {
"angular": "^1.5.0",
"angular-ui-router": "^1.0.0-beta.1",
"angular": "^1.6.0",
"@uirouter/angularjs": "^1.0.0",
"normalize.css": "^3.0.3"
},
"devDependencies": {
Expand Down