Browse Source

Quick fix and making sure CSS temp files in app directory don't get uploaded.

gh-pages
mike12345567 6 years ago
parent
commit
eb5e1ea6d4
  1. 11
      packages/server/src/api/controllers/deploy/aws.js
  2. 2
      packages/server/src/constants/screens.js

11
packages/server/src/api/controllers/deploy/aws.js

@ -7,6 +7,8 @@ const { budibaseAppsDir } = require("../../../utilities/budibaseDir")
const PouchDB = require("../../../db") const PouchDB = require("../../../db")
const env = require("../../../environment") const env = require("../../../environment")
const EXCLUDED_DIRECTORIES = ["css"]
/** /**
* Finalises the deployment, updating the quota for the user API key * Finalises the deployment, updating the quota for the user API key
* The verification process returns the levels to update to. * The verification process returns the levels to update to.
@ -140,10 +142,17 @@ exports.uploadAppAssets = async function({ appId, bucket, accountId }) {
// Upload HTML, CSS and JS of the web app // Upload HTML, CSS and JS of the web app
walkDir(appAssetsPath, function(filePath) { walkDir(appAssetsPath, function(filePath) {
const filePathParts = filePath.split("/")
const publicIndex = filePathParts.indexOf("public")
const directory = filePathParts[publicIndex + 1]
// don't include these top level directories
if (EXCLUDED_DIRECTORIES.indexOf(directory) !== -1) {
return
}
const appAssetUpload = prepareUploadForS3({ const appAssetUpload = prepareUploadForS3({
file: { file: {
path: filePath, path: filePath,
name: [...filePath.split("/")].pop(), name: filePathParts.pop(),
}, },
s3Key: filePath.replace(appAssetsPath, `assets/${appId}`), s3Key: filePath.replace(appAssetsPath, `assets/${appId}`),
s3, s3,

2
packages/server/src/constants/screens.js

@ -123,7 +123,7 @@ exports.LOGIN_SCREEN = {
}, },
routing: { routing: {
route: "/", route: "/",
accessLevelId: BUILTIN_LEVEL_IDS.PUBLIC, accessLevelId: BUILTIN_ROLE_IDS.PUBLIC,
}, },
name: "login-screen", name: "login-screen",
} }

Loading…
Cancel
Save