Browse Source

remove public folder concept, upload client lib directly

pull/1547/head
Martin McKeaveney 5 years ago
parent
commit
3d4eab27a8
  1. 14
      packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
  2. 6
      packages/server/src/utilities/fileSystem/index.js
  3. 5
      packages/server/src/utilities/fileSystem/newApp.js

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

@ -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}

6
packages/server/src/utilities/fileSystem/index.js

@ -12,8 +12,9 @@ const {
streamUpload,
deleteFolder,
downloadTarball,
uploadDirectory,
} = 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 +135,8 @@ exports.performBackup = async (appId, backupName) => {
*/
exports.createApp = async appId => {
await downloadLibraries(appId)
await newAppPublicPath(appId)
await uploadClientLibrary(appId)
await uploadDirectory(ObjectStoreBuckets.APPS, NODE_MODULES_PATH, appId)
}
/**

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

@ -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))
}

Loading…
Cancel
Save