From a314aef11c8da4115722842a2f88493ed60207bf Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:40:11 -0400 Subject: [PATCH 1/7] updated - workflow to be on --- .../workflows/{stage.disabled => stage.yml} | 0 config.codekit3 | 26 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) rename .github/workflows/{stage.disabled => stage.yml} (100%) diff --git a/.github/workflows/stage.disabled b/.github/workflows/stage.yml similarity index 100% rename from .github/workflows/stage.disabled rename to .github/workflows/stage.yml diff --git a/config.codekit3 b/config.codekit3 index fc92638..acc9dca 100644 --- a/config.codekit3 +++ b/config.codekit3 @@ -92,19 +92,19 @@ "oAP" : "\/.github\/workflows\/security.yml", "oF" : 0 }, - "\/.github\/workflows\/stage.disabled" : { + "\/.github\/workflows\/stage.yml" : { "cB" : 0, "ft" : 8192, "hM" : 0, "oA" : 0, - "oAP" : "\/.github\/workflows\/stage.disabled", + "oAP" : "\/.github\/workflows\/stage.yml", "oF" : 0 }, "\/.gitignore" : { "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/.gitignore", "oF" : 0 }, @@ -125,13 +125,13 @@ "oF" : 0 }, "\/assets\/css\/editor-layout.css" : { - "aP" : 0, + "aP" : 1, "bl" : 0, "ci" : 0, "co" : 0, "ft" : 16, "ma" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/assets\/css\/editor-layout-min.css", "oF" : 0, "pg" : 0 @@ -165,13 +165,13 @@ "oF" : 0 }, "\/assets\/css\/main.css" : { - "aP" : 0, + "aP" : 1, "bl" : 0, "ci" : 0, "co" : 0, "ft" : 16, "ma" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/assets\/css\/main-min.css", "oF" : 0, "pg" : 0 @@ -3643,7 +3643,7 @@ "oF" : 0, "oS" : 0, "pg" : 0, - "sct" : 1 + "sct" : 0 }, "\/assets\/scss\/partials\/_site-footer.scss" : { "aP" : 0, @@ -3806,7 +3806,7 @@ "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/inc\/layouts.php", "oF" : 0 }, @@ -3822,7 +3822,7 @@ "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/inc\/loop.php", "oF" : 0 }, @@ -3854,7 +3854,7 @@ "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/inc\/shared-counts.php", "oF" : 0 }, @@ -3870,7 +3870,7 @@ "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/inc\/template-tags.php", "oF" : 0 }, @@ -4043,7 +4043,7 @@ "cB" : 0, "ft" : 8192, "hM" : 0, - "oA" : 2, + "oA" : 0, "oAP" : "\/single.php", "oF" : 0 }, From f2b62430f2b8d2c0c75ec147ec55e8f461f3847b Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:44:21 -0400 Subject: [PATCH 2/7] added - debug --- .../blocks/calculator-signup-block/calculator-signup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/template-parts/blocks/calculator-signup-block/calculator-signup.php b/template-parts/blocks/calculator-signup-block/calculator-signup.php index d503016..6c396b3 100644 --- a/template-parts/blocks/calculator-signup-block/calculator-signup.php +++ b/template-parts/blocks/calculator-signup-block/calculator-signup.php @@ -55,6 +55,7 @@

Date: Thu, 6 Jun 2024 13:47:50 -0400 Subject: [PATCH 3/7] fixed - misnamed vars --- .../blocks/calculator-signup-block/calculator-signup.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/template-parts/blocks/calculator-signup-block/calculator-signup.php b/template-parts/blocks/calculator-signup-block/calculator-signup.php index 6c396b3..5993c03 100644 --- a/template-parts/blocks/calculator-signup-block/calculator-signup.php +++ b/template-parts/blocks/calculator-signup-block/calculator-signup.php @@ -55,10 +55,9 @@

'; echo ''; From c588f0c01af1113e0bde38933f2e840fed9d907f Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:51:32 -0400 Subject: [PATCH 4/7] updated - block link var --- .../blocks/calculator-signup-block/calculator-signup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-parts/blocks/calculator-signup-block/calculator-signup.php b/template-parts/blocks/calculator-signup-block/calculator-signup.php index 5993c03..653cfc0 100644 --- a/template-parts/blocks/calculator-signup-block/calculator-signup.php +++ b/template-parts/blocks/calculator-signup-block/calculator-signup.php @@ -58,7 +58,7 @@ if ( ! empty( $block_link ) ) { $url = $block_link['url']; $calculator_title = $block_link['title']; - if ( $link['url'] ) { + if ( $url ) { echo ''; echo ''; echo esc_html( $calculator_title ); From 13bd681e34cf6b3c6aabee14a7901eb6d15e7ecb Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:52:34 -0400 Subject: [PATCH 5/7] upated - master deploy to be active --- .github/workflows/master.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/master.yml diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml new file mode 100644 index 0000000..1688748 --- /dev/null +++ b/.github/workflows/master.yml @@ -0,0 +1,25 @@ +name: Deploy Files via FTP (Production) + +on: + pull_request: + branches: + - master + types: [closed] + +jobs: + ftp-deploy: + name: "Deploy via FTP" + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true + steps: + - name: "Checkout" + uses: actions/checkout@v3 + + - name: "FTP Deploy" + uses: SamKirkland/FTP-Deploy-Action@v4.3.4 + with: + server: "198.175.25.37" + username: "studentloanplannercom" + password: ${{ secrets.FTP_PASSWORD_PRD }} + local-dir: "./" # Set to the local directory you want to deploy + server-dir: "/public/wp-content/themes/student-loan-planner-theme/" # Update with your server path From bff1a6c9f1979211e9b27914c5f81ca664b074db Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:52:47 -0400 Subject: [PATCH 6/7] build --- config.codekit3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.codekit3 b/config.codekit3 index acc9dca..15719b9 100644 --- a/config.codekit3 +++ b/config.codekit3 @@ -76,12 +76,12 @@ "oAP" : "\/.github\/workflows\/lint-php.yml", "oF" : 0 }, - "\/.github\/workflows\/master.disabled" : { + "\/.github\/workflows\/master.yml" : { "cB" : 0, "ft" : 8192, "hM" : 0, "oA" : 0, - "oAP" : "\/.github\/workflows\/master.disabled", + "oAP" : "\/.github\/workflows\/master.yml", "oF" : 0 }, "\/.github\/workflows\/security.yml" : { From 5d5e6c543f3bf0793bce3f54ab82b0ac7530c94f Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Thu, 6 Jun 2024 13:53:03 -0400 Subject: [PATCH 7/7] renamed - deploy --- .github/workflows/master.disabled | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/master.disabled diff --git a/.github/workflows/master.disabled b/.github/workflows/master.disabled deleted file mode 100644 index 1688748..0000000 --- a/.github/workflows/master.disabled +++ /dev/null @@ -1,25 +0,0 @@ -name: Deploy Files via FTP (Production) - -on: - pull_request: - branches: - - master - types: [closed] - -jobs: - ftp-deploy: - name: "Deploy via FTP" - runs-on: ubuntu-latest - if: github.event.pull_request.merged == true - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - - name: "FTP Deploy" - uses: SamKirkland/FTP-Deploy-Action@v4.3.4 - with: - server: "198.175.25.37" - username: "studentloanplannercom" - password: ${{ secrets.FTP_PASSWORD_PRD }} - local-dir: "./" # Set to the local directory you want to deploy - server-dir: "/public/wp-content/themes/student-loan-planner-theme/" # Update with your server path