Merge pull request #123 from slashbaseide/develop

Release 0.9.1

Author: paraswaykole

.dockerignore

@@ -31,8 +31,5 @@ app.db
 # Wails
 build/bin
 node_modules
-frontend/desktop/dist
-build/darwin/gon-notarize.json
-
-# Frontend Server
-frontend/server/dist
+frontend/dist
+build/darwin/gon-notarize.json

.gitignore

@@ -31,8 +31,5 @@ app.db
 # Wails
 build/bin
 node_modules
-frontend/desktop/dist
-build/darwin/gon-notarize.json
-
-# Frontend Server
-frontend/server/dist
+frontend/dist
+build/darwin/gon-notarize.json

Dockerfile

@@ -15,15 +15,6 @@ RUN apk update && apk add --no-cache ca-certificates git build-base && update-ca
 COPY go.mod go.sum ./
 RUN go mod download
 
-# Executable builder
-FROM base as backendbuilder
-
-WORKDIR /app
-COPY . .
-RUN mkdir -p /app/frontend/desktop/dist
-RUN touch /app/frontend/desktop/dist/nofile
-RUN make build-server
-
 # Install dependencies only when needed
 FROM node:alpine AS deps
 
@@ -40,12 +31,19 @@ COPY ./frontend/server/ .
 COPY --from=deps /app/node_modules ./node_modules
 RUN yarn build
 
+# Executable builder
+FROM base as backendbuilder
+
+WORKDIR /app
+COPY . .
+COPY --from=frontendbuilder /dist /app/frontend/dist
+RUN make build-server
+
 # Production
 FROM alpine:3.14
 
 WORKDIR /slashbase
 COPY --from=backendbuilder /app/slashbase /slashbase
-COPY --from=frontendbuilder /app/dist /slashbase/web
 
 ENTRYPOINT ["/slashbase/slashbase"]
 EXPOSE 3000

development.env.sample

@@ -2,6 +2,7 @@ import React from 'react'
 import { Project } from '../../../data/models'
 import Constants from '../../../constants'
 import { Link } from 'react-router-dom'
+import Button from '../../ui/Button'
 
 type NewDBConnButtonPropType = {
     project: Project
@@ -12,11 +13,7 @@ const NewDBConnButton = ({ project }: NewDBConnButtonPropType) => {
     return (
         <Link to={Constants.APP_PATHS.NEW_DB.path.replace('[id]', project.id)}>
             <a>
-                <button className="button" >
-                    <i className={"fas fa-plus-circle"} />
-                    &nbsp;&nbsp;
-                    Add New DB Connection
-                </button>
+            <Button text="Add New DB Connection" icon={<i className={"fas fa-plus-circle"} />} />
             </a>
         </Link>
     )

frontend/desktop/src/components/cards/dbconncard/newdbconnectionbutton.tsx

@@ -3,6 +3,7 @@ import { DBConnection, DBDataModel } from '../../../data/models'
 import { DBConnType, TabType } from '../../../data/defaults'
 import { useAppDispatch } from '../../../redux/hooks'
 import { updateActiveTab } from '../../../redux/tabsSlice'
+import Button from '../../ui/Button'
 
 type DBDataModelPropType = {
     dbConnection: DBConnection
@@ -33,14 +34,18 @@ const DBDataModelCard = ({ dataModel, dbConnection }: DBDataModelPropType) => {
                         <b>{dataModel.name}</b>}
                 </div>
                 <div className="buttons">
-                    <button className="button is-small is-white" onClick={updateActiveTabToData}>
-                        <span className="icon is-small"><i className="fas fa-table" /></span>
-                        <span>View Data</span>
-                    </button>
-                    <button className="button is-small is-white" onClick={updateActiveTabToModel}>
-                        <span className="icon is-small"><i className="fas fa-list-alt" /></span>
-                        <span>View Model</span>
-                    </button>
+                    <Button 
+                        className="is-small is-white"
+                        icon={<i className="fas fa-table"/>}
+                        onClick={updateActiveTabToData}
+                        text='View Data'
+                    />
+                    <Button 
+                        className="is-small is-white"
+                        icon={<i className="fas fa-list-alt"/>}
+                        onClick={updateActiveTabToModel}
+                        text='View Model'
+                    />
                 </div>
             </div>
         </div>

frontend/desktop/src/components/cards/dbdatamodelcard/dbdatamodelcard.tsx

@@ -13,6 +13,7 @@ import {
     ArcElement,
     Tooltip
 } from 'chart.js'
+import Button from '../../ui/Button'
 
 ChartJS.register(
     CategoryScale,
@@ -135,7 +136,7 @@ const Chart = ({ dbConn, queryData }: ChartPropType) => {
                             </div>
                             <br />
                             <div className="control">
-                                <button className="button is-primary" onClick={createChart}>Create</button>
+                                <Button className="is-primary" onClick={createChart} text='Create'/>
                             </div>
 
                         </React.Fragment>

frontend/desktop/src/components/dbfragments/chart/chart.tsx

@@ -3,6 +3,7 @@ import { DBConnType } from '../../../data/defaults'
 import CheatsheetCommand from './command'
 import _ from 'lodash'
 import lunr from 'lunr'
+import Button from '../../ui/Button'
 
 type CheatSheetPropType = {
     dbType: DBConnType
@@ -69,7 +70,7 @@ const CheatSheetModal = ({ dbType, onClose }: CheatSheetPropType) => {
                     </>}
                 </section>
                 <footer className="modal-card-foot">
-                    <button className="button" onClick={onClose}>Close</button>
+                    <Button onClick={onClose} text='Close'/>
                 </footer>
             </div>
         </div>

frontend/desktop/src/components/dbfragments/cheatsheet/cheatsheet.tsx

@@ -4,6 +4,7 @@ import toast from 'react-hot-toast'
 import { useAppDispatch, useAppSelector } from '../../../redux/hooks'
 import { addDBDataModelField } from '../../../redux/dataModelSlice'
 import TabContext from '../../layouts/tabcontext'
+import Button from '../../ui/Button'
 
 type AddModal = {
     dbConn: DBConnection
@@ -64,8 +65,8 @@ const AddFieldModal = ({ dbConn, mSchema, mName, onAddField, onClose }: AddModal
                     </div>
                 </section>
                 <footer className="modal-card-foot">
-                    <button className="button is-primary" onClick={startAdding}>Add</button>
-                    <button className="button" onClick={onClose}>Cancel</button>
+                    <Button className="is-primary" text='Add' onClick={startAdding}/>
+                    <Button text='Cancel' onClick={onClose}/>
                 </footer>
             </div>
         </div>

frontend/desktop/src/components/dbfragments/datamodel/addfieldmodal.tsx

@@ -4,6 +4,7 @@ import toast from 'react-hot-toast'
 import { addDBDataModelIndex } from '../../../redux/dataModelSlice'
 import { useAppDispatch, useAppSelector } from '../../../redux/hooks'
 import TabContext from '../../layouts/tabcontext'
+import Button from '../../ui/Button'
 
 type AddIndexModal = {
     dbConn: DBConnection
@@ -74,8 +75,8 @@ const AddIndexModal = ({ dbConn, mSchema, mName, onAddIndex, onClose }: AddIndex
                     </div>
                 </section>
                 <footer className="modal-card-foot">
-                    <button className="button is-primary" onClick={startAdding}>Add</button>
-                    <button className="button" onClick={onClose}>Cancel</button>
+                    <Button className="is-primary" text='Add' onClick={startAdding}/>
+                    <Button text='Cancel' onClick={onClose}/>
                 </footer>
             </div>
         </div>