move assets to root, add new features to botway ui app

Author: abdfnx

.github/workflows/deploy.yml

@@ -32,7 +32,7 @@ jobs:
           cd ./installer
           cargo build --release
           cp $LINUX_TARGET_PATH/botway-installer ./installer-linux
-          cp ./installer-linux ./assets/static/installers
+          cp ./installer-linux ../assets/static/installers
 
           # Build Botway OSX Installer
           git clone https://github.com/abdfnx/osxcross-alpine osxcross
@@ -48,7 +48,7 @@ jobs:
           LIBZ_SYS_STATIC=1 \
           cargo build --release --target x86_64-apple-darwin && \
           cp $DARWIN_TARGET_PATH/botway-installer ./installer-macos && \
-          cp ./installer-macos ./assets/static/installers
+          cp ./installer-macos ../assets/static/installers
 
       - name: Upload to Deno Deploy
         uses: denoland/deployctl@v1

app/api/constants.ts

@@ -4,10 +4,9 @@ export const ValidateProps = {
     name: { type: "string", minLength: 1, maxLength: 50 },
     password: { type: "string", minLength: 8 },
     email: { type: "string", minLength: 1 },
-    githubApiToken: { type: "string", minLength: 0, maxLength: 40 },
-    railwayApiToken: { type: "string", minLength: 0, maxLength: 36 },
-    renderApiToken: { type: "string", minLength: 0, maxLength: 32 },
-    renderUserEmail: { type: "string", minLength: 0 },
+    githubApiToken: { type: "string", maxLength: 40 },
+    railwayApiToken: { type: "string", maxLength: 36 },
+    renderApiToken: { type: "string", maxLength: 32 },
     isAdmin: { type: "boolean" },
     projects: { type: "array" },
   },
@@ -23,12 +22,14 @@ export const ValidateProps = {
     lang: { type: "string", minLength: 1, maxLength: 50 },
     packageManager: { type: "string", minLength: 1, maxLength: 50 },
     hostService: { type: "string", minLength: 1, maxLength: 50 },
-    botToken: { type: "string", minLength: 0, maxLength: 100 },
-    botAppToken: { type: "string", minLength: 0, maxLength: 100 },
-    botSecretToken: { type: "string", minLength: 0, maxLength: 100 },
-    railwayProjectId: { type: "string", minLength: 0, maxLength: 38 },
-    railwayServiceId: { type: "string", minLength: 0, maxLength: 38 },
-    railwayEnvId: { type: "string", minLength: 0, maxLength: 38 },
-    renderProjectId: { type: "string", minLength: 0, maxLength: 24 },
+    botToken: { type: "string", maxLength: 100 },
+    botAppToken: { type: "string", maxLength: 100 },
+    botSecretToken: { type: "string", maxLength: 100 },
+    railwayProjectId: { type: "string", maxLength: 38 },
+    railwayServiceId: { type: "string", maxLength: 38 },
+    railwayEnvId: { type: "string", maxLength: 38 },
+    renderServiceId: { type: "string", maxLength: 24 },
+    repoBranch: { type: "string" },
+    pullRequestPreviewsEnabled: { type: "string", maxLength: 3 },
   },
 };

app/api/db/project.ts

@@ -18,11 +18,13 @@ export async function insertProject(
     railwayProjectId,
     railwayServiceId,
     railwayEnvId,
-    renderProjectId,
+    renderServiceId,
     icon,
     buildCommand,
     startCommand,
     rootDirectory,
+    repoBranch,
+    pullRequestPreviewsEnabled,
   }: any
 ) {
   const project: any = {
@@ -40,11 +42,13 @@ export async function insertProject(
     railwayProjectId,
     railwayServiceId,
     railwayEnvId,
-    renderProjectId,
+    renderServiceId,
     icon,
     buildCommand,
     startCommand,
     rootDirectory,
+    repoBranch,
+    pullRequestPreviewsEnabled,
     createdAt: new Date(),
   };
 

app/api/db/user.ts

@@ -70,7 +70,6 @@ export async function insertUser(
     githubApiToken,
     railwayApiToken,
     renderApiToken,
-    renderUserEmail,
   }: any
 ) {
   let user: any = {
@@ -82,7 +81,6 @@ export async function insertUser(
     githubApiToken,
     railwayApiToken,
     renderApiToken,
-    renderUserEmail,
     projects: [],
   };
 

app/components/Project/index.tsx

@@ -6,6 +6,7 @@ export const Project = ({ project, mutate, user }: any) => {
   const [isOpen, setIsOpen] = useState(false);
 
   const closeModal = () => {
+    mutate();
     setIsOpen(false);
   };