Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
thatguyinabeanie committed Nov 10, 2024
2 parents 11fc858 + 5516126 commit 3a11af9
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions apps/nextjs/src/app/server-actions/accounts/actions.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
"use server";

import { auth } from "@clerk/nextjs/server";

import { db, eq } from "@battle-stadium/db";
import { accounts, clerkUsers, profiles } from "@battle-stadium/db/schema";

export async function getAccounts() {
export async function getAccounts () {
return await db.query.accounts.findMany();
}

export async function getAccount(username: string) {
export async function getAccount (
username: string,
) {

const profile = await db.query.profiles.findFirst({
where: eq(profiles.username, username),
});
Expand All @@ -23,7 +24,8 @@ export async function getAccount(username: string) {
});
}

export async function getAccountMe() {
export async function getAccountMe () {

const { userId } = await auth();

if (!userId) {
Expand Down

0 comments on commit 3a11af9

Please sign in to comment.