Skip to content

Commit

Permalink
update some text as per Rodney's wishes
Browse files Browse the repository at this point in the history
  • Loading branch information
@rohangpta
rohangpta committed Aug 16, 2023
1 parent 8b9a6aa commit 2a95db9
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 108 deletions.
50 changes: 26 additions & 24 deletions frontend/pages/club/[club]/renew.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
APPROVAL_AUTHORITY,
APPROVAL_AUTHORITY_URL,
MEMBERSHIP_ROLE_NAMES,
OBJECT_NAME_PLURAL,
OBJECT_NAME_SINGULAR,
OBJECT_NAME_TITLE_SINGULAR,
SCHOOL_NAME,
Expand Down Expand Up @@ -251,40 +250,43 @@ const RenewPage = (props: RenewPageProps): ReactElement => {
)}
<TextInfoBox>
<p>
Every year, the{' '}
The annual club registration process is a procedure conducted by
the{' '}
<a target="_blank" href={APPROVAL_AUTHORITY_URL}>
{APPROVAL_AUTHORITY}
</a>{' '}
requires clubs to renew their approval status to ensure that the{' '}
{APPROVAL_AUTHORITY} has the <b>most up to date information</b>{' '}
and that club members are <b>aware of university policies</b>.
This process must be performed once a year by the current
leadership of the club.
to ensure that student-run clubs are officially registered and
permitted to operate on campus for the upcoming academic year.
During this process, clubs are required to submit update their
club officers and membership roster information; if applicable,
update primary contact information fulfill any other requirements
set by the University.
</p>
<p>
You must fill out this approval form by <b>August 24, {year}</b>{' '}
in order to have your {OBJECT_NAME_SINGULAR} shown during the New
Student Orientation. Late submissions will be accepted, but we
cannot guarantee that they will be processed in time for New
Student Orientation.
The purpose of the annual club registration process is to maintain
a well-organized and vibrant campus community, allowing students
to explore various interests and engage in extracurricular
activities. By registering each year, clubs reaffirm their
commitment to following school policies, uphold their mission, and
demonstrate their ongoing relevance to the student body.
</p>
<p>
During this process, you will review your {OBJECT_NAME_SINGULAR}{' '}
information, update your {OBJECT_NAME_SINGULAR} constitution, and
agree to the latest policies governing student organizations at
the {SCHOOL_NAME}.
Benefits of club registration include access to funding
opportunities, the ability to reserve campus facilities for
events, eligibility to participate in campus-wide events like the
annual activities’ fairs, and access to resources and support from
the student affairs office or other university departments.
</p>
<p>
Starting from Fall 2020, all {OBJECT_NAME_PLURAL} will perform
this process using the {SITE_NAME} website. We hope to make the
process as easy as possible, and would love your feedback on how
we're doing. If you run into technical difficulties or have
feedback on the renewal process, please contact <Contact />.
Overall, the annual club registration process plays a crucial role
in fostering a diverse and active campus life, enriching the
educational experience of students, and promoting a sense of
community and belonging.
</p>
<p>
If you have any questions about the {OBJECT_NAME_SINGULAR} renewal
process, please contact the {APPROVAL_AUTHORITY} at{' '}
<Contact point="osa" />.
If you have any questions about the club registration process,
please contact the Office of Student Affairs at
[email protected].
</p>
</TextInfoBox>
</>
Expand Down
106 changes: 22 additions & 84 deletions frontend/pages/fair.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,12 @@ import moment from 'moment-timezone'
import { NextPageContext } from 'next'
import Link from 'next/link'
import { ReactElement, useEffect, useState } from 'react'
import TimeAgo from 'react-timeago'
import renderPage from 'renderPage'
import { ClubFair } from 'types'
import { cache, doApiRequest, useSetting } from 'utils'
import {
FAIR_NAME,
OBJECT_NAME_LONG_PLURAL,
OBJECT_NAME_PLURAL,
OBJECT_NAME_SINGULAR,
OBJECT_NAME_TITLE,
OBJECT_NAME_TITLE_SINGULAR,
SITE_NAME,
} from 'utils/branding'
import { FAIR_NAME } from 'utils/branding'

import { CLUB_ROUTE, LIVE_EVENTS, SNOW } from '~/constants'
import { CLUB_ROUTE, SNOW } from '~/constants'

type FairPageProps = {
isOverride: boolean
Expand Down Expand Up @@ -85,85 +76,32 @@ const FairPage = ({
an error, please contact <Contact />.
</div>
)}

<p>
<b>Hi there! Welcome to {SITE_NAME}!</b> We are the official platform
for {OBJECT_NAME_LONG_PLURAL} on campus, and we are excited to get you
connected to {OBJECT_NAME_PLURAL} on our platform this year. In
collaboration with {fairOrgName}, we will be hosting the fair for this
semester. Below is some important information that will set you up for
a successful experience.
The 2023 Fall Activities Fair sponsored by the Student Activities
Council(SAC), will be held from August 29th to August 31st! This event
will showcase various student-run clubs, with each day dedicated to
highlighting different club categories. The fair will take place on
College Green from 12p-4p each day.
</p>
<p>
<b>How the {fairName} will be run:</b>
To participate, sign-up will be facilitated through Penn Clubs and
will coincide with the annual club registration process. Only
returning undergraduate student-run groups that were registered in
Penn Clubs last year are eligible to sign-up for the Fall Activities
Fair.
</p>
<ul>
<li>
The {fairName} will be held on <b>{fairTime}</b>.
</li>
<li>
You can visit each {OBJECT_NAME_SINGULAR}'s individual page. Each{' '}
{OBJECT_NAME_SINGULAR}'s page has a description, contact
information, and a FAQ feature that {OBJECT_NAME_SINGULAR} officers
will be monitoring throughout the fair that you can use to ask
questions. Questions can be submitted anonymously.
</li>
<li>
To keep track of {OBJECT_NAME_PLURAL} you are interested in, we
encourage you to use some of the tools on our platform!
<ul>
<li>
The{' '}
<b>
<Icon name="bookmark" /> Bookmark
</b>{' '}
button will allow you to save a {OBJECT_NAME_SINGULAR} for later
for your own personal reference. {OBJECT_NAME_TITLE} will not be
able to see your contact information unless you have allowed it.
</li>
<li>
The{' '}
<b>
<Icon name="bell" /> Subscribe
</b>{' '}
button will put your name on a {OBJECT_NAME_SINGULAR}'s mailing
list. {OBJECT_NAME_TITLE_SINGULAR}
officers can use this list to send you updates on their upcoming
events, newsletters, information, and more.
</li>
</ul>
</li>
</ul>
<p>
<b>Contact:</b>
To secure your club’s spot, be sure to register before the deadline on
August 22nd. Once the registration process is complete, registered
clubs will receive information about their scheduled day for the Fair
by August 24th.
</p>
<p>
For any inquiries or clarifications about the Fair, don't hesitate to
reach out to SAC at [email protected]. We look forward to seeing you
there!
</p>
<ul>
<li>
If you have any questions or concerns regarding the {fairName},
please contact <Contact email={fairContact as string} />.
</li>
<li>
If you have any questions or concerns regarding the {SITE_NAME}{' '}
platform, please contact <Contact />.
</li>
</ul>
{fairAdditionalInfo && !!(fairAdditionalInfo as string).length && (
<p>
<div
dangerouslySetInnerHTML={{ __html: fairAdditionalInfo as string }}
/>
</p>
)}
{isFairOpen ? (
<Link href={LIVE_EVENTS} as={LIVE_EVENTS}>
<a className="button is-primary">
<Icon name="chevrons-right" /> Go to events
</a>
</Link>
) : (
<p>
The <b>{fairName}</b> opens <TimeAgo date={fair?.start_time} />.
</p>
)}
<div className="columns mt-3">
{events.map(
({ start_time, end_time, events }, i): ReactElement => {
Expand Down

0 comments on commit 2a95db9

Please sign in to comment.