From a4e846c72b2e640e9bd40093b340d42362616b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Thu, 30 Sep 2021 19:19:46 +0200 Subject: [PATCH 01/25] feat((frontend) admin invites): initial invites admin page --- packages/frontend/src/router/index.js | 5 ++ packages/frontend/src/views/admin/Admin.vue | 41 ++++++++++------ .../frontend/src/views/admin/AdminInvites.vue | 48 +++++++++++++++++++ packages/frontend/vue.config.js | 4 ++ 4 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 packages/frontend/src/views/admin/AdminInvites.vue diff --git a/packages/frontend/src/router/index.js b/packages/frontend/src/router/index.js index 47ead4575..2f1784f5e 100644 --- a/packages/frontend/src/router/index.js +++ b/packages/frontend/src/router/index.js @@ -218,6 +218,11 @@ const routes = [ name: 'Admin | Settings', path: 'settings', component: () => import('@/views/admin/AdminSettings.vue') + }, + { + name: 'Admin | Invites', + path: 'invites', + component: () => import('@/views/admin/AdminInvites.vue') } ] } diff --git a/packages/frontend/src/views/admin/Admin.vue b/packages/frontend/src/views/admin/Admin.vue index eafae1114..7fb5cd08d 100644 --- a/packages/frontend/src/views/admin/Admin.vue +++ b/packages/frontend/src/views/admin/Admin.vue @@ -1,16 +1,15 @@ - - diff --git a/packages/frontend/src/views/admin/AdminInvites.vue b/packages/frontend/src/views/admin/AdminInvites.vue new file mode 100644 index 000000000..f5bbef136 --- /dev/null +++ b/packages/frontend/src/views/admin/AdminInvites.vue @@ -0,0 +1,48 @@ + + + diff --git a/packages/frontend/vue.config.js b/packages/frontend/vue.config.js index b9542acb1..178d94735 100644 --- a/packages/frontend/vue.config.js +++ b/packages/frontend/vue.config.js @@ -1,4 +1,7 @@ module.exports = { + configureWebpack: { + devtool: 'source-map' + }, productionSourceMap: false, pages: { app: { @@ -16,6 +19,7 @@ module.exports = { }, devServer: { host: 'localhost', + proxy: 'http://localhost:3000', historyApiFallback: { rewrites: [ { from: /^\/$/, to: '/app.html' }, From 19af6d631dd86f7ae73bfd92ba1f8a12da40cd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Mon, 4 Oct 2021 11:26:04 +0200 Subject: [PATCH 02/25] feat((frontend) batch invites): add batch invite functionality to admin invites page --- .../frontend/src/views/admin/AdminInvites.vue | 186 +++++++++++++++--- 1 file changed, 157 insertions(+), 29 deletions(-) diff --git a/packages/frontend/src/views/admin/AdminInvites.vue b/packages/frontend/src/views/admin/AdminInvites.vue index f5bbef136..d532e7b7d 100644 --- a/packages/frontend/src/views/admin/AdminInvites.vue +++ b/packages/frontend/src/views/admin/AdminInvites.vue @@ -1,47 +1,175 @@ diff --git a/packages/server/modules/fileuploads/index.js b/packages/server/modules/fileuploads/index.js index b5aa50ac9..1a48f9f8b 100644 --- a/packages/server/modules/fileuploads/index.js +++ b/packages/server/modules/fileuploads/index.js @@ -53,7 +53,9 @@ exports.init = async ( app, options ) => { if ( process.env.DISABLE_FILE_UPLOADS ) { return res.status( 503 ).send( 'File uploads are disabled on this server' ) } + let fileInfo = await getFileInfo( { fileId: req.params.fileId } ) + if ( !fileInfo ) return res.status( 404 ).send( 'File not found' ) @@ -85,7 +87,7 @@ exports.init = async ( app, options ) => { let fileStream = await getFileStream( { fileId: req.params.fileId } ) - res.writeHead( 200, { 'Content-Type': 'application/octet-stream', 'Content-Disposition': 'attachment' } ) + res.writeHead( 200, { 'Content-Type': 'application/octet-stream', 'Content-Disposition': `attachment; filename="${fileInfo.fileName}"`, } ) fileStream.pipe( res ) } ), diff --git a/packages/server/modules/shared/index.js b/packages/server/modules/shared/index.js index cab2cfcc7..ddeebfcfe 100644 --- a/packages/server/modules/shared/index.js +++ b/packages/server/modules/shared/index.js @@ -21,10 +21,9 @@ async function contextApiTokenHelper( { req, res, connection } ) { if ( connection && connection.context.token ) { // Websockets (subscriptions) token = connection.context.token - } else if ( req && req.headers.authorization ) { // Standard http + } else if ( req && req.headers.authorization ) { // Standard http post token = req.headers.authorization - } - + } if ( token && token.includes( 'Bearer ' ) ) { token = token.split( ' ' )[ 1 ] } From f16f0f79726ed367ddbe2ddca75039be336ed8f2 Mon Sep 17 00:00:00 2001 From: Dimitrie Stefanescu Date: Fri, 8 Oct 2021 16:07:51 +0100 Subject: [PATCH 10/25] feat(ifc/frontend): adds branch selection --- .../src/components/FileUploadItem.vue | 63 +++++++++---------- .../frontend/src/views/stream/Uploads.vue | 9 ++- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/frontend/src/components/FileUploadItem.vue b/packages/frontend/src/components/FileUploadItem.vue index d7b8de6e0..9d7ec767b 100644 --- a/packages/frontend/src/components/FileUploadItem.vue +++ b/packages/frontend/src/components/FileUploadItem.vue @@ -9,47 +9,37 @@ {{ file.size }}kb - Upload + + + + + {{ item.name }} + + + + Upload An error occurred.