Merge pull request #27 from avored/dev

merging dev to master

composer.json

@@ -74,4 +74,4 @@
 		"wiki" : "https://www.avored.com/docs",
 		"source" : "https://www.github.com/avored/framework"
 	}
-}
+}

config/avored-framework.php

@@ -10,6 +10,7 @@
 
     'admin_url' => 'admin',
 
+    'symlink_storage_folder' => 'storage',
 
     'cart' => ['session_key' => 'cart_products'],
 

database/migrations/2017_03_29_000000_avored_framework_schema.php

@@ -353,7 +353,7 @@ public function up()
 
         Schema::create('admin_users', function (Blueprint $table) {
             $table->increments('id');
-            $table->tinyInteger('is_super_admin')->nullable();
+            $table->tinyInteger('is_super_admin')->nullable()->default(null);
             $table->integer('role_id')->unsigned()->default(null);
             $table->string('first_name')->nullable();
             $table->string('last_name')->nullable();

phpunit.xml

@@ -22,7 +22,7 @@
     </filter>
 
     <!--logging>
-        <log type="coverage-html" target="../../../public/cov/framework" 
+        <log type="coverage-html" target="../../public/cov/framework" 
              lowUpperBound="50" highLowerBound="80"/>
     </logging-->
 </phpunit>  

resources/assets/js/app.js

@@ -21,6 +21,7 @@ require('select2');
 require('summernote');
 require('pc-bootstrap4-datetimepicker');
 require('chartjs');
+require('sweetalert');
 require('jquery-sortable');
 window.Vue = require('vue/dist/vue');
 window.axios = require('axios');

resources/assets/sass/_colors.scss

@@ -0,0 +1,8 @@
+$primary : #b71c1c;
+$black: #ddd;
+$white: #fff;
+
+$body-bg: #f5f5f5;
+$bg-site-color: #ff0041;
+$bg-site-second-color: #510094;
+

resources/assets/sass/_fonts.scss

@@ -0,0 +1,9 @@
+@font-face {
+  font-weight:normal;
+  font-style:normal;
+  font-family:"summernote";
+  src:url("../fonts/summernote.eot");
+  src:url("../fonts/summernote.eot?#iefix") format("embedded-opentype"),
+      url("../fonts/summernote.woff") format("woff"),
+      url("../fonts/summernote.ttf") format("truetype");
+}

resources/assets/sass/app.scss

@@ -1,21 +1,26 @@
 // Fonts
+$fa-font-path: "../fonts" !default;
 @import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
 
+@import "_colors";
+@import "_fonts";
 
-$primary : #b71c1c;
-@import "_variables";
+// Dependencies
 @import "~bootstrap/scss/bootstrap";
 
-
-$fa-font-path: "../fonts" !default;
 @import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome";
 @import "~@fortawesome/fontawesome-free-webfonts/scss/fa-regular";
 @import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid";
 @import "~@fortawesome/fontawesome-free-webfonts/scss/fa-brands";
 
-
 @import "~select2/src/scss/core";
 @import "~summernote/src/less/summernote-bs4";
 @import "~pc-bootstrap4-datetimepicker/src/sass/bootstrap-datetimepicker-build";
-@import "table";
-@import "custom";
+
+// theme partials
+@import "partials/theme";
+@import "partials/navigation";
+@import "partials/icons";
+@import "partials/tables";
+@import "partials/tags";
+@import "partials/widgets";

resources/assets/sass/partials/_forms.scss

@@ -0,0 +1,4 @@
+.datetime.form-control:disabled,
+.datetime.form-control[readonly] {
+  background: $white;
+}

resources/assets/sass/_variables.scss → resources/assets/sass/partials/_icons.scss

@@ -1,15 +1,3 @@
-@font-face {
-  font-weight:normal;
-  font-style:normal;
-  font-family:"summernote";
-  src:url("../fonts/summernote.eot");
-  src:url("../fonts/summernote.eot?#iefix") format("embedded-opentype"),
-      url("../fonts/summernote.woff") format("woff"),
-      url("../fonts/summernote.ttf") format("truetype");
-}
-
-
-
 // Bootstrap Overrides
 [class^="note-icon-"]:before,
 [class*=" note-icon-"]:before {
@@ -505,4 +493,3 @@
   }
 
 }
-