MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1547 from Budibase/fix/minio 

remove public folder concept, upload client lib directly
This commit is contained in:
Martin McKeaveney 2021-05-24 20:19:12 +01:00 committed by GitHub
parent 8c52af4cf7 39fb5f9b78
commit 39b6ab7790
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
View File

@ -10,13 +10,13 @@
</script> </script>
{#if show} {#if show}
<ActionButton> <ActionButton
<a target="_blank" href="/api/admin/auth/google"> on:click={() => window.open("/api/admin/auth/google", "_blank")}
>
<div class="inner"> <div class="inner">
<img src={GoogleLogo} alt="google icon" /> <img src={GoogleLogo} alt="google icon" />
<p>Sign in with Google</p> <p>Sign in with Google</p>
</div> </div>
</a>
</ActionButton> </ActionButton>
{/if} {/if}

4
packages/server/src/utilities/fileSystem/index.js
View File

@ -13,7 +13,7 @@ const {
deleteFolder, deleteFolder,
downloadTarball, downloadTarball,
} = require("./utilities") } = require("./utilities")
const { downloadLibraries, newAppPublicPath } = require("./newApp") const { downloadLibraries, uploadClientLibrary } = require("./newApp")
const download = require("download") const download = require("download")
const env = require("../../environment") const env = require("../../environment")
const { homedir } = require("os") const { homedir } = require("os")
@ -134,7 +134,7 @@ exports.performBackup = async (appId, backupName) => {
*/ */
exports.createApp = async appId => { exports.createApp = async appId => {
await downloadLibraries(appId) await downloadLibraries(appId)
await newAppPublicPath(appId) await uploadClientLibrary(appId)
} }
/** /**

5
packages/server/src/utilities/fileSystem/newApp.js
View File

@ -26,10 +26,9 @@ exports.downloadLibraries = async appId => {
return paths return paths
} }
exports.newAppPublicPath = async appId => { exports.uploadClientLibrary = async appId => {
const path = join(appId, "public")
const sourcepath = require.resolve("@budibase/client") const sourcepath = require.resolve("@budibase/client")
const destPath = join(path, "budibase-client.js") const destPath = join(appId, "budibase-client.js")
await streamUpload(BUCKET_NAME, destPath, fs.createReadStream(sourcepath)) await streamUpload(BUCKET_NAME, destPath, fs.createReadStream(sourcepath))
} }