Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
307 commits
Select commit Hold shift + click to select a range
cf596ad
minor fixes
jona159 May 25, 2023
54a905e
add getOwnCampaigns function
jona159 Jun 1, 2023
126bf1e
maybe add boxIds to campaign schema in the future
jona159 Jun 15, 2023
7d34327
add heatmap package temporarily
jona159 Jun 15, 2023
9eab363
add update schema for campaigns
jona159 Jun 15, 2023
80aecff
add profile route first draft
jona159 Jun 15, 2023
d5f2a02
add code for heatmaps temporarily
jona159 Jun 15, 2023
697677d
overview heatmaps, filters, etc...
jona159 Jun 15, 2023
bbd0868
merge dev
jona159 Jun 17, 2023
e9ebd20
merge dev
jona159 Jun 17, 2023
165aa6e
use popover in create/area
jona159 Jun 19, 2023
db8e02f
popover
jona159 Jun 20, 2023
96006f4
only german phenomena labels
jona159 Jun 20, 2023
0207ffa
comment popover for now
jona159 Jun 20, 2023
d2d226e
add participant number to progress
jona159 Jun 20, 2023
2b3560f
add map and styling
jona159 Jun 20, 2023
0497bd6
capitalize title
jona159 Jun 20, 2023
73cb7e1
form labels in german
jona159 Jun 20, 2023
eb45c11
merge
jona159 Jun 28, 2023
f71cefb
update deps
jona159 Jun 28, 2023
b624563
remove duplicate in package.json
jona159 Jun 28, 2023
98a8f96
scroll to error in form
jona159 Jun 29, 2023
5c68793
form improvements
jona159 Jun 29, 2023
d4fe0be
fix country
jona159 Jun 29, 2023
29fdc01
add icon to create button
jona159 Jun 29, 2023
2ae99e0
add info cards
jona159 Jun 29, 2023
5aeeeb4
commented heatmap code
jona159 Jun 30, 2023
e79892a
merge dev
jona159 Jun 30, 2023
4cf2a9a
add popover to map
jona159 Jun 30, 2023
129afd8
download geojson
jona159 Jul 1, 2023
03c6f5c
campaign slug
jona159 Jul 1, 2023
c42d2dc
rename campaignId to slug
jona159 Jul 1, 2023
b882e78
share campaigns
jona159 Jul 1, 2023
058d886
linkedIn Icon
jona159 Jul 1, 2023
1a1e356
create comments
jona159 Jul 2, 2023
1415414
add map styles
jona159 Jul 2, 2023
0694ea9
add showMap switch
jona159 Jul 2, 2023
2217988
display comments
jona159 Jul 2, 2023
eda115c
move download geojson function to lib
jona159 Jul 2, 2023
87bff17
tabview
jona159 Jul 2, 2023
085ed5a
display comments in md
jona159 Jul 2, 2023
bf516d4
delete comments
jona159 Jul 3, 2023
d9ba6b7
fix download button
jona159 Jul 3, 2023
b847247
edit comment
jona159 Jul 3, 2023
77b8174
create events
jona159 Jul 3, 2023
4e682c7
delete events
jona159 Jul 4, 2023
d77cdf4
update events
jona159 Jul 4, 2023
20a3cfa
move actions
jona159 Jul 4, 2023
7922574
campaign description in md
jona159 Jul 4, 2023
43c622b
secure md
jona159 Jul 4, 2023
bad7e8e
style event form
jona159 Jul 5, 2023
f55d156
style edit events
jona159 Jul 5, 2023
d5af872
style comments
jona159 Jul 5, 2023
25f82f4
refactor events tab
jona159 Jul 5, 2023
4033f6b
refactor comments tab
jona159 Jul 5, 2023
d4db9e0
fix imports
jona159 Jul 5, 2023
796be8d
still show map when scrolling
jona159 Jul 8, 2023
292df74
translations
jona159 Jul 8, 2023
2c03fc5
add participants to campaign
jona159 Jul 8, 2023
dd99739
mention participants
jona159 Jul 8, 2023
f218500
merge dev
jona159 Jul 9, 2023
50dd82a
style slug page and overview-table
jona159 Jul 10, 2023
e52282a
move forms to dialog
jona159 Jul 10, 2023
edb4787
merge dev
jona159 Jul 13, 2023
7232dd7
merge dev
jona159 Jul 13, 2023
5615710
patch tributejs changes
jona159 Jul 13, 2023
956ee0e
only osem img as link
jona159 Jul 13, 2023
3f986c3
center text
jona159 Jul 13, 2023
86432c8
add icons and some styling
jona159 Jul 13, 2023
d5efc25
cleanup
jona159 Jul 13, 2023
cc5dd21
show popover on draw button click
jona159 Jul 13, 2023
4aaccb4
campaigns translations
jona159 Jul 13, 2023
e59898e
overview translations
jona159 Jul 13, 2023
b5054e3
create-campaign translations
jona159 Jul 13, 2023
529316d
area translations
jona159 Jul 13, 2023
eb99b12
zoom to extent
jona159 Jul 14, 2023
c0af82f
add home logo
jona159 Jul 14, 2023
499ec17
popup and delete feature
jona159 Jul 15, 2023
acf85e6
normalize geojson
jona159 Jul 15, 2023
6d3e593
move click to select button
jona159 Jul 15, 2023
393bc38
move zoom to extent to function and remove button
jona159 Jul 15, 2023
0507728
fix popup, toast on error
jona159 Jul 15, 2023
3baa271
translations
jona159 Jul 15, 2023
a3fc2d4
color of imported geojson
jona159 Jul 15, 2023
e093f80
add task description, style cards
jona159 Jul 15, 2023
824aab0
fix bug
jona159 Jul 15, 2023
819fba3
move map to seperate component
jona159 Jul 15, 2023
610fdf3
style next button
jona159 Jul 15, 2023
3a9cbfd
flatten and normalize geojson
jona159 Jul 16, 2023
ad0746a
fix feature display
jona159 Jul 16, 2023
662f384
fix switch display
jona159 Jul 16, 2023
7e88ee7
add campaign cards to profile settings
jona159 Jul 16, 2023
b2fa22d
fix downloadgeojson
jona159 Jul 16, 2023
c0ac1c7
add icons
jona159 Jul 16, 2023
1354a06
cluster pointlayer
jona159 Jul 16, 2023
eefcb14
improve map style
jona159 Jul 16, 2023
cb7b5db
improve tribute
jona159 Jul 16, 2023
f74346c
delete Campaigns from slug page
jona159 Jul 16, 2023
15f440a
edit campaign table
jona159 Jul 16, 2023
4e2ca4c
edit more fields
jona159 Jul 17, 2023
724559a
styles
jona159 Jul 17, 2023
ff980be
deleteModal
jona159 Jul 17, 2023
53a8e2d
translations
jona159 Jul 17, 2023
4193fbf
redirect after update
jona159 Jul 17, 2023
4a92054
improve update campaign function
jona159 Jul 17, 2023
08f6d32
style tab trigger
jona159 Jul 17, 2023
ce9fdcb
move delete button to top bar
jona159 Jul 17, 2023
a872668
translations campaign slug
jona159 Jul 17, 2023
70bbc53
action files
jona159 Jul 18, 2023
3d8ec6e
style tabs
jona159 Jul 18, 2023
ea2aaa4
style comments
jona159 Jul 18, 2023
489632e
clusters
jona159 Jul 18, 2023
71d776f
layout
jona159 Jul 18, 2023
2fe62a2
improve popup
jona159 Jul 18, 2023
10b879c
cleanup overview
jona159 Jul 18, 2023
1d5bbae
3 campaigns per row
jona159 Jul 18, 2023
e897b96
more filters, country dropdown
jona159 Jul 18, 2023
e7867b3
combobox country dropdown
jona159 Jul 18, 2023
d609d2e
add flag icons
jona159 Jul 18, 2023
b7997fb
edit country
jona159 Jul 18, 2023
0176ab5
more filter fields
jona159 Jul 18, 2023
b3cbd06
filters modal
jona159 Jul 18, 2023
346bc6b
refactor filter bar
jona159 Jul 18, 2023
71986f3
simplify urgency dropdown
jona159 Jul 18, 2023
0f5a143
button styles
jona159 Jul 18, 2023
93654cf
show selected filters in buttons
jona159 Jul 18, 2023
96fbea8
filters modal translations
jona159 Jul 18, 2023
befface
cancel button
jona159 Jul 18, 2023
d8cf329
fix marker click
jona159 Jul 19, 2023
4d666c2
fix phenomena fetch
jona159 Jul 19, 2023
a323dc1
multi select
jona159 Jul 19, 2023
c103368
delete campaign profile route
jona159 Jul 19, 2023
75d533e
campaign update validation
jona159 Jul 19, 2023
8e657cb
fix create campaign function
jona159 Jul 19, 2023
fb8d97a
fix types
jona159 Jul 19, 2023
8023103
include participants and getCampaigns function
jona159 Jul 19, 2023
43093f8
fix types area
jona159 Jul 19, 2023
2e5e23b
fix types form
jona159 Jul 19, 2023
4dccf00
more type fixes
jona159 Jul 19, 2023
aef3056
types
jona159 Jul 19, 2023
353e7a1
types campaign slug page
jona159 Jul 19, 2023
df859f0
types
jona159 Jul 19, 2023
0eb41e1
campaign badge labels
jona159 Jul 19, 2023
09c191b
badge styles
jona159 Jul 19, 2023
b97aa5e
use badges in slug page
jona159 Jul 19, 2023
e742955
reduce overwhelming colors
jona159 Jul 19, 2023
93d4a1e
styles
jona159 Jul 19, 2023
25dd5dd
show description in md
jona159 Jul 19, 2023
874d592
filterobject
jona159 Jul 20, 2023
a1bc630
functions for filter
jona159 Jul 20, 2023
ae39949
make functions callbacks
jona159 Jul 20, 2023
d836ba2
style alert icon
jona159 Jul 20, 2023
2d8eb56
local filterobject in modal
jona159 Jul 20, 2023
6ed4a37
rename urgency to priority
jona159 Jul 20, 2023
cba4773
style multiselect
jona159 Jul 20, 2023
41023b9
exposure placeholder
jona159 Jul 20, 2023
1286cde
phenomena select scrollable
jona159 Jul 20, 2023
3b3a027
time range filter
jona159 Jul 20, 2023
2feb828
better translation
jona159 Jul 20, 2023
646a048
improve popover
jona159 Jul 20, 2023
c1a24e9
apply filters to map
jona159 Jul 20, 2023
dfdb46d
translation
jona159 Jul 20, 2023
72117d2
translations
jona159 Jul 20, 2023
03e2c33
phenomena filter
jona159 Jul 20, 2023
d868706
add notificaiton bell to campaign page
jona159 Jul 20, 2023
1bbd7f6
slug layout
jona159 Jul 20, 2023
3feb21e
pagination
jona159 Jul 21, 2023
fa677ff
page buttons
jona159 Jul 21, 2023
731e679
variants for pagination buttons
jona159 Jul 21, 2023
bb2aca3
search serverside
jona159 Jul 21, 2023
85566f7
search component
jona159 Jul 21, 2023
9d7cf5d
style search responsive
jona159 Jul 21, 2023
dcedcb4
filter server side
jona159 Jul 22, 2023
df341b3
try catch parsing
jona159 Jul 22, 2023
fd1f547
fix string array
jona159 Jul 22, 2023
e99bb49
ui for bookmarking campaigns
jona159 Jul 22, 2023
a0fa35e
remove some styles from tab
jona159 Jul 22, 2023
cf541bc
style edit button
jona159 Jul 22, 2023
514950e
bookmark campaigns
jona159 Jul 22, 2023
f2bfe62
fix hardware available
jona159 Jul 22, 2023
433cf9c
bookmark stylin
jona159 Jul 22, 2023
d061182
remove bookmark if previously bookmarked
jona159 Jul 22, 2023
057a60c
bookmark from overview
jona159 Jul 22, 2023
b82966d
order by bookmark
jona159 Jul 23, 2023
4f3c61d
fix update schema
jona159 Jul 23, 2023
7b4184b
add updatedAt to orderBy
jona159 Jul 23, 2023
ac670e8
handle orderBy on client
jona159 Jul 23, 2023
fa2b06e
fix sortBy
jona159 Jul 23, 2023
7107904
flag and title on same line
jona159 Jul 23, 2023
390ac05
extract where object to file
jona159 Jul 23, 2023
aed8550
type
jona159 Jul 23, 2023
cd99f09
toast sucessfull bookmark overview
jona159 Jul 23, 2023
31363f0
improve toasts
jona159 Jul 23, 2023
8ccd1a4
toast on slug page
jona159 Jul 23, 2023
9f8cb6b
add geometry back in
jona159 Jul 23, 2023
aef8d6a
translations
jona159 Jul 23, 2023
69d3c26
refactor campaign grid
jona159 Jul 24, 2023
b30e05c
campaign cards responsive
jona159 Jul 24, 2023
3b121b5
pagination dots unclickable
jona159 Jul 24, 2023
46caa96
notification bell if logged in
jona159 Jul 24, 2023
daec946
card size
jona159 Jul 24, 2023
e47f8aa
display all campaigns on overview map
jona159 Jul 25, 2023
2bccf49
filter campaigns on marker click
jona159 Jul 25, 2023
1474135
fix modal button size
jona159 Jul 25, 2023
24c848c
fix sortBy
jona159 Jul 26, 2023
6def91d
fix translations
jona159 Jul 26, 2023
f4807db
improve file upload
jona159 Jul 29, 2023
63ddeec
update layer colors
jona159 Jul 29, 2023
404d879
remove stuff
jona159 Aug 3, 2023
ce2c206
redesign info page
jona159 Aug 3, 2023
90227c8
fix names
jona159 Aug 3, 2023
2b1566d
fix style
jona159 Aug 3, 2023
3274085
schema changes
jona159 Aug 3, 2023
bdc1f87
layout
jona159 Aug 3, 2023
5225edd
info link first
jona159 Aug 3, 2023
7793b82
tutorial page
jona159 Aug 3, 2023
1a967fb
er-diagram prisma schema
jona159 Aug 16, 2023
2d5197b
different changes
jona159 Aug 29, 2023
e5763bb
remove uneccessary package
jona159 Sep 12, 2023
1cb9f10
add novu api key to exmaple env and env server
jona159 Sep 12, 2023
f9d0fca
get user by name
jona159 Sep 12, 2023
8126f36
remove field required sensors
jona159 Sep 12, 2023
c1f690d
style notification bell
jona159 Sep 12, 2023
b4490b0
move function readFileAsync to its own file
jona159 Sep 12, 2023
d368d86
remove unecessary links
jona159 Sep 12, 2023
79d7018
create new subscriber on register
jona159 Sep 12, 2023
96d84be
remove package
jona159 Sep 12, 2023
bacb379
make osem logo and links responsive for create routes
jona159 Sep 12, 2023
e6eec64
cleanup and responsive
jona159 Sep 13, 2023
5b957ee
fix onDelete function and next button disable
jona159 Sep 13, 2023
487d1cd
improve text and cards in mobile
jona159 Sep 13, 2023
b270d02
work in progress...
jona159 Dec 17, 2023
cbfc234
migrate campaigns to drizzle
jona159 Jan 2, 2024
b450ab7
fix exposure boxmarker
jona159 Jan 2, 2024
f51eaf1
package updates
jona159 Jan 16, 2024
98312a6
cast types
jona159 Jan 16, 2024
7080255
update drizzle-kit
jona159 Jan 16, 2024
0bd396a
refactor campaign table
jona159 Jan 16, 2024
4218d29
remove unnecessary Object.values
jona159 Jan 16, 2024
55121c0
add schema for posts and comments
jona159 Jan 16, 2024
14ed79b
crud methods for post
jona159 Jan 16, 2024
a599f1b
add new table for campaign and fields to create a post
jona159 Jan 16, 2024
52b3234
include posts in campaign query
jona159 Jan 16, 2024
7c0a27f
create thread component
jona159 Jan 16, 2024
e60476e
list posts component, refactor campaign slug page
jona159 Jan 16, 2024
0b0b91e
add replies to posts
jona159 Jan 17, 2024
2d7ca0a
getComments
jona159 Jan 17, 2024
912e2bc
fetch comments dynamically
jona159 Jan 17, 2024
d0f9bb4
types
jona159 Jan 17, 2024
e41e77e
get comments server function
jona159 Jan 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
DATABASE_URL="postgresql://postgres:postgres@localhost:5432/opensensemap"
SHADOW_DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"

SESSION_SECRET="super-duper-s3cret"

MAPBOX_ACCESS_TOKEN=""
MAPBOX_GEOCODING_API="https://api.mapbox.com/geocoding/v5/mapbox.places/"

OSEM_API_URL="https://api.opensensemap.org/"
DIRECTUS_URL="https://coelho.opensensemap.org"

MYBADGES_API_URL = "https://api.v2.mybadges.org/"
MYBADGES_URL = "https://mybadges.org/"
MYBADGES_SERVERADMIN_USERNAME = ""
MYBADGES_SERVERADMIN_PASSWORD = ""
MYBADGES_ISSUERID_OSEM = ""
MYBADGES_CLIENT_ID = ""
MYBADGES_CLIENT_SECRET = ""

NOVU_API_KEY= ""
NOVU_API_URL = ""
NOVU_WEBSOCKET_URL = ""
NOVU_APPLICATION_IDENTIFIER = ""
15 changes: 15 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2

updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
94 changes: 29 additions & 65 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
permissions:
actions: write
contents: read
packages: write

jobs:
lint:
Expand Down Expand Up @@ -140,13 +141,6 @@ jobs:
- name: ⬇️ Checkout repo
uses: actions/checkout@v3

- name: 👀 Read app name
uses: SebRollen/[email protected]
id: app_name
with:
file: "fly.toml"
field: "app"

- name: 🐳 Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
Expand All @@ -161,67 +155,37 @@ jobs:
restore-keys: |
${{ runner.os }}-buildx-

# - name: 🔑 Fly Registry Auth
# uses: docker/login-action@v2
# with:
# registry: registry.fly.io
# username: x
# password: ${{ secrets.FLY_API_TOKEN }}

# - name: 🐳 Docker build
# uses: docker/build-push-action@v4
# with:
# context: .
# push: true
# tags: registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}
# build-args: |
# COMMIT_SHA=${{ github.sha }}
# cache-from: type=local,src=/tmp/.buildx-cache
# cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/opensensemap/frontend

- name: 🔑 GitHub Registry Auth
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: 🐳 Docker build
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
COMMIT_SHA=${{ github.sha }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new

# This ugly bit is necessary if you don't want your cache to grow forever
# till it hits GitHub's limit of 5GB.
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
# - name: 🚚 Move cache
# run: |
# rm -rf /tmp/.buildx-cache
# mv /tmp/.buildx-cache-new /tmp/.buildx-cache

# deploy:
# name: 🚀 Deploy
# runs-on: ubuntu-latest
# needs: [lint, typecheck, vitest, cypress, build]
# # only build/deploy main branch on pushes
# if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}

# steps:
# - name: 🛑 Cancel Previous Runs
# uses: styfle/[email protected]

# - name: ⬇️ Checkout repo
# uses: actions/checkout@v3

# - name: 👀 Read app name
# uses: SebRollen/[email protected]
# id: app_name
# with:
# file: "fly.toml"
# field: "app"

# - name: 🚀 Deploy Staging
# if: ${{ github.ref == 'refs/heads/dev' }}
# uses: superfly/[email protected]
# with:
# args: "deploy --app ${{ steps.app_name.outputs.value }}-staging --image registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}"
# env:
# FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

# - name: 🚀 Deploy Production
# if: ${{ github.ref == 'refs/heads/main' }}
# uses: superfly/[email protected]
# with:
# args: "deploy --image registry.fly.io/${{ steps.app_name.outputs.value }}:${{ github.ref_name }}-${{ github.sha }}"
# env:
# FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
- name: 🚚 Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
1 change: 1 addition & 0 deletions ERD.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions app/components/Map/Map.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import type { MapProps, MapRef } from "react-map-gl";
import { NavigationControl, Map as ReactMap } from "react-map-gl";
import { forwardRef } from "react";

const Map = forwardRef<MapRef, MapProps>(
(
// take fog and terrain out of props to resolve error
{ children, mapStyle, fog = null, terrain = null, ...props },
ref
) => {
return (
<ReactMap
id="osem"
dragRotate={false}
initialViewState={{
longitude: 10,
latitude: 25,
zoom: 2,
}}
mapStyle="mapbox://styles/mapbox/streets-v12"
mapboxAccessToken={ENV.MAPBOX_ACCESS_TOKEN}
pitchWithRotate={false}
preserveDrawingBuffer
ref={ref}
style={{
width: "100%",
height: "100%",
position: "fixed",
top: 0,
left: 0,
}}
touchZoomRotate={false}
{...props}
>
{children}
<NavigationControl position="bottom-left" showCompass={false} />
</ReactMap>
);
}
);

Map.displayName = "Map";

export default Map;
84 changes: 0 additions & 84 deletions app/components/Map/cluster/index.ts

This file was deleted.

Loading