Implement Article navbutton fix #2

Merged
audrey merged 26 commits from navbar-fix into master 2024-08-14 15:20:30 +00:00
8 changed files with 253 additions and 32 deletions

View File

@ -0,0 +1,27 @@
name: Gitea Actions Demo
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
on:
push:
branches:
- master
jobs:
Deploy:
name: Deploy Project files
runs-on: intranet
steps:
- name: Check out repository code
uses: actions/checkout@v4
with:
SSH-KEY: ${{secrets.read_key}}
SSH-KNOWN-HOSTS: gitea.jv.com,192.168.0.214 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHsv90d6ofdNgJx0W6zPTVpouqDeF/qv/L0guzFBg6YON4jiubCovUZ0h7M8ipg/kXACHLfNBWAmNvsaGrPpHNU=
SSH-STRICT: 'false'
- name: Copy files to project dir
run: |
mkdir ${{ var.PROD_DEPLOY_DIR }}
xcopy /E /I . ${{ var.PROD_DEPLOY_DIR }}
- name: Update Composer Packages
working-directory: ${{ var.PROD_DEPLOY_DIR }}
run: composer update --no-interaction --working-dir=${{ var.PROD_DEPLOY_DIR }}

5
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"gitea.owner": "audrey",
"gitea.repo": "intranet",
"gitea.instanceURL": "https://gitea.jv.com"
}

170
composer.lock generated
View File

@ -4,8 +4,84 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5625360c4bf0ca4c404a3a47e7b43354", "content-hash": "6c9cd0fccf203daf66cab2a05cf2e389",
"packages": [ "packages": [
{
"name": "doctrine/annotations",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
"reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f",
"shasum": ""
},
"require": {
"doctrine/lexer": "^2 || ^3",
"ext-tokenizer": "*",
"php": "^7.2 || ^8.0",
"psr/cache": "^1 || ^2 || ^3"
},
"require-dev": {
"doctrine/cache": "^2.0",
"doctrine/coding-standard": "^10",
"phpstan/phpstan": "^1.8.0",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"symfony/cache": "^5.4 || ^6",
"vimeo/psalm": "^4.10"
},
"suggest": {
"php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
},
"type": "library",
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
},
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
},
{
"name": "Johannes Schmitt",
"email": "schmittjoh@gmail.com"
}
],
"description": "Docblock Annotations Parser",
"homepage": "https://www.doctrine-project.org/projects/annotations.html",
"keywords": [
"annotations",
"docblock",
"parser"
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/2.0.1"
},
"time": "2023-02-02T22:02:53+00:00"
},
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "2.2.0", "version": "2.2.0",
@ -2008,6 +2084,84 @@
}, },
"time": "2021-07-14T16:46:02+00:00" "time": "2021-07-14T16:46:02+00:00"
}, },
{
"name": "sensio/framework-extra-bundle",
"version": "v6.2.10",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
"reference": "2f886f4b31f23c76496901acaedfedb6936ba61f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f",
"reference": "2f886f4b31f23c76496901acaedfedb6936ba61f",
"shasum": ""
},
"require": {
"doctrine/annotations": "^1.0|^2.0",
"php": ">=7.2.5",
"symfony/config": "^4.4|^5.0|^6.0",
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
"symfony/framework-bundle": "^4.4|^5.0|^6.0",
"symfony/http-kernel": "^4.4|^5.0|^6.0"
},
"conflict": {
"doctrine/doctrine-cache-bundle": "<1.3.1",
"doctrine/persistence": "<1.3"
},
"require-dev": {
"doctrine/dbal": "^2.10|^3.0",
"doctrine/doctrine-bundle": "^1.11|^2.0",
"doctrine/orm": "^2.5",
"symfony/browser-kit": "^4.4|^5.0|^6.0",
"symfony/doctrine-bridge": "^4.4|^5.0|^6.0",
"symfony/dom-crawler": "^4.4|^5.0|^6.0",
"symfony/expression-language": "^4.4|^5.0|^6.0",
"symfony/finder": "^4.4|^5.0|^6.0",
"symfony/monolog-bridge": "^4.0|^5.0|^6.0",
"symfony/monolog-bundle": "^3.2",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
"symfony/security-bundle": "^4.4|^5.0|^6.0",
"symfony/twig-bundle": "^4.4|^5.0|^6.0",
"symfony/yaml": "^4.4|^5.0|^6.0",
"twig/twig": "^1.34|^2.4|^3.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "6.1.x-dev"
}
},
"autoload": {
"psr-4": {
"Sensio\\Bundle\\FrameworkExtraBundle\\": "src/"
},
"exclude-from-classmap": [
"/tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "This bundle provides a way to configure your controllers with annotations",
"keywords": [
"annotations",
"controllers"
],
"support": {
"source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10"
},
"abandoned": "Symfony",
"time": "2023-02-24T14:57:12+00:00"
},
{ {
"name": "symfony/asset", "name": "symfony/asset",
"version": "v6.3.0", "version": "v6.3.0",
@ -5487,16 +5641,16 @@
}, },
{ {
"name": "symfony/runtime", "name": "symfony/runtime",
"version": "v6.3.1", "version": "v6.3.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/runtime.git", "url": "https://github.com/symfony/runtime.git",
"reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d" "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/runtime/zipball/8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d", "url": "https://api.github.com/repos/symfony/runtime/zipball/a8d2b8f6033a33c224b43065a10bab5e4f0be486",
"reference": "8e83b5d8e0ace903e1a91dedfe08a84ed2a54b0d", "reference": "a8d2b8f6033a33c224b43065a10bab5e4f0be486",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5546,7 +5700,7 @@
"runtime" "runtime"
], ],
"support": { "support": {
"source": "https://github.com/symfony/runtime/tree/v6.3.1" "source": "https://github.com/symfony/runtime/tree/v6.3.12"
}, },
"funding": [ "funding": [
{ {
@ -5562,7 +5716,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-06-21T12:08:28+00:00" "time": "2024-01-23T14:35:58+00:00"
}, },
{ {
"name": "symfony/security-bundle", "name": "symfony/security-bundle",
@ -9480,5 +9634,5 @@
"ext-iconv": "*" "ext-iconv": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.2.0"
} }

View File

@ -11,4 +11,5 @@ return [
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
]; ];

View File

@ -0,0 +1,3 @@
sensio_framework_extra:
router:
annotations: false

View File

@ -15,24 +15,21 @@ Cards:
# - { title: 'Item Title', url: 'URL goes here'} # - { title: 'Item Title', url: 'URL goes here'}
General Safety: General Safety:
- { title: 'General Safety', url: '/Training/Safety/Topics/general'} - { title: 'General Safety', url: 'general'}
- { title: 'Bloodborne Pathogens', url: '/Training/Safety/Topics/bloodborne'} - { title: 'Bloodborne Pathogens', url: 'bloodborne'}
- { title: 'Safe Lifting (Video)', url: '/Training/Safety/Topics/safelifting'} - { title: 'Safe Lifting (Video)', url: 'safelifting'}
- { title: 'Hazard Communication (Video)', url: '/Training/Safety/Topics/hazardcommunication'} - { title: 'Hazard Communication (Video)', url: 'hazardcommunication'}
- { title: 'Electrical Safety', url: '/Training/Safety/Topics/electrical'} - { title: 'Electrical Safety', url: 'electrical'}
- { title: 'Hearing Protection (Video)', url: '/Training/Safety/Topics/hearing'} - { title: 'Hearing Protection (Video)', url: 'hearing'}
- { title: 'Fall Protection', url: '/Training/Safety/Topics/fall'} - { title: 'Fall Protection', url: 'fall'}
Workplace Hazards: Workplace Hazards:
- {title: 'Hand & Power Tools', url: '/Training/Safety/Topics/powertools'} - {title: 'Hand & Power Tools', url: 'powertools'}
- {title: 'Welding safety (Video)', url: '/Training/Safety/Topics/welding'} - {title: 'Welding safety (Video)', url: 'welding'}
- {title: 'Personal Protective Equipment (PPE)', url: '/Training/Safety/Topics/ppe'} - {title: 'Personal Protective Equipment (PPE)', url: 'ppe'}
- {title: 'Lockout Tagout (Video)', url: '/Training/Safety/Topics/tagout'} - {title: 'Lockout Tagout (Video)', url: 'tagout'}
- {title: 'Machine Guarding', url: '/Training/Safety/Topics/guarding'} - {title: 'Machine Guarding', url: 'guarding'}
- {title: 'Crane/Hoist (Video)', url: '/Training/Safety/Topics/crane'} - {title: 'Crane/Hoist (Video)', url: 'crane'}
Planning: Planning:
- {title: 'Emergency Action Plan', url: '/Training/Safety/Topics/actionplan'} - {title: 'Emergency Action Plan', url: 'actionplan'}
- {title: 'Fire Prevention', url: '/Training/Safety/Topics/fireprevention'} - {title: 'Fire Prevention', url: 'fireprevention'}
- {title: 'Fire Extinguisher Training', url: '/Training/Safety/Topics/extinguisher'} - {title: 'Fire Extinguisher Training', url: 'extinguisher'}
Forklift:
- {title: 'Account Creation', url: 'https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp'}
- {title: 'Training', url: 'https://www.sunbeltrentals.com/training/safety/'}

View File

@ -1,4 +1,13 @@
{ {
"doctrine/annotations": {
"version": "2.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.10",
"ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
}
},
"doctrine/doctrine-bundle": { "doctrine/doctrine-bundle": {
"version": "2.10", "version": "2.10",
"recipe": { "recipe": {
@ -40,6 +49,18 @@
"tests/bootstrap.php" "tests/bootstrap.php"
] ]
}, },
"sensio/framework-extra-bundle": {
"version": "6.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "5.2",
"ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
},
"files": [
"config/packages/sensio_framework_extra.yaml"
]
},
"symfony/console": { "symfony/console": {
"version": "6.3", "version": "6.3",
"recipe": { "recipe": {

View File

@ -30,18 +30,31 @@
<div class="card-text"> <div class="card-text">
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% for link in links %} {% for link in links %}
<a class="list-group-item list-group-item-action list-item {{ (link.disabled|default(false))? 'disabled' : ''}}" href="{{link.url}}">{{link.title}}</a> <a class="list-group-item list-group-item-action list-item {{ (link.disabled|default(false))? 'disabled' : ''}}" href="/Training/Safety/Topics/{{link.url}}">{{link.title}}</a>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div>
</div> </div>
{# Forklift Training #}
<div class="card-group">
<div class="card text-center service-card">
<div class="card-body">
<div class="card-header">
<h5 class="card-title">Forklift Training</h5>
</div>
<div class="card-text">
<ul class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-item" href="https://sunbeltrentals.csod.com/login/render.aspx?id=defaultclp">Account Creation</a>
<a class="list-group-item list-group-item-action list-item" href="https://www.sunbeltrentals.com/training/safety/">Training</a>
</ul>
</div>
</div>
</div>
</div>
</div>
</body> </body>
</html> </html>