This repository has been archived by the owner on Dec 14, 2023. It is now read-only.
Allow dojos to have a facebook #1091
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DanielBrierton
suggested changes
Feb 15, 2017
| <div class="col-lg-8"> | ||
| <input type="text" class="form-control" ng-model="dojo.facebook" | ||
| cd-input-prefix="https://facebook.com/" | ||
| name="dojoFacebook" id="dojoTwitter" placeholder="{@i18n key="e.g. @CoderDojo"/}" |
There was a problem hiding this comment.
s/Twitter/Facebook. Also, example should be a Facebook URL, since that's what we're looking for.
lib/dojos.js
Outdated
| @@ -27,6 +27,9 @@ var joiValidator = { | |||
| twitter: function () { | |||
| return Joi.string().allow(''); | |||
| }, | |||
| facebook: function () { | |||
| return Joi.string().regex(/^https:\/\/facebook.com\//).allow(''); | |||
There was a problem hiding this comment.
/^https?:\/\/facebook\.com\// lrn2regex 😛
lib/dojos.js
Outdated
| @@ -406,6 +410,7 @@ exports.register = function (server, options, next) { | |||
| expectedAttendees: Joi.number().allow(null), | |||
| website: joiValidator.optionalUri(), | |||
| twitter: Joi.alternatives().try(joiValidator.twitter(), Joi.string().valid(null).valid('')), | |||
| facebook: Joi.alternatives().try(joiValidator.facebook(), Joi.string().valid(null).valid('')), | |||
There was a problem hiding this comment.
We've already allowed '' in the facebook validator, so probably don't need .valid('') here.
DanielBrierton
suggested changes
Feb 15, 2017
| cd-input-prefix="https://facebook.com/" | ||
| name="dojoFacebook" id="dojoTwitter" placeholder="{@i18n key="e.g. @CoderDojo"/}" | ||
| cd-input-prefix="https://www.facebook.com/" | ||
| name="dojoFacebook" id="dojoFacebook" placeholder="{@i18n key="e.g. @CoderDojo"/}" |
There was a problem hiding this comment.
Still haven't fixed the placeholder
Wardormeur
force-pushed
the
bugfix/1029-add-facebook-dojos-page
branch
from
d995be1
to
ebdb314
Compare
DanielBrierton
approved these changes
Feb 17, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes CoderDojo/community-platform#1029