Skip to content

Commit 4c4e87b

Browse files
tw2113dependabot[bot]
tw2113
and
dependabot[bot]
authored
Release 2.18.0 (#830)
* Bump flatted from 3.3.3 to 3.4.2 (#820) Bumps [flatted](https://github.com/WebReflection/flatted) from 3.3.3 to 3.4.2. - [Commits](WebReflection/flatted@v3.3.3...v3.4.2) --- updated-dependencies: - dependency-name: flatted dependency-version: 3.4.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump lodash-es from 4.17.23 to 4.18.1 (#826) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash-es dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-forge from 1.3.2 to 1.4.0 (#825) Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.2 to 1.4.0. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.2...v1.4.0) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump picomatch (#824) Bumps and [picomatch](https://github.com/micromatch/picomatch). These dependencies needed to be updated together. Updates `picomatch` from 2.3.1 to 2.3.2 - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) Updates `picomatch` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/micromatch/picomatch/releases) - [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md) - [Commits](micromatch/picomatch@2.3.1...2.3.2) --- updated-dependencies: - dependency-name: picomatch dependency-version: 2.3.2 dependency-type: indirect - dependency-name: picomatch dependency-version: 4.0.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump axios from 1.12.2 to 1.15.0 (#836) Bumps [axios](https://github.com/axios/axios) from 1.12.2 to 1.15.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.12.2...v1.15.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.15.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump basic-ftp from 5.2.0 to 5.2.2 (#835) Bumps [basic-ftp](https://github.com/patrickjuchli/basic-ftp) from 5.2.0 to 5.2.2. - [Release notes](https://github.com/patrickjuchli/basic-ftp/releases) - [Changelog](https://github.com/patrickjuchli/basic-ftp/blob/master/CHANGELOG.md) - [Commits](patrickjuchli/basic-ftp@v5.2.0...v5.2.2) --- updated-dependencies: - dependency-name: basic-ftp dependency-version: 5.2.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump lodash from 4.17.23 to 4.18.1 (#834) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Feature/con 516 block updates (#821) * update logo * handle upcoming deprecations * css touchups for block * save our logo source * from let to const * color retooling * add some keywords to our block.json * bump up the block version * bump to next intended release version * make sure we have array keys first (#823) * touch up button icon margins for incoming WP 7.0 (#829) * early return if we do not have a service. (#828) * Feature/con 519 api requests auditing (#831) * early return if no response body * capitalization touchup * Updated Connect Now UI (#827) * refreshed branch from main * re-add recent changes around local/dev installs and re-connecting * Feature/con 507 code review updates redo (#822) * re-merge API utility updates so far * handle api class and moved previous methods * move previously deprecated function to appropriate file * misc phpcs * re-merge method order reorganization * fix up changes from other merged PRs * update since tag * fill in since tags * version bumps * changelog * update changelog.md file * merge in joeyyax contributions * changelog touchup * move zip creation to after some final commands * accept that we will need to manually delete the composer files for sake of zip creation * run a composer update --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 4297842 commit 4c4e87b

26 files changed

Lines changed: 1707 additions & 1746 deletions

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
= 2.18.0 =
2+
3+
* Added: Revised refresh process to be more permissible of failures that are not expired refresh token related.
4+
* Updated: "Connect now" screen UI.
5+
* Updated: details and visuals for the embed block.
6+
* Updated: small visuals for WP 7.0.
7+
* Updated: Extra error handling from empty API responses.
8+
* Updated: internal code organization.
9+
* Fixed: errors when deleting a form.
10+
* Fixed: JS errors from CAPTCHA settings UI hiding, elsewhere in admin.
11+
12+
= 2.17.0 =
13+
14+
* Added: Hide UI of non-selected Captcha services until selected for usage.
15+
* Added: Details regarding list status in Constant Contact account, to our forms list.
16+
* Added: Email status or address destination column to Forms list table.
17+
* Added: Messaging regarding user accounts on connect screen if a non-production install.
18+
* Fixed: Issues around website field type not saving to custom field
19+
* Updated: Moved custom field cap to 50 to match allowed contact field limit.
20+
* Updated: Minor UI details around accessibility, wording, capitalization, visual spacing.
21+
122
= 2.16.0 =
223

324
* Added: Cloudflare Turnstile support

‎assets/images/form-example-connect.png‎

193 KB
Loading

‎assets/js/ctct-plugin-admin/builder.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ window.CTCTBuilder = {};
9696
* Handles the beforeunload callback and display.
9797
*
9898
* @param e beforeunload event.
99-
* @since NEXT
99+
* @since 2.8.0
100100
*/
101101
that.bindMessage = (e) => {
102102
e.preventDefault();

‎assets/js/ctct-plugin-admin/settings.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ window.ctctsettings = {};
3737
*/
3838
that.bindEvents = () => {
3939
const service = document.querySelector(that.cache.service);
40+
if (null === service) {
41+
return;
42+
}
4043
const recaptcha = document.querySelector(that.cache.recaptcha);
4144
const hcaptcha = document.querySelector(that.cache.hcaptcha);
4245
const turnstile = document.querySelector(that.cache.turnstile);

‎assets/sass/_admin-connect.scss‎

Lines changed: 107 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
text-align: left;
4242
}
4343

44-
&::before{
44+
&.connected::before {
4545
width: 46px;
4646
height: 46px;
4747
position: absolute;
@@ -205,14 +205,117 @@
205205
}
206206
}
207207
}
208-
.ctct-connection-notice {
209-
color: variables.$color-red;
208+
209+
.ctct-connection-notice {
210+
color: variables.$color-red;
210211
}
211212
}
212213

214+
.ctct-wrap {
215+
margin: 35px auto 0;
216+
padding: 35px 45px 0;
213217

214-
// Connection Details
218+
max-width: 850px;
219+
background-color: variables.$color-connect-background;
220+
border-radius: 12px;
221+
border: solid variables.$color-connect-border 1px;
222+
box-shadow: 0 0 2px variables.$color-connect-text;
223+
224+
.not-connected {
225+
box-sizing: border-box;
226+
227+
* {
228+
box-sizing: border-box;
229+
}
215230

231+
a {
232+
color: variables.$color-connect-button-primary;
233+
}
234+
235+
236+
color: variables.$color-connect-text;
237+
display: flex;
238+
flex-direction: column;
239+
justify-content: space-between;
240+
gap: 20px;
241+
242+
243+
@include mixins.wider-than('small') {
244+
flex-direction: row;
245+
}
246+
247+
h2 {
248+
color: variables.$color-connect-text;
249+
font-size: 1.8rem;
250+
line-height: 1.5;
251+
margin-top: 0;
252+
}
253+
254+
.ctct-logo {
255+
background: transparent url('../images/ctct_ripple.svg') no-repeat;
256+
background-size: 75%;
257+
height: 50px;
258+
width: 50px;
259+
}
260+
.ctct-cta-left,
261+
.ctct-cta-right {
262+
flex: 2 1;
263+
264+
.button.ctct-button {
265+
border-radius: 8px;
266+
color: variables.$color-connect-button-secondary;
267+
font-size: 16px;
268+
height: auto;
269+
line-height: 1;
270+
padding: 14px 30px;
271+
transition: all 0.15s ease;
272+
273+
&.button-blue {
274+
background-color: variables.$color-connect-button-primary;
275+
border: 1px solid color.adjust(variables.$color-connect-button-primary, $lightness: -10%);
276+
color: variables.$color-white;
277+
278+
&:hover,
279+
&:focus {
280+
color: variables.$color-white;
281+
background-color: color.adjust(variables.$color-connect-button-primary, $lightness: 10%);
282+
}
283+
}
284+
&.ctct-signup {
285+
background: transparent;
286+
border-color: variables.$color-connect-button-secondary;
287+
color: variables.$color-connect-button-secondary;
288+
}
289+
}
290+
}
291+
292+
.ctct-cta-left {
293+
flex: 2;
294+
.cta-buttons {
295+
display: flex;
296+
gap: 10px;
297+
flex-direction: column;
298+
text-align: center;
299+
@include mixins.wider-than('small') {
300+
flex-direction: row;
301+
}
302+
@include mixins.wider-than('small') {
303+
text-align: left;
304+
}
305+
}
306+
}
307+
308+
.ctct-cta-right {
309+
flex: 1;
310+
}
311+
}
312+
313+
.ctct-connection-notice {
314+
color: variables.$color-red;
315+
}
316+
}
317+
318+
// Connection Details
216319
.ctct-connected-wrap{
217320

218321
.ctct-connection-details{
@@ -287,27 +390,6 @@
287390
}
288391
}
289392

290-
291-
// Connect to GA
292-
293-
.ctct-connected-opt-in{
294-
display: none;
295-
width: 100%;
296-
text-align: left;
297-
298-
.ctct-connect-ga-optin{
299-
display: flex;
300-
flex-wrap: nowrap;
301-
padding: 15px 0 0;
302-
303-
.button{
304-
text-align: center;
305-
margin: 0 10px 0 0;
306-
width: auto;
307-
}
308-
}
309-
}
310-
311393
.ctct-error {
312394
background: none !important;
313395
border: 1px solid variables.$color-red;

‎assets/sass/_admin-forms.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,11 @@ body.post-type-ctct_forms #titlediv #title {
300300
}
301301
}
302302
}
303+
304+
305+
[class*="version-7"] {
306+
.cmb-repeatable-group .cmb-shift-rows .dashicons-arrow-down-alt2,
307+
.cmb-repeatable-group .cmb-shift-rows .dashicons-arrow-up-alt2 {
308+
margin-top: .4em;
309+
}
310+
}

‎assets/sass/_variables.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ $color-modal-text: #555;
4040
$color-light-silver: #747e88;
4141
$color-med-gray: #999;
4242

43+
// connect page
44+
$color-connect-border: #DCE2EC;
45+
$color-connect-background: #f7f9fd;
46+
$color-connect-text: #3F4B63;
47+
$color-connect-button-primary: #186DED;
48+
$color-connect-button-secondary: #8D9BB6;
49+
4350
// box model
4451
$padding: 1em;
4552
$radius: 4px;

0 commit comments

Comments
 (0)