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

chore: remove all swag up code 🚮 #531

Merged
merged 6 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ export default function ActivateStudentPage() {

<Modal.Description>
Just confirming - do you want to activate {student.firstName}{' '}
{student.lastName}? They will receive an email with the ability to claim
a swag pack in their profile.
{student.lastName}? They will receive an email with a gift card to the
merch store.
</Modal.Description>

<RemixForm className="form" method="post">
Expand Down
2 changes: 0 additions & 2 deletions apps/api/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,3 @@ STUDENT_PROFILE_URL=http://localhost:3000
# SMTP_HOST=
# SMTP_PASSWORD=
# SMTP_USERNAME=
# SWAG_UP_CLIENT_ID=
# SWAG_UP_CLIENT_SECRET=
4 changes: 0 additions & 4 deletions apps/api/src/shared/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ const BaseEnvironmentConfig = z.object({
SLACK_INTRODUCTIONS_CHANNEL_ID: EnvironmentVariable,
SLACK_SIGNING_SECRET: EnvironmentVariable,
STUDENT_PROFILE_URL: EnvironmentVariable,
SWAG_UP_CLIENT_ID: EnvironmentVariable,
SWAG_UP_CLIENT_SECRET: EnvironmentVariable,
});

const EnvironmentConfig = z.discriminatedUnion('ENVIRONMENT', [
Expand Down Expand Up @@ -98,8 +96,6 @@ const EnvironmentConfig = z.discriminatedUnion('ENVIRONMENT', [
SLACK_FEED_CHANNEL_ID: true,
SLACK_INTRODUCTIONS_CHANNEL_ID: true,
SLACK_SIGNING_SECRET: true,
SWAG_UP_CLIENT_ID: true,
SWAG_UP_CLIENT_SECRET: true,
}).extend({
ENVIRONMENT: z.literal(Environment.DEVELOPMENT),
SMTP_HOST: EnvironmentVariable.optional(),
Expand Down
2 changes: 0 additions & 2 deletions apps/member-profile/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ STUDENT_PROFILE_URL=http://localhost:3000
# SMTP_HOST=
# SMTP_PASSWORD=
# SMTP_USERNAME=
# SWAG_UP_CLIENT_ID=
# SWAG_UP_CLIENT_SECRET=
13 changes: 3 additions & 10 deletions apps/member-profile/app/routes/_profile.home.activation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,7 @@ export default function ActivationModal() {
function ActivatedState() {
return (
<>
<Text color="gray-500">
Great news -- you're activated and eligible to{' '}
<Link className="link" to={Route['/home/claim-swag-pack']}>
claim your FREE swag pack
</Link>
! 🎉
</Text>

<Text color="gray-500">Great news -- you're activated! 🎉</Text>
<ActivationList />
</>
);
Expand Down Expand Up @@ -167,8 +160,8 @@ function NotActivatedState() {
<>
<Text color="gray-500">
You've completed {requirementsCompleted.length}/6 activation
requirements. Once you hit all 6, you will be eligible to claim your
FREE swag pack! 👀
requirements. Once you hit all 6, you will get a gift card to claim your
FREE merch! 👀
</Text>

<ActivationList />
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions apps/member-profile/app/routes/_profile.home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ function ActivationCard() {

<Card.Description>
You've completed {student.activationRequirementsCompleted.length}/6
activation requirements. Once you hit all 6, you will be eligible to
claim your FREE swag pack! 👀
activation requirements. Once you hit all 6, you will get a gift card to
claim your FREE merch! 👀
</Card.Description>

<Button.Group>
Expand Down
7 changes: 0 additions & 7 deletions apps/member-profile/app/routes/_public.claim-swag-pack.tsx

This file was deleted.

Loading