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.

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

I made cool schedule #33

Merged
merged 17 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
run prettier
  • Loading branch information
joshuasilva414 committed Oct 23, 2024
commit 5f1672787f1db2f40e0cdeea9d22d403462377e8
22 changes: 11 additions & 11 deletions apps/bot/bot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ app.get("/postMsgToServer", (h) => {
text: "Questions or issues? Contact an organizer :)",
iconURL: "https://static.acmutsa.org/Info_Simple.svg.png",
});
console.log(
`server type is: ${serverType}\nDev channel id is: ${process.env.DISCORD_DEV_VERIFY_CHANNEL_ID}\nProd channel id is: ${process.env.DISCORD_PROD_VERIFY_CHANNEL_ID}`,
);
console.log(
`server type is: ${serverType}\nDev channel id is: ${process.env.DISCORD_DEV_VERIFY_CHANNEL_ID}\nProd channel id is: ${process.env.DISCORD_PROD_VERIFY_CHANNEL_ID}`,
);
const channel = client.channels.cache.get(
serverType === "dev"
? (process.env.DISCORD_DEV_VERIFY_CHANNEL_ID as string)
Expand Down Expand Up @@ -239,25 +239,25 @@ app.post("/api/checkDiscordVerification", async (h) => {
return h.json({ success: false });
}

console.log("attempting to get member...")
console.log("attempting to get member...");

const member = guild.members.cache.get(verification.discordUserID);

if (!member) {
console.log("failed cause could not find member");
return h.json({ success: false });
}
console.log('got member');
console.log("got member");
// Holy waterfalling request
console.log('adding role');
console.log("adding role");
await member.roles.add(role);
console.log('added role');
console.log('adding group role');
console.log("added role");
console.log("adding group role");
await member.roles.add(userGroupRole);
console.log('added group role');
console.log('setting nickname');
console.log("added group role");
console.log("setting nickname");
await member.setNickname(user.firstName + " " + user.lastName);
console.log('set nickname');
console.log("set nickname");

return h.json({ success: true });
});
Expand Down
17 changes: 7 additions & 10 deletions apps/web/src/actions/discord-verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,14 @@ export const confirmVerifyDiscord = authenticatedAction
env.BOT_API_URL +
"/api/checkDiscordVerification?access=" +
env.INTERNAL_AUTH_KEY;
console.log("url is: ", url);
const res = await fetch(
url,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({ code }),
console.log("url is: ", url);
const res = await fetch(url, {
method: "POST",
headers: {
"Content-Type": "application/json",
},
);
body: JSON.stringify({ code }),
});
let resJson = await res.json();
console.log(resJson);

Expand Down
2 changes: 0 additions & 2 deletions apps/web/src/components/dash/overview/ServerBubbles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ export function TitleBubble() {
<div className="relative col-span-1 !col-start-1 !row-start-1 aspect-video h-full w-full overflow-hidden rounded-xl border border-hackathon p-5 sm:col-span-2 sm:row-span-2 lg:!col-start-auto lg:!row-start-auto lg:aspect-auto">
<GradientHero />
<div className="relative z-20 flex h-full w-full flex-col items-center justify-center gap-y-2 rounded-xl">

<h1 className="text-6xl font-black text-white xs:text-7xl">

{c.hackathonName}
</h1>
<h2 className="text-center font-mono text-xs text-white sm:text-sm">
Expand Down
Loading