Skip to content

Commit

Permalink
Merge pull request #593 from technologiestiftung/staging
Browse files Browse the repository at this point in the history
  • Loading branch information
ff6347 authored May 23, 2023
2 parents 84738df + 7557ce6 commit f29af44
Show file tree
Hide file tree
Showing 95 changed files with 3,541 additions and 4,249 deletions.
23 changes: 10 additions & 13 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# The absolute base url
NEXT_PUBLIC_BASE_URL=http://localhost:3000

# Supabase will redirect to this url after recovery
NEXT_PUBLIC_RECOVERY_AUTH_REDIRECT_URL=${NEXT_PUBLIC_BASE_URL}/reset-password

# Mapbox Credentials
NEXT_PUBLIC_MAPBOX_API_KEY=pk.123.xyz

Expand All @@ -22,23 +25,17 @@ NEXT_PUBLIC_MAP_INITIAL_LONGITUDE=13.419047
NEXT_PUBLIC_MAP_INITIAL_ZOOM=11
NEXT_PUBLIC_MAP_INITIAL_ZOOM_MOBILE=13

# Auth0
NEXT_PUBLIC_AUTH0_DOMAIN=myauthzeropath.eu.auth0.com
NEXT_PUBLIC_AUTH0_CLIENT_ID=7479d17d-2212-4a23-a42c-363b898dc618
NEXT_PUBLIC_AUTH0_AUDIENCE=https://my-tree-api-url.io
# giessdenkiez API
# See https://github.com/technologiestiftung/giessdenkiez-de-postgres-api
NEXT_PUBLIC_SUPABASE_URL=http://localhost:54321
NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
NEXT_PUBLIC_API_ENDPOINT=http://localhost:8080

# Matomo tracking
NEXT_PUBLIC_MATOMO_SITE_ID=23
NEXT_PUBLIC_MATOMO_URL=https://piwik.example.com
# User management
# Uses the auth0 management API to create the possibility
# to delete users
# see https://github.com/technologiestiftung/tsb-trees-api-user-management
NEXT_PUBLIC_USER_DATA_API_URL=https://my-user-management-api.io

# giessdenkiez API
# See https://github.com/technologiestiftung/giessdenkiez-de-postgres-api
NEXT_PUBLIC_API_ENDPOINT=https://localhost:8000/my-local-postgres-api

# The mail used to send emails to users (recovery, confirm, signup, etc)
NEXT_PUBLIC_FROM_EMAIL=noreply@mail.app.supabase.io
# Disable NextJs telemetry
NEXT_TELEMETRY_DISABLED=1
22 changes: 14 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@
name: Node.js CI
env:
BUILD_TARGET: DEFAULT
NEXT_PUBLIC_SUPABASE_URL: http://localhost:54321
NEXT_PUBLIC_SUPABASE_ANON_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
NEXT_PUBLIC_API_ENDPOINT: https://localhost:8000/my-local-postgres-api
NEXT_PUBLIC_USER_DATA_API_URL: https://my-user-management-api.io
NEXT_PUBLIC_AUTH0_AUDIENCE: https://my-tree-api-url.io
NEXT_PUBLIC_AUTH0_CLIENT_ID: 7479d17d-2212-4a23-a42c-363b898dc618
NEXT_PUBLIC_AUTH0_DOMAIN: myauthzeropath.eu.auth0.com
NEXT_PUBLIC_BASE_URL: http://localhost:3000
NEXT_PUBLIC_RECOVERY_AUTH_REDIRECT_URL: http://localhost:3000/auth
NEXT_TELEMETRY_DISABLED: '1'
#mapbox related
NEXT_PUBLIC_MAPBOX_TREES_TILESET_LAYER: layer-name-within-tileset
NEXT_PUBLIC_MAPBOX_TREES_TILESET_URL: mapbox://{username}.{tilesetId}
NEXT_PUBLIC_MAP_BOUNDING_BOX: 13.0824446341071,52.3281202651866,13.7682544186827,52.681600197973
NEXT_PUBLIC_MAPBOX_API_KEY: pk.123.xyz
# if you are not in Berlin change these below
NEXT_PUBLIC_MAP_BOUNDING_BOX: 13.0824446341071,52.3281202651866,13.7682544186827,52.681600197973
NEXT_PUBLIC_MAP_INITIAL_LATITUDE: 52.500869
NEXT_PUBLIC_MAP_INITIAL_LONGITUDE: 13.419047
NEXT_PUBLIC_MAP_INITIAL_ZOOM: 11
NEXT_PUBLIC_MAP_INITIAL_ZOOM_MOBILE: 13
# data generated by the harvester
NEXT_PUBLIC_RAIN_DATA_URL: https://tsb-trees.s3.eu-central-1.amazonaws.com/weather_light.geojson.gz
NEXT_PUBLIC_BASE_URL: http://localhost:3000
NEXT_TELEMETRY_DISABLED: '1'
NODE_ENV: test
NEXT_PUBLIC_FROM_EMAIL: noreply@giessdenkiez.de

on:
push:
Expand All @@ -41,7 +48,6 @@ jobs:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"

steps:
- uses: actions/checkout@v3
- name: Use Node.js from .nvmrc
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,6 @@ docs/users-stats/token

# Local Netlify folder
.netlify

# intellij
.idea
8 changes: 0 additions & 8 deletions docs/users-stats/.editorconfig

This file was deleted.

8 changes: 0 additions & 8 deletions docs/users-stats/.env.example

This file was deleted.

2 changes: 0 additions & 2 deletions docs/users-stats/.eslintignore

This file was deleted.

3 changes: 0 additions & 3 deletions docs/users-stats/.gitignore

This file was deleted.

26 changes: 0 additions & 26 deletions docs/users-stats/.vscode/settings.json

This file was deleted.

37 changes: 0 additions & 37 deletions docs/users-stats/README.md

This file was deleted.

61 changes: 0 additions & 61 deletions docs/users-stats/explorer.ts

This file was deleted.

44 changes: 0 additions & 44 deletions docs/users-stats/get_token.ts

This file was deleted.

Loading

1 comment on commit f29af44

@vercel
Copy link

@vercel vercel bot commented on f29af44 May 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.