Skip to content

Commit 14c6456

Browse files
kushthedudekushthedude
authored
Merge branch 'development' into drop
2 parents d1024ee + f5b35e6 commit 14c6456

File tree

17 files changed

+153
-73
lines changed

17 files changed

+153
-73
lines changed

‎app/components/forms/admin/settings/system-form.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,26 @@ export default Component.extend(FormMixin, {
9999
]
100100
},
101101

102+
googlereCAPTCHAsitekey: {
103+
identifier : 'google_recaptcha_sitekey',
104+
rules : [
105+
{
106+
type : 'empty',
107+
prompt : this.l10n.t('Please enter the reCAPTCHA site key')
108+
}
109+
]
110+
},
111+
112+
googlereCAPTCHAsecretkey: {
113+
identifier : 'google_recaptcha_secretkey',
114+
rules : [
115+
{
116+
type : 'empty',
117+
prompt : this.l10n.t('Please enter the reCAPTCHA secret key')
118+
}
119+
]
120+
},
121+
102122
emailFrom: {
103123
identifier : 'email_from',
104124
rules : [

‎app/components/forms/admin/settings/system/captcha-form.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Component from '@ember/component';
2+
3+
export default Component.extend({
4+
});

‎app/models/custom-form.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import ModelBase from 'open-event-frontend/models/base';
44
import { belongsTo } from 'ember-data/relationships';
55

66
export default ModelBase.extend({
7+
78
fieldIdentifier : attr('string'),
89
form : attr('string'),
910
type : attr('string', { defaultValue: 'text' }),
@@ -86,6 +87,7 @@ export default ModelBase.extend({
8687
} else {
8788
name = this.get(`attendee.${name}`);
8889
}
90+
8991
return name;
9092
}),
9193

‎app/models/setting.js‎

Lines changed: 64 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,70 @@ export default ModelBase.extend({
88
* Attributes
99
*/
1010

11-
appEnvironment : attr('string'),
12-
appName : attr('string'),
13-
tagline : attr('string'),
14-
secret : attr('string'),
15-
storagePlace : attr('string'),
16-
awsKey : attr('string'),
17-
awsSecret : attr('string'),
18-
awsBucketName : attr('string'),
19-
awsRegion : attr('string'),
20-
gsKey : attr('string'),
21-
gsSecret : attr('string'),
22-
gsBucketName : attr('string'),
23-
googleClientId : attr('string'),
24-
googleClientSecret : attr('string'),
25-
fbClientId : attr('string'),
26-
fbClientSecret : attr('string'),
27-
twConsumerKey : attr('string'),
28-
twConsumerSecret : attr('string'),
29-
inClientId : attr('string'),
30-
inClientSecret : attr('string'),
31-
paypalMode : attr('string'),
32-
paypalClient : attr('string'),
33-
paypalSecret : attr('string'),
34-
paypalSandboxClient : attr('string'),
35-
paypalSandboxSecret : attr('string'),
36-
alipaySecretKey : attr('string'),
37-
alipayPublishableKey : attr('string'),
38-
omiseMode : attr('string'),
39-
omiseTestPublic : attr('string'),
40-
omiseTestSecret : attr('string'),
41-
omiseLivePublic : attr('string'),
42-
omiseLiveSecret : attr('string'),
43-
stripeClientId : attr('string'),
44-
stripeSecretKey : attr('string'),
45-
stripePublishableKey : attr('string'),
46-
isPaypalActivated : attr('boolean'),
47-
isStripeActivated : attr('boolean'),
48-
isAliPayActivated : attr('boolean'),
49-
isOmiseActivated : attr('boolean'),
50-
emailService : attr('string'),
51-
emailFrom : attr('string'),
52-
emailFromName : attr('string'),
53-
sendgridKey : attr('string'),
54-
smtpHost : attr('string'),
55-
smtpUsername : attr('string'),
56-
smtpPassword : attr('string'),
57-
smtpPort : attr('string'),
58-
smtpEncryption : attr('string'),
59-
analyticsKey : attr('string'),
60-
googleUrl : attr('string'),
61-
githubUrl : attr('string'),
62-
twitterUrl : attr('string'),
63-
supportUrl : attr('string'),
64-
facebookUrl : attr('string'),
65-
youtubeUrl : attr('string'),
66-
androidAppUrl : attr('string'),
67-
frontendUrl : attr('string'),
68-
webAppUrl : attr('string'),
69-
staticDomain : attr('string'),
70-
cookiePolicy : attr('string'),
71-
cookiePolicyLink : attr('string'),
11+
appEnvironment : attr('string'),
12+
appName : attr('string'),
13+
tagline : attr('string'),
14+
secret : attr('string'),
15+
storagePlace : attr('string'),
16+
awsKey : attr('string'),
17+
awsSecret : attr('string'),
18+
awsBucketName : attr('string'),
19+
awsRegion : attr('string'),
20+
gsKey : attr('string'),
21+
gsSecret : attr('string'),
22+
gsBucketName : attr('string'),
23+
isGoogleRecaptchaEnabled : attr('boolean', { defaultValue: false }),
24+
googleRecaptchaSitekey : attr('string'),
25+
googleRecaptchaSecretkey : attr('string'),
26+
googleClientId : attr('string'),
27+
googleClientSecret : attr('string'),
28+
fbClientId : attr('string'),
29+
fbClientSecret : attr('string'),
30+
twConsumerKey : attr('string'),
31+
twConsumerSecret : attr('string'),
32+
inClientId : attr('string'),
33+
inClientSecret : attr('string'),
34+
paypalMode : attr('string'),
35+
paypalClient : attr('string'),
36+
paypalSecret : attr('string'),
37+
paypalSandboxClient : attr('string'),
38+
paypalSandboxSecret : attr('string'),
39+
alipaySecretKey : attr('string'),
40+
alipayPublishableKey : attr('string'),
41+
omiseMode : attr('string'),
42+
omiseTestPublic : attr('string'),
43+
omiseTestSecret : attr('string'),
44+
omiseLivePublic : attr('string'),
45+
omiseLiveSecret : attr('string'),
46+
stripeClientId : attr('string'),
47+
stripeSecretKey : attr('string'),
48+
stripePublishableKey : attr('string'),
49+
isPaypalActivated : attr('boolean'),
50+
isStripeActivated : attr('boolean'),
51+
isAliPayActivated : attr('boolean'),
52+
isOmiseActivated : attr('boolean'),
53+
emailService : attr('string'),
54+
emailFrom : attr('string'),
55+
emailFromName : attr('string'),
56+
sendgridKey : attr('string'),
57+
smtpHost : attr('string'),
58+
smtpUsername : attr('string'),
59+
smtpPassword : attr('string'),
60+
smtpPort : attr('string'),
61+
smtpEncryption : attr('string'),
62+
analyticsKey : attr('string'),
63+
googleUrl : attr('string'),
64+
githubUrl : attr('string'),
65+
twitterUrl : attr('string'),
66+
supportUrl : attr('string'),
67+
facebookUrl : attr('string'),
68+
youtubeUrl : attr('string'),
69+
androidAppUrl : attr('string'),
70+
frontendUrl : attr('string'),
71+
webAppUrl : attr('string'),
72+
staticDomain : attr('string'),
73+
cookiePolicy : attr('string'),
74+
cookiePolicyLink : attr('string'),
7275

7376
/**
7477
* Computed properties

‎app/templates/components/forms/admin/settings/system-form.hbs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
{{input type='text' name='tag_line' value=settings.tagline}}
3434
</div>
3535
<div class="ui hidden divider"></div>
36-
3736
{{forms/admin/settings/system/social-media-token settings=settings}}
38-
39-
37+
<div class="ui hidden divider"></div>
38+
{{forms/admin/settings/system/captcha-form settings=settings}}
4039
<div class="ui hidden divider"></div>
4140
{{forms/admin/settings/system/storage-option settings=settings}}
4241
<div class="ui hidden divider"></div>

‎app/templates/components/forms/admin/settings/system/captcha-form.hbs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<h3 class="ui header">
2+
{{t 'Captcha Options'}}
3+
<div class="sub header">
4+
{{t 'Captcha settings for sensitive actions in app.'}}
5+
</div>
6+
</h3>
7+
<div class="inline field">
8+
<label>
9+
{{t 'Enable Google reCAPTCHA'}}
10+
</label>
11+
{{ui-checkbox class='toggle' checked=settings.isGoogleRecaptchaEnabled onChange=(action (mut settings.isGoogleRecaptchaEnabled))}}
12+
</div>
13+
{{#if settings.isGoogleRecaptchaEnabled}}
14+
<h3 class="ui header">
15+
{{t 'Google reCaptcha'}}
16+
<div class="sub header">
17+
{{t 'See'}}
18+
<a href="https://www.google.com/recaptcha/intro/v3.html" target="_blank" rel="noopener nofollow">
19+
{{t 'here'}}
20+
</a>
21+
{{t 'on how to obtain these keys.'}}
22+
</div>
23+
</h3>
24+
<div class="field">
25+
<label>
26+
{{t 'Google reCAPTCHA Site Key'}}
27+
</label>
28+
{{input type='text' name='google_recaptcha_sitekey' value=settings.googleRecaptchaSitekey}}
29+
</div>
30+
<div class="field">
31+
<label>
32+
{{t 'Google reCAPTCHA Secret Key'}}
33+
</label>
34+
{{input type='text' name='google_recaptcha_secretkey' value=settings.googleRecaptchaSecretkey}}
35+
</div>
36+
{{/if}}

‎app/templates/components/public/session-item.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<div class="content">
4545
{{#each session.speakers as |speaker|}}
4646
<div class="ui divider"></div>
47-
<img alt="speaker" class="ui tiny avatar image" src="{{if speaker.photo.iconImageUrl speaker.photo.iconImageUrl '/images/placeholders/avatar.png'}}">
47+
<img alt="speaker" class="ui tiny avatar image" src="{{if speaker.iconImageUrl speaker.iconImageUrl (if speaker.photoUrl speaker.photoUrl '/images/placeholders/avatar.png')}}">
4848
<p>
4949
<br>
5050
{{speaker.name}}

‎app/utils/dictionary/licenses.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ export const licenses = [
33
name : 'Attribution-NonCommercial-NoDerivs',
44
link : 'https://creativecommons.org/licenses/by-nc-nd/4.0',
55
imageSrc : '/images/copyright/attribution-nc-nd.png',
6-
logoUrl : 'https://licensebuttons.net/l/by-nc-nd/4.0/80x15.png'
6+
logoUrl : '/images/copyright/attribution-nc-nd-logo.png'
77
},
88
{
99
name : 'Attribution-NonCommercial',
1010
link : 'https://creativecommons.org/licenses/by-nc/4.0',
1111
imageSrc : '/images/copyright/attribution-nc.png',
12-
logoUrl : 'https://licensebuttons.net/l/by-nc/4.0/80x15.png'
12+
logoUrl : '/images/copyright/attribution-nc-logo.png'
1313
},
1414
{
1515
name : 'Public Domain Dedication (CC0)',
1616
link : 'https://creativecommons.org/publicdomain/zero/1.0/',
1717
imageSrc : '/images/copyright/pdd.png',
18-
logoUrl : 'https://licensebuttons.net/p/zero/1.0/80x15.png'
18+
logoUrl : '/images/copyright/pdd-logo.png'
1919
},
2020
{
2121
name : 'Attribution',
2222
link : 'https://creativecommons.org/licenses/by/4.0',
2323
imageSrc : '/images/copyright/attribution.png',
24-
logoUrl : 'https://licensebuttons.net/l/by/4.0/80x15.png'
24+
logoUrl : '/images/copyright/attribution-logo.png'
2525
},
2626
{
2727
name : 'All rights reserved',
@@ -33,24 +33,24 @@ export const licenses = [
3333
name : 'Attribution-NoDerivs',
3434
link : 'https://creativecommons.org/licenses/by-nd/4.0',
3535
imageSrc : '/images/copyright/attribution-nd.png',
36-
logoUrl : 'https://licensebuttons.net/l/by-nd/4.0/80x15.png'
36+
logoUrl : '/images/copyright/attribution-nd-logo.png'
3737
},
3838
{
3939
name : 'Public Domain Work',
4040
link : 'https://creativecommons.org/publicdomain/mark/1.0/',
4141
imageSrc : '/imagescopyright/pdw.png',
42-
logoUrl : 'https://licensebuttons.net/p/mark/1.0/80x15.png'
42+
logoUrl : '/images/copyright/pdw-logo.png'
4343
},
4444
{
4545
name : 'Attribution-NonCommercial-ShareAlike',
4646
link : 'https://creativecommons.org/licenses/by-nc-sa/4.0',
4747
imageSrc : '/imagescopyright/attribution-nc-sa.png',
48-
logoUrl : 'https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png'
48+
logoUrl : '/images/copyright/attribution-nc-sa.png'
4949
},
5050
{
5151
name : 'Attribution-ShareAlike',
5252
link : 'https://creativecommons.org/licenses/by-sa/4.0',
5353
imageSrc : '/imagescopyright/attribution-sa.png',
54-
logoUrl : 'https://licensebuttons.net/l/by-sa/4.0/80x15.png'
54+
logoUrl : '/images/copyright/attribution-sa-logo.png'
5555
}
5656
];

‎public/images/copyright/attribution-logo.png‎

450 Bytes
Loading

‎public/images/copyright/attribution-nc-logo.png‎

477 Bytes
Loading

0 commit comments

Comments
 (0)