Skip to content

Commit

Permalink
Merge branch 'main' into fix/zooming
Browse files Browse the repository at this point in the history
  • Loading branch information
AbdulTheActivePiecer committed Feb 15, 2024
2 parents 5996553 + d25a3ff commit ae8579d
Show file tree
Hide file tree
Showing 666 changed files with 268,835 additions and 8,128 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/codespaces.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ gh codespace ports visibility 3000:public -c $CODESPACE_NAME
gh codespace ports visibility 4200:public -c $CODESPACE_NAME
export BACKEND_URL=$(gh codespace ports -c $CODESPACE_NAME --json sourcePort,browseUrl | jq -r '.[] | select(.sourcePort == 3000) | .browseUrl')
sed -i "s|apiUrl: 'http://localhost:3000/v1'|apiUrl: '${BACKEND_URL}/v1'|g" /workspace/packages/ui/common/src/lib/environments/environment.ts
sed -i "s|AP_WEBHOOK_URL=\"http://localhost:3000\"|AP_WEBHOOK_URL=\"${BACKEND_URL}\"|g" /workspace/packages/backend/.env
sed -i "s|AP_WEBHOOK_URL=\"http://localhost:3000\"|AP_WEBHOOK_URL=\"${BACKEND_URL}\"|g" /workspace/packages/server/api/.env
2 changes: 1 addition & 1 deletion .github/workflows/build-cloud-nx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
parallel-commands-on-agents: |
npx nx affected --target=lint --parallel=3
npx nx affected --target=build -c production --parallel=3
npx nx run-many --target=test --projects=engine,shared,backend --parallel=3
npx nx run-many --target=test --projects=engine,shared,server-api --parallel=3
agents:
name: Nx Cloud - Agents
Expand Down
45 changes: 0 additions & 45 deletions .github/workflows/crowdin.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ tmp
.nx/
/out-tsc
firebase-admin-sdk.json
cache
dev

# SDK Build
Expand Down Expand Up @@ -49,7 +48,6 @@ Thumbs.db
.angular
activepieces-engine.js
.history/
packages/backend/.env

# produced by unsandboxed engine execution
.pnpm-store
Expand All @@ -61,4 +59,3 @@ packages/backend/.env
scratch.md

# environment variables
.env
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ COPY . .
COPY .npmrc package.json package-lock.json ./
RUN npm ci

RUN npx nx run-many --target=build --projects=backend,ui-core --configuration production --skip-nx-cache
RUN npx nx run-many --target=build --projects=server-api,ui-core --configuration production --skip-nx-cache

# Install backend production dependencies
RUN cd dist/packages/backend && npm install --production --force
RUN cd dist/packages/server/api && npm install --production --force

### STAGE 2: Run ###
FROM base AS run

# Set up backend
WORKDIR /usr/src/app

COPY packages/backend/src/assets/default.cf /usr/local/etc/isolate
COPY packages/server/api/src/assets/default.cf /usr/local/etc/isolate

# Install Nginx and gettext for envsubst
RUN apt-get update && apt-get install -y nginx gettext
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Copyright (c) 2020-2024 Activepieces Inc.

Portions of this software are licensed as follows:

* All content that resides under the "packages/ee/" and "packages/backend/src/app/ee/" directory of this repository, if that directory exists, is licensed under the license defined in packages/ee/LICENSE
* All content that resides under the "packages/ee/" and "packages/server/api/src/app/ee" directory of this repository, if that directory exists, is licensed under the license defined in packages/ee/LICENSE
* All third party components incorporated into the Activepieces Inc Software are licensed under the original license provided by the owner of the applicable component.
* Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.

Expand Down
Empty file.
Empty file.
1 change: 1 addition & 0 deletions cache/sandbox/0/input.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"piece":{"packageType":"REGISTRY","pieceType":"OFFICIAL","pieceName":"@activepieces/piece-github","pieceVersion":"0.3.6"},"flowVersion":{"id":"Vh2Bq0psJeNeZImpwPEOD","created":"2024-02-13T10:19:41.379Z","updated":"2024-02-13T11:56:28.281Z","flowId":"DR7FPOc83gO6LzR4KI4ns","displayName":"Untitled","trigger":{"name":"trigger","type":"WEBHOOK","valid":true,"settings":{"inputUiInfo":{"currentSelectedData":""}},"nextAction":{"name":"step_1","type":"PIECE","valid":false,"settings":{"input":{"auth":"{{connections['github_1']}}"},"pieceName":"@activepieces/piece-github","pieceType":"OFFICIAL","actionName":"github_create_issue","inputUiInfo":{"customizedInputs":{}},"packageType":"REGISTRY","pieceVersion":"~0.3.6","errorHandlingOptions":{"retryOnFailure":{"value":false},"continueOnFailure":{"value":false}}},"displayName":"Create Issue"},"displayName":"hi there abdul how is it going buddy ?"},"updatedBy":"tS6qrFNEEP5f0Ob0HmChv","valid":false,"state":"DRAFT"},"propertyName":"assignees","stepName":"github_create_issue","input":{},"projectId":"frgcvhJIpjj5WkaTHLnAi","serverUrl":"http://178.20.191.78/api/","workerToken":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjEifQ.eyJpZCI6Im10eWpLd3ozbzRBMTN4RUNremFtaiIsInR5cGUiOiJXT1JLRVIiLCJwcm9qZWN0SWQiOiJmcmdjdmhKSXBqajVXa2FUSExuQWkiLCJpYXQiOjE3MDc4MjU0MDksImV4cCI6MTcwODQzMDIwOSwiaXNzIjoiYWN0aXZlcGllY2VzIn0._bbSdZnyWXNy5wsGzSMJnhdaqxz92H9oKGy6SPmcJL0"}
Loading

0 comments on commit ae8579d

Please sign in to comment.