feat(core): fix dockerfile bug [SO BOTHERING]

Author: hkdeman

core/Dockerfile

@@ -1,30 +1,23 @@
-FROM node:18.12.1-alpine as build-stage
-
+FROM node:18.12.1-alpine AS build-stage
 RUN npm i -g pnpm
-
 WORKDIR /app
 COPY ./frontend/package.json ./frontend/pnpm-lock.yaml ./
 RUN pnpm install
 COPY ./frontend/ ./
 RUN pnpm run build
 
-
-FROM golang:1.22.1-alpine3.19 as backend-stage
-
+FROM golang:1.22.1-alpine3.19 AS backend-stage
 RUN apk update && apk add --no-cache gcc musl-dev
-
 WORKDIR /app
 COPY ./core/go.mod ./core/go.sum ./
 RUN go mod download
 COPY ./core/ ./
+COPY --from=build-stage /app/build/ ./build/
 RUN CGO_ENABLED=1 GOOS=linux go build -o /core
 
 FROM alpine:3.19
-
 RUN apk update && apk add --no-cache ca-certificates
-
 WORKDIR /app
 COPY --from=backend-stage /core /core
-COPY --from=build-stage /app/build/ ./build/
 
-CMD ["/core"]
+CMD ["/core"]

core/src/plugins/mysql/db.go

@@ -14,7 +14,7 @@ func DB(config *engine.PluginConfig) (*gorm.DB, error) {
 	charset := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Charset", "utf8mb4")
 	parseTime := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Parse Time", "True")
 	loc := common.GetRecordValueOrDefault(config.Credentials.Advanced, "Loc", "Local")
-	dsn := fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=%v&parseTime=%v&loc=%v", config.Credentials.Username, config.Credentials.Password, config.Credentials.Hostname, config.Credentials.Database, port, charset, parseTime, loc)
+	dsn := fmt.Sprintf("%v:%v@tcp(%v:%v)/%v?charset=%v&parseTime=%v&loc=%v", config.Credentials.Username, config.Credentials.Password, config.Credentials.Hostname, port, config.Credentials.Database, charset, parseTime, loc)
 	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
 		return nil, err

frontend/src/config/routes.tsx

@@ -43,8 +43,8 @@ export const InternalRoutes = {
         component: <GraphPage />,
     },
     RawExecute: {
-        name: "Raw Execute",
-        path: "/raw-execute",
+        name: "Scratchpad",
+        path: "/scratchpad",
         component: <RawExecutePage />,
     },
     Logout: {

frontend/src/pages/auth/login.tsx

@@ -110,6 +110,10 @@ export const LoginPage: FC = () => {
                 },
             });
         }
+        setHostName("");
+        setUsername("");
+        setPassword("");
+        setDatabase("");
         setDatabaseType(item);
         setAdvancedForm(item.extra);
     }, [getDatabases]);
@@ -179,8 +183,8 @@ export const LoginPage: FC = () => {
 
     return (
         <Page className="justify-center items-center">
-            <div className={twMerge(BASE_CARD_CLASS, "w-fit h-fit transition-all")}>
-                <div className="flex flex-col justify-between grow gap-4 transition-all">
+            <div className={twMerge(BASE_CARD_CLASS, "w-fit h-fit")}>
+                <div className="flex flex-col justify-between grow gap-4">
                     <div className="flex grow">
                         <div className="flex flex-col gap-4 grow w-[350px]">
                             <div className="flex justify-between">
@@ -210,7 +214,10 @@ export const LoginPage: FC = () => {
                             </div>
                         }
                     </div>
-                    <div className="flex justify-between">
+                    <div className={classNames("flex", {
+                        "justify-end": advancedForm == null,
+                        "justify-between": advancedForm != null,
+                    })}>
                         <AnimatedButton className={classNames({
                             "hidden": advancedForm == null,
                         })} icon={Icons.Adjustments} label={showAdvanced ? "Less Advanced" : "Advanced"} onClick={handleAdvancedToggle} />