Skip to content

Commit

Permalink
Enable Angular routing
Browse files Browse the repository at this point in the history
  • Loading branch information
@quentinfayet
quentinfayet committed Nov 15, 2015
1 parent 151c8f4 commit df860b7
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 40 deletions.
37 changes: 2 additions & 35 deletions client/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,14 @@
<link rel="stylesheet" type="text/css" href="css/style.css">
<!-- <script src="libs/angular/angular.js"></script>-->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular-route.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.11.2/angular-material.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular-animate.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular-aria.js"></script>
<script src="//cdn.jsdelivr.net/angular-material-icons/0.4.0/angular-material-icons.min.js"></script>
<script src="libs/angular-cookies/angular-cookies.js"></script>
<script src="js/language.js"></script>
</head>
<body layout="row" ng-controller="RegistrationController as registration">
<div layout="column" class="relative" layout-fill role="main">
<md-content flex md-scroll-y>
<ui-view layout="column" layout-fill layout-padding>
<div class="inset" hide-sm></div>
<div role="tabpanel"
id="tab1-content"
aria-labelledby="tab1"
layout="row" layout-align="center center">
<md-card flex-gt-sm="90" flex-gt-md="60" flex-gt-lg="30" class="login-card">
<md-card-content>
<div class="login-card__header">
<div class="login-card__user-avatar"></div>
</div>
<form ng-submit="registration.register()">
<md-input-container>
<label>Email</label>
<input type="email" ng-model="registration.email" required>
</md-input-container>
<md-input-container>
<label>Username</label>
<input type="text" ng-model="registration.username" maxlength="20" required>
</md-input-container>
<md-input-container>
<label>Password</label>
<input type="password" ng-model="registration.password" required>
</md-input-container>
<md-button class="md-raised md-primary">Register</md-button>
</form>
</md-card-content>
</md-card>
</div>
</ui-view>
</md-content>
</div>
<body layout="row" ng-view>
</body>
</html>
34 changes: 34 additions & 0 deletions client/public/pages/home.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<div layout="column" class="relative" layout-fill role="main" ng-controller="RegistrationController as registration">
<md-content flex md-scroll-y>
<ui-view layout="column" layout-fill layout-padding>
<div class="inset" hide-sm></div>
<div role="tabpanel"
id="tab1-content"
aria-labelledby="tab1"
layout="row" layout-align="center center">
<md-card flex-gt-sm="90" flex-gt-md="60" flex-gt-lg="30" class="login-card">
<md-card-content>
<div class="login-card__header">
<div class="login-card__user-avatar"></div>
</div>
<form ng-submit="registration.register()">
<md-input-container>
<label>Email</label>
<input type="email" ng-model="registration.email" required>
</md-input-container>
<md-input-container>
<label>Username</label>
<input type="text" ng-model="registration.username" maxlength="20" required>
</md-input-container>
<md-input-container>
<label>Password</label>
<input type="password" ng-model="registration.password" required>
</md-input-container>
<md-button class="md-raised md-primary">Register</md-button>
</form>
</md-card-content>
</md-card>
</div>
</ui-view>
</md-content>
</div>
18 changes: 13 additions & 5 deletions client/static/js/language.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
require('./authentication/authentication');

angular.module('Language', ['Language.Authentication'])
.config(function($mdThemingProvider) {
var customBlueMap = $mdThemingProvider.extendPalette('light-blue', {
function config($mdThemingProvider, $routeProvider) {
var customBlueMap = $mdThemingProvider.extendPalette('light-blue', {
'contrastDefaultColor': 'light',
'contrastDarkColors': ['50'],
'50': 'ffffff'
Expand All @@ -15,5 +14,14 @@ angular.module('Language', ['Language.Authentication'])
})
.accentPalette('pink');
$mdThemingProvider.theme('input', 'default')
.primaryPalette('grey')
});
.primaryPalette('grey');

$routeProvider
.when('/', {
templateUrl: 'pages/home.html',
controller: 'RegistrationController'
});
}

angular.module('Language', ['Language.Authentication', 'ngRoute'])
.config(config);

0 comments on commit df860b7

Please sign in to comment.