+
+
{categorizedSkills[key].title}
- {categorizedSkills[key].skills
+ {categorizedSkills[key].skills
.filter(skill => {
return skill.includes(search.toLowerCase())
})
@@ -61,7 +61,7 @@ const Skills = props => {
))}
- )
+ )
}
export default Skills
diff --git a/src/components/work.js b/src/components/work.js
index ae68bc8..8fe4441 100644
--- a/src/components/work.js
+++ b/src/components/work.js
@@ -151,6 +151,22 @@ const Work = props => {
onChange={event => props.handleLinkChange("blog", event)}
/>
{
if (social.github && isGitHubUsernameValid(social.github)) {
generate()
}
+ } else if (data.twitterBadge) {
+ if (social.twitter && isTwitterUsernameValid(social.twitter)) {
+ generate()
+ }
} else if (social.github) {
if (isGitHubUsernameValid(social.github)) {
generate()
@@ -365,10 +377,10 @@ const IndexPage = () => {
return
}
- setPrefix(cache.prefix || DEFAULT_PREFIX)
- setData(cache.data || DEFAULT_DATA)
- setLink(cache.link || DEFAULT_LINK)
- setSocial(cache.social || DEFAULT_SOCIAL)
+ setPrefix(cache.prefix ? {...DEFAULT_PREFIX, ...cache.prefix} : DEFAULT_PREFIX)
+ setData(cache.data ? {...DEFAULT_DATA, ...cache.data} : DEFAULT_DATA)
+ setLink(cache.link ? {...DEFAULT_LINK, ...cache.link} : DEFAULT_LINK)
+ setSocial(cache.social ? {...DEFAULT_SOCIAL, ...cache.social} : DEFAULT_SOCIAL)
const cacheSkills = mergeDefaultWithNewDataSkills(
DEFAULT_SKILLS,
@@ -470,6 +482,7 @@ const IndexPage = () => {
data={data}
social={social}
handleCheckChange={handleCheckChange}
+ handleDataChange={handleDataChange}
/>
{(data.visitorsBadge ||
@@ -520,6 +533,20 @@ const IndexPage = () => {
) : (
""
)}
+ {data.twitterBadge && !social.twitter ? (
+
+ * Please add twitter username to use these add-ons
+
+ ) : (
+ ""
+ )}
+ {social.twitter && !isTwitterUsernameValid(social.twitter) ? (
+
+ * Twitter username is invalid, please add a valid username
+
+ ) : (
+ ""
+ )}
{
tabIndex="0"
role="button"
onClick={handleGenerate}
+ onKeyDown={(e) => e.keyCode === 13 && handleGenerate()}
>
Generate README
@@ -538,21 +566,17 @@ const IndexPage = () => {
{generateMarkdown || generatePreview ? (
-
+
-
{copyObj.isCopied === true ? (
@@ -563,38 +587,32 @@ const IndexPage = () => {
{copyObj.copiedText}
-
+
-
download markdown
-
+
-
download backup
-
+
-
{previewMarkdown.isPreview ? (
@@ -605,7 +623,7 @@ const IndexPage = () => {
{previewMarkdown.buttonText}
-
+
@@ -657,14 +675,12 @@ const IndexPage = () => {
new feature
-
Reset form
-
+
{
value={restore}
onChange={e => setRestore(e.target.value)}
/>
-
Restore
-
+
Tips
diff --git a/src/utils/validation.js b/src/utils/validation.js
index 6e9bbd7..3ed982a 100644
--- a/src/utils/validation.js
+++ b/src/utils/validation.js
@@ -9,4 +9,9 @@ const isMediumUsernameValid = username => {
return true
}
-export { isGitHubUsernameValid, isMediumUsernameValid }
+const isTwitterUsernameValid = username => {
+ var pattern = /^[a-zA-Z0-9_]{1,15}$/
+ return pattern.test(username)
+}
+
+export { isGitHubUsernameValid, isMediumUsernameValid, isTwitterUsernameValid }
