Skip to content

Commit

Permalink
Merge branch 'main' into feature/frontend/pwa
Browse files Browse the repository at this point in the history
  • Loading branch information
TomRomeo committed Jan 26, 2024
2 parents dbffa3f + 557045f commit 63cd785
Show file tree
Hide file tree
Showing 9 changed files with 171 additions and 138 deletions.
15 changes: 15 additions & 0 deletions backend/api-documentation/groups/decline invitation.bru
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
meta {
name: decline invitation
type: http
seq: 13
}

delete {
url: {{baseUrl}}/api/groups/{{groupID}}/members/request
body: none
auth: bearer
}

auth:bearer {
token: {{accessToken}}
}
21 changes: 21 additions & 0 deletions backend/api-documentation/groups/decline request.bru
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
meta {
name: decline request
type: http
seq: 14
}

delete {
url: {{baseUrl}}/api/groups/{{groupID}}/members/invitation
body: json
auth: bearer
}

auth:bearer {
token: {{accessToken}}
}

body:json {
{
"invitedUserEmail": "[email protected]"
}
}
2 changes: 1 addition & 1 deletion backend/api-documentation/groups/delete group.bru
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meta {
name: delete group
type: http
seq: 13
seq: 11
}

delete {
Expand Down
2 changes: 1 addition & 1 deletion backend/api-documentation/groups/leave group.bru
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meta {
name: leave group
type: http
seq: 14
seq: 12
}

delete {
Expand Down
2 changes: 1 addition & 1 deletion backend/api-documentation/groups/modify group.bru
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meta {
name: modify group
type: http
seq: 10
seq: 9
}

put {
Expand Down
2 changes: 1 addition & 1 deletion backend/api-documentation/groups/promote or demote.bru
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
meta {
name: promote or demote
type: http
seq: 11
seq: 10
}

put {
Expand Down
82 changes: 41 additions & 41 deletions backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,84 +6,84 @@ require (
github.com/go-micro/plugins/v4/client/grpc v1.2.1
github.com/go-micro/plugins/v4/registry/kubernetes v1.1.2
github.com/go-micro/plugins/v4/server/grpc v1.2.0
github.com/gofiber/fiber/v2 v2.50.0
github.com/gofiber/fiber/v2 v2.52.0
github.com/gofiber/jwt/v3 v3.3.10
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/joho/godotenv v1.5.1
go-micro.dev/v4 v4.10.2
go.opentelemetry.io/otel v1.19.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
google.golang.org/grpc v1.58.3
gorm.io/driver/postgres v1.5.3
go.opentelemetry.io/otel v1.22.0
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
gorm.io/driver/postgres v1.5.4
gorm.io/gorm v1.25.5
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/SherClockHolmes/webpush-go v1.3.0 // indirect
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgx/v5 v5.5.2 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/klauspost/compress v1.17.1 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/robfig/cron/v3 v3.0.0 // indirect
github.com/sirupsen/logrus v1.9.2 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.50.0 // indirect
github.com/valyala/fasthttp v1.51.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect
go.opentelemetry.io/contrib v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/contrib v1.22.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.61.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/bitly/go-simplejson v0.5.1 // indirect
github.com/cloudflare/circl v1.3.5 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-acme/lego/v4 v4.14.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.9.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry v1.2.0
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.3.0 // indirect
github.com/gobwas/ws v1.3.2 // indirect
github.com/gofiber/contrib/otelfiber v1.0.10
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/miekg/dns v1.1.56 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
Expand All @@ -93,20 +93,20 @@ require (
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/stretchr/testify v1.8.4
github.com/urfave/cli/v2 v2.25.7 // indirect
github.com/urfave/cli/v2 v2.27.1 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0
go.opentelemetry.io/otel/sdk v1.22.0
golang.org/x/crypto v0.18.0
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/protobuf v1.31.0
golang.org/x/tools v0.17.0 // indirect
google.golang.org/protobuf v1.32.0
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gorm.io/plugin/opentelemetry v0.1.4
Expand Down
Loading

0 comments on commit 63cd785

Please sign in to comment.