Merge branch 'master' into phundament-as-dna-code-generator

Conflicts:
	.env-dist
	README.md
	composer.json
	composer.lock
	config/env.php

Author: motin

.env-dist

@@ -7,6 +7,7 @@ YII_ENV=prod
 # Application
 # -----------
 
+APP_ID=myapp
 APP_NAME=$SITENAME
 APP_ADMIN_EMAIL=$SUPPORT_EMAIL
 APP_ADMIN_PASSWORD=$YII_ADMIN_PASSWORD

.travis.yml

@@ -4,14 +4,13 @@ php:
   - 5.4
   - 5.5
   - 5.6
-#  - hhvm
+  - hhvm
 
-# run build against PHP 5.6 and hhvm but allow them to fail
+# run build against hhvm but allow them to fail
 # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
 matrix:
   allow_failures:
     - php: hhvm
-    - php: 5.6
 
 env:
   global:

CHANGELOG.md

@@ -3,8 +3,24 @@ CHANGELOG
 
 Phundament 4
 
-4.0.0-beta9 (in progress)
--------------------------
+4.0.0-dev
+---------
+
+- [UPD] updated default configuration (schmunk42)
+
+4.0.0-beta11
+------------
+
+- [ENH] Refactored Docker setup (schmunk42)
+- [UPD] Template views and style (schmunk42)
+
+4.0.0-beta10
+------------
+
+- build fixes
+
+4.0.0-beta9
+-----------
 
 - [FIX] Vagrant shared folder issues (schmunk42)
 

Dockerfile

@@ -1,11 +1,16 @@
 FROM phundament/app:development
 
+# Prepare composer
+# /!\ Note: Please add your own API token to config.json; Phundament comes with a public token for your convenince, which may hit a rate limit
+ADD ./build/composer/config.json /root/.composer/config.json
+
+# Install packages first
 ADD ./composer.lock /app/composer.lock
 ADD ./composer.json /app/composer.json
-RUN /usr/local/bin/composer install --prefer-dist --dev
-ADD . /app
+RUN /usr/local/bin/composer install --prefer-dist --dev --optimize-autoloader
 
+# Add application code
+ADD . /app
 
-# Uncomment to enable password protection (demo/demo) for app server
-#ADD docs/examples/docker-staging/default     /etc/nginx/sites-available/default
-#ADD docs/examples/docker-staging/.htpasswd   /etc/nginx/.htpasswd
+# Easy PaaS setup
+ENV DB_ENV_MYSQL_DATABASE dev-myapp

Dockerfile-production

@@ -0,0 +1,27 @@
+FROM phundament/app:production
+
+# Prepare composer
+# /!\ Note: Please add your own API token to config.json; Phundament comes with a public token for your convenince, which may hit a rate limit
+ADD ./build/composer/config.json /root/.composer/config.json
+
+# Install packages first (non-development only)
+ADD ./composer.lock /app/composer.lock
+ADD ./composer.json /app/composer.json
+RUN /usr/local/bin/composer install --prefer-dist --no-dev --optimize-autoloader
+
+# Add application code
+ADD . /app
+
+
+# Easy PaaS setup
+# ---------------
+ENV DB_ENV_MYSQL_DATABASE prod-myapp
+ENV APP_NAME My Application
+ENV APP_ADMIN_PASSWORD=YOU_HAVE_TO_CHANGE_THIS
+
+
+# Staging
+# -------
+# Uncomment to enable password protection (demo/demo) for app server
+#ADD docs/examples/docker-staging/default     /etc/nginx/sites-available/default
+#ADD docs/examples/docker-staging/.htpasswd   /etc/nginx/.htpasswd

Vagrantfile

@@ -15,7 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "rproxy" do |rproxy|
     rproxy.vm.network "forwarded_port", guest: 80, host: 80
     rproxy.vm.provider "docker" do |docker|
-      docker.vagrant_vagrantfile = "build/dockerhost/Vagrantfile"
+      docker.vagrant_vagrantfile = "build/vagrant-dockerhost/Vagrantfile"
       docker.name = "rproxy"
       docker.image = "jwilder/nginx-proxy"
       docker.volumes = ["/var/run/docker.sock:/tmp/docker.sock"]
@@ -25,7 +25,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "db" do |db|
     db.vm.network "forwarded_port", guest: 3306, host: 3306, auto_correct: true
     db.vm.provider "docker" do |docker|
-      docker.vagrant_vagrantfile = "build/dockerhost/Vagrantfile"
+      docker.vagrant_vagrantfile = "build/vagrant-dockerhost/Vagrantfile"
       docker.name = "db"
       docker.image = "mysql"
       docker.env = {
@@ -41,7 +41,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     web.vm.network "forwarded_port", guest: 80, host: 10080, auto_correct: true
     web.vm.synced_folder "./", "/app"
     web.vm.provider "docker" do |docker|
-      docker.vagrant_vagrantfile = "build/dockerhost/Vagrantfile"
+      docker.vagrant_vagrantfile = "build/vagrant-dockerhost/Vagrantfile"
       docker.build_dir = "."
       docker.link("rproxy:RPROXY")
       docker.link("db:DB")

assets/AppAsset.php

@@ -7,6 +7,7 @@
 
 namespace app\assets;
 
+use yii\helpers\FileHelper;
 use yii\web\AssetBundle;
 
 /**
@@ -31,20 +32,22 @@ class AppAsset extends AssetBundle
         'yii\web\YiiAsset',
     ];
 
-    public function init(){
+    public function init()
+    {
         parent::init();
         \Yii::$app->getAssetManager()->bundles['yii\bootstrap\BootstrapAsset'] = false;
-        // "forceCopy" for this bundle only
-        /*if (YII_ENV_DEV) {
-            touch(\Yii::getAlias($this->sourcePath));
-        }*/        
-    }
-
-    public function registerAssetFiles($view) {
-        #$view->getAssetManager()->bundles['yii\bootstrap\BootstrapAsset'] = ['css'=>false];
-        #var_dump($view->getAssetManager()->bundles);exit;
-        parent::registerAssetFiles($view);
-        #$view->getAssetManager()->bundles['yii\bootstrap\BootstrapAsset'] = false;
 
+        // /!\ CSS/LESS development only setting /!\
+        // Touch the asset folder with the highest mtime of all contained files
+        // This will create a new folder in web/assets for every change and request
+        // made to the app assets.
+        if (YII_ENV_DEV) {
+            $files  = FileHelper::findFiles(\Yii::getAlias($this->sourcePath));
+            $mtimes = [];
+            foreach ($files AS $file) {
+                $mtimes[] = filemtime($file);
+            }
+            touch(\Yii::getAlias($this->sourcePath), max($mtimes));
+        }
     }
 }

assets/less/app.less

@@ -3,11 +3,11 @@
 @import "bootstrap";
 
 /* Custom Variables */
-@brand-primary: #222;
-@border-radius-base: 2px;
-@border-radius-large: 4px;
-@border-radius-small: 1px;
-@font-size-base: 18px;
+//@brand-primary: #484748;
+@border-radius-base: 1px;
+@border-radius-large: 3px;
+@border-radius-small: 0px;
+@font-size-base: 14px;
 
 /* Custom CSS for Bootstrap 3.x */
 html,
@@ -20,9 +20,9 @@ body {
 body {
   margin-top: 50px;
   background: @gray-lighter;
-
 }
 
+
 .wrap {
   background: white;
 }
@@ -84,17 +84,17 @@ pre code {
 }
 
 .header {
-  height: 80%;
-  background: @brand-primary url('http://pub.phundament.com/unsplash.com/toddquackenbush/dufer-collateral.jpg') no-repeat center center;
+  height: 20%;
+  background: @brand-primary no-repeat center center;
   @media (max-width: 767px) {
-    background: @brand-primary url('http://pub.phundament.com/unsplash.com/toddquackenbush/dufer-collateral-low.jpg') no-repeat center center;
+    background: @brand-primary no-repeat center center;
   }
   background-size: cover;
   text-align: center;
   h1 {
-    font-size: 140px;
+    font-size: 3em;
     @media (max-width: @screen-md) {
-      font-size: 100px;
+      font-size: 2.5em;
     }
     @media (max-width: 767px) {
       font-size: 44px;
@@ -135,8 +135,8 @@ pre code {
 .vert {
   vertical-align: middle;
   width: 100%;
-  padding-top: 8%;
-  padding-bottom: 10%;
+  padding-top: 1%;
+  padding-bottom: 3%;
 }
 
 .blurb {
@@ -186,29 +186,6 @@ pre code {
   }
 }
 
-.docs {
-  blockquote {
-    font-size: 1em;
-    color: @gray-light;
-  }
-  A {
-    text-decoration: underline;
-  }
-  .toc {
-    h1 {
-      font-size: 1.2em;
-    }
-    h2, h3, h4, h5 {
-      font-size: 1em;
-      color: @gray
-    }
-    ul {
-      padding-left: 20px;
-    }
-  }
-
-}
-
 footer {
   padding: 30px 0;
   color: @gray-light;

assets/less/bootstrap.less

@@ -1,5 +1,6 @@
 @bootstrap-path: "../../vendor/bower/bootstrap/less";
 
+
 // Core variables and mixins
 @import "@{bootstrap-path}/variables.less";
 @import "@{bootstrap-path}/mixins.less";