CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-09-30 17:18:14 +13:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1547 from Budibase/fix/minio

Browse source 
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
commit a1a7604022
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
View file

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

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

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