Skip to content

Commit 28444f9

Browse files
authored
Merge pull request #202 from Signal-K/revert-201-SSG-270
Revert "⛵︎🫓 ↝ [SSG-270 SSM-251 SSM-252]: A lot of notification content, entit…"
2 parents d947b5c + 59fb272 commit 28444f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+251
-4621
lines changed

.env.example

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
# Supabase Configuration
2-
NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321
3-
NEXT_PUBLIC_SUPABASE_ANON_KEY=your_supabase_anon_key_here
4-
SUPABASE_DB_URL=postgresql://postgres:postgres@host.docker.internal:54322/postgres?sslmode=disable
5-
SUPABASE_SERVICE_ROLE_KEY=your_service_role_key
6-
71
# Database Configuration (Drizzle ORM)
8-
DATABASE_URL=postgresql://postgres:postgres@localhost:54322/postgres
2+
DATABASE_URL="postgresql://postgres:postgres@localhost:5432/navigation"
93

10-
# PostHog Analytics
11-
NEXT_PUBLIC_POSTHOG_KEY=your_posthog_key_here
12-
NEXT_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
13-
14-
# Push Notifications (VAPID Keys)
15-
NEXT_PUBLIC_VAPID_PUBLIC_KEY=your_vapid_public_key_here
16-
VAPID_PRIVATE_KEY=your_vapid_private_key_here
4+
# For production deployment
5+
POSTGRES_DB=navigation
6+
POSTGRES_USER=postgres
7+
POSTGRES_PASSWORD=your_secure_password_here
178

189
# Next.js Configuration
1910
NODE_ENV=development
2011
NEXTAUTH_SECRET=your_nextauth_secret_here
2112
NEXTAUTH_URL=http://localhost:3000
2213

23-
# For production deployment
24-
POSTGRES_DB=navigation
25-
POSTGRES_USER=postgres
26-
POSTGRES_PASSWORD=your_secure_password_here
14+
# Supabase Configuration (if still using alongside Drizzle)
15+
NEXT_PUBLIC_SUPABASE_URL=
16+
NEXT_PUBLIC_SUPABASE_ANON_KEY=
17+
SUPABASE_SERVICE_ROLE_KEY=your_service_role_key
18+
19+
# OpenAI Configuration
20+
OPENAI_API_KEY=
21+
22+
# Push Notifications (Web Push)
23+
VAPID_PUBLIC_KEY=your_vapid_public_key
24+
VAPID_PRIVATE_KEY=your_vapid_private_key
2725

2826
# API Configuration
2927
NEXT_PUBLIC_API_URL=http://localhost:5001

.env.test

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Test Environment Variables
2+
NODE_ENV=test
3+
NEXTAUTH_URL=http://localhost:3000
4+
NEXT_PUBLIC_BASE_URL=http://localhost:3000
5+
6+
# Placeholder Supabase environment variables for testing
7+
NEXT_PUBLIC_SUPABASE_URL=https://placeholder.supabase.co
8+
NEXT_PUBLIC_SUPABASE_ANON_KEY=placeholder_key
9+
10+
# Skip problematic tests
11+
SKIP_USER_CREATION_TESTS=true

.github/workflows/e2e.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@ jobs:
3232
uses: actions/setup-node@v4
3333
with:
3434
node-version: '18'
35-
cache: 'yarn'
35+
cache: 'npm'
3636

3737
- name: Install dependencies
38-
run: yarn install --frozen-lockfile
38+
run: npm ci --legacy-peer-deps
3939

4040
- name: Setup environment
4141
run: |
4242
echo "SKIP_USER_CREATION_TESTS=true" >> $GITHUB_ENV
4343
echo "NODE_ENV=test" >> $GITHUB_ENV
4444
4545
- name: Build application
46-
run: yarn build
46+
run: npm run build
4747

4848
- name: Start application
4949
run: |
50-
yarn start &
50+
npm start &
5151
sleep 10
5252
env:
5353
NODE_ENV: production
5454

5555
- name: Run E2E tests
56-
run: yarn test:e2e:headless
56+
run: npm run test:e2e:headless
5757
env:
5858
SKIP_USER_CREATION_TESTS: true
5959

.github/workflows/send-push.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,4 @@ public/workbox-7144475a.js
5656
public/workbox-7144475a.js.map
5757
public/workbox-f1770938.js
5858
certificates
59-
.env.local
60-
61-
# Supabase
62-
supabase/seed.sql
59+
.env.local

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ up-full:
1010

1111
down:
1212
docker-compose down
13-
docker-compose --profile studio down
14-
docker-compose --profile test down
15-
docker-compose --profile notify down
16-
# supabase stop || true
1713

1814
# Run locally without Docker (recommended for Supabase development)
1915
dev:

add_unlocked_column.sql

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/api/check-subscriptions/route.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/api/save-subscription/route.ts

Lines changed: 0 additions & 66 deletions
This file was deleted.

app/api/send-test-notification/route.ts

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)