Skip to content

Commit a9e6190

Browse files
bnleftbnleft
authored
Merge pull request #570 from CougarCS/master
Prod Release
2 parents 3800438 + d620abc commit a9e6190

File tree

11 files changed

+66
-80
lines changed

11 files changed

+66
-80
lines changed

‎src/App.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ const Tutoring = lazy(() => import('./pages/Tutoring/Tutoring'));
1313
const ContactUs = lazy(() => import('./pages/ContactUs/ContactUs'));
1414
const Events = lazy(() => import('./pages/Events/Events'));
1515
const Home = lazy(() => import('./pages/Home/Home'));
16-
const Membership = lazy(() => import('./pages/Membership/Membership'));
16+
const Join = lazy(() => import('./pages/Join/Join'));
1717
const NotFound = lazy(() => import('./pages/NotFound/NotFound'));
18-
const UserRegister = lazy(() =>
19-
import('./components/UserRegister/UserRegister')
20-
);
2118
const Hackathon = lazy(() => import('./pages/Hackathon/Hackathon'));
2219
const Privacy = lazy(() => import('./pages/Policy/Privacy'));
2320
const Gallery = lazy(() => import('./pages/Gallery/Gallery'));
@@ -36,10 +33,9 @@ const App = () => {
3633
<Routes>
3734
<Route path='/' element={<Home />} />
3835
<Route path='/about' element={<About />} />
39-
<Route path='/membership' element={<Membership />} />
36+
<Route path='/join' element={<Join />} />
4037
<Route path='/calendar' element={<Events />} />
4138
<Route path='/contactus' element={<ContactUs />} />
42-
<Route path='/register' element={<UserRegister />} />
4339
<Route path='/hackathons' element={<Hackathon />} />
4440
<Route path='/privacy-policy' element={<Privacy />} />
4541
<Route path='/gallery' element={<Gallery />} />

‎src/assets/partner-logos/codeCoogs.webp

17.8 KB
Binary file not shown.

‎src/assets/partner-logos/coogEsportsLogo.webp

35 KB
Binary file not shown.

‎src/assets/poweredByStripe.svg

Lines changed: 1 addition & 0 deletions
Loading

‎src/components/Navbar/Navbar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ const NavBar = () => {
3434
<ActiveListItem url='/calendar' name='Events' />
3535
<ActiveListItem url='/gallery' name='Gallery' />
3636
<ActiveListItem url='/tutoring' name='Tutoring' />
37-
<ActiveListItem url='/membership' name='Membership' />
38-
<ActiveListItem url='/hackathons' name='Hackathons' />
37+
{/* when hackathon will return to active it again no need to delete */}
38+
{/* <ActiveListItem url='/hackathons' name='Hackathons' /> */}
3939
<ActiveListItem url='/contactus' name='Contact Us' />
4040
<Nav.Link href='https://uhcode.red/' target='_blank' rel='noreferrer'>
4141
CodeRED <i className='fas fa-external-link-alt'></i>
4242
</Nav.Link>
43-
<LinkContainer to='/register'>
43+
<LinkContainer to='/join'>
4444
<Nav.Link>
45-
<button className='button'>Register</button>
45+
<button className='button'>Join Us</button>
4646
</Nav.Link>
4747
</LinkContainer>
4848
</Nav>

‎src/components/UserRegister/UserRegister.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
color: #495057;
2424
padding: 6px;
2525
}
26+
27+
.Stripe-logo {
28+
width: 11rem;
29+
}

‎src/components/UserRegister/UserRegister.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,33 @@ import React from 'react';
22
import { loadStripe } from '@stripe/stripe-js';
33
import { Elements } from '@stripe/react-stripe-js';
44
import { Payment } from '../Payment/Payment';
5-
import { MetaData } from '../Meta/MetaData';
5+
import PoweredByStripe from '../../assets/poweredByStripe.svg';
66
import './UserRegister.css';
77

88
const PUBLIC_KEY = process.env.REACT_APP_STRIPE_KEY;
99
const stripePromise = loadStripe(`${PUBLIC_KEY}`);
1010

11-
const meta = {
12-
title: 'Register',
13-
desc: 'Become a CougarCS member',
14-
url: 'https://cougarcs.com/gallery',
15-
img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
16-
};
17-
1811
const UserRegister = () => {
1912
return (
2013
<>
21-
<MetaData {...meta} />
2214
<div className='container formContainer mt-4'>
23-
<h1 className='formHeader mt-4'>Register</h1>
15+
<h1 className='formHeader mt-4'>Join Us</h1>
2416
<Elements stripe={stripePromise}>
2517
<Payment />
2618
</Elements>
19+
<div>
20+
<a
21+
href='https://stripe.com/'
22+
target='_blank'
23+
rel='nofollow noopener noreferrer'
24+
>
25+
<img
26+
src={PoweredByStripe}
27+
className='Stripe-logo'
28+
alt='stripe logo'
29+
/>
30+
</a>
31+
</div>
2732
</div>
2833
</>
2934
);

‎src/pages/About/About.js

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import React, { lazy, Suspense } from 'react';
22
import { Col, Container, Row } from 'react-bootstrap';
33
import gif from '../../assets/about.svg';
44
import { officersFall2023 } from '../../data/officers';
5-
import chevronLogo from '../../assets/partner-logos/chevron.webp';
65
import cougarettesLogo from '../../assets/partner-logos/cougarettes.webp';
76
import csgirlsLogo from '../../assets/partner-logos/csgirls.webp';
8-
import ripplematchLogo from '../../assets/partner-logos/ripplematch.svg';
9-
import promazoLogo from '../../assets/partner-logos/promazo.webp';
7+
import codeCoogsLogo from '../../assets/partner-logos/codeCoogs.webp';
8+
import CoogEsportsLogo from '../../assets/partner-logos/coogEsportsLogo.webp';
109
import { MetaData } from '../../components/Meta/MetaData';
1110

1211
import './About.css';
@@ -60,19 +59,20 @@ const About = () => {
6059
</Suspense>
6160
<Container fluid className='contained partners-wrapper sub-section'>
6261
<Row>
63-
<Col md='6'>
64-
<h2 className='heading'>Official Sponsors</h2>
65-
<div className='partner-logos'>
66-
<img
67-
src={chevronLogo}
68-
className='partner-logo'
69-
alt='Chevron Logo'
70-
/>
71-
</div>
72-
</Col>
73-
<Col md='6'>
62+
<Col md='12'>
7463
<h2 className='heading'>Partner Clubs</h2>
7564
<div className='partner-logos'>
65+
<a
66+
href='https://uh.campuslabs.com/engage/organization/coogesports'
67+
target='_blank'
68+
rel='noreferrer'
69+
>
70+
<img
71+
src={CoogEsportsLogo}
72+
className='partner-logo'
73+
alt='Coog Esports'
74+
/>
75+
</a>
7676
<a
7777
href='https://uhcougarettes.com/'
7878
target='_blank'
@@ -91,21 +91,17 @@ const About = () => {
9191
alt='CSGirls Logo'
9292
/>
9393
</a>
94-
</div>
95-
</Col>
96-
<Col md='12'>
97-
<h2 className='heading'>Partner Companies</h2>
98-
<div className='partner-logos'>
99-
<img
100-
src={ripplematchLogo}
101-
className='partner-logo'
102-
alt='Ripple Match Logo'
103-
/>
104-
<img
105-
src={promazoLogo}
106-
className='partner-logo'
107-
alt='Promazo Logo'
108-
/>
94+
<a
95+
href='https://www.codecoogs.com/'
96+
target='_blank'
97+
rel='noreferrer'
98+
>
99+
<img
100+
src={codeCoogsLogo}
101+
className='partner-logo'
102+
alt='Code Coogs Logo'
103+
/>
104+
</a>
109105
</div>
110106
</Col>
111107
</Row>

‎src/pages/Home/Home.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ const Home = () => {
6464
</LinkContainer>
6565
</div>
6666
<div>
67-
<LinkContainer to='/register'>
67+
<LinkContainer to='/join'>
6868
<ButtonToolbar>
6969
<Button size='lg' variant='primary'>
70-
Register
70+
Join Us
7171
</Button>
7272
</ButtonToolbar>
7373
</LinkContainer>

‎src/pages/Membership/Membership.css renamed to ‎src/pages/Join/Join.css

File renamed without changes.

‎src/pages/Membership/Membership.js renamed to ‎src/pages/Join/Join.js

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
import React from 'react';
1+
import React, { lazy, Suspense } from 'react';
22
import { Card, Col, Container, Row } from 'react-bootstrap';
33
import analyticsSVG from '../../assets/analytics.svg';
44
import collectingSVG from '../../assets/collecting.svg';
55
import gif from '../../assets/member.svg';
66
import memorySVG from '../../assets/memory.svg';
77
import teachingSVG from '../../assets/teaching.svg';
88
import { MetaData } from '../../components/Meta/MetaData';
9-
import './Membership.css';
10-
9+
import './Join.css';
10+
import Loading from '../../components/Loading/Loading';
11+
const UserRegister = lazy(() =>
12+
import('../../components/UserRegister/UserRegister')
13+
);
1114
const Membership = () => {
1215
const meta = {
1316
title: 'Membership',
1417
desc: 'Learn more about our membership.',
15-
url: 'https://cougarcs.com/membership',
18+
url: 'https://cougarcs.com/join',
1619
img: 'https://i.ibb.co/NTLFrdj/cougarcs-background11.jpg',
1720
};
1821

@@ -47,37 +50,15 @@ const Membership = () => {
4750
<p>
4851
Memberships are priced at{' '}
4952
<strong>$40.00 for a full year </strong> or{' '}
50-
<strong>$25.00 a semester</strong>. If you are interested in
51-
becoming a member there are a few ways you can let us know.
52-
Request to become a member on the get involved page and our
53-
Vice President of Internal Affairs,{' '}
54-
{
55-
<a href='mailto:[email protected]'>
56-
Christian Ayala
57-
</a>
58-
}
59-
, will be in contact with you shortly. You can also
60-
{/* find an
61-
Officer on the 5th floor of PGH (Philip Guthrie Hoffman Hall)
62-
or */}{' '}
63-
email us at{' '}
64-
<a href='mailto:[email protected]'>[email protected]</a>.
53+
<strong>$25.00 a semester</strong>. You can join by completing
54+
the form below.
6555
</p>
6656
</div>
67-
<div>
68-
{/* <LinkContainer to='/register'>
69-
<ButtonToolbar>
70-
<Button className='learnMoreBtn' variant='primary'>
71-
Become a member
72-
</Button>
73-
</ButtonToolbar>
74-
</LinkContainer> */}
75-
</div>
7657
</div>
7758
</Col>
7859
</Row>
7960
</Container>
80-
<Container fluid style={{ textAlign: 'center' }}>
61+
<Container fluid style={{ textAlign: 'center', marginBottom: '10rem' }}>
8162
<h2>What Are The Benefits</h2>
8263
<Row className='benefits' md={12} xs={12}>
8364
<div>
@@ -160,6 +141,9 @@ const Membership = () => {
160141
</div>
161142
</Row>
162143
</Container>
144+
<Suspense fallback={<Loading />}>
145+
<UserRegister />
146+
</Suspense>
163147
</div>
164148
);
165149
};

0 commit comments

Comments
 (0)