flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

quick fix + yarn

Browse source
This commit is contained in:
flash 2016-12-04 15:26:48 +01:00
parent cb8d4a1501
commit fb07ca4026
4 changed files with 52 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
README.md
View file

@ -3,10 +3,11 @@
![SensioLabsInsight](https://insight.sensiolabs.com/projects/6c9b3813-0f50-406c-ab26-665e11876bc9/mini.png) ![SensioLabsInsight](https://insight.sensiolabs.com/projects/6c9b3813-0f50-406c-ab26-665e11876bc9/mini.png)
## Requirements ## Requirements
- PHP 7.0.0 or newer - PHP 7.1 or an equivalent environment
- A database engine compatible with your PHP install and Laravel/Illuminate's database abstraction layer, MySQL 5.7 recommended. - MySQL 5.7 is recommended, you can use any database engine compatible with [illuminate/database](https://github.com/illuminate/database/tree/5.2) in theory though.
- [Composer](https://getcomposer.org/) - [Composer](https://getcomposer.org/)
- [NPM from NodeJS](https://nodejs.org/) - [node.js](https://nodejs.org/) (for the typescript and less compilers)
- [Yarn](https://yarnpkg.com/) because npm is trash
## Installing ## Installing
### Backend ### Backend
@ -20,11 +21,11 @@ php mahou setup
After that you can either use `php mahou serve` to use the built in development server or serve the public folder through your webserver of choice. After that you can either use `php mahou serve` to use the built in development server or serve the public folder through your webserver of choice.
### Frontend ### Frontend
To compile the LESS and TypeScript assets you need to have the individual compiler installed, both are available from npm and can be installed through the following command: To compile the LESS and TypeScript assets you need to have the individual compilers installed, both are available through yarn and can be installed with the following command:
``` ```
npm install -g less typescript yarn global add less typescript
``` ```
After that install the required libraries by running `npm install` and from then on to compile the files you need to run `build.sh`. After that install the required libraries by running `yarn` and from then on to compile the files you need to run `build.sh`.
If your editor yells at you that it can't find certain namespaces try running `build.sh` since that generates the required typings (.d.ts files). If your editor yells at you that it can't find certain namespaces try running `build.sh` since that generates the required typings (.d.ts files).

71
composer.lock generated
View file

@ -462,16 +462,16 @@
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
"version": "v2.6.1", "version": "v2.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/common.git", "url": "https://github.com/doctrine/common.git",
"reference": "a579557bc689580c19fee4e27487a67fe60defc0" "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0", "url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"reference": "a579557bc689580c19fee4e27487a67fe60defc0", "reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -531,7 +531,7 @@
"persistence", "persistence",
"spl" "spl"
], ],
"time": "2015-12-25 13:18:31" "time": "2016-11-30 16:50:46"
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
@ -727,18 +727,21 @@
}, },
{ {
"name": "erusev/parsedown", "name": "erusev/parsedown",
"version": "1.6.0", "version": "1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/erusev/parsedown.git", "url": "https://github.com/erusev/parsedown.git",
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7" "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/erusev/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
"reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7", "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
"shasum": "" "shasum": ""
}, },
"require": {
"php": ">=5.3.0"
},
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-0": { "psr-0": {
@ -762,7 +765,7 @@
"markdown", "markdown",
"parser" "parser"
], ],
"time": "2015-10-04 16:44:32" "time": "2016-11-02 15:56:58"
}, },
{ {
"name": "illuminate/container", "name": "illuminate/container",
@ -1353,16 +1356,16 @@
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "swiftmailer/swiftmailer",
"version": "v5.4.3", "version": "v5.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git", "url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/545ce9136690cea74f98f86fbb9c92dd9ab1a756",
"reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "reference": "545ce9136690cea74f98f86fbb9c92dd9ab1a756",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1402,7 +1405,7 @@
"mail", "mail",
"mailer" "mailer"
], ],
"time": "2016-07-08 11:51:25" "time": "2016-11-24 01:01:23"
}, },
{ {
"name": "symfony/class-loader", "name": "symfony/class-loader",
@ -1507,16 +1510,16 @@
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.2.0", "version": "v1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "dff51f72b0706335131b00a7f49606168c582594" "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
"reference": "dff51f72b0706335131b00a7f49606168c582594", "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1528,7 +1531,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.2-dev" "dev-master": "1.3-dev"
} }
}, },
"autoload": { "autoload": {
@ -1562,20 +1565,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2016-05-18 14:26:46" "time": "2016-11-14 01:06:16"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v3.1.6", "version": "v3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "ff1285087397d2f64041b35e591f3025881c90cd" "reference": "64ab6fc0b42e5386631f408e6adcaaff8eee5ba1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/ff1285087397d2f64041b35e591f3025881c90cd", "url": "https://api.github.com/repos/symfony/translation/zipball/64ab6fc0b42e5386631f408e6adcaaff8eee5ba1",
"reference": "ff1285087397d2f64041b35e591f3025881c90cd", "reference": "64ab6fc0b42e5386631f408e6adcaaff8eee5ba1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1599,7 +1602,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.1-dev" "dev-master": "3.2-dev"
} }
}, },
"autoload": { "autoload": {
@ -1626,20 +1629,20 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-10-18 04:30:12" "time": "2016-11-18 21:17:59"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.27.0", "version": "v1.28.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97" "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97", "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c",
"reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97", "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1647,12 +1650,12 @@
}, },
"require-dev": { "require-dev": {
"symfony/debug": "~2.7", "symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~2.7" "symfony/phpunit-bridge": "~3.2@dev"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.27-dev" "dev-master": "1.28-dev"
} }
}, },
"autoload": { "autoload": {
@ -1687,7 +1690,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2016-10-25 19:17:17" "time": "2016-11-23 18:41:40"
} }
], ],
"packages-dev": [], "packages-dev": [],

2
resources/views/aitemu/master.twig
View file

@ -50,7 +50,7 @@
<div class="banner" style="background-image: url('/images/enable-javascript.png')"></div> <div class="banner" style="background-image: url('/images/enable-javascript.png')"></div>
</noscript> </noscript>
<div class="banner {{ banner_large ? 'banner--large' : '' }} {{ banner_classes|default('') }}" style="background-image: url('{{ banner|default('/images/default-banner.png') }}')"> <div class="banner {{ banner_large is defined and banner_large ? 'banner--large' : '' }} {{ banner_classes|default('') }}" style="background-image: url('{{ banner|default('/images/default-banner.png') }}')">
{{ block('banner_content') }} {{ block('banner_content') }}
</div> </div>

7
yarn.lock Normal file
View file

@ -0,0 +1,7 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
turbolinks@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/turbolinks/-/turbolinks-5.0.0.tgz#94c73fa299716824b0d96639b993b2efd7ef0e44"