Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MVP Release #223

Merged
merged 24 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b76f724
chore: updated dependencies and cleanup of IDE configuration
Goldziher Dec 1, 2023
9f5b090
chore: simplified taskfile
Goldziher Dec 1, 2023
772ad8a
chore: simplified taskfile (#217)
Goldziher Dec 2, 2023
5d8087e
chore: removed gateway proto
Goldziher Dec 2, 2023
32fc663
chore: added git submodule for gateway proto
Goldziher Dec 2, 2023
ecc8736
chore: updated taskfile and submodule
Goldziher Dec 2, 2023
b41ef52
chore: removed unnecessary packages
Goldziher Dec 2, 2023
20d5138
chore: move gateway proto to git submodule (#218)
Goldziher Dec 2, 2023
e43415d
style: fixed some part of the UI
isaaclindenman Dec 1, 2023
54be0e4
chore: fix linting issues
Goldziher Dec 1, 2023
2674423
chore: updated dependencies
Goldziher Dec 2, 2023
5e40e3a
style: fixed navbar
isaaclindenman Dec 2, 2023
e5c64ed
chore: fixed pnpm-lock
Goldziher Dec 2, 2023
e919b26
Apply suggestions from code review
Goldziher Dec 2, 2023
df5fd19
chore: changed third card name
isaaclindenman Dec 2, 2023
1384923
chore: removed the extra disabled
isaaclindenman Dec 3, 2023
29916f9
chore: deleted navrail, align logo
isaaclindenman Dec 3, 2023
cd3620f
chore: refactor based on PR comments
isaaclindenman Dec 3, 2023
2e251d1
chore: updated containers, unified styles and refactored prompt-confi…
Goldziher Dec 3, 2023
a99fcb8
feat: added generic code snippet component
Goldziher Dec 3, 2023
dfd8999
chore: applied pre-commit
Goldziher Dec 3, 2023
1b5a025
chore: removed PR agent
Goldziher Dec 3, 2023
c843490
feat: added generic code snippet component (#221)
Goldziher Dec 3, 2023
91c189b
chore: updated dependencies
Goldziher Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .commitlintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "extends": ["@commitlint/config-conventional"] }
18 changes: 0 additions & 18 deletions .github/workflows/pr-agent.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/tests-ts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "proto/gateway"]
path = proto/gateway
url = https://github.com/basemind-ai/gateway-proto
2 changes: 1 addition & 1 deletion .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/monorepo.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,18 @@ repos:
hooks:
- id: commitlint
stages: [commit-msg]
additional_dependencies:
- '@commitlint/cli'
- '@commitlint/config-conventional'
additional_dependencies: ['@commitlint/config-conventional']
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v4.5.0'
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
exclude: '.idea/modules'
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/koalaman/shellcheck-precommit
rev: v0.9.0
hooks:
- id: shellcheck
exclude: 'gradle*'
- repo: https://github.com/hadolint/hadolint
rev: v2.12.1-beta
hooks:
Expand All @@ -29,14 +25,14 @@ repos:
rev: 'v3.1.0'
hooks:
- id: prettier
exclude: 'go.mod|gen/ts|.idea/modules'
exclude: 'go.mod|gen/ts'
- repo: https://github.com/pre-commit/mirrors-eslint
rev: 'v8.54.0'
rev: 'v8.55.0'
hooks:
- id: eslint
files: \.tsx?$
types: [file]
args: [--fix]
args: [--fix, --no-ignore]
exclude: 'gen/ts'
- repo: https://github.com/golangci/golangci-lint
rev: 'v1.55.2'
Expand Down
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"jsonRecursiveSort": true,
"plugins": ["@prettier/plugin-xml", "prettier-plugin-sort-json"],
"quoteProps": "consistent",
"semi": true,
"singleQuote": true,
"tabWidth": 4,
"trailingComma": "all",
"useTabs": true
}
10 changes: 0 additions & 10 deletions .prettierrc.js

This file was deleted.

10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ root # repository root, holding all tooling configuration
│ ├─── openai # openai-connector protobuf schema
│ ├─── cohere # cohere-connector protobuf schema
│ └─── ptesting # api-gateway prompt testing protobuf schema
├─── sdks # client libraries that connect to our API gateway
│ └─── android # android apps
│ ├─── test-app # test application
│ └─── sdk # android sdk
├─── services # microservices
│ ├─── api-gateway # api-gateway
│ ├─── dashboard-backend # backend for the frontend web-app
Expand All @@ -47,7 +43,6 @@ root # repository root, holding all tooling configuration
- Go >= 1.21
- Docker >= 24.0
- Python >= 3.11
- Java >= 17.0

2. Execute the setup task with:

Expand Down Expand Up @@ -104,11 +99,6 @@ Configuration files that should not be committed into git are stored under the `
You will need to receive them from another developer and they must be communicated securely using a service such
as [yopass](https://yopass.se/).

You will need to add the following files:

- `.env.frontend` - this is an ENV file for the frontend application.
- `serviceAccountKey.json` - this is a GCP / firebase configuration file for backend applications.

### Proto Files

We use gRPC and protobuf files. The proto files are located under the `proto` folder and the generated code is stored
Expand Down
93 changes: 14 additions & 79 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
@@ -1,97 +1,32 @@
version: '3'

tasks:
# project dependencies
install-pnpm:
cmds:
- |
if command -v brew &> /dev/null; then
brew install pnpm
else
npm install -g pnpm
fi
status:
- command -v pnpm &> /dev/null || exit 1
install-pre-commit:
cmds:
- |
if command -v brew &> /dev/null; then
brew install pre-commit
else
pip install pre-commit
fi
status:
- command -v pre-commit &> /dev/null || exit 1
install-sqlc:
cmds:
- |
if command -v brew &> /dev/null; then
brew install sqlc
else
go install github.com/sqlc-dev/sqlc/cmd/sqlc@latest
fi
status:
- command -v sqlc &> /dev/null || exit 1
install-atlas:
cmds:
- |
if command -v brew &> /dev/null; then
brew install ariga/tap/atlas
else
curl -sSf https://atlasgo.sh | sh
fi
status:
- command -v atlas &> /dev/null || exit 1
install-buf:
cmds:
- |
if command -v brew &> /dev/null; then
brew install bufbuild/buf/buf
else
npm install -g @bufbuild/buf
fi
status:
- command -v buf &> /dev/null || exit 1
install-terraform:
cmds:
- |
if command -v brew &> /dev/null; then
brew tap hashicorp/tap
brew install hashicorp/tap/terraform
brew install tflint
else
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
sudo apt-get update && sudo apt-get install terraform
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
fi
status:
- command -v terraform &> /dev/null || exit 1
# project management
update-brew:
cmds:
- |
if command -v brew &> /dev/null; then
brew update;
brew upgrade;
brew cleanup || true;
fi
- brew update && brew upgrade && brew cleanup || true
setup:
desc: Setup the project dependencies
cmds:
- task: update-brew
- task: install-pnpm
- task: install-pre-commit
- task: install-sqlc
- task: install-atlas
- task: install-buf
- task: install-terraform
- pre-commit install && pre-commit install --hook-type commit-msg
- git submodule update --init --recursive || true
- git submodule update --recursive --remote
- command -v pnpm &> /dev/null || brew install pnpm
- command -v pre-commit &> /dev/null || brew install pre-commit
- command -v sqlc &> /dev/null || brew install sqlc
- command -v atlas &> /dev/null || brew install ariga/tap/atlas
- command -v buf &> /dev/null || brew install bufbuild/buf/buf
- command -v terraform &> /dev/null || brew tap hashicorp/tap && brew install hashicorp/tap/terraform
- command -v tflint &> /dev/null || brew install tflint
- command -v gcloud &> /dev/null || curl https://sdk.cloud.google.com | bash
- pnpm install -r
- go mod download
# - pre-commit install && pre-commit install --hook-type commit-msg && pre-commit install-hooks
update:
desc: Update the project dependencies
cmds:
- task: update-brew
- git submodule update --recursive --remote
- pnpm add -g pnpm && pnpm update -r --latest
- go mod tidy && go get -u ./... &> /dev/null
- pre-commit autoupdate
Expand Down
1 change: 0 additions & 1 deletion commitlint.config.js

This file was deleted.

9 changes: 3 additions & 6 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,24 @@
"firebase": "^10.7.0",
"firebaseui": "^6.1.0",
"next": "14.0.3",
"next-intl": "^3.2.0",
"next-translate-plugin": "^2.6.2",
"next-intl": "^3.2.1",
"react": "18.2.0",
"react-bootstrap-icons": "^1.10.3",
"react-dom": "18.2.0",
"react-intl": "^6.5.5",
"react-syntax-highlighter": "^15.5.0",
"react-tailwindcss-datepicker": "^1.6.6",
"swr": "^2.2.4",
"unique-names-generator": "^4.7.1",
"validator": "^13.11.0",
"zustand": "^4.4.7"
},
"devDependencies": {
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@types/react-syntax-highlighter": "^15.5.10",
"@types/validator": "^13.11.7",
"@vitejs/plugin-react": "^4.2.0",
"daisyui": "^4.4.14",
"daisyui": "^4.4.18",
"jsdom": "^23.0.1",
"mock-socket": "^9.3.1",
"vite-plugin-magical-svg": "^1.0.3"
Expand Down
Loading
Loading