From 137aee21eed837f246e38ef093ab96d0773ac49a Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 6 Feb 2022 01:25:56 +0000 Subject: [PATCH 1/6] :purple_heart: Updates contributors list --- docs/credits.md | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/docs/credits.md b/docs/credits.md index ea1571df..201cf697 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -34,10 +34,25 @@ - ratty222 + ratty222
Ratty222 + + + + undefined +
+ undefined + + + + + + jtfinley72 +
+ jtfinley72 + @@ -124,14 +139,21 @@ Dan Gilbert + + + rubenandre +
+ RĂºben Silva + + + BeginCI
Begin - - + skaarj1989 @@ -166,15 +188,15 @@
Ishan Jain - + + KierenConnell
Kieren Connell - - + rubjo @@ -209,7 +231,8 @@
Aniket Teredesai - + + jnach From 7d8c048e3c73a06f53b2c30fbcff7e014d4945b5 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 6 Feb 2022 01:25:57 +0000 Subject: [PATCH 2/6] :yellow_heart: Updates sponsors table --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e8134096..8800f8b9 100644 --- a/README.md +++ b/README.md @@ -516,10 +516,25 @@ Huge thanks to the sponsors helping to support Dashy's development! - ratty222 + ratty222
Ratty222 + + + + undefined +
+ undefined + + + + + + jtfinley72 +
+ jtfinley72 + From 8e82e450ecfc40505d9d3573ff5a7a216922e8a0 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 6 Feb 2022 01:26:00 +0000 Subject: [PATCH 3/6] :blue_heart: Updates contributor SVG --- docs/assets/CONTRIBUTORS.svg | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index f2984c00..f6bd0f86 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -30,40 +30,43 @@ + + + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file From 7428838c55241dfb428e80948baf52efb073dfaa Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 6 Feb 2022 01:26:06 +0000 Subject: [PATCH 4/6] :blue_heart: Makes author list --- .github/AUTHORS.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index 37e64dbb..09040d51 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -17,6 +17,7 @@ jnach <33467747+jnach@users.noreply.github.com> - 1 commits BOZG - 2 commits Brendan <'Lear> - 2 commits Dan - 2 commits +Ruben - 2 commits liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits ᗪєνιη <Ï…Đ½> - 2 commits Walkx <71191962+walkxcode@users.noreply.github.com> - 3 commits @@ -31,13 +32,13 @@ Alicia - 16 commits github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 16 commits snyk-bot - 18 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits -repo-visualizer - 22 commits -snyk-bot - 25 commits +repo-visualizer - 23 commits Alicia - 28 commits -Alicia - 45 commits -liss-bot - 58 commits +snyk-bot - 29 commits +Alicia - 47 commits +liss-bot - 59 commits Alicia - 60 commits Lissy93 - 78 commits Lissy93 - 206 commits -Alicia - 323 commits -Alicia - 1346 commits \ No newline at end of file +Alicia - 332 commits +Alicia - 1374 commits \ No newline at end of file From b0cc37ac33a18fc5a8275bed293c2d56ece20ab3 Mon Sep 17 00:00:00 2001 From: repo-visualizer Date: Sun, 6 Feb 2022 01:27:03 +0000 Subject: [PATCH 5/6] :yellow_heart: Updates repo diagram --- docs/assets/repo-visualization.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/repo-visualization.svg b/docs/assets/repo-visualization.svg index 05ed50f1..2607c19b 100644 --- a/docs/assets/repo-visualization.svg +++ b/docs/assets/repo-visualization.svg @@ -1 +1 @@ -viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file +viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file From e5ccdd9e97c0f9f6b5d6b70c5c319bf20cb5619a Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Mon, 7 Feb 2022 15:55:35 +0000 Subject: [PATCH 6/6] :goal_net: Adds try catch to server welcome msg (#477) --- server.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/server.js b/server.js index bc66efc3..4cef9e23 100644 --- a/server.js +++ b/server.js @@ -1,8 +1,8 @@ /** - * Note: The app must first be built (yarn build) before this script is run * This is the main entry point for the application, a simple server that * runs some checks, and then serves up the app from the ./dist directory - * Also includes some routes for status checks/ ping and config saving + * Also imports some routes for status checks/ ping and config saving + * Note: The app must first be built (yarn build) before this script is run * */ /* Import built-in Node server modules */ @@ -46,10 +46,15 @@ const getLocalIp = () => { /* Gets the users local IP and port, then calls to print welcome message */ const printWelcomeMessage = () => { - getLocalIp().then(({ address }) => { - const ip = address || 'localhost'; - console.log(printMessage(ip, port, isDocker)); // eslint-disable-line no-console - }); + try { + getLocalIp().then(({ address }) => { + const ip = address || 'localhost'; + console.log(printMessage(ip, port, isDocker)); // eslint-disable-line no-console + }); + } catch (e) { + // Fetching info for welcome message failed, print simple msg instead + console.log(`Dashy server has started (${port})`); // eslint-disable-line no-console + } }; /* Just console.warns an error */ @@ -65,7 +70,7 @@ const app = express() .use(express.static(path.join(__dirname, 'dist'))) .use(express.static(path.join(__dirname, 'public'), { index: 'initialization.html' })) // Load middlewares for parsing JSON, and supporting HTML5 history routing - .use(express.json()) + .use(express.json({ limit: '1mb' })) .use(history()) // GET endpoint to run status of a given URL with GET request .use(ENDPOINTS.statusCheck, (req, res) => { @@ -114,7 +119,13 @@ const app = express() }); /* Create HTTP server from app on port, and print welcome message */ -http.createServer(app).listen(port, () => { printWelcomeMessage(); }); +http.createServer(app) + .listen(port, () => { + printWelcomeMessage(); + }) + .on('error', (err) => { + printWarning('Unable to start Dashy\'s Node server', err); + }); /* Check, and if possible start SSL server too */ sslServer(app);