Labels
{labels.length === 0 ? (No labels are associated with this host.
@@ -231,31 +260,63 @@ export class HostDetailsPage extends Component { }; renderPacks = () => { - const { onPackClick } = this; const { host } = this.props; - const { packs = [] } = host; + const { pack_stats } = host; + const wrapperClassName = `${baseClass}__table`; - const packItems = packs.map((pack) => { - return ( -| Query name | +Description | +Frequency | +Last run | +
|---|
Packs
- {packs.length === 0 ? ( -No packs have this host as a target.
+ {!pack_stats ? ( ++ No packs with scheduled queries have this host as a target. +
) : ( -{`Last fetched ${humanHostDetailUpdated( - titleData.detail_updated_at - )}`}
++ {`Last fetched ${humanHostDetailUpdated( + titleData.detail_updated_at + )}`}{" "} +
+ {renderRefetch()}About this host
Osquery configuration
-Agent options
+- -
); }; diff --git a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss index 2a93e306eb..71b1356f97 100644 --- a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss +++ b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss @@ -46,8 +46,23 @@ } } + &__no-queries { + .info { + &__header { + margin: $pad-medium 0 $pad-medium 0; + } + &__data { + margin: 0 0 $pad-large 0; + } + } + } + + &__query-modal { + display: flex; + } + &__filter-queries { - flex-grow: 1; + flex-grow: 3; position: relative; .input-field { @@ -63,9 +78,14 @@ } } + &__create-query { + span { + margin: 15px; + font-weight: bold; + } + } + &__custom-query-button { font-size: $x-small; - color: $core-vibrant-blue; - font-weight: $bold; } } diff --git a/frontend/pages/hosts/HostDetailsPage/_styles.scss b/frontend/pages/hosts/HostDetailsPage/_styles.scss index 126722c77e..576e55e69f 100644 --- a/frontend/pages/hosts/HostDetailsPage/_styles.scss +++ b/frontend/pages/hosts/HostDetailsPage/_styles.scss @@ -1,17 +1,27 @@ .host-details { display: flex; - flex-direction: column; + flex-wrap: wrap; + flex-grow: 1; + align-content: flex-start; padding-bottom: 50px; min-width: 0; + background-color: $ui-off-white; + gap: $pad-large; .section { + flex: 100%; display: flex; flex-direction: column; - margin: $pad-xxlarge 0 0; + background-color: $core-white; + border-radius: 16px; + border: 1px solid $ui-fleet-blue-15; + padding: $pad-xxlarge; + box-shadow: 0px 3px 0px rgba(226, 228, 234, 0.4); &__header { - margin: 0 0 $pad-medium; font-size: $medium; + font-weight: bold; + margin: 0 0 $pad-large 0; } .info { @@ -50,16 +60,18 @@ } .results { - margin: auto; + margin: 0; width: 350px; &__header { + margin: 0 0 $pad-medium 0; font-size: $small; color: $core-fleet-black; font-weight: $bold; } &__data { + margin: 0; font-size: $x-small; } } @@ -92,9 +104,75 @@ margin: 0; padding-left: $pad-small; } + + .refetch { + display: flex; + + .refetch-btn { + color: $core-vibrant-blue; + cursor: default; + font-size: $x-small; + display: inline; + margin: 9px 0 0 0; // aligns with spinner + + &::before { + display: inline-block; + position: relative; + padding: 5px 0 0 0; // centers spin + content: url(../assets/images/icon-refetch-12x12@2x.png); + transform: scale(0.5); + vertical-align: bottom; + height: 20px; + } + + &:hover { + cursor: pointer; + } + } + + .refetch-offline { + opacity: 25%; + + &:hover { + cursor: default; + } + } + + .refetch-spinner { + color: $core-vibrant-blue; + cursor: default; + font-size: $x-small; + display: inline; + opacity: 50%; + filter: saturate(100%); + + &::before { + display: inline-block; + position: relative; + top: 7px; // aligns with text + padding: 5px 0 0 0; // centers spin + display: inline-block; + content: url(../assets/images/icon-refetch-12x12@2x.png); + transform: scale(0.5); + animation: spin 2s linear infinite; + } + + @keyframes spin { + 0% { + transform: scale(0.5) rotate(0deg); + transform-origin: center center; + } + 100% { + transform: scale(0.5) rotate(360deg); + transform-origin: center center; + } + } + } + } } - .about { + .about, + .osquery { .info { &__item { &--about { @@ -107,18 +185,25 @@ display: flex; flex-direction: column; margin-right: $pad-xxlarge; + } + &__data { + margin-bottom: $pad-medium; - span { - margin-bottom: $pad-medium; - - &:last-child { - margin-bottom: 0; - } + &:last-child { + margin-bottom: 0; } } } } + .col-50 { + flex: 2; + } + + .col-25 { + flex: 1; + } + .status { color: $core-fleet-black; text-transform: capitalize; @@ -224,4 +309,83 @@ white-space: nowrap; } } + + &__back-link { + display: flex; + align-items: center; + height: 16px; + font-size: $x-small; + color: $core-vibrant-blue; + font-weight: $bold; + text-decoration: none; + } + + #back-chevron { + width: 16px; + margin-right: $pad-small; + } + + .accordion { + border-radius: 2px; + } + + .accordion__item + .accordion__item { + border-top: 1px solid rgba(0, 0, 0, 0.1); + } + + .accordion__button { + background-color: #fff; + color: $core-fleet-black; + cursor: pointer; + text-align: left; + font-size: $x-small; + font-weight: bold; + border: none; + padding: 17px 12px; + } + + .accordion__button:hover { + background-color: $ui-vibrant-blue-10; + } + + .accordion__button:after { + display: block; + content: url("../assets/images/icon-chevron-purple-9x6@2x.png"); + text-align: center; + top: 50%; + float: right; + width: 32px; + height: 32px; + border-radius: 4px; + transform: scale(0.5) translate(-50%, -60%); + } + + .accordion__button[aria-expanded="true"]::after, + .accordion__button[aria-selected="true"]::after { + background-color: $core-vibrant-blue; + content: url("../assets/images/icon-accordion-collapse-16x16@2x.png"); + } + + [hidden] { + display: none; + } + + .accordion__panel { + padding: 20px; + animation: fadein 0.35s ease-in; + } + + /* -------------------------------------------------- */ + /* ---------------- Animation part ------------------ */ + /* -------------------------------------------------- */ + + @keyframes fadein { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } + } } diff --git a/frontend/pages/hosts/HostDetailsPage/helpers.js b/frontend/pages/hosts/HostDetailsPage/helpers.js index bf9a54dc2c..b16e8fb1d1 100644 --- a/frontend/pages/hosts/HostDetailsPage/helpers.js +++ b/frontend/pages/hosts/HostDetailsPage/helpers.js @@ -16,6 +16,10 @@ export const destroyHost = (dispatch, host) => { }); }; +export const refetchHost = (dispatch, host) => { + return dispatch(hostActions.refetchHostStart(host)); +}; + export const queryHostCustom = (dispatch, host) => { return dispatch( push({ @@ -34,4 +38,10 @@ export const queryHostSaved = (dispatch, host, selectedQuery) => { ); }; -export default { fetchHost, destroyHost, queryHostCustom, queryHostSaved }; +export default { + fetchHost, + destroyHost, + queryHostCustom, + queryHostSaved, + refetchHost, +}; diff --git a/frontend/pages/hosts/ManageHostsPage/components/AddHostModal/AddHostModal.jsx b/frontend/pages/hosts/ManageHostsPage/components/AddHostModal/AddHostModal.jsx index 725608751b..7354fe54cd 100644 --- a/frontend/pages/hosts/ManageHostsPage/components/AddHostModal/AddHostModal.jsx +++ b/frontend/pages/hosts/ManageHostsPage/components/AddHostModal/AddHostModal.jsx @@ -152,7 +152,7 @@ class AddHostModal extends Component {` based on the temporary marker that was added in the `beforeConvert` function above
+ // console.log('RAN AFTER HOOK, found: ',modifiedHtml.match(/(]*)(>\s*)(\<!--\s*__LANG=\%[^\%]*\%__\s*--\>)/g));
+ modifiedHtml = modifiedHtml.replace(// Interpret `js` as `javascript`
+ // $1 $2 $3 $4
+ /(]*)(>\s*)(\<!-- __LANG=\%js\%__ --\>)\s*/gm,
+ '$1 class="javascript"$2$3'
+ );
+ modifiedHtml = modifiedHtml.replace(// Interpret `sh` and `bash` as `bash`
+ // $1 $2 $3 $4
+ /(]*)(>\s*)(\<!-- __LANG=\%(bash|sh)\%__ --\>)\s*/gm,
+ '$1 class="bash"$2$3'
+ );
+ modifiedHtml = modifiedHtml.replace(// When unspecified, default to `text`
+ // $1 $2 $3 $4
+ /(]*)(>\s*)(\<!-- __LANG=\%\%__ --\>)\s*/gm,
+ '$1 class="nohighlight"$2$3'
+ );
+ modifiedHtml = modifiedHtml.replace(// Finally, nab the rest, leaving the code language as-is.
+ // $1 $2 $3 $4 $5 $6
+ /(]*)(>\s*)(\<!-- __LANG=\%)([^%]+)(\%__ --\>)\s*/gm,
+ '$1 class="$5"$2$3'
+ );
+
+ return proceed(undefined, modifiedHtml);
+ },
+ }], (err)=>{
+ if (err) {
+ reject(err);
+ } else {
+ resolve();
+ }
+ });//_∏_
+ });
+
+ // Now return the menu data, to provide a nicer way of programmatically working with it.
+ // But first, we'll clean it up a bit.
+ let filesGenerated = await sails.helpers.fs.readJson(jsMenuOutputPath);
+
+ // TODO: bring in the other cleanup in marshal-doc-page-metadata from sailsjs.com repo
+
+ // Since the format from the doc-templater package can be a little bit misleading,
+ // we'll also munge the resulting data a little bit.
+ for (let fileInfo of filesGenerated) {
+
+ fileInfo.path = fileInfo.fullPathAndFileName;// « for clarity (it's not technically the full path)
+ delete fileInfo.fullPathAndFileName;
+
+ fileInfo.fallbackTitle = sails.helpers.toSentenceCase(path.basename(fileInfo.templateTitle, '.ejs'));// « for clarity (the page isn't a template, necessarily, and this title is just a guess. Display title will, more likely than not, come from a tag -- see the bottom of the original, raw unformatted markdown of any page in the sailsjs docs for an example of how to use docmeta tags)
+ delete fileInfo.templateTitle;
+
+ delete fileInfo.data.lastModified;// « for clarity (this isn't the timestamp you're expecting, so we delete it)
+ }//∞
+
+ return filesGenerated;
+
+ }
+
+
+};
diff --git a/website/api/helpers/to-sentence-case.js b/website/api/helpers/to-sentence-case.js
new file mode 100644
index 0000000000..3454aaaa8f
--- /dev/null
+++ b/website/api/helpers/to-sentence-case.js
@@ -0,0 +1,33 @@
+module.exports = {
+
+
+ friendlyName: 'To sentence case',
+
+
+ description: 'Make a best-effort conversion of the specified text into sentence case.',
+
+
+ sync: true,
+
+
+ inputs: {
+ text: { type: 'string', example: 'the-Weird Catfood', required: true }
+ },
+
+
+ exits: {
+ success: { outputType: 'string', outputExample: 'The weird catfood' },
+ },
+
+
+ fn: function ({ text }) {
+ return text
+ .split(/[\s-_]+/)
+ .filter((word, idx) => !(idx === 0 && word.match(/[0-9]+/))) // « strip off any leading numbers so first word is actually capitalized
+ .map((word, idx) => (idx === 0? word[0].toUpperCase() : word[0].toLowerCase())+word.slice(1))
+ .join(' ');
+ }
+
+
+};
+
diff --git a/website/assets/images/chevron-12x8@2x.png b/website/assets/images/chevron-12x8@2x.png
new file mode 100644
index 0000000000..c58c19b7ee
Binary files /dev/null and b/website/assets/images/chevron-12x8@2x.png differ
diff --git a/website/assets/js/pages/contact.page.js b/website/assets/js/pages/contact.page.js
index 035e53d7b5..5f6b65b6f7 100644
--- a/website/assets/js/pages/contact.page.js
+++ b/website/assets/js/pages/contact.page.js
@@ -16,9 +16,10 @@ parasails.registerPage('contact', {
// Form rules
formRules: {
emailAddress: {isEmail: true, required: true},
- fullName: {required: true},
+ firstName: {required: true},
+ lastName: {required: true},
topic: {required: true},
- message: {required: true},
+ message: {required: false},
},
// Server error state for the form
diff --git a/website/assets/js/pages/query-detail.page.js b/website/assets/js/pages/query-detail.page.js
new file mode 100644
index 0000000000..752921e501
--- /dev/null
+++ b/website/assets/js/pages/query-detail.page.js
@@ -0,0 +1,25 @@
+parasails.registerPage('query-detail', {
+ // ╦╔╗╔╦╔╦╗╦╔═╗╦ ╔═╗╔╦╗╔═╗╔╦╗╔═╗
+ // ║║║║║ ║ ║╠═╣║ ╚═╗ ║ ╠═╣ ║ ║╣
+ // ╩╝╚╝╩ ╩ ╩╩ ╩╩═╝ ╚═╝ ╩ ╩ ╩ ╩ ╚═╝
+ data: {
+ //…
+ },
+
+ // ╦ ╦╔═╗╔═╗╔═╗╦ ╦╔═╗╦ ╔═╗
+ // ║ ║╠╣ ║╣ ║ ╚╦╝║ ║ ║╣
+ // ╩═╝╩╚ ╚═╝╚═╝ ╩ ╚═╝╩═╝╚═╝
+ beforeMount: function() {
+ //…
+ },
+ mounted: async function() {
+ //…
+ },
+
+ // ╦╔╗╔╔╦╗╔═╗╦═╗╔═╗╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
+ // ║║║║ ║ ║╣ ╠╦╝╠═╣║ ║ ║║ ║║║║╚═╗
+ // ╩╝╚╝ ╩ ╚═╝╩╚═╩ ╩╚═╝ ╩ ╩╚═╝╝╚╝╚═╝
+ methods: {
+ //…
+ }
+});
diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
index 5ff72e033f..c03b5974b3 100644
--- a/website/assets/styles/bootstrap-overrides.less
+++ b/website/assets/styles/bootstrap-overrides.less
@@ -12,6 +12,7 @@
body {
font-family: @main-font;
+ color: @core-fleet-black;
}
img {
@@ -51,6 +52,13 @@ footer {
line-height: 24px;
}
+.text-danger {
+ color: @core-vibrant-red !important; //lesshint-disable-line importantRule
+}
+
+a.text-danger:hover, a.text-danger:focus {
+ color: darken(@core-vibrant-red, 20%) !important; //lesshint-disable-line importantRule
+}
.btn {
font-family: @header-font;
@@ -79,25 +87,42 @@ footer {
}
&.btn-primary {
- background-color: #EF7182;
- border-color: #EF7182;
+ background-color: #ff5c83;
+ border-color: #ff5c83;
&:hover {
- background-color: darken(#EF7182, 10%);
- border-color: darken(#EF7182, 10%);
+ background-color: darken(#ff5c83, 10%);
+ border-color: darken(#ff5c83, 10%);
+ }
+ &:focus, &.focus {
+ box-shadow: 0 0 0.25rem 0.2rem #ff5c83;
+ }
+ &.disabled, &:disabled {
+ color: #fff;
+ background-color: darken(#ff5c83, 10%), 0.25;
+ border-color: darken(#ff5c83, 10%), 0.25;
+ }
+ &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active, .show > &.dropdown-toggle {
+ color: #fff;
+ background-color: darken(#ff5c83, 10%), 0.25;
+ border-color: darken(#ff5c83, 10%), 0.25;
+ }
+ &:not(:disabled):not(.disabled):active:focus, &:not(:disabled):not(.disabled).active:focus, .show > &.dropdown-toggle:focus {
+ box-shadow: 0 0 0.25rem 0.2rem #ff5c83;
}
}
+
&.btn-info {
- background-color: #6B6CFA;
- border-color: #6B6CFA;
+ background-color: #6b6cfa;
+ border-color: #6b6cfa;
&:hover {
- background-color: darken(#6B6CFA, 10%);
- border-color: darken(#6B6CFA, 10%);
+ background-color: darken(#6b6cfa, 10%);
+ border-color: darken(#6b6cfa, 10%);
}
}
}
.card {
- box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: 0px 6px 20px rgba(0, 0, 0, 0.05);
}
.dropdown:hover > .dropdown-menu {
@@ -108,7 +133,7 @@ footer {
}
.dropdown-menu {
- left: 16px !important;//lesshint-disable-line importantRule
+ left: 16px !important; //lesshint-disable-line importantRule
min-width: 0;
margin: 0;
}
@@ -133,3 +158,32 @@ footer {
pointer-events: none;
font-weight: @bold;
}
+
+.form-control {
+ height: 54px;
+ padding: 8px 16px;
+ font-size: 18px;
+ color: #192147;
+ border: 1px solid #C5C7D1;
+}
+.form-control:focus {
+ border: 2px solid #6a67fe;
+ box-shadow: unset;
+}
+.form-control.is-invalid:focus {
+ box-shadow: unset;
+}
+.form-control.is-invalid {
+ border: 2px solid #FF5C83;
+}
+textarea.form-control {
+ height: 108px;
+}
+.form-group {
+ margin-bottom: 24px;
+}
+
+.invalid-feedback {
+ color: @core-vibrant-red;
+}
+
diff --git a/website/assets/styles/importer.less b/website/assets/styles/importer.less
index 4b287d8fc1..00cd70bcc7 100644
--- a/website/assets/styles/importer.less
+++ b/website/assets/styles/importer.less
@@ -42,3 +42,5 @@
@import 'pages/404.less';
@import 'pages/500.less';
@import 'pages/498.less';
+
+@import 'pages/query-detail.less';
diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
index d013930be7..c51b2f7cb3 100644
--- a/website/assets/styles/layout.less
+++ b/website/assets/styles/layout.less
@@ -22,7 +22,7 @@ html, body {
right: 0;
.header-btn {
color: #ffffff;
- cursor: default !important;//lesshint-disable-line importantRule
+ cursor: pointer !important;//lesshint-disable-line importantRule
font-family: @navigation-font;
font-weight: @bold;
}
@@ -80,6 +80,24 @@ html, body {
background-color: #f1f0ff;
font-weight: @bold;
}
+ .menu-link {
+ color: #192147;
+ font-weight: @bold;
+ svg {
+ path {
+ fill: #192147;
+ }
+ }
+ }
+ .menu-link:hover {
+ color: #6a67fe;
+
+ svg {
+ path {
+ fill: #6a67fe;
+ }
+ }
+ }
}
[purpose='page-header'].header {
@@ -88,7 +106,7 @@ html, body {
border-bottom: 1px solid #e2e4ea;
.header-btn {
color: #192147;
- cursor: default !important;//lesshint-disable-line importantRule
+ cursor: pointer !important;//lesshint-disable-line importantRule
font-family: @navigation-font;
font-weight: @bold;
}
@@ -141,6 +159,24 @@ html, body {
background-color: #f1f0ff;
font-weight: @bold;
}
+ .menu-link {
+ color: #192147;
+ font-weight: @bold;
+ svg {
+ path {
+ fill: #192147;
+ }
+ }
+ }
+ .menu-link:hover {
+ color: #6a67fe;
+
+ svg {
+ path {
+ fill: #6a67fe;
+ }
+ }
+ }
}
[purpose='page-footer'] {
@@ -177,21 +213,25 @@ body.detected-mobile {
// …
}
+.dropdown:hover > .btn.btn-link {
+ color: #6a67fe;
+}
+
@media (max-width: 1199px) {
[purpose='page-wrap'] {
- padding-bottom: 230px;
+ padding-bottom: 260px;
[purpose='page-footer'] {
- height: 230px;
+ height: 260px;
}
}
}
@media (max-width: 767px) {
[purpose='page-wrap'] {
- padding-bottom: 360px;
+ padding-bottom: 380px;
[purpose='page-footer'] {
padding-top: 44px;
- height: 360px;
+ height: 380px;
}
}
}
diff --git a/website/assets/styles/mixins-and-variables/colors.less b/website/assets/styles/mixins-and-variables/colors.less
index 42f35bd939..817041b2cc 100644
--- a/website/assets/styles/mixins-and-variables/colors.less
+++ b/website/assets/styles/mixins-and-variables/colors.less
@@ -2,12 +2,14 @@
* Color Variables
*/
+@core-fleet-black: #192147;
+@core-vibrant-red: #FF5C83;
+
@brand: #14acc2;
-@error: #B53A03;
+@error: @core-vibrant-red;
-
-@text-normal: #000;
+@text-normal: @core-fleet-black;
@text-muted: lighten(@text-normal, 60%);
@bg-lt-gray: #f1f1f1;
diff --git a/website/assets/styles/pages/contact.less b/website/assets/styles/pages/contact.less
index 488cc71e78..c240d894f0 100644
--- a/website/assets/styles/pages/contact.less
+++ b/website/assets/styles/pages/contact.less
@@ -1,5 +1,43 @@
#contact {
- //…
+ label {
+ font-weight: 700;
+ font-size: 18px;
+ }
+ .btn-primary {
+ background-color: #ff5c83;
+ border-color: #ff5c83;
+ &:hover {
+ background-color: darken(#ff5c83, 10%);
+ border-color: darken(#ff5c83, 10%);
+ }
+ }
+
+ .selectbox {
+ position: relative;
+ }
+ .selectbox::after {
+ content: url('/images/chevron-12x8@2x.png');
+ right: 16px;
+ transform: scale(0.5);
+ top: 16px;
+ position: absolute;
+ pointer-events: none;
+ }
+ .selectbox select {
+ appearance: none;
+ }
+
+ @media (max-width: 575px) {
+ h2, p, .btn-container {
+ text-align: center;
+ }
+
+ button {
+ display: inline;
+ width: 100%;
+ max-width: 325px;
+ }
+ }
}
diff --git a/website/assets/styles/pages/get-started.less b/website/assets/styles/pages/get-started.less
index d52f62c6dd..73bb9fcdea 100644
--- a/website/assets/styles/pages/get-started.less
+++ b/website/assets/styles/pages/get-started.less
@@ -9,7 +9,7 @@
color: #6a67fe;
}
#primary-button {
- color: #fff;
+ color: #fff;
}
#learn-more {
background: #f9fafc;
@@ -33,6 +33,7 @@
border-color: #f9fafc;
}
}
+
#arrow {
padding-right: 45px;
cursor: pointer;
@@ -41,11 +42,11 @@
color: #192147;
font-weight: bold;
user-select: none;
- transition: 0.2s linear;
- -o-transition: 0.2s linear;
- -ms-transition: 0.2s linear;
- -moz-transition: 0.2s linear;
- -webkit-transition: 0.2s linear;
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
}
#arrow:before {
@@ -54,16 +55,21 @@
position: absolute;
top: 12px;
left: 80%; // <--- here
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
/* opacity: 0; */
}
#arrow:hover:before {
left: 82%; // <--- here
- transition: 0.2s linear;
- -o-transition: 0.2s linear;
- -ms-transition: 0.2s linear;
- -moz-transition: 0.2s linear;
- -webkit-transition: 0.2s linear;
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
/* opacity:1; */
}
}
diff --git a/website/assets/styles/pages/homepage.less b/website/assets/styles/pages/homepage.less
index e7bad929d3..942632c780 100644
--- a/website/assets/styles/pages/homepage.less
+++ b/website/assets/styles/pages/homepage.less
@@ -1,4 +1,12 @@
#homepage {
+ .btn-primary {
+ background-color: #ff5c83;
+ border-color: #ff5c83;
+ &:hover {
+ background-color: darken(#ff5c83, 10%);
+ border-color: darken(#ff5c83, 10%);
+ }
+ }
.hero-banner {
background: rgb(31, 29, 66);
background: linear-gradient(170.26deg, #1F1D42 7.33%, #00FFF0 130.16%);//lesshint-disable-line duplicateProperty
@@ -27,9 +35,6 @@
.quote-mark {
font-family: @header-font;
}
- .footer-fade {
- background: linear-gradient(360deg, #201E43 0%, #353D62 100%);
- }
.log-destinations-container {
display: flex;
flex-wrap: wrap;
@@ -53,6 +58,48 @@
font-weight: bold;
font-size: 0.9rem;
}
+
+ // TODO: dedupe this into a mixin and use from here and in pricing.less, or use existing transition mixin
+ [purpose='animated-arrow-button'] {
+ padding-right: 45px;
+ cursor: pointer;
+ position: relative;
+ width: auto;
+ color: #192147;
+ font-weight: bold;
+ user-select: none;
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
+ }
+
+ [purpose='animated-arrow-button']:before {
+ content: url('/images/arrow-right-16x16@2x.png');
+ transform: scale(0.5);
+ position: absolute;
+ top: 12px;
+ left: 80%; // <--- here
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
+ /* opacity: 0; */
+ }
+
+ [purpose='animated-arrow-button']:hover:before {
+ left: 82%; // <--- here
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
+ /* opacity:1; */
+ }
+
+
@media (max-width: 1175px) {
.hero-bg {
background-position: -1100px bottom;
diff --git a/website/assets/styles/pages/pricing.less b/website/assets/styles/pages/pricing.less
index d58de5e90e..4c5f486c4e 100644
--- a/website/assets/styles/pages/pricing.less
+++ b/website/assets/styles/pages/pricing.less
@@ -2,32 +2,16 @@
h1, p {
color: #192147;
}
- section {
+ section {// TODO remove this in favor of making HTML match homepage.ejs w/ bootstrap row classes and such
max-width: 800px;
}
- .btn {
- font-family: @header-font;
- font-weight: 700;
- padding-top: 18px;
- padding-bottom: 18px;
- font-size: 20px;
- line-height: 23px;
- border-radius: 10px;
- &.btn-white {
- position: relative;
- padding-right: 20px;
- color: #192147;
- background-color: #fff;
- border-color: #fff;
- }
- }
- .card-body {
- box-shadow: 0px 6px 20px rgba(0, 0, 0, 0.05);
- border: 1px solid #e2e4ea;
- border-radius: 0.75rem;
+
+ @media (max-width: 767px) {
+ p {font-size: 16px;}
}
- #arrow {
+ // TODO: dedupe animated-arrow-button (see homepage.less)
+ [purpose='animated-arrow-button'] {
padding-right: 45px;
cursor: pointer;
position: relative;
@@ -35,29 +19,34 @@
color: #192147;
font-weight: bold;
user-select: none;
- transition: 0.2s linear;
- -o-transition: 0.2s linear;
- -ms-transition: 0.2s linear;
- -moz-transition: 0.2s linear;
- -webkit-transition: 0.2s linear;
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
}
- #arrow:before {
+ [purpose='animated-arrow-button']:before {
content: url('/images/arrow-right-16x16@2x.png');
transform: scale(0.5);
position: absolute;
top: 12px;
left: 80%; // <--- here
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
/* opacity: 0; */
}
- #arrow:hover:before {
+ [purpose='animated-arrow-button']:hover:before {
left: 82%; // <--- here
- transition: 0.2s linear;
- -o-transition: 0.2s linear;
- -ms-transition: 0.2s linear;
- -moz-transition: 0.2s linear;
- -webkit-transition: 0.2s linear;
+ transition: 0.2s ease-in-out;
+ -o-transition: 0.2s ease-in-out;
+ -ms-transition: 0.2s ease-in-out;
+ -moz-transition: 0.2s ease-in-out;
+ -webkit-transition: 0.2s ease-in-out;
/* opacity:1; */
}
}
diff --git a/website/assets/styles/pages/query-detail.less b/website/assets/styles/pages/query-detail.less
new file mode 100644
index 0000000000..f3963d5be7
--- /dev/null
+++ b/website/assets/styles/pages/query-detail.less
@@ -0,0 +1,5 @@
+#query-detail {
+
+ //…
+
+}
diff --git a/website/config/custom.js b/website/config/custom.js
index 44de0294c5..fa8de14f08 100644
--- a/website/config/custom.js
+++ b/website/config/custom.js
@@ -98,8 +98,9 @@ module.exports.custom = {
/***************************************************************************
* *
* Any other custom config this Sails app should use during development. *
+ * (and possibly in ALL environments, if not overridden in config/env/) *
* *
***************************************************************************/
- // …
+ //…
};
diff --git a/website/config/env/development.js b/website/config/env/development.js
index fdd45c303e..19ac24135e 100644
--- a/website/config/env/development.js
+++ b/website/config/env/development.js
@@ -14,4 +14,10 @@ module.exports = {
// be running on port 1337 on your computer.)
port: 2024,
+ // Add any dev-only routes for local development of not-yet-released pages.
+ // e.g. http://localhost:2024/sandbox/example-query
+ routes: {
+ 'GET /sandbox/example-query': { action: 'view-query-detail' },
+ },
+
};
diff --git a/website/config/policies.js b/website/config/policies.js
index 97d83384b1..662f79a854 100644
--- a/website/config/policies.js
+++ b/website/config/policies.js
@@ -23,5 +23,6 @@ module.exports.policies = {
'legal/view-terms': true,
'legal/view-privacy': true,
'deliver-contact-form-message': true,
+ 'view-query-detail': true,
};
diff --git a/website/config/routes.js b/website/config/routes.js
index be89883e3d..0d3458635e 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -17,26 +17,19 @@ module.exports.routes = {
'/blog': 'https://medium.com/fleetdm',
- '/pricing': (req, res)=>{
- // FUTURE: pricing page explaining commercial support and EE, w/ our subscription terms
- res.redirect('mailto:todo@example.com?subject=Pricing question&body=Please do not send this email!\n\nWe are a very young company and still working on our processes. For now, if you have a pricing question or would like to know Fleet\'s latest pricing and support tiers, please create an issue at https://github.com/fleetdm/fleet/issues. Thank you!');
- },
-
'/legal/terms': 'https://docs.google.com/document/d/1OM6YDVIs7bP8wg6iA3VG13X086r64tWDqBSRudG4a0Y/edit',
- '/security': (req, res)=>{
- // FUTURE: make a page- check out how Sails does it, and also https://about.gitlab.com/security/
- res.redirect('mailto:todo@example.com?subject=Security vulnerability&body=Please do not send this email!\n\nWe are a very young company and still working on our processes. For now, if you have a security vulnerability to report, please send a DM to mikermcneil or Zach Wasserman in the "osquery" Slack workspace. Thank you for letting us know!');
- },
+ '/security': 'https://github.com/fleetdm/fleet/security/policy',
'/company/about': '/blog', // FUTURE: brief "about" page explaining the origins of the company
'/company/stewardship': 'https://github.com/fleetdm/fleet', // FUTURE: page about how we approach open source and our commitments to the community
'GET /company/contact': { action: 'view-contact' },
- 'GET /get-started': { action: 'view-get-started' },
- 'GET /pricing': { action: 'view-pricing' },
- '/try-fleet': '/get-started',
+ 'GET /apply': 'https://fleet-device-management.breezy.hr',
+
+ 'GET /get-started': { action: 'view-pricing' },
+ 'GET /install': 'https://github.com/fleetdm/fleet/blob/master/README.md', // « FUTURE: When ready, bring back { action: 'view-get-started' }
'/documentation': 'https://github.com/fleetdm/fleet/tree/master/docs',
- '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/3-Contribution',
+ '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/4-Contribution',
'/hall-of-fame': 'https://github.com/fleetdm/fleet/pulse',
@@ -62,13 +55,18 @@ module.exports.routes = {
// ╔╦╗╦╔═╗╔═╗ ╦═╗╔═╗╔╦╗╦╦═╗╔═╗╔═╗╔╦╗╔═╗ ┬ ╔╦╗╔═╗╦ ╦╔╗╔╦ ╔═╗╔═╗╔╦╗╔═╗
// ║║║║╚═╗║ ╠╦╝║╣ ║║║╠╦╝║╣ ║ ║ ╚═╗ ┌┼─ ║║║ ║║║║║║║║ ║ ║╠═╣ ║║╚═╗
// ╩ ╩╩╚═╝╚═╝ ╩╚═╚═╝═╩╝╩╩╚═╚═╝╚═╝ ╩ ╚═╝ └┘ ═╩╝╚═╝╚╩╝╝╚╝╩═╝╚═╝╩ ╩═╩╝╚═╝
- // '/logout': '/api/v1/account/logout',
+
+ // Convenience
+ '/pricing': '/get-started',
'/company': '/company/about',
'/support': '/company/contact',
'/contact': '/company/contact',
'/legal': '/legal/terms',
'/terms': '/legal/terms',
+ // '/logout': '/api/v1/account/logout',
+ // Legacy (to avoid breaking links)
+ '/try-fleet': '/get-started',
// ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗
// ║║║║╣ ╠╩╗╠═╣║ ║║ ║╠╩╗╚═╗
@@ -89,6 +87,6 @@ module.exports.routes = {
// 'POST /api/v1/entrance/signup': { action: 'entrance/signup' },
// 'POST /api/v1/entrance/send-password-recovery-email': { action: 'entrance/send-password-recovery-email' },
// 'POST /api/v1/entrance/update-password-and-login': { action: 'entrance/update-password-and-login' },
- // 'POST /api/v1/deliver-contact-form-message': { action: 'deliver-contact-form-message' },
+ 'POST /api/v1/deliver-contact-form-message': { action: 'deliver-contact-form-message' },
};
diff --git a/website/package-lock.json b/website/package-lock.json
index 8ad0b5f8bf..9f6a492a8f 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -72,6 +72,30 @@
"uid2": "0.0.3"
}
},
+ "CSSselect": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz",
+ "integrity": "sha1-+Kt+H4QYzmPNput713ioXX7EkrI=",
+ "requires": {
+ "CSSwhat": "0.4",
+ "domutils": "1.4"
+ },
+ "dependencies": {
+ "domutils": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+ "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=",
+ "requires": {
+ "domelementtype": "1"
+ }
+ }
+ }
+ },
+ "CSSwhat": {
+ "version": "0.4.7",
+ "resolved": "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz",
+ "integrity": "sha1-hn2g/zn3eGEyQsRM/qg/CqTr35s="
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -646,6 +670,44 @@
"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
"dev": true
},
+ "cheerio": {
+ "version": "0.18.0",
+ "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz",
+ "integrity": "sha1-ThwGN35yW3QOmW4N/sNThj3md/o=",
+ "requires": {
+ "CSSselect": "~0.4.0",
+ "dom-serializer": "~0.0.0",
+ "entities": "~1.1.1",
+ "htmlparser2": "~3.8.1",
+ "lodash": "~2.4.1"
+ },
+ "dependencies": {
+ "dom-serializer": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
+ "integrity": "sha1-lYmCfx4y0iw3yCmtq9WbMkevjq8=",
+ "requires": {
+ "domelementtype": "~1.1.1",
+ "entities": "~1.1.1"
+ }
+ },
+ "domelementtype": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+ "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+ },
+ "entities": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+ },
+ "lodash": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+ "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+ }
+ }
+ },
"class-utils": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -843,6 +905,11 @@
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
},
+ "convert-to-ecmascript-compatible-varname": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.5.tgz",
+ "integrity": "sha1-9npJOMUjNENWQlBHnGcBS6yHhJk="
+ },
"cookie": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
@@ -1166,6 +1233,305 @@
}
}
},
+ "doc-templater": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/doc-templater/-/doc-templater-0.4.0.tgz",
+ "integrity": "sha1-/3UagCSWN/ePUlYkjIvw1g2BWb0=",
+ "requires": {
+ "async": "~0.9.0",
+ "fs-extra": "~0.8.1",
+ "lodash": "~2.4.1",
+ "machine": "^2.0.4",
+ "machinepack-fs": "~1.3.4",
+ "machinepack-git": "^2.2.0",
+ "machinepack-markdown": "^1.0.1",
+ "machinepack-process": "^3.0.0-4"
+ },
+ "dependencies": {
+ "async": {
+ "version": "0.9.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+ "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+ },
+ "fs-extra": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.8.1.tgz",
+ "integrity": "sha1-Dld5/7/t9RG8dVWVx/A8BtS0Po0=",
+ "requires": {
+ "jsonfile": "~1.1.0",
+ "mkdirp": "0.3.x",
+ "ncp": "~0.4.2",
+ "rimraf": "~2.2.0"
+ }
+ },
+ "include-all": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/include-all/-/include-all-1.0.8.tgz",
+ "integrity": "sha1-6LuEsFcniiLPlEMZA32XAMGKQ3k=",
+ "requires": {
+ "lodash": "3.10.1"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ }
+ }
+ },
+ "jsonfile": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz",
+ "integrity": "sha1-2k/WrXfxolUgPqY8e8Mtwx72RDM="
+ },
+ "lodash": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+ "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+ },
+ "machine": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-2.0.6.tgz",
+ "integrity": "sha1-pO3cp6zoy6I8KYdI0oov70z3myM=",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "^0.1.0",
+ "debug": "^2.1.1",
+ "lodash": "~2.4.1",
+ "object-hash": "~0.3.0",
+ "rttc": "^1.0.0",
+ "switchback": "~1.1.0"
+ }
+ },
+ "machinepack-fs": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/machinepack-fs/-/machinepack-fs-1.3.4.tgz",
+ "integrity": "sha1-5MoHeslnhelPFLp8L29KI8+OYl8=",
+ "requires": {
+ "async": "^0.9.0",
+ "fs-extra": "~0.10.0",
+ "list-directory-contents": "0.0.2",
+ "lodash": "^2.4.1",
+ "machine": "^1.0.0"
+ },
+ "dependencies": {
+ "fs-extra": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
+ "integrity": "sha1-mcDsL9XqqtnWRiReSwFLVnKZgq8=",
+ "requires": {
+ "jsonfile": "^1.2.0",
+ "mkdirp": "^0.5.0",
+ "ncp": "^0.5.1",
+ "rimraf": "^2.2.8"
+ }
+ },
+ "jsonfile": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz",
+ "integrity": "sha1-XzXWzZ+Ubsl7Wxg1P6nljfG4b2o="
+ },
+ "machine": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-1.3.2.tgz",
+ "integrity": "sha1-m/Z4xdpXV2p+HyZRWw6squzMj0g=",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "^0.1.0",
+ "lodash": "~2.4.1",
+ "object-hash": "~0.3.0",
+ "rttc": "^0.2.2",
+ "switchback": "~1.1.0"
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
+ "ncp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz",
+ "integrity": "sha1-dDmFMW49tFkoG1hxaehFc1oFQ58="
+ },
+ "rttc": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-0.2.4.tgz",
+ "integrity": "sha1-XlctrnBlhZSqC2cAgKIxZCGfqVE=",
+ "requires": {
+ "lodash": "~2.4.1"
+ }
+ }
+ }
+ },
+ "machinepack-json": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/machinepack-json/-/machinepack-json-2.0.1.tgz",
+ "integrity": "sha1-uZGrXIjYxR6dgafe87U4gpVmzEA=",
+ "requires": {
+ "lodash.iserror": "3.1.1",
+ "lodash.isfunction": "3.0.8",
+ "lodash.isregexp": "3.0.5",
+ "machine": "~12.1.0"
+ },
+ "dependencies": {
+ "convert-to-ecmascript-compatible-varname": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.4.tgz",
+ "integrity": "sha1-Sf9G6WwdNWqR1Lg+X/4BM8PIrBQ="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ },
+ "machine": {
+ "version": "12.1.1",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-12.1.1.tgz",
+ "integrity": "sha512-fohf/zxGNvZL69JfbZI/rf660cLnC2tU3tSz8BHGrl+5c7C/82Zypy2fpT2FKPh1q56zfAaCqyI5hSROqBF90g==",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "0.1.4",
+ "debug": "3.1.0",
+ "lodash": "3.10.1",
+ "object-hash": "0.3.0",
+ "rttc": "~9.3.0",
+ "switchback": "2.0.0"
+ }
+ },
+ "rttc": {
+ "version": "9.3.4",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-9.3.4.tgz",
+ "integrity": "sha1-vABXU7c80WrFANkURta5kyBhctc=",
+ "requires": {
+ "lodash": "3.8.0"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.8.0",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
+ "integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E="
+ }
+ }
+ },
+ "switchback": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/switchback/-/switchback-2.0.0.tgz",
+ "integrity": "sha1-KifZAzPe8wWnUh3MHjL2qOOtcgU=",
+ "requires": {
+ "lodash": "~2.4.1"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+ "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+ }
+ }
+ }
+ }
+ },
+ "machinepack-process": {
+ "version": "3.0.0-4",
+ "resolved": "https://registry.npmjs.org/machinepack-process/-/machinepack-process-3.0.0-4.tgz",
+ "integrity": "sha1-t6q3yCdAnfxCC+2gkBZYMd5wuIA=",
+ "requires": {
+ "lodash": "3.10.1",
+ "machine": "^13.0.0-7",
+ "machinepack-json": "~2.0.0",
+ "open": "0.0.5"
+ },
+ "dependencies": {
+ "convert-to-ecmascript-compatible-varname": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.4.tgz",
+ "integrity": "sha1-Sf9G6WwdNWqR1Lg+X/4BM8PIrBQ="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ },
+ "machine": {
+ "version": "13.0.0-24",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-13.0.0-24.tgz",
+ "integrity": "sha512-M4jMQbHlAgPklsGdCxP6udDgeOEABlYxwSV0oybcgt4bZ5hz0CLIIpJUtBNtpDNe29K9u6qFHQrGAAIkEiNa7w==",
+ "requires": {
+ "@sailshq/lodash": "^3.10.2",
+ "convert-to-ecmascript-compatible-varname": "0.1.4",
+ "debug": "3.1.0",
+ "include-all": "^1.0.5",
+ "rttc": "^9.8.1",
+ "switchback": "^2.0.1"
+ }
+ },
+ "rttc": {
+ "version": "9.8.2",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-9.8.2.tgz",
+ "integrity": "sha1-IzfSHUE/SjT/+IF3+V6uft+9Jr8=",
+ "requires": {
+ "lodash": "3.10.1"
+ }
+ },
+ "switchback": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/switchback/-/switchback-2.0.5.tgz",
+ "integrity": "sha512-w9gnsTxR5geOKt45QUryhDP9KTLcOAqje9usR2VQ2ng8DfhaF+mkIcArxioMP/p6Z/ecKE58i2/B0DDlMJK1jw==",
+ "requires": {
+ "@sailshq/lodash": "^3.10.3"
+ }
+ }
+ }
+ },
+ "mkdirp": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+ "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
+ },
+ "ncp": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+ "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ="
+ },
+ "rimraf": {
+ "version": "2.2.8",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+ "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
+ },
+ "rttc": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-1.0.2.tgz",
+ "integrity": "sha1-TTZCjpUoQrJ0P6cC5PVhoi9kje8=",
+ "requires": {
+ "lodash": "~2.4.1"
+ }
+ },
+ "switchback": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/switchback/-/switchback-1.1.3.tgz",
+ "integrity": "sha1-EscBCTSNailvc5upEO64U/i25jE=",
+ "requires": {
+ "lodash": "~2.4.1"
+ }
+ }
+ }
+ },
"doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1179,8 +1545,6 @@
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
- "dev": true,
- "optional": true,
"requires": {
"domelementtype": "^2.0.1",
"entities": "^2.0.0"
@@ -1189,32 +1553,24 @@
"domelementtype": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
- "dev": true,
- "optional": true
+ "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
},
"entities": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
- "dev": true,
- "optional": true
+ "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
}
}
},
"domelementtype": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
- "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
- "dev": true,
- "optional": true
+ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
},
"domhandler": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
"integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
- "dev": true,
- "optional": true,
"requires": {
"domelementtype": "1"
}
@@ -1223,8 +1579,6 @@
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
- "dev": true,
- "optional": true,
"requires": {
"dom-serializer": "0",
"domelementtype": "1"
@@ -1349,9 +1703,7 @@
"entities": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
- "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
- "dev": true,
- "optional": true
+ "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY="
},
"error-ex": {
"version": "1.3.2",
@@ -2910,8 +3262,6 @@
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
"integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
- "dev": true,
- "optional": true,
"requires": {
"domelementtype": "1",
"domhandler": "2.3",
@@ -2924,8 +3274,6 @@
"version": "1.1.14",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
- "dev": true,
- "optional": true,
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
@@ -3588,6 +3936,14 @@
"resolve": "^1.1.7"
}
},
+ "list-directory-contents": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/list-directory-contents/-/list-directory-contents-0.0.2.tgz",
+ "integrity": "sha1-D3Kqpy9xJum6LvJkUnt8E2ihnJY=",
+ "requires": {
+ "walker": "~1.0.6"
+ }
+ },
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -3614,11 +3970,26 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
+ "lodash.iserror": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.1.1.tgz",
+ "integrity": "sha1-KXuaBfq2cUvCRE18wZ0dfES17Ow="
+ },
+ "lodash.isfunction": {
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz",
+ "integrity": "sha1-TbcJ/IG8So/XEnpFilNGxc3OLGs="
+ },
"lodash.isplainobject": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
},
+ "lodash.isregexp": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/lodash.isregexp/-/lodash.isregexp-3.0.5.tgz",
+ "integrity": "sha1-4PWWJC8voiioQAhrbIrYLktx/S0="
+ },
"lodash.issafeinteger": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/lodash.issafeinteger/-/lodash.issafeinteger-4.0.4.tgz",
@@ -3689,6 +4060,54 @@
"walker": "1.0.7"
}
},
+ "machinepack-git": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/machinepack-git/-/machinepack-git-2.2.0.tgz",
+ "integrity": "sha1-ahYf8Z3+npQgujDovkpP4wEBods=",
+ "requires": {
+ "machine": "^10.3.1",
+ "machinepack-process": "^1.2.0"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ },
+ "machine": {
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-10.4.0.tgz",
+ "integrity": "sha1-m1Ys5GeCEzKCijd9GQ65NrTkB7I=",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "^0.1.0",
+ "debug": "^2.1.1",
+ "lodash": "^3.8.0",
+ "object-hash": "~0.3.0",
+ "rttc": "^7.2.1",
+ "switchback": "^2.0.0"
+ }
+ },
+ "machinepack-process": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/machinepack-process/-/machinepack-process-1.4.0.tgz",
+ "integrity": "sha1-MDE++2I+pO5Hc4a1gKhcpGI2Ymg=",
+ "requires": {
+ "lodash": "^3.9.2",
+ "machine": "^10.3.1",
+ "machinepack-json": "^1.1.0",
+ "open": "0.0.5"
+ }
+ },
+ "rttc": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz",
+ "integrity": "sha1-vJys1Grdkj3rYklaAZNOt+9hn7Q=",
+ "requires": {
+ "lodash": "^3.8.0"
+ }
+ }
+ }
+ },
"machinepack-http": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/machinepack-http/-/machinepack-http-8.0.0.tgz",
@@ -3701,6 +4120,124 @@
"rttc": "^10.0.1"
}
},
+ "machinepack-json": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/machinepack-json/-/machinepack-json-1.2.1.tgz",
+ "integrity": "sha1-lRj+7w6LYD01e4ExLBhM3Yv33gU=",
+ "requires": {
+ "lodash": "^3.9.2",
+ "machine": "^11.0.1",
+ "rttc": "^8.1.5"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ },
+ "machine": {
+ "version": "11.0.3",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-11.0.3.tgz",
+ "integrity": "sha1-a0fMYVgGr+D+0CquYf9K72oREOk=",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "^0.1.0",
+ "debug": "^2.1.1",
+ "lodash": "^3.8.0",
+ "object-hash": "~0.3.0",
+ "rttc": "^8.1.5",
+ "switchback": "^2.0.0"
+ }
+ },
+ "rttc": {
+ "version": "8.1.7",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-8.1.7.tgz",
+ "integrity": "sha1-ODksjpA5beVdgbnxjR/2D3RDAgw=",
+ "requires": {
+ "lodash": "^3.8.0"
+ }
+ }
+ }
+ },
+ "machinepack-markdown": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/machinepack-markdown/-/machinepack-markdown-1.1.0.tgz",
+ "integrity": "sha1-lACobKM1wS9gGGU25Dfhgy2oZEg=",
+ "requires": {
+ "async": "~0.9.0",
+ "fs-extra": "~0.10.0",
+ "lodash": "~2.4.1",
+ "machine": "^10.3.1",
+ "marked": "~0.3.2"
+ },
+ "dependencies": {
+ "async": {
+ "version": "0.9.2",
+ "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+ "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+ },
+ "fs-extra": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
+ "integrity": "sha1-mcDsL9XqqtnWRiReSwFLVnKZgq8=",
+ "requires": {
+ "jsonfile": "^1.2.0",
+ "mkdirp": "^0.5.0",
+ "ncp": "^0.5.1",
+ "rimraf": "^2.2.8"
+ }
+ },
+ "jsonfile": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz",
+ "integrity": "sha1-XzXWzZ+Ubsl7Wxg1P6nljfG4b2o="
+ },
+ "lodash": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+ "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+ },
+ "machine": {
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/machine/-/machine-10.4.0.tgz",
+ "integrity": "sha1-m1Ys5GeCEzKCijd9GQ65NrTkB7I=",
+ "requires": {
+ "convert-to-ecmascript-compatible-varname": "^0.1.0",
+ "debug": "^2.1.1",
+ "lodash": "^3.8.0",
+ "object-hash": "~0.3.0",
+ "rttc": "^7.2.1",
+ "switchback": "^2.0.0"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ }
+ }
+ },
+ "ncp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz",
+ "integrity": "sha1-dDmFMW49tFkoG1hxaehFc1oFQ58="
+ },
+ "rttc": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz",
+ "integrity": "sha1-vJys1Grdkj3rYklaAZNOt+9hn7Q=",
+ "requires": {
+ "lodash": "^3.8.0"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+ "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+ }
+ }
+ }
+ }
+ },
"machinepack-postgresql": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/machinepack-postgresql/-/machinepack-postgresql-1.0.2.tgz",
@@ -3816,6 +4353,11 @@
"object-visit": "^1.0.0"
}
},
+ "marked": {
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
+ "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
+ },
"math-random": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@@ -4132,6 +4674,11 @@
}
}
},
+ "object-hash": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-0.3.0.tgz",
+ "integrity": "sha1-VIII5Ds2pE5NowutbFasU7iF50Q="
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -4210,6 +4757,11 @@
"mimic-fn": "^1.0.0"
}
},
+ "open": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+ "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw="
+ },
"opn": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
diff --git a/website/package.json b/website/package.json
index 0792d77840..d4422f9f90 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,6 +16,8 @@
"sails-postgresql": "^1.0.2"
},
"devDependencies": {
+ "cheerio": "0.18.0",
+ "doc-templater": "^0.4.0",
"eslint": "5.16.0",
"grunt": "1.0.4",
"htmlhint": "0.11.0",
@@ -24,9 +26,9 @@
},
"scripts": {
"custom-tests": "echo \"(No other custom tests yet.)\" && echo",
- "build-for-prod": "echo 'Now building+minifying assets for production...' && echo '(Hang tight, this could take a while.)' && echo && node node_modules/grunt/bin/grunt buildProd || (echo && echo '------------------------------------------' && echo 'IMPORTANT! IMPORTANT! IMPORTANT!' && echo 'ERROR: Could not compile assets for production!' && echo && echo 'Please fix the issues logged above' && echo 'and push that up. Then, try deploying again.' && echo '------------------------------------------' && echo) && mv www .www && node -e 'sailsrc = JSON.parse(require(\"fs\").readFileSync(\"./.sailsrc\", \"utf8\")); if (sailsrc.paths&&sailsrc.paths.public !== undefined || sailsrc.hooks&&sailsrc.hooks.grunt !== undefined) { throw new Error(\"Cannot complete deployment script: .sailsrc file has conflicting contents! Please remove the conflicting stuff from .sailsrc, then commit and push that up.\"); } sailsrc.paths = sailsrc.paths || {}; sailsrc.paths.public = \"./.www\"; sailsrc.hooks = sailsrc.hooks || {}; sailsrc.hooks.grunt = false; require(\"fs\").writeFileSync(\"./.sailsrc\", JSON.stringify(sailsrc))' && echo 'Build is complete. Ready to deploy.'",
+ "build-for-prod": "echo 'Now compiling markdown content and building+minifying assets for production...' && echo '(Hang tight, this could take a while.)' && echo && ./node_modules/sails/bin/sails.js run build-from-markdown && echo && node node_modules/grunt/bin/grunt buildProd || (echo && echo '------------------------------------------' && echo 'IMPORTANT! IMPORTANT! IMPORTANT!' && echo 'ERROR: Could not compile assets for production!' && echo && echo 'Please fix the issues logged above' && echo 'and push that up. Then, try deploying again.' && echo '------------------------------------------' && echo) && mv www .www && node -e 'sailsrc = JSON.parse(require(\"fs\").readFileSync(\"./.sailsrc\", \"utf8\")); if (sailsrc.paths&&sailsrc.paths.public !== undefined || sailsrc.hooks&&sailsrc.hooks.grunt !== undefined) { throw new Error(\"Cannot complete deployment script: .sailsrc file has conflicting contents! Please remove the conflicting stuff from .sailsrc, then commit and push that up.\"); } sailsrc.paths = sailsrc.paths || {}; sailsrc.paths.public = \"./.www\"; sailsrc.hooks = sailsrc.hooks || {}; sailsrc.hooks.grunt = false; require(\"fs\").writeFileSync(\"./.sailsrc\", JSON.stringify(sailsrc))' && echo 'Build is complete. Ready to deploy.'",
"build": "echo '\"npm run build\" deliberately left unimplemented to prevent its use, since different platforms like Heroku and GitHub Actions all like to try and run it by default, which can lead to inadvertent duplication and unnecessary lock-in, since one has to find the config to turn that off.'",
- "lint": "./node_modules/eslint/bin/eslint.js . --max-warnings=0 --report-unused-disable-directives && echo '✔ Your .js files look so good.' && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/**/*.ejs && echo '✔ So do your .ejs files.' && ./node_modules/lesshint/bin/lesshint assets/styles/ --max-warnings=0 && echo '✔ Your .less files look good, too.'",
+ "lint": "./node_modules/eslint/bin/eslint.js . --max-warnings=0 --report-unused-disable-directives && echo '✔ Your .js files look so good.' && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/**/**/*.ejs && echo '✔ So do your .ejs files.' && ./node_modules/lesshint/bin/lesshint assets/styles/ --max-warnings=0 && echo '✔ Your .less files look good, too.'",
"start": "NODE_ENV=production node app.js",
"test": "npm run lint && npm run custom-tests && echo 'Done.'",
"wipe-staging": "sails_datastores__default__adapter=sails-postgresql sails_datastores__default__ssl=true sails_datastores__default__url='REAL_DB_URI_HERE' sails lift --drop"
diff --git a/website/scripts/build-from-markdown.js b/website/scripts/build-from-markdown.js
new file mode 100644
index 0000000000..bafcc76135
--- /dev/null
+++ b/website/scripts/build-from-markdown.js
@@ -0,0 +1,44 @@
+module.exports = {
+
+
+ friendlyName: 'Build from markdown',
+
+
+ description: 'Generate HTML partials from markdown content in fleetdm/fleet repo, and configure metadata about the generate files so it is available in `sails.config.builtFromMarkdown`.',
+
+
+ fn: async function () {
+
+ let path = require('path');
+
+ let filesGeneratedBySection = {
+ documentation: await sails.helpers.compileMarkdownContent('docs/'),
+ queryLibrary: await sails.helpers.compileMarkdownContent('handbook/queries/')
+ };
+ // FUTURE: Make this work in parallel as shown here by improving doctemplater to avoid the alreadyExists error
+ // (this actually only fails the very first time, but still, thinking is that it's not worth leaving a hack in
+ // here for a trivial build perf boost right now, especially since it only affects website deploys)
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ // let filesGeneratedBySection = await sails.helpers.flow.simultaneously({
+ // documentation: async() => await sails.helpers.compileMarkdownContent('docs/'),
+ // queryLibrary: async() => await sails.helpers.compileMarkdownContent('handbook/queries/')
+ // });
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ // console.log(filesGeneratedBySection);
+
+ // Compile and generate XML sitemap
+ // (see "refresh" action in sailsjs.com repo for example)
+ // TODO
+
+ // Now take the compiled menu file and inject it into the .sailsrc file so it
+ // can be accessed for the purposes of config using `sails.config.builtFromMarkdown`.
+ let sailsrcPath = path.resolve(sails.config.appPath, '.sailsrc');
+ let sailsrcContent = await sails.helpers.fs.readJson(sailsrcPath);
+ sailsrcContent.builtFromMarkdown = filesGeneratedBySection;
+ await sails.helpers.fs.writeJson(sailsrcPath, sailsrcContent, true);
+
+ }
+
+
+};
+
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index dbe7c70c92..20248f1104 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -73,7 +73,9 @@
- 
+
+
+
@@ -81,16 +83,18 @@
@@ -98,11 +102,11 @@
-
-
+
-
+
-
+
© 2021 Fleet Device Management Inc.
-
+
All trademarks, service marks, and company names are the property of their respective owners.
@@ -226,6 +231,7 @@
+
<% /* Display an overlay if the current browser is not supported.
diff --git a/website/views/pages/contact.ejs b/website/views/pages/contact.ejs
index d1ed43b775..af62062579 100644
--- a/website/views/pages/contact.ejs
+++ b/website/views/pages/contact.ejs
@@ -1,40 +1,56 @@
- Get in touch
- Have a question for us? Maybe some feedback? We love talking to users about NEW_APP_NAME, and we're happy to answer questions about our pricing, roadmap, or business solutions. Send us a note and we'll get back to you as soon as possible.
-
+ Contact our team
+ We're here to answer your questions, and familiarize you with Fleet.
-
-
- Please let us know what to call you.
+
+
+
+
+ Please let us know what to call you.
+
+
+
+
+ Please let us know what to call you.
+
+
-
-
+
+
Please enter a valid email address.
-
-
- Please choose a topic for your message.
+
+
+
+
+ Please choose a topic for your message.
-
+
Message cannot be empty.
+ Fields marked with an asterisk (*) are required.
Send message
+
+ Submit
-
- Thanks for reaching out!
-
- We have received your message, and someone from our team will get back to you soon.
+
+ Thank you, {{formData.firstName}}!
+ We’re happy to hear from you. A member of our team will get back to you soon - usually within 1 business day (or less!).
diff --git a/website/views/pages/get-started.ejs b/website/views/pages/get-started.ejs
index 4931641a73..6ca5e76182 100644
--- a/website/views/pages/get-started.ejs
+++ b/website/views/pages/get-started.ejs
@@ -1,5 +1,5 @@
-
+
Open source
endpoint visibility.
- Ask questions about your servers, containers, and laptops running Linux, Windows, and macOS. Quickly deploy osquery and scale your fleet to 50,000+ devices on top of a stable core technology.
+ Ask questions about your servers, containers, and laptops running Linux, Windows, and macOS. Quickly deploy osquery and scale your fleet to 100,000+ devices on top of a stable core technology.
@@ -22,7 +22,7 @@
- Get started with Fleet
+ Get started with Fleet
@@ -47,23 +47,13 @@
-
-
-
- "Fleet is hands down the best osquery platform out there. Zach and I created Fleet as a natural extension to our original vision for osquery and this has manifested in the ease-of-use, flexibility, and adoption it has today. Look to Fleet for the future of open-source endpoint monitoring."
- - Mike Arpaia, Co-creator of osquery
- 
-
-
-
-
Send device data to any log destination.
Fleet makes it easier to query and track your servers, containers, and laptops. It extends osquery to answer questions about multiple devices at the same time and provides log streams that enable automated threat detection.
-
+
Filesystem
@@ -124,82 +114,97 @@
-
+
- “
- I've been using Fleet to manage thousands of hosts running osquery. Fleet itself is pretty low-maintenance; mostly I don't have to worry about Fleet uptime and instead focus on what matters: deploying osquery, developing better queries, and getting the most out of osquery logs.
- - Brendan Shaklovitz, Senior Site Reliability Engineer, Security Team @ Atlassian
- 
+
+ “I've been using Fleet to manage thousands of hosts running osquery: deploying, developing better queries, and getting the most out of osquery logs.”
+ Brendan Shaklovitz, Site Reliability Engineer
+
-
-
diff --git a/website/views/pages/pricing.ejs b/website/views/pages/pricing.ejs
index a521575268..36391e7a3e 100644
--- a/website/views/pages/pricing.ejs
+++ b/website/views/pages/pricing.ejs
@@ -1,5 +1,5 @@
-
+
Choose your plan
- Choose the right plan for your business
+ Choose the right plan for where your organization is at today.
@@ -19,13 +19,14 @@
Core
FREE
- /host/month
+ /host/month
Start nowInstall Fleet
- Get free trial
+ Chat with us
-
+
-
+
SUPPORT
-
-
+
+
Fleet Core
-
-
+
+
Fleet Basic
-
+
- Community GitHub
+ Public issue tracker (GitHub)
-
+
-
+
-
+
- Community Slack
+ Community Slack channel
-
+
-
+
-
+
- Telephone support
+ Unlimited email support (confidential)
-
-
+
+
-
+
- Email support
+ Phone and video call support
-
-
+
+
-
+
Dedicated Slack channel
-
-
+
+
-
+
INVENTORY MANAGEMENT
-
-
+
+
-
+
-
- Device management & inventory dashboard
-
+ Secure REST API
-
+
-
+
-
+
- Realtime device inventory
+ Command line tool (CLI)
-
+
-
+
-
+
- REST API & CLI tool
+ Realtime device inventory dashboard
-
+
-
+
-
+
+ Browse installed software packages
+
+
+
+
+
+
+
+
+
+
+ 
Search devices by IP, serial, hostname, UUID
-
+
-
+
-
+
- Software inventory*†
-
-
-
-
-
-
-
-
-
-
-
- Integration users with API-only access*†
+ Target and configure specific groups of devices*†
-
-
-
-
+
+
-
+
- Human-to-device mapping*†
-
-
-
-
-
-
-
-
-
-
-
- Target and configure specific groups of systems*†
+ Aggregate insights for groups of devices*†
-
-
-
-
-
-
-
-
-
- Aggregate insights for groups of systems*†
-
-
-
-
+
+
-
+
COLLABORATION
-
-
+
+
-
+
Shareable device health reports
-
+
-
+
-
+
+ Versionable queries and config (GitOps)
+
+
+
+
+
+
+
+
+
+
+
+ Human-to-device mapping*†
+
+
+
+
+
+
+
+
+
+
+
Scope transparency*
-
+
-
+
-
+
Multiple teams*
-
-
+
+
-
+
SECURITY AND COMPLIANCE
-
-
+
+
-
+
Single sign on (SSO, SAML)
-
+
-
+
-
+
+ Audit queries and user activities*
+
+
+
+
+
+
+
+
+
+
+
+
+ Grant API-only access*†
+
+
+
+
+
+
+
+
+
+
+
+
Role-based access control*
-
-
+
+
-
+
MONITORING
-
-
+
+
-
+
- Audit queries and other activity*
+ Schedule and automate custom queries
-
+
-
+
-
+
- Programmable vulnerability management*†
+ Detect vulnerable software*†
-
+
-
+
-
+
Query performance monitoring*
-
+
-
+
-
+
Standard query library*†
-
+
-
+
-
+
Detect and surface issues with devices*†
-
+
-
+
-
+
Self-remediation*†
-
-
+
+
-
+
DATA OUTPUTS
-
-
+
+
-
+
Flexible log destinations (AWS Kinesis, Lambda, GCP)
-
+
-
+
-
+
StreamAlert integration*†
-
+
-
+
+
+
+
+
+
+ File carving (AWS S3)
+
+
+
+
+
+
-
+
DEPLOYMENT
-
-
+
+
-
+
- Self-managed
+ Self-managed (host Fleet in your own environment)
-
+
-
+
-
+
Deployment tools (Helm, Terraform)
-
+
-
+
-
+
-
- Compatible with custom osquery extensions
-
+ Configure osquery startup flags on the fly*
-
+
-
+
-
+
- Configure osquery startup flags*
+ Autoupdate osquery agents†
-
+
-
+
-
+
-
- Programmable vulnerability management*
-
+ Self-hosted autoupdate registry†
-
-
-
-
+
+
-
+
- Osquery agent autoupdates†
-
-
-
-
-
-
-
-
-
-
-
- Self-hosted agent autoupdates†
-
-
-
-
-
-
-
-
-
Mass deploy custom osquery extensions*
-
-
+
+
+
+
+
+
+
+
+ Autoupdate custom osquery extensions*
+
+
+
+
+
@@ -1055,28 +1122,39 @@
+
+
+
+
+ "Fleet is hands down the best osquery platform out there. Zach and I created Fleet as a natural extension to our original vision for osquery and this has manifested in the ease-of-use, flexibility, and adoption it has today. Look to Fleet for the future of open-source endpoint monitoring."
+ - Mike Arpaia, Co-creator of osquery
+
+
+
+
+
-
+
- Still got questions? Get in touch.
+ Still got questions?
diff --git a/website/views/pages/query-detail.ejs b/website/views/pages/query-detail.ejs
new file mode 100644
index 0000000000..48ee108b7b
--- /dev/null
+++ b/website/views/pages/query-detail.ejs
@@ -0,0 +1,11 @@
+
+
+ TODO: Implement this page.
+ (See also assets/styles/pages/query-detail.less, assets/js/pages/query-detail.page.js, and api/controllers/view-query-detail.js.)
+
+ This paragraph, and the content above it, are just here for reference. The HTML generated from markdown is below.
+
+ <%- partial('../partials/built-from-markdown/handbook-queries/get-installed-macos-software.ejs') %>
+
+
+<%- /* Expose server-rendered data as window.SAILS_LOCALS :: */ exposeLocalsToBrowser() %>
diff --git a/yarn.lock b/yarn.lock
index 30150c9057..b0088199ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10659,6 +10659,11 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
+react-accessible-accordion@^3.3.4:
+ version "3.3.4"
+ resolved "https://registry.yarnpkg.com/react-accessible-accordion/-/react-accessible-accordion-3.3.4.tgz#84b08015e74d6b3b225e0101b518b2ea8969e292"
+ integrity sha512-EUq+KmVRIIG5u1fR5XIbb2JU7w7NouLjuyfuPvnhuDIfNNWNYap1I8ijn2rdA6OQi1gGSRGbVzHs+3wxH/M0Sw==
+
react-ace@^6.3.2:
version "6.6.0"
resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-6.6.0.tgz#a79457ef03c3b1f8d4fc598a003b1d6ad464f1a0"
+