Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2022-07-13 15:41:33 +02:00
commit 5747b0e914
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
4 changed files with 38 additions and 2 deletions

29
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,29 @@
image: jakzal/phpqa:php7.3
stages:
- Security
- CodingStandards
security:
stage: Security
script:
- local-php-security-checker --format=json --path=./composer.lock > security-checker-report.json
artifacts:
when: on_failure
expose_as: 'security-checker'
paths:
- security-checker-report.json
allow_failure: true
phpcs:
stage: CodingStandards
script:
- phpcs --report=junit --report-file=phpcs-report.xml
artifacts:
when: on_failure
expose_as: 'phpcs'
paths:
- phpcs-report.xml
reports:
junit: phpcs-report.xml
allow_failure: false

2
package-lock.json generated
View file

@ -1,5 +1,5 @@
{
"name": "loue",
"name": "srcs",
"lockfileVersion": 2,
"requires": true,
"packages": {

View file

@ -7,7 +7,12 @@ const bootstrap = require("bootstrap");
* to our Laravel back-end. This library automatically handles sending the
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
axios.defaults.headers.common = {
'Accept': 'application/json, text/plain, */*',
'X-Requested-With': 'XMLHttpRequest',
'X-CSRF-TOKEN' : document.querySelector('meta[name="csrf-token"]')!.getAttribute('content')
};
window.axios = axios;
window.bootstrap = bootstrap;

View file

@ -76,6 +76,7 @@ mix.ts('resources/ts/back.ts', 'public/js/back.js', { transpileOnly: true })
})
.sass('resources/scss/back.scss', 'public/css/back.css')
.polyfill(polyfill)
.version()
// .sourceMaps(false)
// * FO
@ -87,6 +88,7 @@ mix.ts('resources/ts/front.ts', 'public/js/front.js', { transpileOnly: true })
globalStyles: false
})
.polyfill(polyfill)
.version()
// .sourceMaps(false)
// Copy Blade Images Assets