')
+ })
+ }
+
+ if (el.children && el.children.length) {
+ el.children.forEach(element => {
+ addTargetBlankAndExternalLinkIcons(element)
+ })
+ }
+ }
+ }
+
+ /**
+ * Getting info about the url. It includes checking isEmail of isInternal
+ * @param {*} url
+ */
+ function getUrlInfo (url) {
+ const data = {}
+
+ if (url.match(/^mailto:/)) { // checking url email or not
+ data.is_email = true
+ return data
+ }
+
+ const mainDomainFromGivenUrl = extractMainDomainFromUrl(url)
+
+ // checking url is email or not
+ if (mainDomainFromGivenUrl !== mainUrl) {
+ data.is_internal = false
+ return data
+ } else {
+ data.is_internal = true
+ }
+
+ return data
+ }
+
+ /**
+ * Extracting main domain from the url
+ * @param {*} url
+ */
+ function extractMainDomainFromUrl (url) {
+ const domainRe = /(https?:\/\/){0,1}((?:[\w\d-]+\.)+[\w\d]{2,})/i; // taken example from https://stackoverflow.com/questions/6238351/fastest-way-to-detect-external-urls
+
+ const data = domainRe.exec(url)
+
+ const splittedDomain = data[2].split('.')
+
+ if (splittedDomain.length === 2) { // check extra subdomain is present or not
+ return data[2]
+ }
+
+ return splittedDomain[splittedDomain.length - 2] + '.' + splittedDomain[splittedDomain.length - 1] // return only main domain address
+ }
+
let lastCompanyName = null;
$( 'tr' ).each( ( i, tr ) => {
@@ -422,6 +494,7 @@ exports.parseFromDirectory = contentPath => {
// 'body' are block-level elements. I think this is correct,
// because from what I've seen, any inline content is wrapped
// in a . + addTargetBlankAndExternalLinkIcons(el) profileContent[ currentHeading ] = ( profileContent[ currentHeading ] + '\n\n' + $.html( el ) diff --git a/package-lock.json b/package-lock.json index ed12177e..c5b9ce15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -622,9 +622,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "log-symbols": { "version": "2.2.0", @@ -1274,9 +1274,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", "dev": true }, "yargs": { @@ -1292,7 +1292,8 @@ }, "yargs-parser": { "version": "13.1.1", - "resolved": "", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/site/assets/external-link.svg b/site/assets/external-link.svg new file mode 100644 index 00000000..8020dbd5 --- /dev/null +++ b/site/assets/external-link.svg @@ -0,0 +1,5 @@ + + diff --git a/site/templates/base.html b/site/templates/base.html index 80ce33ec..4746e3db 100644 --- a/site/templates/base.html +++ b/site/templates/base.html @@ -116,11 +116,11 @@
Powered by
-
+
GitHub
and
- Netlify
+ Netlify
Edit this page on GitHub
diff --git a/site/templates/company.html b/site/templates/company.html
index 0c0ae3a1..cb9e7d29 100644
--- a/site/templates/company.html
+++ b/site/templates/company.html
@@ -10,7 +10,10 @@
href="{{ company.websiteUrl }}"
target="_blank"
rel="noopener noreferrer"
- >{{ company.websiteText }}
+ >
+ {{ company.websiteText }}
+
+
{% if company.shortRegion %}
{{ company.shortRegion }}
@@ -45,7 +48,7 @@
+
{% if company.shortRegion %}
{{ company.shortRegion }}
@@ -45,7 +48,7 @@
Want to help?
- Send us a pull request on GitHub
+ Send us a pull request on GitHub
with your changes to this file!
We make websites and content management simple and fun with premiere web design & development consulting services, by contributing to open platforms like WordPress, and by providing tools and products (like PushUp) that make web publishing a cinch.
+We make websites and content management simple and fun with premiere web design & development consulting services, by contributing to open platforms like WordPress, and by providing tools and products (like PushUp ) that make web publishing a cinch.
At 10up, we don’t just “make” things – we engineer them. We’re a group of people built to solve problems; made to create; wired to delight. From beautiful pixels to beautiful code, we constantly improve the things around us, applying our passions to our clients’ projects and goals.
diff --git a/test/fixtures/valid-incomplete/parsed-content/10up.howToApply.html b/test/fixtures/valid-incomplete/parsed-content/10up.howToApply.html index 4b85c6fa..d1838453 100644 --- a/test/fixtures/valid-incomplete/parsed-content/10up.howToApply.html +++ b/test/fixtures/valid-incomplete/parsed-content/10up.howToApply.html @@ -1 +1 @@ -Check out our careers page and send an email to jobs@10up.com. Our amazing Recruitment Manager Christine Garrison will be on the other end.
+Check out our careers page and send an email to jobs@10up.com. Our amazing Recruitment Manager Christine Garrison will be on the other end.
If you want to apply directly to 18F please email join18f@gsa.gov. We don’t require a formal cover letter, but let us know more about you:
@@ -8,4 +8,4 @@ Specify what role you’d like to be considered for. Check out our openings If you're a Veteran of the U.S. Armed Forces or if you are eligible for "derived" preference, please mention that in your email so we can give you priority consideration. Don't see an opening that suits you? Tell us what you want to do! - + diff --git a/test/fixtures/valid-incomplete/parsed-content/18f.remoteStatus.html b/test/fixtures/valid-incomplete/parsed-content/18f.remoteStatus.html index af96cf07..83ab0084 100644 --- a/test/fixtures/valid-incomplete/parsed-content/18f.remoteStatus.html +++ b/test/fixtures/valid-incomplete/parsed-content/18f.remoteStatus.html @@ -4,4 +4,4 @@Because we work on distributed teams so frequently, we've developed certain strategies for working well as a collaborative operation.
-We have a “remote first” mindset.
+We have a “remote first” mindset.
If you know something we don't, help us fill it in! Here's how:
-
-
- Read our Contributing Guidelines -
- Have a look at our example company profile -
- Follow the structure of the example profile and send us a pull request with your changes to this file! +
- Read our Contributing Guidelines
+
- Have a look at our example company profile
+
- Follow the structure of the example profile and send us a pull request with your changes to this file!
Without
-variation selector
+variation selector
invisible character:
@@ -17,7 +17,7 @@ invisible character:
With
-variation selector
+variation selector
invisible character:
@@ -25,7 +25,7 @@ invisible character:
With
-variation selector
+variation selector
invisible character (x2):
diff --git a/test/fixtures/valid-incomplete/parsed-content/aerolab.companyBlurb.html b/test/fixtures/valid-incomplete/parsed-content/aerolab.companyBlurb.html index bf4327d2..0eb7f3b0 100644 --- a/test/fixtures/valid-incomplete/parsed-content/aerolab.companyBlurb.html +++ b/test/fixtures/valid-incomplete/parsed-content/aerolab.companyBlurb.html @@ -3,7 +3,7 @@If you know something we don't, help us fill it in! Here's how:
-
diff --git a/test/fixtures/valid-incomplete/parsed-content/and-yet.companyBlurb.html b/test/fixtures/valid-incomplete/parsed-content/and-yet.companyBlurb.html index 6206483a..aae6df50 100644 --- a/test/fixtures/valid-incomplete/parsed-content/and-yet.companyBlurb.html +++ b/test/fixtures/valid-incomplete/parsed-content/and-yet.companyBlurb.html @@ -1,13 +1,13 @@ -- Read our Contributing Guidelines
-- Have a look at our example company profile
-- Follow the structure of the example profile and send us a pull request with your changes to this file!
+- Read our Contributing Guidelines
+- Have a look at our example company profile
+- Follow the structure of the example profile and send us a pull request with your changes to this file!
&yet is about people. We’re known as a design and development consultancy (specializing in Node, React, and realtime), but we don’t fit neatly in a box.
+&yet
-We design and develop custom software for web, mobile, desktop, chat, and voice.
+We design and develop custom software
-We enable millions of people to make super simple video calls with Talky.
+We enable millions of people to make super simple video calls with Talky
-We pioneer software and standards for realtime communications.
+We pioneer software and standards for realtime communications
-We wrote the book on taking a human approach to marketing for people who would rather make what they love than persuade people to buy it.
+We wrote the book
-We create high-impact conference experiences such as RealtimeConf and more recently–&yetConf.
+We create high-impact conference experiences such as RealtimeConf
- + \ No newline at end of file diff --git a/test/fixtures/valid-incomplete/parsed-content/and-yet.officeLocations.html b/test/fixtures/valid-incomplete/parsed-content/and-yet.officeLocations.html index b58d193d..67deccfb 100644 --- a/test/fixtures/valid-incomplete/parsed-content/and-yet.officeLocations.html +++ b/test/fixtures/valid-incomplete/parsed-content/and-yet.officeLocations.html @@ -1 +1 @@ -Fuse Coworking in Richland, WA
+Fuse Coworking in Richland, WA
\ No newline at end of file diff --git a/test/fixtures/valid-incomplete/parsed-content/and-yet.remoteStatus.html b/test/fixtures/valid-incomplete/parsed-content/and-yet.remoteStatus.html index 45985173..787fa65c 100644 --- a/test/fixtures/valid-incomplete/parsed-content/and-yet.remoteStatus.html +++ b/test/fixtures/valid-incomplete/parsed-content/and-yet.remoteStatus.html @@ -1,6 +1,6 @@We employ several strategies to ensure an inclusive and collaborative environment for all our employees.
-To communicate we use Slack (text-chat), our own product Talky (video chat and meetings), Twist (daily check-ins) and GitHub (organization wide discussions).
+To communicate we use Slack
One-on-ones and bi-weekly company-wide updates are a crucial part of staying connected and understanding our team as things change. We encourage employees to use these meetings to bring up frustrations, ideas, or whatever they need in order to be their best selves and to do their best work.
diff --git a/test/fixtures/valid-incomplete/parsed-content/angularclass.companyBlurb.html b/test/fixtures/valid-incomplete/parsed-content/angularclass.companyBlurb.html index bba328f0..2b75bea1 100644 --- a/test/fixtures/valid-incomplete/parsed-content/angularclass.companyBlurb.html +++ b/test/fixtures/valid-incomplete/parsed-content/angularclass.companyBlurb.html @@ -3,7 +3,7 @@If you know something we don't, help us fill it in! Here's how:
-
- Read our Contributing Guidelines
-- Have a look at our example company profile
-- Follow the structure of the example profile and send us a pull request with your changes to this file!
+- Read our Contributing Guidelines
+- Have a look at our example company profile
+- Follow the structure of the example profile and send us a pull request with your changes to this file!