Acrecio
diff --git a/‎.gitignore
+27-25 b/‎.gitignore
+27-25
diff --git a/‎.travis.yml
+1 b/‎.travis.yml
+1
diff --git a/‎README.md
+13-9 b/‎README.md
+13-9
diff --git a/‎app/Resources/views/base.html.twig
-13 b/‎app/Resources/views/base.html.twig
-13
diff --git a/‎back-end/Dockerfile
+22 b/‎back-end/Dockerfile
+22
diff --git a/‎app/.htaccess renamed to ‎back-end/app/.htaccess b/‎app/.htaccess renamed to ‎back-end/app/.htaccess
diff --git a/‎app/AppCache.php renamed to ‎back-end/app/AppCache.php b/‎app/AppCache.php renamed to ‎back-end/app/AppCache.php
diff --git a/‎app/AppKernel.php renamed to ‎back-end/app/AppKernel.php b/‎app/AppKernel.php renamed to ‎back-end/app/AppKernel.php
diff --git a/‎app/autoload.php renamed to ‎back-end/app/autoload.php b/‎app/autoload.php renamed to ‎back-end/app/autoload.php
diff --git a/‎app/config/config.yml renamed to ‎back-end/app/config/config.yml b/‎app/config/config.yml renamed to ‎back-end/app/config/config.yml
diff --git a/‎app/config/config_dev.yml renamed to ‎back-end/app/config/config_dev.yml b/‎app/config/config_dev.yml renamed to ‎back-end/app/config/config_dev.yml
diff --git a/‎app/config/config_prod.yml renamed to ‎back-end/app/config/config_prod.yml b/‎app/config/config_prod.yml renamed to ‎back-end/app/config/config_prod.yml
diff --git a/‎app/config/config_test.yml renamed to ‎back-end/app/config/config_test.yml b/‎app/config/config_test.yml renamed to ‎back-end/app/config/config_test.yml
diff --git a/‎back-end/app/config/parameters.yml
+14 b/‎back-end/app/config/parameters.yml
+14
diff --git a/‎app/config/parameters.yml.dist renamed to ‎back-end/app/config/parameters.yml.dist b/‎app/config/parameters.yml.dist renamed to ‎back-end/app/config/parameters.yml.dist
diff --git a/‎app/config/routing.yml renamed to ‎back-end/app/config/routing.yml b/‎app/config/routing.yml renamed to ‎back-end/app/config/routing.yml
diff --git a/‎app/config/routing_dev.yml renamed to ‎back-end/app/config/routing_dev.yml b/‎app/config/routing_dev.yml renamed to ‎back-end/app/config/routing_dev.yml
diff --git a/‎app/config/security.yml renamed to ‎back-end/app/config/security.yml
+1 b/‎app/config/security.yml renamed to ‎back-end/app/config/security.yml
+1
diff --git a/‎app/console renamed to ‎back-end/app/console b/‎app/console renamed to ‎back-end/app/console
diff --git a/‎app/phpunit.xml.dist renamed to ‎back-end/app/phpunit.xml.dist b/‎app/phpunit.xml.dist renamed to ‎back-end/app/phpunit.xml.dist
diff --git a/‎composer.json renamed to ‎back-end/composer.json b/‎composer.json renamed to ‎back-end/composer.json
diff --git a/‎src/.htaccess renamed to ‎back-end/src/.htaccess b/‎src/.htaccess renamed to ‎back-end/src/.htaccess
diff --git a/‎src/AppBundle/AppBundle.php renamed to ‎back-end/src/AppBundle/AppBundle.php b/‎src/AppBundle/AppBundle.php renamed to ‎back-end/src/AppBundle/AppBundle.php
diff --git a/‎src/AppBundle/Controller/ApiController.php renamed to ‎back-end/src/AppBundle/Controller/ApiController.php b/‎src/AppBundle/Controller/ApiController.php renamed to ‎back-end/src/AppBundle/Controller/ApiController.php
diff --git a/‎src/AppBundle/Controller/DefaultController.php renamed to ‎back-end/src/AppBundle/Controller/DefaultController.php b/‎src/AppBundle/Controller/DefaultController.php renamed to ‎back-end/src/AppBundle/Controller/DefaultController.php
diff --git a/‎src/AppBundle/DependencyInjection/AppExtension.php renamed to ‎back-end/src/AppBundle/DependencyInjection/AppExtension.php b/‎src/AppBundle/DependencyInjection/AppExtension.php renamed to ‎back-end/src/AppBundle/DependencyInjection/AppExtension.php
diff --git a/‎src/AppBundle/DependencyInjection/Configuration.php renamed to ‎back-end/src/AppBundle/DependencyInjection/Configuration.php b/‎src/AppBundle/DependencyInjection/Configuration.php renamed to ‎back-end/src/AppBundle/DependencyInjection/Configuration.php
diff --git a/‎src/AppBundle/Entity/User.php renamed to ‎back-end/src/AppBundle/Entity/User.php b/‎src/AppBundle/Entity/User.php renamed to ‎back-end/src/AppBundle/Entity/User.php
diff --git a/‎back-end/src/AppBundle/Listener/CorsListener.php
+15 b/‎back-end/src/AppBundle/Listener/CorsListener.php
+15
diff --git a/‎back-end/src/AppBundle/Resources/config/services.yml
+5 b/‎back-end/src/AppBundle/Resources/config/services.yml
+5
diff --git a/‎back-end/src/AppBundle/Resources/views/Default/index.html.twig
+9 b/‎back-end/src/AppBundle/Resources/views/Default/index.html.twig
+9
diff --git a/‎src/AppBundle/Tests/Controller/DefaultControllerTest.php renamed to ‎back-end/src/AppBundle/Tests/Controller/DefaultControllerTest.php b/‎src/AppBundle/Tests/Controller/DefaultControllerTest.php renamed to ‎back-end/src/AppBundle/Tests/Controller/DefaultControllerTest.php
diff --git a/‎web/.htaccess renamed to ‎back-end/web/.htaccess b/‎web/.htaccess renamed to ‎back-end/web/.htaccess
diff --git a/‎web/app.php renamed to ‎back-end/web/app.php
+2 b/‎web/app.php renamed to ‎back-end/web/app.php
+2
diff --git a/‎web/app_dev.php renamed to ‎back-end/web/app_dev.php
+2 b/‎web/app_dev.php renamed to ‎back-end/web/app_dev.php
+2
diff --git a/‎web/apple-touch-icon.png renamed to ‎back-end/web/apple-touch-icon.png b/‎web/apple-touch-icon.png renamed to ‎back-end/web/apple-touch-icon.png
diff --git a/‎web/favicon.ico renamed to ‎back-end/web/favicon.ico b/‎web/favicon.ico renamed to ‎back-end/web/favicon.ico
diff --git a/‎web/robots.txt renamed to ‎back-end/web/robots.txt b/‎web/robots.txt renamed to ‎back-end/web/robots.txt
diff --git a/‎bin/doctrine
-1 b/‎bin/doctrine
-1
diff --git a/‎bin/doctrine.php
-1 b/‎bin/doctrine.php
-1
diff --git a/‎bin/karma/config/karma.conf.js
-39 b/‎bin/karma/config/karma.conf.js
-39
diff --git a/‎bin/karma/config/protractor-conf.js
-19 b/‎bin/karma/config/protractor-conf.js
-19
diff --git a/‎bin/karma/scripts/e2e-test.bat
-12 b/‎bin/karma/scripts/e2e-test.bat
-12
diff --git a/‎bin/karma/scripts/e2e-test.sh
-18 b/‎bin/karma/scripts/e2e-test.sh
-18
diff --git a/‎bin/karma/scripts/test-all.sh
-32 b/‎bin/karma/scripts/test-all.sh
-32
diff --git a/‎bin/karma/scripts/test.bat
-11 b/‎bin/karma/scripts/test.bat
-11
diff --git a/‎bin/karma/scripts/test.sh
-9 b/‎bin/karma/scripts/test.sh
-9
@@ -1,44 +1,46 @@
 # Cache and logs (Symfony2)
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
+/back-end/app/cache/*
+/back-end/app/logs/*
+!/back-end/app/cache/.gitkeep
+!/back-end/app/logs/.gitkeep
 
-/app/check.php
+/back-end/app/check.php
 
 # Cache and logs (Symfony3)
-/var/cache/*
-/var/logs/*
-!var/cache/.gitkeep
-!var/logs/.gitkeep
+/back-end/var/cache/*
+!/back-end/var/cache/.gitkeep
+/back-end/var/logs/*
+!/back-end/var/logs/.gitkeep
 
 # Parameters
-/app/config/parameters.yml
-/app/config/parameters.ini
+/back-end/app/config/parameters.yml
+/back-end/app/config/parameters.ini
 
 # Managed by Composer
-/app/bootstrap.php.cache
-/app/SymfonyRequirements.php
-/var/bootstrap.php.cache
-/bin/*
+/back-end/app/bootstrap.php.cache
+/back-end/app/SymfonyRequirements.php
+/back-end/var/bootstrap.php.cache
+/back-end/bin/*
 !bin/console
 !bin/symfony_requirements
-/vendor/
+/back-end/vendor/
 
 # Assets and user uploads
-/web/bundles/
-/web/uploads/
+/back-end/web/bundles/
+/back-end/web/uploads/
 
 # Assets managed by Bower
-/web/assets/vendor/
+/back-end/web/assets/vendor/
 
 # PHPUnit
-/app/phpunit.xml
-/phpunit.xml
+/back-end/app/phpunit.xml
+/back-end/phpunit.
 
-# Build data
-/build/
+# Dist
+/front-end/dist
 
 # Composer PHAR
-/composer.phar
-/composer.lock
+*composer.phar
+*composer.lock
+
+node_modules
@@ -8,6 +8,7 @@ php:
 
 before_script:
   - phpenv config-rm xdebug.ini
+  - cd back-end
   - composer self-update
   - composer install
 
 
@@ -0,0 +1,22 @@
+FROM php:5-fpm
+
+ADD . /var/www
+WORKDIR /var/www
+
+RUN usermod -u 1000 www-data
+RUN mkdir -p /var/www/app/cache
+RUN mkdir -p /var/www/app/logs
+RUN chmod -R 777 /var/www/app/cache
+RUN chmod -R 777 /var/www/app/logs
+
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libmcrypt-dev \
+        libpng12-dev \
+    && docker-php-ext-install -j$(nproc) iconv mcrypt \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install -j$(nproc) gd pdo_mysql
+
+EXPOSE 9000
+CMD ["php-fpm"]
@@ -0,0 +1,14 @@
+# This file is auto-generated during the composer install
+parameters:
+    database_driver: pdo_mysql
+    database_host: db
+    database_port: null
+    database_name: symfony
+    database_user: root
+    database_password: root
+    mailer_transport: smtp
+    mailer_host: 127.0.0.1
+    mailer_user: null
+    mailer_password: null
+    locale: en
+    secret: ThisTokenIsNotSoSecretChangeIt
@@ -21,6 +21,7 @@ security:
         wsse_secured:
             pattern: ^/api/.*
             stateless: true
+            methods: [GET, POST, PUT]
             wsse:
               realm: "Secured with WSSE"
               profile: "UsernameToken"
 
@@ -0,0 +1,15 @@
+<?php
+namespace AppBundle\Listener;
+
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+
+class CorsListener
+{
+    public function onKernelResponse(FilterResponseEvent $event)
+    {   
+        $responseHeaders = $event->getResponse()->headers;
+        $responseHeaders->set('Access-Control-Allow-Headers', 'origin, content-type, accept, X-Requested-With, X-WSSE');
+        $responseHeaders->set('Access-Control-Allow-Origin', '*');
+        $responseHeaders->set('Access-Control-Allow-Methods', 'POST, GET, PUT, DELETE, PATCH, OPTIONS');
+    }   
+}
@@ -0,0 +1,5 @@
+services:
+    app.cors_listener:
+        class: AppBundle\Listener\CorsListener
+        tags:
+            - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }
@@ -0,0 +1,9 @@
+<!doctype html>
+<html lang="en" ng-app="myApp">
+  <head>
+    <meta charset="utf-8">
+    <title>My AngularJS App</title>
+  </head>
+  <body>
+  </body>
+</html>
@@ -1,5 +1,7 @@
 <?php
 
+date_default_timezone_set("UTC");
+
 use Symfony\Component\ClassLoader\ApcClassLoader;
 use Symfony\Component\HttpFoundation\Request;
 
 
@@ -1,5 +1,7 @@
 <?php
 
+date_default_timezone_set("UTC");
+
 use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line