-
Notifications
You must be signed in to change notification settings - Fork 53
deploy #1009
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
Open
oliursahin
wants to merge
200
commits into
main
Choose a base branch
from
preview
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
deploy #1009
Changes from 100 commits
Commits
Show all changes
200 commits
Select commit
Hold shift + click to select a range
d2689bd
Fix Redis env var name from REDIS_HOST to REDIS_DB_NAME
oliursahin 4db9740
Replace agent route with objects page and update sidebar navigation icon
oliursahin 75d42c7
Add daily notes component and update agenda layout
oliursahin e6704a4
feat: imp JournalPage
sajdakabir bcc020a
fix: build error
sajdakabir 4128771
Merge pull request #996 from marchhq/sajda-dev
sajdakabir 148f04c
Add task list feature with checkbox support and update default daily …
oliursahin 2822a0e
feat: imp date base journal
sajdakabir 512bc5a
Merge branch 'feat-agenda' of github.com:marchhq/march into sajda-dev
sajdakabir 5cce50d
Merge pull request #998 from marchhq/sajda-dev
sajdakabir fe64e48
feat: added cal
sajdakabir 80a183f
feat: selete month and year
sajdakabir c3baa6b
Merge pull request #999 from marchhq/sajda-dev
sajdakabir 5a187fe
feat: blue dots on notes under date
sajdakabir c157ef3
fix: build error
sajdakabir ced1316
Merge pull request #1000 from marchhq/sajda-dev
sajdakabir 4b33bae
feat: added success msg
sajdakabir b9327b1
Merge pull request #1001 from marchhq/sajda-dev
sajdakabir 6250638
feat: all the scheduled objects of that day
sajdakabir 1b25c07
Merge pull request #1002 from marchhq/sajda-dev
sajdakabir 4f04827
chore: update default port from 8080 to 3000 and use nullish coalesci…
oliursahin a93c9da
Merge pull request #1004 from marchhq/ci-deploy
oliursahin 1740217
Revert "chore: update default port from 8080 to 3000 and use nullish …
oliursahin 871e804
Merge pull request #1005 from marchhq/revert-1004-ci-deploy
oliursahin fb63b8f
Fix: Update server to listen on 0.0.0.0 to accept connections from an…
oliursahin 9f3cd0f
Merge pull request #1006 from marchhq/ci-deploy
oliursahin a6440fb
fix: replace nullish coalescing with logical OR for PORT env var fall…
oliursahin 1d356f8
Merge branch 'preview' of https://github.com/marchhq/march into ci-de…
oliursahin e49ce35
Merge pull request #1007 from marchhq/ci-deploy
oliursahin df6d13c
chore: add mongo-sanitize package for database input sanitization
oliursahin 3e73333
chore: update package name from emptyarray to march and remove mongo-…
oliursahin fcee865
Merge pull request #1008 from marchhq/ci-deploy
oliursahin 89d31b8
chore: add Docker configuration for backend service and MongoDB setup
oliursahin f9a236c
refactor: optimize Docker setup with multi-stage build, health checks…
oliursahin c36696a
Merge pull request #1010 from marchhq/ci-deploy
oliursahin 99f71bc
feat: add Docker support and implement graceful server shutdown with …
oliursahin 41a8b0b
Merge pull request #1011 from marchhq/ci-deploy
oliursahin 935912f
feat: set the urls
sajdakabir 57753a9
Merge branch 'preview' of github.com:marchhq/march into sajda-dev
sajdakabir d54c3dc
Merge pull request #1012 from marchhq/sajda-dev
sajdakabir b08d63b
feat: add logs
sajdakabir 56da77f
Merge pull request #1013 from marchhq/sajda-dev
sajdakabir 4a40535
chore: add AWS Amplify deployment config and fix inotify dependency r…
oliursahin 41dd6fa
Merge pull request #1014 from marchhq/scrut/opp
oliursahin 5904472
Fix amplify.yml configuration for monorepo structure
oliursahin bc962b6
Update amplify.yml to use standard format without monorepo spec
oliursahin a950681
Merge pull request #1015 from marchhq/scrut/opp
oliursahin c8c44a9
Update amplify.yml to include applications key for monorepo support
oliursahin 946210e
Merge pull request #1016 from marchhq/scrut/opp
oliursahin d82c369
Simplify amplify.yml to use standard non-monorepo configuration
oliursahin 81f8203
Merge pull request #1017 from marchhq/scrut/opp
oliursahin 172ac1c
fix
oliursahin 6ea9f2c
Conclude merge
oliursahin 9d901b2
Merge pull request #1018 from marchhq/scrut/opp
oliursahin 9171f1d
Merge branch 'preview' of https://github.com/marchhq/march into scrut…
oliursahin 5bdd289
vibe code: ios app
oliursahin 72aa687
ui
oliursahin af66fe7
fix: github issue
sajdakabir 5ce1c8c
Merge pull request #1021 from zerotrailai/sajda-dev
sajdakabir 8c91610
Merge branch 'preview' of https://github.com/zerotrailai/march into i…
oliursahin 117cef0
polish ui
oliursahin 89a22f5
feat(web): implement minimal sidebar design
oliursahin 9542775
feat(web): implement full-screen object view
oliursahin 903320d
refactor(web): simplify header layout in expanded view
oliursahin cf51060
refactor(web): remove React Query Devtools from QueryProvider
oliursahin 7502b95
refactor(web): simplify header layout by removing unnecessary wrapper
oliursahin 3b3431b
refactor(web): enhance layout consistency across components
oliursahin 507f91d
refactor(web): update date formatting and improve layout in DailyNote…
oliursahin 26c0712
ui: add calendar icon to the list items
oliursahin a7d9996
feat(web): add filter functionality to AllObjects component
oliursahin cbbc7a1
Update README.md
oliursahin 1d8027c
Merge pull request #1025 from zerotrailai/oliursahin-patch-1
oliursahin 6113ca7
feat(landing): update branding and content for landing page
oliursahin 5195910
Merge pull request #1029 from zerotrailai/sajda-dev
sajdakabir 0fd59f1
fix: add Railway deployment configuration
oliursahin 66430b8
Merge pull request #1030 from zerotrailai/ci/deploy
oliursahin 2a237f9
fix: improve frontend Docker build for Railway
oliursahin 3624183
Merge pull request #1031 from zerotrailai/ci/deploy
oliursahin 87671c7
fix: add missing backend dependencies
oliursahin 412c52a
Merge pull request #1032 from zerotrailai/ci/deploy
oliursahin 5caf7ca
fix: resolve frontend Docker build missing public directory
oliursahin 983a7a4
Merge pull request #1033 from zerotrailai/ci/deploy
oliursahin ee59b1a
fix: improve frontend reliability and error handling
oliursahin d4635f3
Merge pull request #1034 from zerotrailai/ci/deploy
oliursahin 50d5e10
debug: add simplified Dockerfile and disable standalone mode
oliursahin 01bd422
Merge pull request #1035 from zerotrailai/ci/deploy
oliursahin c801521
fix: replace Dockerfile with working non-standalone version
oliursahin 1439ec8
Merge pull request #1036 from zerotrailai/ci/deploy
oliursahin be1a93c
fix: resolve npm ci lockfile error
oliursahin 3d7e3be
Merge pull request #1037 from zerotrailai/ci/deploy
oliursahin e61352f
debug: add debugging pages and disable middleware temporarily
oliursahin ecf8e3b
Merge pull request #1038 from zerotrailai/ci/deploy
oliursahin 93eaf07
Fix client-side exception with better error handling
oliursahin 369c69b
Merge pull request #1039 from zerotrailai/ci/deploy
oliursahin 3ee79ba
Enhanced error boundary debugging
oliursahin ddf5289
Merge pull request #1040 from zerotrailai/ci/deploy
oliursahin 4da5884
Fix SSR error: Remove event handlers from error fallback
oliursahin de925e3
remove dubuging logs
oliursahin 1148f3a
Remove all debugging code - production ready
oliursahin 4c896c0
Merge pull request #1041 from zerotrailai/ci/deploy
oliursahin 1fc18b8
fix: GoogleOAuthProvider
sajdakabir 981eaea
Merge branch 'preview' of github.com:marchhq/march into sajda-dev
sajdakabir eed535d
Merge pull request #1042 from zerotrailai/sajda-dev
sajdakabir 6ace8f5
refc: remov egithub login
sajdakabir cd8101f
Merge pull request #1043 from zerotrailai/sajda-dev
sajdakabir 7867577
choe: added a log
sajdakabir c141481
Merge pull request #1044 from zerotrailai/sajda-dev
sajdakabir 2f4a711
Fix Railway environment variable detection issues
oliursahin de7f0bf
Merge pull request #1045 from zerotrailai/ci/deploy
oliursahin bbc3580
Remove railway.toml configuration and optimize Dockerfile for Next.js…
oliursahin 113a411
Merge pull request #1046 from zerotrailai/ci/deploy
oliursahin e51f2a5
Remove all Docker and Railway files from web directory
oliursahin 24332d8
Remove Railway references from Next.js configuration
oliursahin 3c73e41
Merge pull request #1047 from zerotrailai/ci/deploy
oliursahin e889ad3
feat: nav
sajdakabir db18fe6
imp:nav
sajdakabir caebd5c
feat: hero
sajdakabir 9461237
Merge pull request #1049 from zerotrailai/nav
sajdakabir 1f90346
new space
sajdakabir a97a644
feat: added notch
sajdakabir 8c84d9f
feat: added cal
sajdakabir b2f4f69
feat: added cal
sajdakabir e61206d
feat: added upcoming router
sajdakabir 01b938c
feat: fix cal
sajdakabir 605d74f
ui: list cal
sajdakabir cf88fe4
Merge pull request #1050 from zerotrailai/sajda-dev
sajdakabir d135c8d
cal icon
sajdakabir 943d7bb
feat: upcoming objects
sajdakabir ab8117b
Merge pull request #1051 from zerotrailai/sajda-dev
sajdakabir 119a236
feat: time picker
sajdakabir c64822d
feat added recurrence
sajdakabir 1dbd505
recurrence
sajdakabir fd31fcc
feat: Recurrence object
sajdakabir 56fe5fc
feat: showing date
sajdakabir 832f0e1
feat: repect
sajdakabir 6ed073e
fix: dont show red in the recring and icon change
sajdakabir 544c0f2
feat: agenda scroll
sajdakabir 20bf39f
Merge pull request #1052 from oliursahin/sajda-dev
sajdakabir f38abe7
fix scroll
sajdakabir 000444b
Merge pull request #1053 from oliursahin/sajda-dev
sajdakabir 99bc5bd
feat: duedate
sajdakabir a6831bd
Merge pull request #1054 from oliursahin/sajda-dev
sajdakabir bd9f78c
fix: timezon diff
sajdakabir 3ecea0d
Merge pull request #1055 from oliursahin/sajda-dev
sajdakabir 678836c
list date
sajdakabir 718940f
fix: agenda page
sajdakabir 7ef90ae
Merge pull request #1056 from oliursahin/sajda-dev
sajdakabir fece69b
fix: connect linear
sajdakabir 175a2f6
Merge pull request #1057 from zerotrailai/sajda-dev
sajdakabir bb4831a
fix: login issue
sajdakabir c08ab67
fix:logout
sajdakabir 317e6e9
Merge pull request #1058 from zerotrailai/sajda-dev
sajdakabir 2c118d0
fix: x connect
sajdakabir 6b7fb44
refc: css
sajdakabir 95da0fe
fix: github cionnect
sajdakabir ca40e53
Merge pull request #1059 from zerotrailai/sajda-dev
sajdakabir 8e4f3a2
feat: init ai
sajdakabir 3b0f168
fix: 401
sajdakabir 53816c3
fix: simgple task
sajdakabir 6476043
feat: ai
sajdakabir 69c5f9b
imp ui
sajdakabir 0b36a9b
fix ui
sajdakabir 23a9bda
layout change
sajdakabir a5a1e06
Feature buttons - below input
sajdakabir 7dfb06f
Merge branch 'sajda-dev' of github.com:zerotrailai/march into sajda-dev
sajdakabir 736b506
chore: removed unused code
sajdakabir 540933c
fix: ceate obj
sajdakabir 3217fc0
feat:create task using ai
sajdakabir a2894c0
lint error
sajdakabir a541d91
ai res
sajdakabir c5bc16e
fix: lint
sajdakabir a85a2c8
fix : lint
sajdakabir 340cf3d
remove: old code
sajdakabir 4cc8a6d
Merge pull request #1060 from zerotrailai/sajda-dev
sajdakabir 4e3d6d5
init voice
sajdakabir eca0b75
auth issue fixed
sajdakabir da72607
fix: replying in voice
sajdakabir e5f024b
fix: voice
sajdakabir c39c436
refc: merge voice and chat route
sajdakabir 3a6e6f8
fix:lint
sajdakabir 6dcc513
fix: lint issue
sajdakabir d00f879
imp: voice
sajdakabir 32af2ac
imp:enhanced user prompt und
sajdakabir efae6c7
feat: added realtime voice
sajdakabir fabe506
feat: websockt
sajdakabir 647ad38
fix: webhook auth
sajdakabir 45dc44f
imp: connect chat and voice route
sajdakabir bba9842
feat: added realtime responce
sajdakabir ce4af75
fix:imple greetings and basic questions
sajdakabir e7f18e4
Merge pull request #1061 from zerotrailai/sajda-dev
sajdakabir 6026930
fix: env
sajdakabir b4cd229
Merge pull request #1062 from zerotrailai/sajda-dev
sajdakabir fde59bf
fix:pdate Intelligent AI Controller Intent Handling
sajdakabir ad117fc
imp:ai
sajdakabir b717ef7
fix: query not found
sajdakabir f6118e8
Source-aware voice command processing
sajdakabir f742fb0
feat" old code
sajdakabir 4270a77
feat: catlan
sajdakabir 9e4901c
size
sajdakabir 8fc0a13
Merge pull request #1063 from zerotrailai/ai-imp
sajdakabir File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Build stage | ||
| FROM oven/bun:1 as builder | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy package files from backend | ||
| COPY apps/backend/package.json . | ||
| COPY apps/backend/bun.lockb . | ||
|
|
||
| # Install dependencies | ||
| RUN bun install --frozen-lockfile | ||
|
|
||
| # Copy the backend application | ||
| COPY apps/backend/src ./src | ||
| COPY apps/backend/index.js . | ||
|
|
||
| # Production stage | ||
| FROM oven/bun:1-slim | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy from builder | ||
| COPY --from=builder /app/node_modules ./node_modules | ||
| COPY --from=builder /app/package.json . | ||
| COPY --from=builder /app/src ./src | ||
| COPY --from=builder /app/index.js . | ||
|
|
||
| # Set production environment | ||
| ENV NODE_ENV=production | ||
|
|
||
| # Expose the port the app runs on | ||
| EXPOSE 8080 | ||
|
|
||
| # Health check | ||
| HEALTHCHECK --interval=30s --timeout=3s \ | ||
| CMD curl -f http://localhost:8080/health || exit 1 | ||
|
|
||
| # Start the application | ||
| CMD ["bun", "run", "start"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| version: 1 | ||
| applications: | ||
| - appRoot: apps/web | ||
| frontend: | ||
| phases: | ||
| preBuild: | ||
| commands: | ||
| - npm install -g npm@latest | ||
| - npm install -g bun | ||
| - cd apps/web | ||
| - npm ci | ||
| build: | ||
| commands: | ||
| - cd apps/web | ||
| - npm run build | ||
| artifacts: | ||
| baseDirectory: apps/web/.next | ||
| files: | ||
| - '**/*' | ||
| cache: | ||
| paths: | ||
| - node_modules/**/* | ||
| - apps/web/node_modules/**/* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Build stage | ||
| FROM oven/bun:1 as builder | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy package files | ||
| COPY package.json . | ||
|
|
||
| # Install dependencies without lockfile (since we don't have bun.lockb in backend dir) | ||
| RUN bun install | ||
|
|
||
| # Copy the rest of the application | ||
| COPY . . | ||
|
|
||
| # Production stage | ||
| FROM oven/bun:1-slim | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy from builder | ||
| COPY --from=builder /app/node_modules ./node_modules | ||
| COPY --from=builder /app/package.json . | ||
| COPY --from=builder /app/src ./src | ||
| COPY --from=builder /app/index.js . | ||
|
|
||
| # Set production environment | ||
| ENV NODE_ENV=production | ||
|
|
||
| # Expose the port the app runs on | ||
| EXPOSE 8080 | ||
|
|
||
| # Health check | ||
| HEALTHCHECK --interval=30s --timeout=3s \ | ||
| CMD curl -f http://localhost:8080/ || exit 1 | ||
|
|
||
| # Start the application | ||
| CMD ["bun", "run", "start"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # Railway Dockerfile for Backend - use this for Railway deployment | ||
| # This should be used from the ROOT directory of the monorepo | ||
|
|
||
| FROM oven/bun:1 as builder | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy root package.json and lockfile for monorepo setup | ||
| COPY package.json . | ||
| COPY bun.lockb . | ||
| COPY bunfig.toml . | ||
|
|
||
| # Copy backend package.json | ||
| COPY apps/backend/package.json ./apps/backend/ | ||
|
|
||
| # Install all dependencies (this handles the monorepo workspace) | ||
| RUN bun install --frozen-lockfile | ||
|
|
||
| # Copy backend source code | ||
| COPY apps/backend/src ./apps/backend/src | ||
| COPY apps/backend/index.js ./apps/backend/ | ||
|
|
||
| # Production stage | ||
| FROM oven/bun:1-slim | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| # Copy node_modules and backend files from builder | ||
| COPY --from=builder /app/node_modules ./node_modules | ||
| COPY --from=builder /app/apps/backend/package.json . | ||
| COPY --from=builder /app/apps/backend/src ./src | ||
| COPY --from=builder /app/apps/backend/index.js . | ||
|
|
||
| # Set production environment | ||
| ENV NODE_ENV=production | ||
|
|
||
| # Expose the port the app runs on | ||
| EXPOSE 8080 | ||
|
|
||
| # Health check | ||
| HEALTHCHECK --interval=30s --timeout=3s \ | ||
| CMD curl -f http://localhost:8080/ || exit 1 | ||
|
|
||
| # Start the application | ||
| CMD ["bun", "run", "start"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: iOS Build | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main, develop ] | ||
| paths: ['apps/ios/**'] | ||
| pull_request: | ||
| branches: [ main ] | ||
| paths: ['apps/ios/**'] | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: macos-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Xcode | ||
| uses: maxim-lobanov/setup-xcode@v1 | ||
| with: | ||
| xcode-version: latest-stable | ||
|
|
||
| - name: Build iOS App | ||
| working-directory: apps/ios | ||
| run: | | ||
| xcodebuild -project March.xcodeproj \ | ||
| -scheme March \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 15 Pro' \ | ||
| build | ||
|
|
||
| - name: Run Tests | ||
| working-directory: apps/ios | ||
| run: | | ||
| xcodebuild -project March.xcodeproj \ | ||
| -scheme March \ | ||
| -destination 'platform=iOS Simulator,name=iPhone 15 Pro' \ | ||
| test | ||
|
|
||
| - name: Archive Build | ||
| if: github.ref == 'refs/heads/main' | ||
| working-directory: apps/ios | ||
| run: | | ||
| xcodebuild -project March.xcodeproj \ | ||
| -scheme March \ | ||
| -archivePath ./build/March.xcarchive \ | ||
| archive |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: Trim the welcome message string to remove unintended extra spaces. [Typo Fix]