From 6cb59e6ad107d8d4c61a0898c05f03e68e2640ef Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Thu, 12 Dec 2019 22:08:15 -0800 Subject: [PATCH 01/15] Added endpoint to clear logs --- src/api/logs.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/api/logs.ts b/src/api/logs.ts index 842cf916..44d10845 100644 --- a/src/api/logs.ts +++ b/src/api/logs.ts @@ -40,4 +40,25 @@ logsRouter.get('/out/:domain', (req, res) => { } }) +logsRouter.delete('/:domain', (req, res) => { + const { domain } = req.params + + fs.writeFile( + `/home/myproxy/.pm2/logs/${domain}-out.log`, + 'Log cleared', + err => { + if (err) console.log('Error deleting output log') + } + ) + fs.writeFile( + `/home/myproxy/.pm2/logs/${domain}-err.log`, + 'Log cleared', + err => { + if (err) console.log('Error deleting error log') + } + ) + + res.send('LOGS DELETED') +}) + export default logsRouter From bef3503d506fa73fed41ae6935ceb93139182c36 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Thu, 12 Dec 2019 22:36:32 -0800 Subject: [PATCH 02/15] Added code for UI --- src/public/client.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/public/client.ts b/src/public/client.ts index 7cb0a53a..1b58df41 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -41,14 +41,16 @@ class MappingItem { const mappingElement = document.createElement('li') let iconClass let iconColor - // LogClass is used to hide the button to download logs when - // pm2 is not managing the apps. Since pm2 is not managing the apps, - // the logs will not be located at the same location + // The variables below are to hide log related icons when pm2 is not + // being used to monitor the apps. These apps will not have status since + // they are not managed by pm2. + let settingClass let logClass if (data.status === 'online') { iconClass = 'fa fa-circle mr-1 mt-1' iconColor = 'rgba(50,255,50,0.5)' logClass = 'fa fa-file-text-o ml-1 mt-1' + settingClass = 'fa fa-cog' } else if (data.status === 'not started') { iconClass = '' iconColor = 'transparent' @@ -56,6 +58,7 @@ class MappingItem { iconClass = 'fa fa-circle mr-1 mt-1' iconColor = 'rgba(255, 50, 50, 0.5)' logClass = 'fa fa-file-text-o ml-1 mt-1' + settingClass = 'fa fa-cog' } mappingElement.classList.add( 'list-group-item', @@ -83,6 +86,16 @@ class MappingItem { style="font-size: 15px; color: rgba(40,167,70,0.5)" href="/api/logs/out/${data.fullDomain}"> +
+ +
+ +
+
${data.gitLink} From 875ee7f4993d1318bc074ab5d5c570f9f8475755 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Thu, 12 Dec 2019 23:43:52 -0800 Subject: [PATCH 03/15] Updated UI --- src/public/client.ts | 12 ++++++++---- views/layout/head.ejs | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/public/client.ts b/src/public/client.ts index 1b58df41..d7de85c8 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -87,13 +87,17 @@ class MappingItem { href="/api/logs/out/${data.fullDomain}">
- -
- + +
+ @@ -105,14 +117,18 @@ class MappingItem { ${data.gitLink}
- - Download + + Download ` From ead47a90a8232bd74dea309fd3e2e59fc7c45d72 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Thu, 12 Dec 2019 23:56:23 -0800 Subject: [PATCH 05/15] Added margin for dropdown. Removed toggle button triangle --- src/public/client.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/public/client.ts b/src/public/client.ts index b4b861ab..9565f767 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -50,7 +50,7 @@ class MappingItem { iconClass = 'fa fa-circle mr-1 mt-1' iconColor = 'rgba(50,255,50,0.5)' logClass = 'fa fa-file-text-o ml-1 mt-1' - settingClass = 'fa fa-cog' + settingClass = 'ml-1 fa fa-cog' } else if (data.status === 'not started') { iconClass = '' iconColor = 'transparent' @@ -90,12 +90,7 @@ class MappingItem { >
- + Date: Fri, 13 Dec 2019 00:04:34 -0800 Subject: [PATCH 06/15] Changed clear logs color. Added logic for clearing logs --- src/public/client.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/public/client.ts b/src/public/client.ts index 9565f767..734a0bec 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -101,7 +101,7 @@ class MappingItem { @@ -141,6 +141,14 @@ class MappingItem { }) } } + const clearLogButton = helper.getElement('.deleteLogButton') + clearLogButton.onclick = (): void => { + fetch(`/api/logs/${data.fullDomain}`, { + method: 'DELETE' + }).then(() => { + window.location.reload() + }) + } } } From 0081c8f74f726d57650a71689aa308661cbfecd9 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 00:07:05 -0800 Subject: [PATCH 07/15] Corrected helper function --- src/public/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/client.ts b/src/public/client.ts index 734a0bec..56d43c64 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -141,7 +141,7 @@ class MappingItem { }) } } - const clearLogButton = helper.getElement('.deleteLogButton') + const clearLogButton = helper.getElement('.deleteLogButton', mappingElement) clearLogButton.onclick = (): void => { fetch(`/api/logs/${data.fullDomain}`, { method: 'DELETE' From f57cb7d2041a3d45582f27321f26da1f771c9e28 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 00:12:43 -0800 Subject: [PATCH 08/15] Corrected className typo --- src/public/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/client.ts b/src/public/client.ts index 56d43c64..6638e528 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -89,7 +89,7 @@ class MappingItem { href="/api/logs/out/${data.fullDomain}" > -
+
Date: Fri, 13 Dec 2019 00:16:45 -0800 Subject: [PATCH 09/15] Changed gear color --- src/public/client.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/public/client.ts b/src/public/client.ts index 6638e528..3fe5f356 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -91,17 +91,13 @@ class MappingItem {
- - +
From 2cd9ddafae6d1c64377ebca8f265a87d6abc7791 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 00:18:39 -0800 Subject: [PATCH 10/15] Updated Clear Log color --- src/public/client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/client.ts b/src/public/client.ts index 3fe5f356..aa28738e 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -97,7 +97,7 @@ class MappingItem { From 0f0ea3a2d99126c531c45e3bb65a13caac5a0692 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 00:29:39 -0800 Subject: [PATCH 11/15] Added confirmation message for clearing logs --- src/public/client.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/public/client.ts b/src/public/client.ts index aa28738e..7173f3f8 100644 --- a/src/public/client.ts +++ b/src/public/client.ts @@ -139,11 +139,15 @@ class MappingItem { } const clearLogButton = helper.getElement('.deleteLogButton', mappingElement) clearLogButton.onclick = (): void => { - fetch(`/api/logs/${data.fullDomain}`, { - method: 'DELETE' - }).then(() => { - window.location.reload() - }) + if ( + confirm(`Are you sure you want to clear ${data.fullDomain}'s logs?`) + ) { + fetch(`/api/logs/${data.fullDomain}`, { + method: 'DELETE' + }).then(() => { + window.location.reload() + }) + } } } } From 7b499eecfa544211bef99601ffb1b44d78de1a1b Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 00:30:29 -0800 Subject: [PATCH 12/15] Added new line to Log cleared message --- src/api/logs.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/logs.ts b/src/api/logs.ts index 44d10845..6e77c800 100644 --- a/src/api/logs.ts +++ b/src/api/logs.ts @@ -45,14 +45,14 @@ logsRouter.delete('/:domain', (req, res) => { fs.writeFile( `/home/myproxy/.pm2/logs/${domain}-out.log`, - 'Log cleared', + 'Log cleared\n', err => { if (err) console.log('Error deleting output log') } ) fs.writeFile( `/home/myproxy/.pm2/logs/${domain}-err.log`, - 'Log cleared', + 'Log cleared\n', err => { if (err) console.log('Error deleting error log') } From c448521ce94ce961755fa39bfaabae86a2702871 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 19:47:42 -0800 Subject: [PATCH 13/15] Added test for delete logs endpoint --- src/api/logs.ts | 15 ++++++++------- src/tests/integration/log.test.ts | 7 +++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/api/logs.ts b/src/api/logs.ts index 6e77c800..f5f1d616 100644 --- a/src/api/logs.ts +++ b/src/api/logs.ts @@ -43,13 +43,14 @@ logsRouter.get('/out/:domain', (req, res) => { logsRouter.delete('/:domain', (req, res) => { const { domain } = req.params - fs.writeFile( - `/home/myproxy/.pm2/logs/${domain}-out.log`, - 'Log cleared\n', - err => { - if (err) console.log('Error deleting output log') - } - ) + if (isProduction()) + fs.writeFile( + `/home/myproxy/.pm2/logs/${domain}-out.log`, + 'Log cleared\n', + err => { + if (err) console.log('Error deleting output log') + } + ) fs.writeFile( `/home/myproxy/.pm2/logs/${domain}-err.log`, 'Log cleared\n', diff --git a/src/tests/integration/log.test.ts b/src/tests/integration/log.test.ts index 3402d5ee..d883d0a9 100644 --- a/src/tests/integration/log.test.ts +++ b/src/tests/integration/log.test.ts @@ -1,4 +1,5 @@ import { startAppServer } from '../../server/server' +import uuidv4 from 'uuid/v4' import { logAdapter } from '../helpers/logAdapter' const TEST_PORT = process.env.PORT || 50608 @@ -28,4 +29,10 @@ describe('/api/logs', () => { const logResponse = await logAdapter(`/err/${subDomain}.${domain}`, 'GET') expect(logResponse.status).toEqual(200) }) + + it('checks the delete endpoint exists', async () => { + const fullDomain = `${uuidv4()}.walker.com` + const logResponse = await logAdapter(`/${fullDomain}`, 'DELETE') + expect(logResponse.status).toEqual(200) + }) }) From d7673ff27470bc123bc49fb8d3d1b19c8002ba40 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 19:49:22 -0800 Subject: [PATCH 14/15] Refactored logs test --- src/tests/integration/log.test.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tests/integration/log.test.ts b/src/tests/integration/log.test.ts index d883d0a9..c1380297 100644 --- a/src/tests/integration/log.test.ts +++ b/src/tests/integration/log.test.ts @@ -17,16 +17,14 @@ describe('/api/logs', () => { }) it('checks that output logs endpoint exists', async () => { - const subDomain = 'Cloud' - const domain = 'Walker' - const logResponse = await logAdapter(`/out/${subDomain}.${domain}`, 'GET') + const fullDomain = 'Cloud.Walker.com' + const logResponse = await logAdapter(`/out/${fullDomain}`, 'GET') expect(logResponse.status).toEqual(200) }) it('checks that error logs endpoint exists', async () => { - const subDomain = 'Luke' - const domain = 'Walker' - const logResponse = await logAdapter(`/err/${subDomain}.${domain}`, 'GET') + const fullDomain = 'Luke.Walker.com' + const logResponse = await logAdapter(`/err/${fullDomain}`, 'GET') expect(logResponse.status).toEqual(200) }) From a69f1e003da455fae9aeae5c8a8cb54f02d1f7c8 Mon Sep 17 00:00:00 2001 From: hwong0305 Date: Fri, 13 Dec 2019 19:59:01 -0800 Subject: [PATCH 15/15] removed unused class: gearButton --- views/layout/head.ejs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/views/layout/head.ejs b/views/layout/head.ejs index b4b7c330..96695eb7 100644 --- a/views/layout/head.ejs +++ b/views/layout/head.ejs @@ -21,10 +21,6 @@ display: inline-block; cursor: pointer; } - .gearButton { - background: inherit; - border: none; - } .actionContainer .loading { display: none; }