Merge branch 'develop' of https://github.com/Karaka-Management/cssOMS into develop

This commit is contained in:
Dennis Eichhorn 2022-10-23 19:16:29 +02:00
commit 5d64c8c660
8 changed files with 77 additions and 71 deletions

12
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,12 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # orange_management
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: ['https://paypal.me/orangemgmt']

View File

@ -1,6 +1,6 @@
name: CI/CD name: CI
on: [push] on: [push, pull_request]
jobs: jobs:
build_css: build_css:
@ -51,8 +51,9 @@ jobs:
submodules: recursive submodules: recursive
token: ${{ secrets.GH_PAT }} token: ${{ secrets.GH_PAT }}
- name: Lint Code Base - name: Lint Code Base
uses: github/super-linter@v4 uses: github/super-linter/slim@v4
env: env:
VALIDATE_ALL_CODEBASE: false VALIDATE_ALL_CODEBASE: false
VALIDATE_CSS : true
DEFAULT_BRANCH: develop DEFAULT_BRANCH: develop
GITHUB_TOKEN: ${{ secrets.GH_PAT }} GITHUB_TOKEN: ${{ secrets.GH_PAT }}

View File

@ -18,19 +18,12 @@ With Karaka you have one partner who can provide all the tools and software solu
## Requirements ## Requirements
* PHP 8.1 * None
* PHP extension: php8.1-dev php8.1-cli php8.1-common php8.1-mysql php8.1-pgsql php8.1-xdebug php8.1-opcache php8.1-pdo php8.1-sqlite php8.1-mbstring php8.1-curl php8.1-imap php8.1-bcmath php8.1-zip php8.1-dom php8.1-xml php8.1-phar php8.1-gd php-pear
* apache2 (recommended) or nginx
* mysql-server (recommended) or postgresql postgresql-contrib
* Tools: tesseract-ocr, pdftotext, pdftoppm
* Make sure that URL rewriting is active!
### Developer tools ### Developer tools
* Php extension: xdebug * Tools: Npm
* Tools: Composer, Npm * Npm tools: scss
* Composer tools: phpstan, phpunit, phpcs
* Npm tools: eslint
## Installation ## Installation
@ -55,7 +48,7 @@ General updates can be found in our info section at https://karaka.app/info and
## Tech stack ## Tech stack
* Language: php, js, c++, html, css, markdown, shell script * Language: php, js, c/c++, c#, html, css, markdown, shell script
* Database: Maria/MySQL, PostgreSQL, MSSQL/SQLSrv, SQLite * Database: Maria/MySQL, PostgreSQL, MSSQL/SQLSrv, SQLite
* Webserver: apache2, nginx * Webserver: apache2, nginx
* Cache: Redis, Memcached * Cache: Redis, Memcached

94
package-lock.json generated
View File

@ -8,7 +8,7 @@
"name": "css-oms", "name": "css-oms",
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"node-sass": "^7.0.0" "node-sass": "^7.0.3"
}, },
"devDependencies": {} "devDependencies": {}
}, },
@ -1413,9 +1413,9 @@
} }
}, },
"node_modules/node-sass": { "node_modules/node-sass": {
"version": "7.0.1", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.3.tgz",
"integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", "integrity": "sha512-8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"async-foreach": "^0.1.3", "async-foreach": "^0.1.3",
@ -1430,7 +1430,7 @@
"node-gyp": "^8.4.1", "node-gyp": "^8.4.1",
"npmlog": "^5.0.0", "npmlog": "^5.0.0",
"request": "^2.88.0", "request": "^2.88.0",
"sass-graph": "4.0.0", "sass-graph": "^4.0.1",
"stdout-stream": "^1.4.0", "stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2" "true-case-path": "^1.0.2"
}, },
@ -1782,7 +1782,7 @@
"node_modules/require-directory": { "node_modules/require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
@ -1850,13 +1850,13 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"node_modules/sass-graph": { "node_modules/sass-graph": {
"version": "4.0.0", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.1.tgz",
"integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", "integrity": "sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==",
"dependencies": { "dependencies": {
"glob": "^7.0.0", "glob": "^7.0.0",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"scss-tokenizer": "^0.3.0", "scss-tokenizer": "^0.4.3",
"yargs": "^17.2.1" "yargs": "^17.2.1"
}, },
"bin": { "bin": {
@ -1867,12 +1867,12 @@
} }
}, },
"node_modules/scss-tokenizer": { "node_modules/scss-tokenizer": {
"version": "0.3.0", "version": "0.4.3",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz",
"integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", "integrity": "sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==",
"dependencies": { "dependencies": {
"js-base64": "^2.4.3", "js-base64": "^2.4.9",
"source-map": "^0.7.1" "source-map": "^0.7.3"
} }
}, },
"node_modules/semver": { "node_modules/semver": {
@ -1962,9 +1962,9 @@
} }
}, },
"node_modules/source-map": { "node_modules/source-map": {
"version": "0.7.3", "version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
"engines": { "engines": {
"node": ">= 8" "node": ">= 8"
} }
@ -2320,9 +2320,9 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
}, },
"node_modules/yargs": { "node_modules/yargs": {
"version": "17.4.1", "version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==", "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"dependencies": { "dependencies": {
"cliui": "^7.0.2", "cliui": "^7.0.2",
"escalade": "^3.1.1", "escalade": "^3.1.1",
@ -2345,9 +2345,9 @@
} }
}, },
"node_modules/yargs/node_modules/yargs-parser": { "node_modules/yargs/node_modules/yargs-parser": {
"version": "21.0.1", "version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
} }
@ -3447,9 +3447,9 @@
} }
}, },
"node-sass": { "node-sass": {
"version": "7.0.1", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.1.tgz", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.3.tgz",
"integrity": "sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==", "integrity": "sha512-8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw==",
"requires": { "requires": {
"async-foreach": "^0.1.3", "async-foreach": "^0.1.3",
"chalk": "^4.1.2", "chalk": "^4.1.2",
@ -3463,7 +3463,7 @@
"node-gyp": "^8.4.1", "node-gyp": "^8.4.1",
"npmlog": "^5.0.0", "npmlog": "^5.0.0",
"request": "^2.88.0", "request": "^2.88.0",
"sass-graph": "4.0.0", "sass-graph": "^4.0.1",
"stdout-stream": "^1.4.0", "stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2" "true-case-path": "^1.0.2"
} }
@ -3725,7 +3725,7 @@
"require-directory": { "require-directory": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
}, },
"resolve": { "resolve": {
"version": "1.22.0", "version": "1.22.0",
@ -3761,23 +3761,23 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"sass-graph": { "sass-graph": {
"version": "4.0.0", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.0.tgz", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-4.0.1.tgz",
"integrity": "sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==", "integrity": "sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA==",
"requires": { "requires": {
"glob": "^7.0.0", "glob": "^7.0.0",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"scss-tokenizer": "^0.3.0", "scss-tokenizer": "^0.4.3",
"yargs": "^17.2.1" "yargs": "^17.2.1"
} }
}, },
"scss-tokenizer": { "scss-tokenizer": {
"version": "0.3.0", "version": "0.4.3",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz", "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz",
"integrity": "sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==", "integrity": "sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw==",
"requires": { "requires": {
"js-base64": "^2.4.3", "js-base64": "^2.4.9",
"source-map": "^0.7.1" "source-map": "^0.7.3"
} }
}, },
"semver": { "semver": {
@ -3843,9 +3843,9 @@
} }
}, },
"source-map": { "source-map": {
"version": "0.7.3", "version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
}, },
"spdx-correct": { "spdx-correct": {
"version": "3.1.1", "version": "3.1.1",
@ -4131,9 +4131,9 @@
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
}, },
"yargs": { "yargs": {
"version": "17.4.1", "version": "17.5.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
"integrity": "sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==", "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
"requires": { "requires": {
"cliui": "^7.0.2", "cliui": "^7.0.2",
"escalade": "^3.1.1", "escalade": "^3.1.1",
@ -4145,9 +4145,9 @@
}, },
"dependencies": { "dependencies": {
"yargs-parser": { "yargs-parser": {
"version": "21.0.1", "version": "21.1.1",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==" "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
} }
} }
}, },

View File

@ -4,7 +4,7 @@
"description": "", "description": "",
"directories": {}, "directories": {},
"dependencies": { "dependencies": {
"node-sass": "^7.0.0" "node-sass": "^7.0.3"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

View File

@ -4,7 +4,7 @@
<div class="popup"> <div class="popup">
<ul> <ul>
<li> <li>
<input id="id1" type="checkbox"> <input id="id1" type="checkbox" name="">
<ul> <ul>
<li> <li>
<label for="id1"> <label for="id1">
@ -19,7 +19,7 @@
<li><a href="" class="button">PDF</a> <li><a href="" class="button">PDF</a>
<li><a href="" class="button">Word</a> <li><a href="" class="button">Word</a>
<li> <li>
<input id="id2" type="checkbox"> <input id="id2" type="checkbox" name="">
<ul> <ul>
<li> <li>
<label for="id2"> <label for="id2">

View File

@ -4,7 +4,7 @@
<div class="popup"> <div class="popup">
<ul> <ul>
<li> <li>
<input id="id1" type="checkbox"> <input id="id1" type="checkbox" name="">
<ul> <ul>
<li> <li>
<label for="id1"> <label for="id1">
@ -19,7 +19,7 @@
<li><a href="" class="button">PDF</a> <li><a href="" class="button">PDF</a>
<li><a href="" class="button">Word</a> <li><a href="" class="button">Word</a>
<li> <li>
<input id="id2" type="checkbox"> <input id="id2" type="checkbox" name="">
<ul> <ul>
<li> <li>
<label for="id2"> <label for="id2">

View File

@ -7,7 +7,7 @@
<li>Filter <li>Filter
<?php if ($filterType === 'text') : ?> <?php if ($filterType === 'text') : ?>
<li> <li>
<input type="text"> <input type="text" name="<?= $tableId; ?>-filterDropdown-text">
<?php elseif ($filterType === 'select') : ?> <?php elseif ($filterType === 'select') : ?>
<li> <li>
<select multiple> <select multiple>
@ -25,9 +25,9 @@
<option>< <option><
</select> </select>
<?php if ($filterType === 'number') : ?> <?php if ($filterType === 'number') : ?>
<input type="text"> <input type="text" name="<?= $tableId; ?>-filterDropdown-number1">
<?php else : ?> <?php else : ?>
<input type="date"> <input type="date" name="<?= $tableId; ?>-filterDropdown-date1">
<?php endif; ?> <?php endif; ?>
<li>AND <li>AND
<li> <li>
@ -39,9 +39,9 @@
<option>< <option><
</select> </select>
<?php if ($filterType === 'number') : ?> <?php if ($filterType === 'number') : ?>
<input type="text"> <input type="text" name="<?= $tableId; ?>-filterDropdown-number2">
<?php else : ?> <?php else : ?>
<input type="date"> <input type="date" name="<?= $tableId; ?>-filterDropdown-date2">
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<li><label class="button close" for="<?= $tableId; ?>-filterDropdown-<?= $tableFilterCounter; ?>">Cancel</label> <li><label class="button close" for="<?= $tableId; ?>-filterDropdown-<?= $tableFilterCounter; ?>">Cancel</label>