Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- Renamed renderView() to view to be ColdBox 7 compliant now. #52

Merged
merged 4 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"ColdBox Security",
"version":"3.4.2",
"version":"3.4.3",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/[email protected]@.zip",
"author":"Ortus Solutions.com <[email protected]>",
"slug":"cbsecurity",
Expand Down Expand Up @@ -52,15 +52,15 @@
"start:lucee":"server start [email protected]",
"start:2018":"server start [email protected]",
"start:2021":"server start [email protected]",
"start:2023":"server start [email protected]",
"start:2023":"server start [email protected]",
"stop:lucee":"server stop [email protected]",
"stop:2018":"server stop [email protected]",
"stop:2021":"server stop [email protected]",
"stop:2023":"server stop [email protected]",
"stop:2023":"server stop [email protected]",
"logs:lucee":"server log [email protected] --follow",
"logs:2018":"server log [email protected] --follow",
"logs:2021":"server log [email protected] --follow",
"logs:2023":"server log [email protected] --follow"
"logs:2023":"server log [email protected] --follow"
},
"installPaths":{
"jwt-cfml":"modules/jwtcfml/",
Expand Down
4 changes: 3 additions & 1 deletion build/Build.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ component {
variables.cwd = getCWD().reReplace( "\.$", "" );
variables.artifactsDir = cwd & "/.artifacts";
variables.buildDir = cwd & "/.tmp";
variables.apidDocsDir = variables.buildDir & "/apidocs";
variables.apiDocsURL = "http://localhost:60299/apidocs/";
variables.testRunner = "http://localhost:60299/tests/runner.cfm";

Expand All @@ -31,7 +32,8 @@ component {
// Cleanup + Init Build Directories
[
variables.buildDir,
variables.artifactsDir
variables.artifactsDir,
variables.apidDocsDir
].each( function( item ){
if ( directoryExists( item ) ) {
directoryDelete( item, true );
Expand Down
12 changes: 11 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Renamed `renderView()` to `view` to be ColdBox 7 compliant now.

## [3.4.2] - 2024-01-10

## [3.4.1] - 2023-08-09

### Fixed

- Markdown rules updated to fix duplicate headers
- Updated security logs columns to work in Oracle as `clob`
- `cbsecurity_logs` is hard coded instead of using module setting
Expand Down Expand Up @@ -371,7 +379,9 @@ settings = {

- Created first module version

[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.1...HEAD
[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.2...HEAD

[3.4.2]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.1...v3.4.2

[3.4.1]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.0...v3.4.1

Expand Down
2 changes: 1 addition & 1 deletion layouts/Main.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</nav>

<div class="container-fluid m-2 mt-4 mb-5">
#renderView()#
#view()#
</div>

<!--- Scripts --->
Expand Down
2 changes: 1 addition & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name":"cbsecurity-adobe@2023",
"app":{
"serverHomeDirectory":".engine/adobe2023",
"cfengine":"adobe@2023.0.0-beta.1"
"cfengine":"adobe@2023"
},
"web":{
"http":{
Expand Down
4 changes: 2 additions & 2 deletions test-harness/layouts/Main.cfm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>
<h1>Module Tester</h1>
<div>
#renderView()#
#view()#
</div>
</cfoutput>
</cfoutput>
16 changes: 8 additions & 8 deletions views/home/index.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -137,49 +137,49 @@

<div class="tab-content w-100 ms-5 me-2">
<div class="tab-pane fade show active" id="activity-pane" role="tabpanel" aria-labelledby="activity-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/activity",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="authentication-pane" role="tabpanel" aria-labelledby="authentication-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/authentication",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="basicAuth-pane" role="tabpanel" aria-labelledby="basicAuth-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/basicAuth",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="csrf-pane" role="tabpanel" aria-labelledby="csrf-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/csrf",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="firewall-pane" role="tabpanel" aria-labelledby="firewall-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/firewall",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="rules-pane" role="tabpanel" aria-labelledby="rules-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/rules",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="jwt-pane" role="tabpanel" aria-labelledby="jwt-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/jwt",
module = "cbsecurity"
)#
</div>
<div class="tab-pane fade show" id="security-headers-pane" role="tabpanel" aria-labelledby="security-headers-tab" tabindex="0">
#renderView(
#view(
view = "home/tabs/security-headers",
module = "cbsecurity"
)#
Expand Down
Loading