Skip to content

Commit

Permalink
Merge pull request #10 from ishanvyas22/releases/1.1.0
Browse files Browse the repository at this point in the history 
Asset mix plugin changes
  • Loading branch information
@ishanvyas22
ishanvyas22 authored Oct 28, 2019
2 parents b60b9aa + 86d893f commit a43f29b
Show file tree
Hide file tree
Showing 321 changed files with 13,678 additions and 1,168 deletions.
1 change: 1 addition & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"cakephp/cakephp": "3.8.*",
"cakephp/migrations": "^2.0.0",
"cakephp/plugin-installer": "^1.0",
"ishanvyas22/asset-mix": "^0.1.0",
"josegonzalez/dotenv": "3.*",
"mobiledetect/mobiledetectlib": "2.*"
},
Expand Down
2,848 changes: 2,548 additions & 300 deletions composer.lock
View file

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions config/bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,21 @@
*/
require CORE_PATH . 'config' . DS . 'bootstrap.php';

use Cake\Cache\Cache;
use Cake\Console\ConsoleErrorHandler;
use Cake\Log\Log;
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Core\Configure\Engine\PhpConfig;
use Cake\Cache\Cache;
use Cake\Core\Plugin;
use Cake\Mailer\Email;
use Cake\Database\Type;
use Cake\Datasource\ConnectionManager;
use Cake\Core\Configure;
use Cake\Utility\Security;
use Cake\Utility\Inflector;
use Cake\Error\ErrorHandler;
use Cake\Http\ServerRequest;
use Cake\Log\Log;
use Cake\Mailer\Email;
use Cake\Utility\Inflector;
use Cake\Utility\Security;
use Cake\Mailer\TransportFactory;
use Cake\Console\ConsoleErrorHandler;
use Cake\Datasource\ConnectionManager;
use Cake\Core\Configure\Engine\PhpConfig;

/**
* Uncomment block of code below if you want to use `.env` file during development.
Expand Down Expand Up @@ -145,7 +146,7 @@

Cache::setConfig(Configure::consume('Cache'));
ConnectionManager::setConfig(Configure::consume('Datasources'));
Email::setConfigTransport(Configure::consume('EmailTransport'));
TransportFactory::setConfig(Configure::consume('EmailTransport'));
Email::setConfig(Configure::consume('Email'));
Log::setConfig(Configure::consume('Log'));
Security::setSalt(Configure::consume('Security.salt'));
Expand Down
3 changes: 0 additions & 3 deletions mix-manifest.json
View file

This file was deleted.

1,271 changes: 706 additions & 565 deletions package-lock.json
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@
"dev": "NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"production": "NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"production": "NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production"
},
"author": "Ishan Vyas",
"license": "MIT",
"devDependencies": {
"axios": "^0.18.0",
"css-loader": "^3.2.0",
"form-serialize": "^0.7.2",
"laravel-mix": "^4.1.2",
"moment": "^2.24.0",
"style-loader": "^1.0.0",
"vue": "^2.5.18",
"vue-notification": "^1.3.16",
"vue-router": "^3.0.2",
Expand Down
0 webroot/css/base.css → resources/css/base.css
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...css/foundation-icons/foundation-icons.css → resources/css/foundation-icons.css
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*
/*
* Foundation Icons v 3.0
* Made by ZURB 2013 http://zurb.com/playground/foundation-icon-fonts-3
* MIT License
*/

@font-face {
font-family: "foundation-icons";
src: url("foundation-icons.eot");
src: url("foundation-icons.eot?#iefix") format("embedded-opentype"),
url("foundation-icons.woff") format("woff"),
url("foundation-icons.ttf") format("truetype"),
url("foundation-icons.svg#fontcustom") format("svg");
src: url("foundation-icons/foundation-icons.eot");
src: url("foundation-icons/foundation-icons.eot?#iefix") format("embedded-opentype"),
url("foundation-icons/foundation-icons.woff") format("woff"),
url("foundation-icons/foundation-icons.ttf") format("truetype"),
url("foundation-icons/foundation-icons.svg#fontcustom") format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down
298 changes: 298 additions & 0 deletions resources/css/foundation-icons/.fontcustom-data
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
{
"fonts": [
"fontcustom_10588e4d0af9f9cd5471c9540658204b.ttf",
"fontcustom_10588e4d0af9f9cd5471c9540658204b.woff",
"fontcustom_10588e4d0af9f9cd5471c9540658204b.eot",
"fontcustom_10588e4d0af9f9cd5471c9540658204b.svg"
],
"templates": [
"fontcustom.css",
"fontcustom-preview.html"
],
"file_name": "fontcustom_10588e4d0af9f9cd5471c9540658204b",
"glyphs": [
"fi-address-book",
"fi-alert",
"fi-align-center",
"fi-align-justify",
"fi-align-left",
"fi-align-right",
"fi-anchor",
"fi-annotate",
"fi-archive",
"fi-arrow-down",
"fi-arrow-left",
"fi-arrow-right",
"fi-arrow-up",
"fi-arrows-compress",
"fi-arrows-expand",
"fi-arrows-in",
"fi-arrows-out",
"fi-asl",
"fi-asterisk",
"fi-at-sign",
"fi-background-color",
"fi-battery-empty",
"fi-battery-full",
"fi-battery-half",
"fi-bitcoin-circle",
"fi-bitcoin",
"fi-blind",
"fi-bluetooth",
"fi-bold",
"fi-book-bookmark",
"fi-book",
"fi-bookmark",
"fi-braille",
"fi-burst-new",
"fi-burst-sale",
"fi-burst",
"fi-calendar",
"fi-camera",
"fi-check",
"fi-checkbox",
"fi-clipboard-notes",
"fi-clipboard-pencil",
"fi-clipboard",
"fi-clock",
"fi-closed-caption",
"fi-cloud",
"fi-comment-minus",
"fi-comment-quotes",
"fi-comment-video",
"fi-comment",
"fi-comments",
"fi-compass",
"fi-contrast",
"fi-credit-card",
"fi-crop",
"fi-crown",
"fi-css3",
"fi-database",
"fi-die-five",
"fi-die-four",
"fi-die-one",
"fi-die-six",
"fi-die-three",
"fi-die-two",
"fi-dislike",
"fi-dollar-bill",
"fi-dollar",
"fi-download",
"fi-eject",
"fi-elevator",
"fi-euro",
"fi-eye",
"fi-fast-forward",
"fi-female-symbol",
"fi-female",
"fi-filter",
"fi-first-aid",
"fi-flag",
"fi-folder-add",
"fi-folder-lock",
"fi-folder",
"fi-foot",
"fi-foundation",
"fi-graph-bar",
"fi-graph-horizontal",
"fi-graph-pie",
"fi-graph-trend",
"fi-guide-dog",
"fi-hearing-aid",
"fi-heart",
"fi-home",
"fi-html5",
"fi-indent-less",
"fi-indent-more",
"fi-info",
"fi-italic",
"fi-key",
"fi-laptop",
"fi-layout",
"fi-lightbulb",
"fi-like",
"fi-link",
"fi-list-bullet",
"fi-list-number",
"fi-list-thumbnails",
"fi-list",
"fi-lock",
"fi-loop",
"fi-magnifying-glass",
"fi-mail",
"fi-male-female",
"fi-male-symbol",
"fi-male",
"fi-map",
"fi-marker",
"fi-megaphone",
"fi-microphone",
"fi-minus-circle",
"fi-minus",
"fi-mobile-signal",
"fi-mobile",
"fi-monitor",
"fi-mountains",
"fi-music",
"fi-next",
"fi-no-dogs",
"fi-no-smoking",
"fi-page-add",
"fi-page-copy",
"fi-page-csv",
"fi-page-delete",
"fi-page-doc",
"fi-page-edit",
"fi-page-export-csv",
"fi-page-export-doc",
"fi-page-export-pdf",
"fi-page-export",
"fi-page-filled",
"fi-page-multiple",
"fi-page-pdf",
"fi-page-remove",
"fi-page-search",
"fi-page",
"fi-paint-bucket",
"fi-paperclip",
"fi-pause",
"fi-paw",
"fi-paypal",
"fi-pencil",
"fi-photo",
"fi-play-circle",
"fi-play-video",
"fi-play",
"fi-plus",
"fi-pound",
"fi-power",
"fi-previous",
"fi-price-tag",
"fi-pricetag-multiple",
"fi-print",
"fi-prohibited",
"fi-projection-screen",
"fi-puzzle",
"fi-quote",
"fi-record",
"fi-refresh",
"fi-results-demographics",
"fi-results",
"fi-rewind-ten",
"fi-rewind",
"fi-rss",
"fi-safety-cone",
"fi-save",
"fi-share",
"fi-sheriff-badge",
"fi-shield",
"fi-shopping-bag",
"fi-shopping-cart",
"fi-shuffle",
"fi-skull",
"fi-social-500px",
"fi-social-adobe",
"fi-social-amazon",
"fi-social-android",
"fi-social-apple",
"fi-social-behance",
"fi-social-bing",
"fi-social-blogger",
"fi-social-delicious",
"fi-social-designer-news",
"fi-social-deviant-art",
"fi-social-digg",
"fi-social-dribbble",
"fi-social-drive",
"fi-social-dropbox",
"fi-social-evernote",
"fi-social-facebook",
"fi-social-flickr",
"fi-social-forrst",
"fi-social-foursquare",
"fi-social-game-center",
"fi-social-github",
"fi-social-google-plus",
"fi-social-hacker-news",
"fi-social-hi5",
"fi-social-instagram",
"fi-social-joomla",
"fi-social-lastfm",
"fi-social-linkedin",
"fi-social-medium",
"fi-social-myspace",
"fi-social-orkut",
"fi-social-path",
"fi-social-picasa",
"fi-social-pinterest",
"fi-social-rdio",
"fi-social-reddit",
"fi-social-skillshare",
"fi-social-skype",
"fi-social-smashing-mag",
"fi-social-snapchat",
"fi-social-spotify",
"fi-social-squidoo",
"fi-social-stack-overflow",
"fi-social-steam",
"fi-social-stumbleupon",
"fi-social-treehouse",
"fi-social-tumblr",
"fi-social-twitter",
"fi-social-vimeo",
"fi-social-windows",
"fi-social-xbox-20",
"fi-social-yahoo",
"fi-social-yelp",
"fi-social-youtube",
"fi-social-zerply",
"fi-social-zurb",
"fi-sound",
"fi-star",
"fi-stop",
"fi-strikethrough",
"fi-subscript",
"fi-superscript",
"fi-tablet-landscape",
"fi-tablet-portrait",
"fi-target-two",
"fi-target",
"fi-telephone-accessible",
"fi-telephone",
"fi-text-color",
"fi-thumbnails",
"fi-ticket",
"fi-torso-business",
"fi-torso-female",
"fi-torso",
"fi-torsos-all-female",
"fi-torsos-all",
"fi-torsos-female-male",
"fi-torsos-male-female",
"fi-torsos",
"fi-trash",
"fi-trees",
"fi-trophy",
"fi-underline",
"fi-universal-access",
"fi-unlink",
"fi-unlock",
"fi-upload-cloud",
"fi-upload",
"fi-usb",
"fi-video",
"fi-volume-none",
"fi-volume-strike",
"fi-volume",
"fi-web",
"fi-wheelchair",
"fi-widget",
"fi-wrench",
"fi-x-circle",
"fi-x",
"fi-yen",
"fi-zoom-in",
"fi-zoom-out"
]
}
Binary file added resources/css/foundation-icons/foundation-icons.eot
View file
Binary file not shown.
Loading

0 comments on commit a43f29b

Please sign in to comment.