Fix lint rules and simplify website development by checking in a dev-only config file that sets the default port to 2024 instead of 1337, so you dont have to do that with a command-line option.
This commit is contained in:
Mike McNeil
Vendored
+13
-7
@@ -3,21 +3,27 @@
|
||||
This is where the code for the public https://fleetdm.com website lives.
|
||||
|
||||
|
||||
a [Sails v1](https://sailsjs.com) application
|
||||
<!-- a [Sails v1](https://sailsjs.com) application -->
|
||||
|
||||
|
||||
## Test locally
|
||||
|
||||
Run the following commands to test the site locally:
|
||||
|
||||
```sh
|
||||
npm install -g sails
|
||||
cd website/
|
||||
npm install
|
||||
sails lift --port=2024
|
||||
sails lift
|
||||
```
|
||||
|
||||
The site will now be running on http://localhost:2024
|
||||
Your local copy of the website is now running at [http://localhost:2024](http://localhost:2024)!
|
||||
|
||||
|
||||
## Bugs
|
||||
To report a bug or make a suggestion for the website, [click here](https://github.com/fleetdm/fleet/issues).
|
||||
|
||||
|
||||
<!--
|
||||
### Links
|
||||
|
||||
+ [Sails framework documentation](https://sailsjs.com/get-started)
|
||||
@@ -29,14 +35,14 @@ The site will now be running on http://localhost:2024
|
||||
|
||||
### Version info
|
||||
|
||||
This app was originally generated on Wed Aug 26 2020 04:48:44 GMT-0500 (Central Daylight Time) using Sails v1.2.5.
|
||||
This app was originally generated on Wed Aug 26 2020 04:48:44 GMT-0500 (Central Daylight Time) using Sails v1.2.5. -->
|
||||
|
||||
<!-- Internally, Sails used [`sails-generate@2.0.0`](https://github.com/balderdashy/sails-generate/tree/v2.0.0/lib/core-generators/new). -->
|
||||
|
||||
|
||||
<!--
|
||||
This project's boilerplate is based on an expanded seed app provided by the [Sails core team](https://sailsjs.com/about) to make it easier for you to build on top of ready-made features like authentication, enrollment, email verification, and billing. For more information, [drop us a line](https://sailsjs.com/support).
|
||||
|
||||
|
||||
-->
|
||||
<!--
|
||||
Note: Generators are usually run using the globally-installed `sails` CLI (command-line interface). This CLI version is _environment-specific_ rather than app-specific, thus over time, as a project's dependencies are upgraded or the project is worked on by different developers on different computers using different versions of Node.js, the Sails dependency in its package.json file may differ from the globally-installed Sails CLI release it was originally generated with. (Be sure to always check out the relevant [upgrading guides](https://sailsjs.com/upgrading) before upgrading the version of Sails used by your app. If you're stuck, [get help here](https://sailsjs.com/support).)
|
||||
-->
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ h1, h2, h3, h4 {
|
||||
}
|
||||
|
||||
.dropdown-menu {
|
||||
left: 16px !important;
|
||||
left: 16px !important;//lesshint-disable-line importantRule
|
||||
min-width: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@@ -10,8 +10,7 @@ html, body {
|
||||
|
||||
[purpose='page-wrap'] {
|
||||
height: 100%;
|
||||
/* lesshint-disable */height: auto !important;/* lesshint-enable */
|
||||
// ^^The above is to disable "importantRule" and "duplicateProperty" rules.
|
||||
height: auto !important;//lesshint-disable-line importantRule,duplicateProperty
|
||||
min-height: 100%;
|
||||
position: relative;
|
||||
padding-bottom: @footer-height;
|
||||
@@ -23,7 +22,7 @@ html, body {
|
||||
right: 0;
|
||||
.header-btn {
|
||||
color: #ffffff;
|
||||
cursor: default !important;
|
||||
cursor: default !important;//lesshint-disable-line importantRule
|
||||
font-family: @navigation-font;
|
||||
}
|
||||
// .header-btn[aria-expanded='true'] {
|
||||
|
||||
Vendored
+17
@@ -0,0 +1,17 @@
|
||||
/**
|
||||
* Development environment settings
|
||||
* (sails.config.*)
|
||||
*
|
||||
* The configuration in this file only applies when Sails is running
|
||||
* in the local development environment.
|
||||
*/
|
||||
|
||||
module.exports = {
|
||||
|
||||
// Develop locally on http://localhost:2024
|
||||
// (instead of the standard default for Sails apps, http://localhost:1337.
|
||||
// This helps avoid conflicts since `fleetctl preview` will very often already
|
||||
// be running on port 1337 on your computer.)
|
||||
port: 2024,
|
||||
|
||||
};
|
||||
@@ -55,13 +55,13 @@
|
||||
<div class="d-flex d-lg-none">
|
||||
<button style="font-size: 16px; text-decoration: none;" class="header-btn btn btn-link d-flex align-items-center" data-toggle="collapse" data-target="#navbarToggleExternalContent">
|
||||
<span class="mr-2">Menu</span>
|
||||
<img src="/images/icon-hamburger-16x14@2x.png" style="width: 16px;" />
|
||||
<img alt="An icon indicating that interacting with this button will open the navigation menu." src="/images/icon-hamburger-16x14@2x.png" style="width: 16px;" />
|
||||
</button>
|
||||
<div class="mobile-menu collapse px-4 px-sm-5" id="navbarToggleExternalContent">
|
||||
<div class="d-flex justify-content-between">
|
||||
<img alt="Fleet logo" src="/images/logo-blue-162x92@2x.png" style="height: 92px; width: 162px;" class="mt-3"/>
|
||||
<button style="font-size: 16px; text-decoration: none;" class="header-btn btn btn-link d-flex align-items-center" data-toggle="collapse" data-target="#navbarToggleExternalContent">
|
||||
<img src="/images/icon-close-16x16@2x.png" style="width: 16px;" />
|
||||
<img alt="An 'X' icon indicating that this can be interacted with to close the navigation menu." src="/images/icon-close-16x16@2x.png" style="width: 16px;" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="pt-2">
|
||||
@@ -75,7 +75,7 @@
|
||||
<a href="/blog" class="header-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Blog</a>
|
||||
<a href="/company/contact" class="header-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Contact</a>
|
||||
<a target="_blank" href="https://github.com/fleetdm/fleet" class="header-link d-flex align-items-center px-3 py-2" style=" text-decoration: none; color: #192147; font-weight: 700;">
|
||||
<img src="/images/github-mark-blue-24x24@2x.png" style="width: 24px; font-weight: 700;" />
|
||||
<img alt="A blue octocat icon representing the GitHub brand." src="/images/github-mark-blue-24x24@2x.png" style="width: 24px; font-weight: 700;" />
|
||||
<span class="ml-2">GitHub</span>
|
||||
</a>
|
||||
</div>
|
||||
@@ -96,7 +96,7 @@
|
||||
<a target="_blank" href="/blog" class="header-link d-flex align-items-center px-3 py-2 mr-4 text-decoration-none" style=" text-decoration: none;line-height: 23px;">Blog</a>
|
||||
<a href="/company/contact" class="header-link d-flex align-items-center px-3 py-2 mr-4 text-decoration-none" style=" text-decoration: none;line-height: 23px;">Contact</a>
|
||||
<a target="_blank" href="https://github.com/fleetdm/fleet" class="header-link d-flex align-items-center px-3 py-2" style=" text-decoration: none;line-height: 23px;">
|
||||
<img src="/images/github-mark-white-24x24@2x.png" style="width: 24px;" />
|
||||
<img alt="A white octocat icon representing the GitHub brand." src="/images/github-mark-white-24x24@2x.png" style="width: 24px;" />
|
||||
<span class="ml-2">GitHub</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user