Compare commits

..

61 Commits

Author SHA1 Message Date
1780bfaee6
supress confirmation prompts
All checks were successful
Intranet Deployment / Deploy Project files (push) Successful in 2m0s
2024-08-14 12:31:59 -05:00
ee91fa9954
correct vars context
Some checks failed
Intranet Deployment / Deploy Project files (push) Failing after 52s
2024-08-14 12:22:14 -05:00
69a42df8c6
echo deploy dir
Some checks failed
Intranet Deployment / Deploy Project files (push) Has been cancelled
2024-08-14 12:21:24 -05:00
c2c82a1191
formatting change
All checks were successful
Intranet Deployment / Deploy Project files (push) Successful in 1m3s
2024-08-14 12:14:51 -05:00
5124b6139b
flow test
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 52s
2024-08-14 12:08:22 -05:00
aee592e023
copy command restruct
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 53s
2024-08-14 10:59:09 -05:00
32307aa504
rename deploy flow
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 48s
2024-08-14 10:45:52 -05:00
063e8fc113
remove faulty mkdir call 2024-08-14 10:43:55 -05:00
7493e43424 add deploy runner status badge
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 50s
2024-08-14 15:31:50 +00:00
326c7fe1aa Merge pull request 'Implement Article navbutton fix' (#2) from navbar-fix into master
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 51s
Reviewed-on: #2
2024-08-14 15:20:29 +00:00
031367fb2c
resolve merge issue 2024-08-14 10:06:24 -05:00
168dee0259
remove redundant cache refresh 2024-08-14 10:05:58 -05:00
9951d2ee77
require symfony runtime 2024-08-14 10:05:19 -05:00
d172aec5e0
remove redundant cache refresh
All checks were successful
Gitea Actions Demo / Deploy Project files (push) Successful in 47s
2024-08-14 10:03:13 -05:00
a301f19bf8
require symfony runtime 2024-08-14 10:02:49 -05:00
5ee2f09bac
Revert "set composer work dir"
This reverts commit 98af5499db2772106f73fba36d7aaa0d4319ce47.
2024-08-14 10:01:28 -05:00
fa2fe652a8
set composer work dir
Some checks failed
Gitea Actions Demo / Deploy Project files (push) Failing after 52s
2024-08-14 10:00:43 -05:00
98af5499db
set composer work dir 2024-08-14 09:59:59 -05:00
d7ad9f88b7
correct var access context 2024-08-14 09:50:49 -05:00
d9398b994c
completed deployment workflow 2024-08-14 09:50:49 -05:00
478fa849d0
gitea issues plugin config 2024-08-14 09:50:48 -05:00
7698f94869
host key officially good 2024-08-14 09:50:48 -05:00
ae4451fbb0
nothing new 2024-08-14 09:50:48 -05:00
8b73484275
another host attempt 2024-08-14 09:50:48 -05:00
139e370e24
correct public host key 2024-08-14 09:50:48 -05:00
01f150b1ce
add gitea public key to known hosts 2024-08-14 09:50:48 -05:00
Audrey Jensen
44cde46169
disable strict checking 2024-08-14 09:50:48 -05:00
Audrey Jensen
4027a396fe
set correct known hosts 2024-08-14 09:50:47 -05:00
Audrey Jensen
821a161a3a
set known hosts 2024-08-14 09:50:47 -05:00
Audrey Jensen
08e7593f5d
no strict ssh host 2024-08-14 09:50:47 -05:00
Audrey Jensen
6647ec36aa
read deploy key 2024-08-14 09:50:47 -05:00
Audrey Jensen
6fe415f6cf
fix trigger 2024-08-14 09:50:47 -05:00
Audrey Jensen
3b98d508e7
remove demo 2024-08-14 09:50:47 -05:00
Audrey Jensen
5d69219d71
testing repo pull 2024-08-14 09:50:46 -05:00
Audrey Jensen
1ffe8975b1
fix label 2024-08-14 09:50:46 -05:00
Audrey Jensen
c6ddddc0e1
demo runner 2024-08-14 09:50:46 -05:00
afaefb7978
correct var access context
Some checks failed
Gitea Actions Demo / Deploy Project files (push) Failing after 7m33s
2024-08-14 09:43:47 -05:00
f859b7bfd4
completed deployment workflow
Some checks failed
Gitea Actions Demo / Deploy Project files (push) Failing after 56s
2024-08-14 09:38:03 -05:00
3195e8e00e
gitea issues plugin config 2024-08-14 09:37:58 -05:00
85ad3fc91f
host key officially good 2024-08-14 08:48:35 -05:00
044e1077da
nothing new
All checks were successful
Gitea Actions Demo / Deploy (push) Successful in 1m8s
2024-08-14 08:41:47 -05:00
2dc2bf95dd
another host attempt
Some checks are pending
Gitea Actions Demo / Deploy (push) Waiting to run
2024-08-14 08:38:27 -05:00
f04dae3da0
correct public host key
Some checks failed
Gitea Actions Demo / Deploy (push) Has been cancelled
2024-08-14 08:22:12 -05:00
1357d3c211
add gitea public key to known hosts
Some checks failed
Gitea Actions Demo / Deploy (push) Has been cancelled
2024-08-14 08:17:00 -05:00
Audrey Jensen
90f5d20100
disable strict checking
Some checks failed
Gitea Actions Demo / Deploy (push) Has been cancelled
2024-08-13 15:53:57 -05:00
Audrey Jensen
ba7fc83cef
set correct known hosts
Some checks failed
Gitea Actions Demo / Deploy (push) Failing after 54s
2024-08-13 15:52:32 -05:00
Audrey Jensen
5ac9649ef8
set known hosts 2024-08-13 15:51:05 -05:00
Audrey Jensen
97afd7358b
no strict ssh host
All checks were successful
Gitea Actions Demo / Deploy (push) Successful in 58s
2024-08-13 15:34:39 -05:00
Audrey Jensen
576ccdd9eb
read deploy key
Some checks failed
Gitea Actions Demo / Deploy (push) Has been cancelled
2024-08-13 15:33:06 -05:00
Audrey Jensen
e6c34925ef
fix trigger
Some checks failed
Gitea Actions Demo / Deploy (push) Failing after 59s
2024-08-13 15:13:39 -05:00
Audrey Jensen
5af977dd31
remove demo 2024-08-13 15:12:29 -05:00
Audrey Jensen
ae7adb2d91
testing repo pull
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2024-08-13 15:10:42 -05:00
Audrey Jensen
e86ff3ebdc
fix label
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 46s
2024-08-13 14:56:56 -05:00
Audrey Jensen
f81bb0e88e
demo runner
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2024-08-13 14:55:54 -05:00
Audrey Jensen
4b77e11308
hardcode forklift links into template 2024-08-13 14:08:28 -05:00
Audrey Jensen
a8d9e372a3
Revert "add external link support and add forklift links"
This reverts commit 4a5d3060aafb814a12f961a8bde6a42eea07d37b.
2024-08-13 14:04:07 -05:00
Audrey Jensen
ec836a8669
Revert "allow external links"
This reverts commit f05b29675d17479a706ef6129fe45ddddb84b669.
2024-08-13 14:03:13 -05:00
4a5d3060aa add external link support and add forklift links 2024-08-12 19:04:17 +00:00
f05b29675d allow external links 2024-08-12 19:03:21 +00:00
bbbc9e1e1b Chainge complaint to comment 2023-10-24 11:23:44 -05:00
50f03619d1
change complaint to comment 2023-10-19 15:45:17 +00:00
10 changed files with 237 additions and 16 deletions

View File

@ -0,0 +1,23 @@
name: Intranet Deployment
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: xcopy /E /I /Y /V . ${{ vars.PROD_DEPLOY_DIR }}
- name: Update Composer Packages
working-directory: ${{ vars.PROD_DEPLOY_DIR }}
run: composer update --no-interaction --working-dir=${{ vars.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"
}

View File

@ -1,3 +1,5 @@
![Deployed](https://gitea.jv.com/audrey/intranet/actions/workflows/deploy.yaml/badge.svg)
[Install](#install) [Install](#install)
[Configuring IIS](#iis-configuration) [Configuring IIS](#iis-configuration)
[Updating](#updating) [Updating](#updating)

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

@ -1,4 +1,3 @@
Safety Quiz Link: "https://forms.office.com/Pages/ResponsePage.aspx?id=dzi_grwqEkSuyimF-ZKjL544Tiy3xXxPrjITk-mmulFUMUVBMkk3SjY3U1NYUU5XWlFQNjBVQzNaTy4u"
Cards: Cards:
# To add a new card: # To add a new card:
# Create a new object with single indent (2 spaces). The text written here will be the title of the card. # Create a new object with single indent (2 spaces). The text written here will be the title of the card.

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

@ -15,7 +15,7 @@
</p> </p>
</div> </div>
</div> </div>
<a class="col-12 btn btn-danger my-2" href="{{ attribute(content, 'Safety Quiz Link') }}"> <a class="col-12 btn btn-danger my-2" href="/training/safety/quiz">
<h4>Take the Workplace Safety Quiz</h4> <h4>Take the Workplace Safety Quiz</h4>
</a> </a>
{# Cards #} {# Cards #}
@ -37,11 +37,24 @@
</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>

View File

@ -6,12 +6,12 @@
<body> <body>
{{ include('_navbar.html.twig')}} {{ include('_navbar.html.twig')}}
<div class="container"> <div class="container">
<h2>Anonymous Complaint Page <h2>Anonymous Comment Page
<h4 class="text-bold">Instructions</h4> <h4 class="text-bold">Instructions</h4>
<p>Type your complaint or problem into the message box below and click "Submit". <p>Type your complaint or problem into the message box below and click "Submit".
<br>Messages will be sent directly to {{ complaintReceiverName }}'s email account. <br>Messages will be sent directly to {{ complaintReceiverName }}'s email account.
<br>Messages will be completely anonymous so complaints cannot be traced to a specific person. <br>Messages will be completely anonymous so comments cannot be traced to a specific person.
<br> Feel free to submit any problem or concern. <br> Feel free to submit any problem or concern.
<br><strong>Note: If you add personally identifying information (such as your name) then this won't be anonymous. Avoid this, unless you want your identity to be known</strong> <br><strong>Note: If you add personally identifying information (such as your name) then this won't be anonymous. Avoid this, unless you want your identity to be known</strong>
</p> </p>