Skip to content

feat: add static domain fields to admin settings #3463

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 22, 2019
Merged

feat: add static domain fields to admin settings #3463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion app/components/forms/admin/settings/system-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ export default Component.extend(FormMixin, {
]
},

apiUrl: {
identifier : 'api_url',
rules : [
{
type : 'empty',
prompt : this.l10n.t('Please enter the API Url')
},
{
type : 'regExp',
value : protocolLessValidUrlPattern,
prompt : this.l10n.t('Please enter a valid URL for the API')
}
]
},

googleStorageBucketName: {
identifier : 'google_storage_bucket_name',
rules : [
Expand Down Expand Up @@ -225,4 +240,4 @@ export default Component.extend(FormMixin, {
});
}
}
});
});
3 changes: 2 additions & 1 deletion app/models/setting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,6 @@ export default ModelBase.extend({
segmentedGithubUrl : computedSegmentedLink.bind(this)('githubUrl'),
segmentedAndroidAppUrl : computedSegmentedLink.bind(this)('androidAppUrl'),
segmentedWebAppUrl : computedSegmentedLink.bind(this)('webAppUrl'),
segmentedFrontendUrl : computedSegmentedLink.bind(this)('frontendUrl')
segmentedFrontendUrl : computedSegmentedLink.bind(this)('frontendUrl'),
segmentedStaticDomain : computedSegmentedLink.bind(this)('staticDomain')
});
12 changes: 12 additions & 0 deletions app/templates/components/forms/admin/settings/system-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@
</label>
{{input type='text' name='tag_line' value=settings.tagline}}
</div>
<h3 class="ui header">
{{t 'API server details'}}
<div class="sub header">
{{t 'The URL of the API that this frontend will make use of as the backend.'}}
</div>
</h3>
<div class="field">
<label>
{{t 'API Url'}}
</label>
{{widgets/forms/link-input segmentedLink=settings.segmentedStaticDomain inputId='api_url'}}
</div>
<div class="ui hidden divider"></div>
{{forms/admin/settings/system/social-media-token settings=settings}}
<div class="ui hidden divider"></div>
Expand Down