Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update session selects and mini game item. Trial not pausing for user… #208

Merged
merged 8 commits into from
Dec 1, 2023
Merged

update session selects and mini game item. Trial not pausing for user… #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d24507
update session selects and mini game item. Trial not pausing for user…
jongrim Nov 7, 2023
f70dce5
clean up style
jongrim Nov 7, 2023
c04d5b7
fix paths
jongrim Nov 7, 2023
7671fd3
cleanup
jongrim Dec 1, 2023
ede01ef
remove local supabase to try and resolve type gen issue
jongrim Dec 1, 2023
02ef675
change to generate types from linked
jongrim Dec 1, 2023
02e5ac0
omg supabase you make stuff hard
jongrim Dec 1, 2023
5f9a215
remove margin bottom
jongrim Dec 1, 2023
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
15 changes: 7 additions & 8 deletions netlify/functions/dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import { authenticateUser, supabase, logError } from "../utils";
import * as R from "ramda";
import { addDays, endOfDay } from "date-fns";

const SESSION_WITH_GAME_AND_COMMUNITY_INFO =
"*, game_id(*, community_events(*), sessions(*), community_id(*))";

export const handler: Handler = async (event) => {
const today = new Date();
const sevenDaysFromNow = endOfDay(addDays(today, 7));
Expand All @@ -11,7 +14,7 @@ export const handler: Handler = async (event) => {
// load open games in next 7 days
const { data: openGames, error: openGamesError } = await supabase
.from("sessions")
.select("*, game_id(*, community_events(*), sessions(*))")
.select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
.is("deleted_at", null)
.gte("start_time", today.getTime())
.lte("end_time", sevenDaysFromNow.getTime())
Expand Down Expand Up @@ -47,9 +50,7 @@ export const handler: Handler = async (event) => {
// load sessions playing in next 7 days
const { data: playing, error: playingError } = await supabase
.from("sessions")
.select(
"*, game_id(title, id, event_id(id, title), sessions(*)), community_id(name, id, url_short_name)",
)
.select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
.is("deleted_at", null)
.contains("rsvps", [user.data.user.id])
.gte("start_time", today.getTime())
Expand All @@ -63,9 +64,7 @@ export const handler: Handler = async (event) => {
// load sessions managing in next 7 days
const { data: managing, error: managingError } = await supabase
.from("sessions")
.select(
"*, game_id(title, id, event_id(id, title), sessions(*)), community_id(name, id, url_short_name)",
)
.select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
.is("deleted_at", null)
.eq("creator_id", user.data.user.id)
.gte("start_time", today.getTime())
Expand Down Expand Up @@ -138,7 +137,7 @@ export const handler: Handler = async (event) => {
// load open games in next 7 days
const { data: games, error: gamesError } = await supabase
.from("sessions")
.select("*, game_id(*, community_events(*), sessions(*))")
.select(SESSION_WITH_GAME_AND_COMMUNITY_INFO)
.is("deleted_at", null)
.neq("creator_id", user.data.user.id)
.in("community_id", communityIds)
Expand Down
Loading