diff --git a/frontend/Gruntfile.js b/frontend/Gruntfile.js index dc80b6f..b8244a2 100644 --- a/frontend/Gruntfile.js +++ b/frontend/Gruntfile.js @@ -1,4 +1,4 @@ -// Generated on 2017-01-20 using generator-angular 0.15.1 +// Generated on 2017-02-26 using generator-angular 0.15.1 'use strict'; // # Globbing @@ -338,7 +338,7 @@ module.exports = function (grunt) { ngtemplates: { dist: { options: { - module: 'clientApp', + module: 'frontendApp', htmlmin: '<%= htmlmin.dist.options %>', usemin: 'scripts/scripts.js' }, diff --git a/frontend/app/images/yeoman.png b/frontend/app/images/yeoman.png deleted file mode 100644 index 92497ad..0000000 Binary files a/frontend/app/images/yeoman.png and /dev/null differ diff --git a/frontend/app/index.html b/frontend/app/index.html index 0be6125..7bbe0f3 100644 --- a/frontend/app/index.html +++ b/frontend/app/index.html @@ -8,7 +8,7 @@ - + @@ -20,6 +20,7 @@

You are using an outdated browser. Please upgrade your browser to improve your experience.

+ @@ -35,20 +36,20 @@ - - + + + + + - - - - + diff --git a/frontend/app/styles/main.css b/frontend/app/styles/main.css index b2e953f..9b89838 100644 --- a/frontend/app/styles/main.css +++ b/frontend/app/styles/main.css @@ -7,77 +7,5 @@ body { padding: 0; -} - -/* Everything but the jumbotron gets side spacing for mobile first views */ -.header, -.marketing, -.footer { - padding-left: 15px; - padding-right: 15px; -} - -/* Custom page header */ -.header { - border-bottom: 1px solid #e5e5e5; - margin-bottom: 10px; -} -/* Make the masthead heading the same height as the navigation */ -.header h3 { - margin-top: 0; - margin-bottom: 0; - line-height: 40px; - padding-bottom: 19px; -} - -/* Custom page footer */ -.footer { - padding-top: 19px; - color: #777; - border-top: 1px solid #e5e5e5; -} - -.container-narrow > hr { - margin: 30px 0; -} - -/* Main marketing message and sign up button */ -.jumbotron { - text-align: center; - border-bottom: 1px solid #e5e5e5; -} -.jumbotron .btn { - font-size: 21px; - padding: 14px 24px; -} - -/* Supporting marketing content */ -.marketing { - margin: 40px 0; -} -.marketing p + h4 { - margin-top: 28px; -} - -/* Responsive: Portrait tablets and up */ -@media screen and (min-width: 768px) { - .container { - max-width: 730px; - } - - /* Remove the padding we set earlier */ - .header, - .marketing, - .footer { - padding-left: 0; - padding-right: 0; - } - /* Space out the masthead */ - .header { - margin-bottom: 30px; - } - /* Remove the bottom border on the jumbotron for visual effect */ - .jumbotron { - border-bottom: 0; - } -} + background-color: #DADADA; +} \ No newline at end of file diff --git a/frontend/app/views/accueil.html b/frontend/app/views/accueil.html deleted file mode 100644 index 790318d..0000000 --- a/frontend/app/views/accueil.html +++ /dev/null @@ -1,62 +0,0 @@ - -
- -
- -
-
-

'Allo, 'Allo!

-

- I'm Yeoman
- Always a pleasure scaffolding your apps. -

-

Splendid!

-
- -
-

HTML5 Boilerplate

-

- HTML5 Boilerplate is a professional front-end template for building fast, robust, and adaptable web apps or sites. -

- -

Angular

-

- AngularJS is a toolset for building the framework most suited to your application development. -

- -

Karma

-

Spectacular Test Runner for JavaScript.

-
-
- - - - - diff --git a/frontend/app/views/login.html b/frontend/app/views/login.html new file mode 100644 index 0000000..0ded0cb --- /dev/null +++ b/frontend/app/views/login.html @@ -0,0 +1,25 @@ +
+
+ + + + Livret de l'alternant + + + + +
+ + + + + + + + +
+ Se connecter +
+
+
+
\ No newline at end of file diff --git a/frontend/bower.json b/frontend/bower.json index 96fdcd0..e95aa6c 100644 --- a/frontend/bower.json +++ b/frontend/bower.json @@ -1,24 +1,17 @@ { - "name": "client", + "name": "frontend", "version": "0.0.0", "dependencies": { - "angular": "^1.6.0", - "bootstrap": "^3.2.0", - "angular-sanitize": "^1.6.0", - "angular-ui-router": "1.0.0-beta.3" + "angular": "^1.4.0", + "angular-animate": "^1.4.0", + "angular-cookies": "^1.4.0", + "angular-sanitize": "^1.4.0", + "angular-material": "^1.1.3", + "angular-ui-router": "^0.4.2" }, "devDependencies": { - "angular-mocks": "^1.6.0" + "angular-mocks": "^1.4.0" }, "appPath": "app", - "moduleName": "clientApp", - "overrides": { - "bootstrap": { - "main": [ - "less/bootstrap.less", - "dist/css/bootstrap.css", - "dist/js/bootstrap.js" - ] - } - } + "moduleName": "clientApp" } diff --git a/frontend/package.json b/frontend/package.json index ba0c75b..8591e50 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -28,7 +28,7 @@ "jasmine-core": "^2.5.2", "jit-grunt": "^0.9.1", "jshint-stylish": "^1.0.0", - "karma": "^1.4.0", + "karma": "^1.5.0", "karma-jasmine": "^1.1.0", "karma-phantomjs-launcher": "^1.0.2", "phantomjs-prebuilt": "^2.1.14", @@ -39,6 +39,5 @@ }, "scripts": { "test": "karma start test/karma.conf.js" - }, - "dependencies": {} + } } diff --git a/frontend/test/karma.conf.js b/frontend/test/karma.conf.js index bca71cf..0ffd38c 100644 --- a/frontend/test/karma.conf.js +++ b/frontend/test/karma.conf.js @@ -1,5 +1,5 @@ // Karma configuration -// Generated on 2017-01-20 +// Generated on 2017-02-26 module.exports = function(config) { 'use strict'; @@ -20,10 +20,13 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ // bower:js - 'bower_components/jquery/dist/jquery.js', 'bower_components/angular/angular.js', - 'bower_components/bootstrap/dist/js/bootstrap.js', + 'bower_components/angular-animate/angular-animate.js', + 'bower_components/angular-cookies/angular-cookies.js', 'bower_components/angular-sanitize/angular-sanitize.js', + 'bower_components/angular-aria/angular-aria.js', + 'bower_components/angular-messages/angular-messages.js', + 'bower_components/angular-material/angular-material.js', 'bower_components/angular-ui-router/release/angular-ui-router.js', 'bower_components/angular-mocks/angular-mocks.js', // endbower diff --git a/frontend/test/spec/controllers/main.js b/frontend/test/spec/controllers/main.js index 117e95b..cb2fd81 100644 --- a/frontend/test/spec/controllers/main.js +++ b/frontend/test/spec/controllers/main.js @@ -3,7 +3,7 @@ describe('Controller: MainCtrl', function () { // load the controller's module - beforeEach(module('clientApp')); + beforeEach(module('frontendApp')); var MainCtrl, scope;