Ammico : Home

+ + +

+ +

+ + +

diff -r 000000000000 -r cef349423167 client/app/slideshow/slideshow_controller.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/app/slideshow/slideshow_controller.js Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,76 @@ +(function(){ + 'use strict'; + + angular.module('ammicoSlideshow',['ngResource', 'ngRoute', 'ui.bootstrap']) + .config(function ($routeProvider) { + $routeProvider + .when('/', { + templateUrl: 'slideshow/slideshow.html', + controller: 'slideshowCtrl' + }); + }) + .service('slideshowApi', function($resource, context) { + this.slideshow = $resource(context.urls.slideshowUrl, + { + get: { + method: 'GET', + isArray: false + }, + save:{ + method:'PUT', + isArray:false//, headers:{'X-CSRFToken':context.csrf_token} + } + }); + }) + .service('slideshowModel', function(slideshowApi, context) { + console.log('6',this); + if(typeof context.slideshow === 'undefined') { + console.log('6-1'); + this.slideshow = slideshowApi.slideshow.get(); + } + else { + console.log('6-2'); + this.slideshow = new slideshowApi.slideshow(context.slideshow); + } + }) + .controller('slideshowCtrl', function($scope, $location, slideshowModel){ + console.log('6',$scope, $location, slideshowModel); + $scope.slideshow = slideshowModel.slideshow; + + $scope.save = function(){ + $scope.slideshow + .$save() + .then( + function(response) { + console.log('NICE SAVING!', response); + }, + function(reason){ + alert('An error occured while saving : ' + reason); + } + ); + }; + }) + //.directive('slideEditor', function(context) { + .directive('slideEditor', function() { + return { + restrict: 'AE', + replace: true, + scope: false, + templateUrl: 'slideshow/dataEditor.html', + //controller: function($scope, $element, $attrs){ + controller: function($scope){ + $scope.slidesave = function(){ + if(typeof $scope.slide.tags === 'string'){ + $scope.slide.tags = $scope.slide.tags.split(','); + } + for (var i = $scope.slide.tags.length - 1; i >= 0; i--) { + $scope.slide.tags[i] = $scope.slide.tags[i].trim(); + } + $scope.editMode = false; + $scope.save(); + }; + } + }; + }); + +})(); diff -r 000000000000 -r cef349423167 client/app/slideshow/slideshow_controller_test.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/app/slideshow/slideshow_controller_test.js Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,7 @@ +'use strict'; + +describe("slideshow_controller_test", function(){ + it("should assert something",function(){ + expect(true).toBe(true); + }) +}) diff -r 000000000000 -r cef349423167 client/bower.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/bower.json Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,24 @@ +{ + "name": "ammico", + "main": "app.js", + "version": "0.0.0", + "authors": [ + "IRI" + ], + "license": "Ceccill-C", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "devDependencies": { + "angular": "~1.3", + "angular-route": "~1.3", + "angular-resource": "~1.3", + "angular-bootstrap": "~0.11.0", + "bootstrap": "~3.1.1" + } +} diff -r 000000000000 -r cef349423167 client/data/gallery.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/data/gallery.json Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,56 @@ +{ + "title": "bae0704f-b0e1-11e2-8479-c8bcc896c290", + "description": "description DESC", + "images": [ + { + "id": "im001", + "title": "im 1 ceci est un titre très très long vraiment très très très long", + "url": "data/images/ImageAccueilCM1.jpg" + }, + { + "id": "im002", + "title": "im 2", + "url": "data/images/ImageAccueilCM2.jpg" + }, + { + "id": "im003", + "title": "im 3", + "url": "data/images/ImageAccueilCM3.jpg" + }, + { + "id": "im004", + "title": "im 4", + "url": "data/images/ImageAccueilCM4.jpg" + }, + { + "id": "im005", + "title": "im 5", + "url": "data/images/ImageAccueilCM5.jpg" + }, + { + "id": "im006", + "title": "im 6", + "url": "data/images/ImageAccueilCM6.jpg" + }, + { + "id": "im007", + "title": "im 7", + "url": "data/images/ImageAccueilCM7.jpg" + }, + { + "id": "im008", + "title": "im 8", + "url": "data/images/ImageAccueilCM8.jpg" + }, + { + "id": "im009", + "title": "im 9", + "url": "data/images/ImageAccueilCM3.jpg" + }, + { + "id": "im010", + "title": "im 10", + "url": "data/images/ImageAccueilCM8.jpg" + } + ] +} \ No newline at end of file diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM1.jpg Binary file client/data/images/ImageAccueilCM1.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM2.jpg Binary file client/data/images/ImageAccueilCM2.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM3.jpg Binary file client/data/images/ImageAccueilCM3.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM4.jpg Binary file client/data/images/ImageAccueilCM4.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM5.jpg Binary file client/data/images/ImageAccueilCM5.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM6.jpg Binary file client/data/images/ImageAccueilCM6.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM7.jpg Binary file client/data/images/ImageAccueilCM7.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM7_ORIG.jpg Binary file client/data/images/ImageAccueilCM7_ORIG.jpg has changed diff -r 000000000000 -r cef349423167 client/data/images/ImageAccueilCM8.jpg Binary file client/data/images/ImageAccueilCM8.jpg has changed diff -r 000000000000 -r cef349423167 client/data/slideshow.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/data/slideshow.json Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,133 @@ +{ + "title": "titre de mon slideshow", + "description": "description DESC SLIDESHOW BEST EvER", + "images": [ + { + "id": "im001", + "url": "data/images/ImageAccueilCM1.jpg", + "title": "im 1 ceci est un titre très très long vraiment très très très long", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U R im 1 ceci est un titre très très long vraiment très très très long", + "user_description": "U Lorem ipsum dolor sit amet, consectetur adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag 1", + "tag 2", + "tag 3" + ] + }, + { + "id": "im002", + "url": "data/images/ImageAccueilCM2.jpg", + "title": "im 2", + "description": "Lorem ipsum dolor sit amet", + "user_title": "U im 2", + "user_description": "U Lorem ipsum dolor sit amet", + "tags":[ + "tag C", + "tag 5", + "tag 7" + ] + }, + { + "id": "im003", + "url": "data/images/ImageAccueilCM3.jpg", + "title": "im 3", + "description": "adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U im 3", + "user_description": "U adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag F", + "tag 6", + "tag 8" + ] + }, + { + "id": "im004", + "url": "data/images/ImageAccueilCM4.jpg", + "title": "im 4", + "description": "elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U im 4", + "user_description": "U elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag 1" + ] + }, + { + "id": "im005", + "url": "data/images/ImageAccueilCM5.jpg", + "title": "im 5", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing", + "user_title": "U im 5", + "user_description": "U Lorem ipsum dolor sit amet, consectetur adipiscing", + "tags":[ + "tag 2", + "tag 3" + ] + }, + { + "id": "im006", + "url": "data/images/ImageAccueilCM6.jpg", + "title": "im 6", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U im 6", + "user_description": "U Lorem ipsum dolor sit amet, consectetur adipiscing elit. In luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag 4", + "tag 5", + "tag 6" + ] + }, + { + "id": "im007", + "url": "data/images/ImageAccueilCM7.jpg", + "title": "im 7", + "description": "luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U im 7", + "user_description": "U luctus turpis at neque bibendum, non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag A", + "tag b", + "tag c", + "tag d", + "tag e" + ] + }, + { + "id": "im008", + "url": "data/images/ImageAccueilCM8.jpg", + "title": "im 8", + "description": "non porttitor neque porta. Donec euismod neque et orci dictum", + "user_title": "U im 8", + "user_description": "U non porttitor neque porta. Donec euismod neque et orci dictum", + "tags":[ + "tag 1", + "tag 3" + ] + }, + { + "id": "im009", + "url": "data/images/ImageAccueilCM3.jpg", + "title": "im 9", + "description": "Lorem ipsum", + "user_title": "U im 9", + "user_description": "U Lorem ipsum", + "tags":[ + "tag 3", + "tag 1", + "tag 2" + ] + }, + { + "id": "im010", + "url": "data/images/ImageAccueilCM8.jpg", + "title": "im 10", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.", + "user_title": "U im 10", + "user_description": "U Lorem ipsum dolor sit amet, consectetur adipiscing elit.", + "tags":[ + "tag 2 fjhds klfjhqs kldjfh qksljhdf kljqsd fkljq skldjf lkqjshdf kljqdfsklj", + "tag 3" + ] + } + ] +} \ No newline at end of file diff -r 000000000000 -r cef349423167 client/gulpfile.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/gulpfile.js Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,137 @@ +var gulp = require('gulp'); +var gutil = require('gulp-util') +var plugins = require("gulp-load-plugins")({lazy:false}); +//var flatten = require('gulp-flatten'); +//var uglify = require('gulp-uglify'); +//var clean = require('gulp-clean'); +//var rename = require('gulp-rename'); +//var filesize = require('gulp-filesize'); +//var cssmin = require('gulp-cssmin'); + +gulp.task('clean', function () { + return gulp.src('build', {read: false}) + .pipe(clean()); +}); + +var scriptsSrc = ['!./app/**/*_test.js','./app/**/*.js']; + +gulp.task('scripts', function(){ + //combine all js files of the app + gulp.src(scriptsSrc) + .pipe(plugins.jshint()) + .pipe(plugins.jshint.reporter('default')) + .pipe(plugins.jshint.reporter('fail')) + .pipe(plugins.concat('app.js')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .pipe(plugins.uglify()) + .pipe(plugins.rename('app.min.js')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .on('error', gutil.log); +}); + +gulp.task('templates',function(){ + //combine all template files of the app into a js file + gulp.src(['!./app/index.html', + './app/**/*.html']) + .pipe(plugins.angularTemplatecache('templates.js',{standalone:true})) + .pipe(gulp.dest('./build')); +}); + +gulp.task('css', function(){ + gulp.src('./app/**/*.css') +// .pipe(plugins.csslint()) +// .pipe(plugins.csslint.reporter()) + .pipe(plugins.concat('app.css')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .pipe(plugins.minifyCss({keepBreaks:true})) + .pipe(plugins.rename('app.min.css')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()); +}); + +var vendorJSsrc = [ + '!./bower_components/**/*.min.js', + '!./bower_components/bootstrap/Gruntfile.js', + '!./bower_components/bootstrap/grunt/*', + '!./bower_components/bootstrap/js/*', + '!./bower_components/jquery/src/**/*', + '!./bower_components/angular-bootstrap/ui-bootstrap.js', + './bower_components/jquery/dist/jquery.js', + './bower_components/**/*.js' +]; + +gulp.task('vendorJS', function(){ + //concatenate vendor JS files + gulp.src(vendorJSsrc) + .pipe(plugins.concat('lib.js')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .pipe(plugins.uglify()) + .pipe(plugins.rename('lib.min.js')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .on('error', gutil.log); +}); + +gulp.task('vendorCSS', function(){ + //concatenate vendor CSS files + gulp.src(['!./bower_components/**/*.min.css', + './bower_components/**/*.css']) + .pipe(plugins.concat('lib.css')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()) + .pipe(plugins.minifyCss({keepBreaks:true})) + .pipe(plugins.rename('lib.min.css')) + .pipe(gulp.dest('./build')) + .pipe(plugins.filesize()); +}); + +gulp.task('vendorFonts', function(){ + gulp.src(['./bower_components/**/fonts/*']) + .pipe(plugins.flatten()) + .pipe(gulp.dest('./build/fonts')); +}); + +gulp.task('copy-index', function() { + gulp.src('./app/index.html') + .pipe(gulp.dest('./build')); +}); + +gulp.task('copy-data', function() { + gulp.src('./data/**/*') + .pipe(gulp.dest('./build/data')); +}); + +gulp.task('copy-img', function() { + gulp.src('./img/**/*') + .pipe(gulp.dest('./build/img')); +}); + +gulp.task('watch',function(){ + gulp.watch([ + 'build/**/*.html', + 'build/**/*.js', + 'build/**/*.css' + ], function(event) { + return gulp.src(event.path) + .pipe(plugins.connect.reload()); + }); + gulp.watch(['./app/**/*.js','!./app/**/*test.js'],['scripts']); + gulp.watch(['!./app/index.html','./app/**/*.html'],['templates']); + gulp.watch('./app/**/*.css',['css']); + gulp.watch('./app/index.html',['copy-index']); + gulp.watch('./data/**/*',['copy-data']); + gulp.watch('./img/**/*',['copy-img']); + +}); + +gulp.task('connect', plugins.connect.server({ + root: ['build'], + port: 9000, + livereload: true +})); + +gulp.task('default',['connect','scripts','templates','css','copy-index','copy-data','copy-img','vendorJS','vendorCSS','vendorFonts','watch']); diff -r 000000000000 -r cef349423167 client/img/ammico_logo_small.png Binary file client/img/ammico_logo_small.png has changed diff -r 000000000000 -r cef349423167 client/img/loader.gif Binary file client/img/loader.gif has changed diff -r 000000000000 -r cef349423167 client/img/logo_IRI_footer.png Binary file client/img/logo_IRI_footer.png has changed diff -r 000000000000 -r cef349423167 client/karma-unit.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/karma-unit.js Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,70 @@ +// Karma configuration +// Generated on Thu Mar 27 2014 15:49:13 GMT+0800 (PHT) + +module.exports = function(config) { + config.set({ + + // base path that will be used to resolve all patterns (eg. files, exclude) + basePath: '', + + + // frameworks to use + // available frameworks: https://npmjs.org/browse/keyword/karma-adapter + frameworks: ['jasmine'], + + + // list of files / patterns to load in the browser + files: [ + './build/lib.js', + './build/app.js', + './build/templates.js', + './app/**/*test.js' + ], + + + // list of files to exclude + exclude: [ + + ], + + + // preprocess matching files before serving them to the browser + // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor + preprocessors: { + + }, + + + // test results reporter to use + // possible values: 'dots', 'progress' + // available reporters: https://npmjs.org/browse/keyword/karma-reporter + reporters: ['progress'], + + + // web server port + port: 9876, + + + // enable / disable colors in the output (reporters and logs) + colors: true, + + + // level of logging + // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + logLevel: config.LOG_DEBUG, + + + // enable / disable watching file and executing tests whenever any file changes + autoWatch: true, + + + // start these browsers + // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher + browsers: ['Chrome'], + + + // Continuous Integration mode + // if true, Karma captures browsers, runs the tests and exits + singleRun: false + }); +}; diff -r 000000000000 -r cef349423167 client/package.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/package.json Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,33 @@ +{ + "name": "ammico", + "version": "0.0.0", + "description": "Ammico client application", + "main": "app.js", + "repository": { + "type": "mercurial", + "url": "http://www.iri.centrepompidou.fr/dev/hg/ammico" + }, + "author": "IRI", + "license": "Cecill-C", + "devDependencies": { + "bower": "^1.3.4", + "grunt-cli": "^0.1.13", + "gulp": "~3.5.5", + "gulp-angular-templatecache": "^1.1.0", + "gulp-clean": "^0.3.0", + "gulp-concat": "~2.1.7", + "gulp-connect": "^1.0.7", + "gulp-csslint": "^0.1.4", + "gulp-filesize": "0.0.6", + "gulp-flatten": "0.0.2", + "gulp-jshint": "~1.5.0", + "gulp-load-plugins": "~0.4.0", + "gulp-minify-css": "^0.3.4", + "gulp-rename": "^1.2.0", + "gulp-uglify": "^0.3.0", + "gulp-util": "^2.2.16", + "karma": "^0.12.1", + "karma-chrome-launcher": "^0.1.2", + "karma-jasmine": "^0.1.5" + } +} diff -r 000000000000 -r cef349423167 server/README.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/README.md Wed Jun 11 01:26:59 2014 +0200 @@ -0,0 +1,2 @@ +Ammico server +=============

{{ gallery.title }}

{{ gallery.images.length }} points d'intérêt

Ammico Application

{{slide.user_title}}

{{ slideshow.title }}

{{slide.title}}