Skip to content

Commit

Permalink
Merge branch 'preview' of github.com:marchhq/march into fix/connect-s…
Browse files Browse the repository at this point in the history
…tack
  • Loading branch information
deewakar-k committed Dec 9, 2024
2 parents 9f39f17 + d7f19d0 commit b16a54e
Show file tree
Hide file tree
Showing 145 changed files with 1,563 additions and 14,835 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ body:
options:
- Production
- Node version
- Pnpm version
- bun version
- OS Details (Linux, Windows)
validations:
required: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
with:
node-version: '18.17.0'

- name: Setup pnpm
uses: pnpm/action-setup@v2
- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
version: latest
bun-version: latest

- name: Install dependencies
run: pnpm install
run: bun install

- name: Build
run: pnpm run build
run: bun run build

- name: Check sync with preview
run: |
Expand Down
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ git checkout -b <feature-branch-name>
4. Install packages with pnpm

```
pnpm install
bun install
```

5. Set up your .env file
Expand All @@ -54,7 +54,7 @@ Go to the `app/backend` and `app/frontend` directories and duplicate the `.env.e
6. Run (in development mode)

```
pnpm dev
bun dev
```

## Making a Pull Request
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To get a local copy up and running, please follow these simple steps.
Here is what you need to run march.

- Node.js (Version: >=18.x)
- pnpm (recommended)
- bun (recommended)

## Development

Expand Down Expand Up @@ -35,7 +35,8 @@ git checkout -b <feature-branch-name>
4. Install packages with pnpm

```
pnpm install
bun install
```

5. Set up your .env file
Expand All @@ -45,7 +46,8 @@ Go to the `app/backend` and `app/frontend` directories and duplicate the `.env.e
6. Run (in development mode)

```
pnpm dev
bun dev
```

### Linear integration
Expand Down
6 changes: 3 additions & 3 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@satellite/backend",
"name": "@march/backend",
"version": "0.0.1",
"description": "satellite Backend",
"description": "march Backend",
"author": "march-dev",
"private": true,
"main": "index.js",
"type": "module",
"repository": "git@github.com:marchhq/satellite-backend.git",
"repository": "git@github.com:marchhq/march.git",
"license": "MIT",
"scripts": {
"dev": "nodemon index.js",
Expand Down
58 changes: 0 additions & 58 deletions apps/extension/background.js

This file was deleted.

Binary file removed apps/extension/icons/icon16.png
Binary file not shown.
Binary file removed apps/extension/icons/icon48.png
Binary file not shown.
17 changes: 0 additions & 17 deletions apps/extension/manifest.json

This file was deleted.

1 change: 0 additions & 1 deletion apps/extension/tempCodeRunnerFile.js

This file was deleted.

12 changes: 6 additions & 6 deletions apps/frontend/.env.local.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

NEXT_PUBLIC_GOOGLE_CLIENT_ID=
NEXT_PUBLIC_GITHUB_CLIENT_ID=
NEXT_PUBLIC_WEBSOCKET_URL=

GITHUB_CLIENT_ID=
GITHUB_APP_URL=

NEXT_PUBLIC_LINEAR_CLIENT_ID=
NEXT_PUBLIC_LINEAR_REDIRECT_URL=
LINEAR_CLIENT_ID=
LINEAR_REDIRECT_URL=

NEXT_PUBLIC_GITHUB_APP_URL=
NEXT_PUBLIC_WEBSOCKET_URL=
10 changes: 9 additions & 1 deletion apps/frontend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,24 @@
"plugin:@typescript-eslint/recommended",
"plugin:@tanstack/eslint-plugin-query/recommended",
"next/core-web-vitals",
"prettier"
"prettier",
"plugin:jsx-a11y/recommended"
],
"plugins": [
"prettier",
"@typescript-eslint",
"jsx-a11y",
"tailwindcss",
"react-refresh",

"@tanstack/query"
],
"overrides": [
{
"files": ["*.tsx", "*.ts", "*.jsx", "*.js"],
"extends": ["plugin:jsx-a11y/recommended"]
}
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
Expand Down
15 changes: 12 additions & 3 deletions apps/frontend/.github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run build
# - run: npm test

- name: Setup Bun
uses: oven-sh/setup-bun@v1
with:
bun-version: latest

- name: Install dependencies
run: bun install

- name: Build
run: bun run build
# - run: bun test
70 changes: 35 additions & 35 deletions apps/frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local

# vercel
.vercel
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.bun
.bun.lockb

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
bun.lockb

# local env files
.env.local
.env.development.local
.env.test.local
.env.production.local

# vercel
.vercel
15 changes: 8 additions & 7 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Satellite Frontend",
"author": "march-dev",
"scripts": {
"dev": "next dev --turbopack",
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
Expand Down Expand Up @@ -43,6 +43,7 @@
"@tiptap/react": "^2.5.8",
"@tiptap/starter-kit": "^2.5.8",
"@tiptap/suggestion": "^2.6.6",
"@types/lodash": "^4.17.13",
"@types/markdown-it": "^14.1.2",
"axios": "^1.7.2",
"class-variance-authority": "^0.7.0",
Expand All @@ -55,11 +56,11 @@
"lucide-react": "^0.439.0",
"markdown-it": "^14.1.0",
"markdown-it-task-lists": "^2.1.1",
"next": "15.0.3",
"next": "^14.2.5",
"nextjs-toploader": "^3.7.15",
"react": "19.0.0-rc-66855b96-20241106",
"react-day-picker": "8.10.1",
"react-dom": "19.0.0-rc-66855b96-20241106",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-resizable-panels": "^2.0.20",
"tailwind-merge": "^2.5.2",
Expand All @@ -71,12 +72,12 @@
"@iconify-icon/react": "^2.1.0",
"@tanstack/eslint-plugin-query": "^5.51.15",
"@types/node": "^20.14.11",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react": "^18.3.3",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-config-next": "15.0.3",
"eslint-config-next": "^14.2.5",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.9.0",
Expand Down Expand Up @@ -116,7 +117,7 @@
"bugs": {
"url": "/~https://github.com/nirnejak/satellite-frontend/issues"
},
"pnpm": {
"bun": {
"overrides": {
"@types/react": "npm:types-react@19.0.0-rc.1"
}
Expand Down
3 changes: 1 addition & 2 deletions apps/frontend/public/icons/spacesicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 0 additions & 16 deletions apps/frontend/src/app/(app)/space/[slug]/page.tsx

This file was deleted.

Loading

0 comments on commit b16a54e

Please sign in to comment.