Commit 0a886a9b authored by Gatterdam Patrick's avatar Gatterdam Patrick
Browse files

Merge branch 'feature/ci' into 'master'

Feature/ci

See merge request shopware/plugins/RicoDynamicFAQ!15
parents a086124b 19f3ac52
// Breakpoints
@phoneLandscapeViewportWidth: 30em; // 480px
@tabletViewportWidth: 48em; // 768px
@tabletLandscapeViewportWidth: 64em; // 1024px
@desktopViewportWidth: 78.75em; // 1260px
// Basic color definition
@brand-primary: #d9400b;
@brand-primary-light: saturate(lighten(@brand-primary,12%), 5%);
@brand-secondary: #5f7285;
@brand-secondary-dark: darken(@brand-secondary, 15%);
// Grey tones
@gray: #f5f5f8;
@gray-light: lighten(@gray, 1%);
@gray-dark: darken(@gray-light, 10%);
@border-color: @gray-dark;
// Highlight colors
@highlight-success: #2ecc71;
@highlight-error: #e74c3c;
@highlight-notice: #f1c40f;
@highlight-info: #4aa3df;
//Scaffolding
@body-bg: darken(@gray-light, 5%);
@overlay-bg: #555555;
@text-color: @brand-secondary;
@text-color-dark: @brand-secondary-dark;
@link-color: @brand-primary;
@link-hover-color: darken(@brand-primary, 10%);
@rating-star-color: @highlight-notice;
// Base configuration
@font-size-base: 14;
@font-base-weight: 500;
@font-light-weight: 300;
@font-bold-weight: 600;
@font-base-stack: "Open Sans", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
@font-headline-stack: @font-base-stack;
// Heading font sizes
@font-size-h1: 26;
@font-size-h2: 21;
@font-size-h3: 18;
@font-size-h4: 16;
@font-size-h5: @font-size-base;
@font-size-h6: 12;
// Shopware font directory
@font-directory: "../../fonts/";
// Open Sans font directory
@OpenSansPath: "../../fonts/open-sans-fontface";
// Button text sizes
@btn-font-size: 14;
@btn-icon-size: 10;
// Default Button
@btn-default-top-bg: #FFFFFF;
@btn-default-bottom-bg: @gray-light;
@btn-default-hover-bg: #FFFFFF;
@btn-default-text-color: @text-color;
@btn-default-hover-text-color: @brand-primary;
@btn-default-border-color: @border-color;
@btn-default-hover-border-color: @brand-primary;
// Primary Button
@btn-primary-top-bg: @brand-primary-light;
@btn-primary-bottom-bg: @brand-primary;
@btn-primary-hover-bg: @brand-primary;
@btn-primary-text-color:#FFFFFF;
@btn-primary-hover-text-color: @btn-primary-text-color;
// Secondary Button
@btn-secondary-top-bg: @brand-secondary;
@btn-secondary-bottom-bg: @brand-secondary-dark;
@btn-secondary-hover-bg: @brand-secondary-dark;
@btn-secondary-text-color: #FFFFFF;
@btn-secondary-hover-text-color: @btn-secondary-text-color;
// Panels
@panel-header-bg: @gray-light;
@panel-header-font-size: 14;
@panel-header-color: @text-color;
@panel-border: @border-color;
@panel-bg: #FFFFFF;
// Labels
@label-font-size: 12;
@label-color: @text-color;
// Form base
@input-font-size: 16;
@input-bg: @gray-light;
@input-color: @brand-secondary;
@input-placeholder-color: lighten(@text-color, 15%);
@input-border: @border-color;
// Form states
@input-focus-bg: #FFFFFF;
@input-focus-border: @brand-primary;
@input-focus-color: @brand-secondary;
@input-error-bg: desaturate(lighten(@highlight-error, 38%), 20%);
@input-error-border: @highlight-error;
@input-error-color: @highlight-error;
@input-success-bg: #FFFFFF;
@input-success-border: @highlight-success;
@input-success-color: @brand-secondary-dark;
// Tables
@panel-table-header-bg: @brand-secondary-dark;
@panel-table-header-color: #FFFFFF;
@table-row-bg: #FFFFFF;
@table-row-color: @brand-secondary;
@table-row-highlight-bg: darken(@table-row-bg, 4%);
@table-header-bg: @brand-secondary;
@table-header-color: #FFFFFF;
// Badges, Hints
@badge-discount-bg: @highlight-error;
@badge-discount-color: #FFFFFF;
@badge-newcomer-bg: @highlight-notice;
@badge-newcomer-color: #FFFFFF;
@badge-recommendation-bg: @highlight-success;
@badge-recommendation-color: #FFFFFF;
@badge-download-bg: @highlight-info;
@badge-download-color: #FFFFFF;
//additional
@shopware-revision: 0;
@overlay-opacity: 0.1;
@overlay-theme-dark-bg: @overlay-bg;
@overlay-theme-light-bg: @overlay-bg;
@brand-primary-dark: #000;
@brand-primary-darkest: #000;
\ No newline at end of file
@import "../../vendor/shopware/shopware/themes/Frontend/Bare/frontend/_public/src/less/all";
@import "../../vendor/shopware/shopware/themes/Frontend/Responsive/frontend/_public/src/less/all";
@import "./additional_variables";
@import "../../custom/project/TrueFruits/Resources/Themes/Frontend/TrueFruits/frontend/_public/src/less/all";
\ No newline at end of file
{
"name": "tf_lint",
"version": "1.0.0",
"dependencies": {
"eslint": "^5.14.1",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^8.0.1",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"jshint": "^2.10.1",
"less": "^3.9.0"
}
}
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- .Build/
#region templates
.debug: &debug
image: debian:jessie-slim
stage: debug
dependencies:
- composer-base
before_script:
- mkdir -p debug_logs
artifacts:
name: ${CI_COMMIT_REF_SLUG}-debug_check
expire_in: 2h
when: on_failure
paths:
- debug_logs
#endregion
stages:
- build
- code_quallity
- debug
- lint
- quality
composer:
image: composer:1.6.5
#region base
composer-base:
stage: build
image: composer:latest
script:
- composer -q -n install
- composer update --no-interaction --ignore-platform-reqs --no-scripts --with-dependencies
artifacts:
expire_in: 1 hour
name: ${CI_COMMIT_REF_SLUG}-composer
expire_in: 2h
paths:
- .Build/
only:
- master
phpstan:
image: php:7.1
stage: code_quallity
script:
- .Build/bin/phpstan analyse -l 1 .
only:
- master
allow_failure: true
codesniffer:
image: php:7.1
stage: code_quallity
script:
- .Build/bin/phpcs --error-severity=1 --warning-severity=8 --extensions=php .
only:
- master
allow_failure: true
phpmd:
image: php:7.1
stage: code_quallity
script:
- .Build/bin/phpmd . text phpmd.xml
only:
- master
allow_failure: true
- vendor
- composer.lock
cache:
key: ${CI_COMMIT_REF_SLUG}-composer
paths:
- vendor
- composer.lock
node-base:
image: node:alpine
stage: build
script:
- npm i ./.ci
artifacts:
name: ${CI_COMMIT_REF_SLUG}-composer
expire_in: 2h
paths:
- node_modules
cache:
key: ${CI_COMMIT_REF_SLUG}-node
policy: push
paths:
- node_modules
- package-lock.json
#endregion
#region DEBUG
smarty-debug:
<<: *debug
script:
- grep -r -i --include \*.tpl "{debug}" . > debug_logs/smarty_debug.txt || true
- cat debug_logs/smarty_debug.txt
- if (($(wc -l debug_logs/smarty_debug.txt | awk '{print $1}' ) > 0)); then exit "1"; fi
js-debug:
<<: *debug
script:
- grep -r -i --include \*.js "window.console.log" . > debug_logs/js_debug.txt || true
- cat debug_logs/js_debug.txt
- if (($(wc -l debug_logs/js_debug.txt | awk '{print $1}' ) > 0)); then exit "1"; fi
php-debug:
<<: *debug
script:
- grep -r -i --include \*.php "var_dump" . > debug_logs/php_debug.txt || true
- grep -r -i --include \*.php "\\Kint::dump" . >> debug_logs/php_debug.txt || true
- cat debug_logs/php_debug.txt
- if (($(wc -l debug_logs/php_debug.txt | awk '{print $1}' ) > 0)); then exit "1"; fi
#endregion
#region lint
js-hint:
image: node:alpine
stage: lint
dependencies:
- node-base
script:
- node_modules/jshint/bin/jshint --verbose custom/project
php-lint:
stage: lint
image: php:7.2-alpine
script:
- if find . -type f -name '*.php' -and -not -path vendor -exec php -l {} \; | grep "Parsing error"; then exit 1; fi
#endregion
#region codequality
js-lint:
image: node:alpine
stage: quality
dependencies:
- node-base
script:
- node_modules/eslint/bin/eslint.js .
php-cs:
stage: quality
image: ekreative/php-cs-fixer:2
dependencies:
- composer-base
script:
- php-cs-fixer fix --config=".php_cs" --format="json" --dry-run .
#endregion
<?php
/**
* @author: Alexander Wink <alexander.wink@riconet.de>
* @company: Hees riconet GmbH
* @package: RicoHistory
* This file is part of the "RicoDynamicFaq" plugin for shopware.
* @package: RicoDynamicFaq
* @copyright: (c) 2019 Wolf Utz <utz@riconet.de>, Hees riconet GmbH
* @license: For the full copyright and license information,
* please read the LICENSE.txt file that was distributed with this source code.
*/
namespace RicoDynamicFaq\Loader;
......
......@@ -15,7 +15,7 @@
},
"require": {
"shopware/shopware": ">=5.2 <5.6",
"php": ">=5.6 <=7.2"
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment