Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
94cc866
animations~
kevwu27 May 30, 2024
039372e
more small changes to animations
kevwu27 May 30, 2024
943c71e
text changes
kevwu27 Oct 3, 2024
71037cd
adding minor option
shreyaNagunuri Oct 3, 2024
1f1fefb
got rid of some warnings
kevwu27 Oct 3, 2024
5cdb318
Merge branch 'Will-Hsu:main' into feature/shreyaNagunuri/UpdateMinorO…
shreyaNagunuri Oct 3, 2024
233359c
fixed event card, rewards hover
kevwu27 Oct 9, 2024
01b47d6
Merge pull request #4 from CSES-UCSD/feature/shreyaNagunuri/UpdateMin…
CSES-UCSD Oct 10, 2024
3b03715
Merge branch 'main' into feature/Kevin-Wu/FE-HomeAndAboutAnimation
CSES-UCSD Oct 15, 2024
87044b6
Merge pull request #5 from CSES-UCSD/feature/Kevin-Wu/FE-HomeAndAbout…
CSES-UCSD Oct 15, 2024
9c90b02
adding board photos and remove innovate org
shreyaNagunuri Oct 31, 2024
6a02b3c
Merge pull request #7 from CSES-UCSD/feature/Kevin-Wu/EventCardUI
CSES-UCSD Oct 31, 2024
bd4011b
updating board photos
shreyaNagunuri Oct 31, 2024
60ef08b
Added csesucsd.com to cors list
SithuSoe04 Oct 31, 2024
dd26449
fixed alignment issues on login page
kevwu27 Nov 12, 2024
ce8e331
slight mobile/ipad fix
kevwu27 Nov 12, 2024
ef7b780
Update README.md
CSES-UCSD Nov 13, 2024
259fd1e
Update README.md
CSES-UCSD Nov 13, 2024
4c2cb61
Updated Mailchimp API Key
SithuSoe04 Nov 13, 2024
d3a1b09
Merge pull request #13 from CSES-UCSD/bug/backend/mailchimp
CSES-UCSD Nov 13, 2024
36bc8a1
Merge pull request #9 from CSES-UCSD/feature/shreyaNagunuri/UpdateBoa…
CSES-UCSD Nov 13, 2024
3a2419e
Merge pull request #12 from CSES-UCSD/feature/KevinWu/FE/LoginAlignme…
CSES-UCSD Nov 13, 2024
4ae3ede
mobile formatting for the about page
ganeshkumar321 Nov 14, 2024
5c69696
Update README.md
SithuSoe04 Nov 19, 2024
1f9fce3
updated set up guide
Nov 20, 2024
b6fb499
Merge remote-tracking branch 'origin/main' into feature/ganeshkumar32…
ganeshkumar321 Nov 20, 2024
ac332c3
Merge remote-tracking branch 'origin/main' into feature/ganeshkumar32…
ganeshkumar321 Nov 27, 2024
cb1b4c8
Merge pull request #14 from CSES-UCSD/feature/ganeshkumar321/FE-mobil…
ganeshkumar321 Nov 27, 2024
dd1292a
Revert "Feature/ganeshkumar321/fe mobile formatting"
nikhilitis Nov 27, 2024
1b4df65
Merge pull request #15 from CSES-UCSD/revert-14-feature/ganeshkumar32…
nikhilitis Nov 27, 2024
121c0d4
fixed small syntax errors (semicolons and single-quotes)
Nov 27, 2024
f8aba1d
fixed some frontend mobile issues
ganeshkumar321 Nov 28, 2024
f5aa99d
Added E/Acc card to about page
himansig7 Dec 4, 2024
9c852c8
Merge pull request #16 from CSES-UCSD/bug/nikhilitis/BE-CodeCleanup
SithuSoe04 Dec 4, 2024
438fde2
Added Template Website for the Communities
lucashlaing Dec 8, 2024
db10a91
got rid of tabs for the teams, adjusted the page buttons to be closer…
lucashlaing Jan 13, 2025
6bf0cf1
Merge pull request #17 from CSES-UCSD/feature/ganeshkumar321/FE-mobil…
nikhilitis Jan 15, 2025
0169a29
Corrected Rahul's title
SithuSoe04 Jan 21, 2025
c897cf0
Merge pull request #19 from CSES-UCSD/feature/SithuSoe04/FE-TeamUpdate
nikhilitis Jan 22, 2025
3513e72
Fixed minor margin issues
SithuSoe04 Jan 29, 2025
3564df7
Temporarily added Shruti and Himansi as admins
SithuSoe04 Jan 29, 2025
017ed22
Merge pull request #21 from CSES-UCSD/feature/SithuSoe04/FE-AuthConte…
nikhilitis Jan 29, 2025
9f2ae89
Merge pull request #20 from CSES-UCSD/feature/SithuSoe04/FE-AboutUpdate
nikhilitis Jan 29, 2025
89ab64e
fixed button alignment for meet the team
lucashlaing Jan 30, 2025
3237153
Merge pull request #18 from CSES-UCSD/feature/lucashlaing-OscarKhaing…
SithuSoe04 Jan 30, 2025
1fed683
Merge branch 'main' into feature/himansig7-wintergk7/FE-EAccCard
himansig7 Feb 4, 2025
0f44eb8
Fixed the e/acc card update
himansig7 Mar 5, 2025
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
20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@
2. Clone the repository on the `main` branch and open the project in VSCode.
3. Install VSCode extensions Eslint and Prettier (for linting and formatting).

## FrontEnd

3. Go to the `project/frontend` directory.
4. Run `npm install` to install all the node packages.
5. Run `npm start` to run the React App and check if you can see the rendered site at http://localhost:3000/
## Add .env files
4. Ask Nikhil or Sithu for the contents of these files, which you will add to your local repository.

## BackEnd

6. Go to the `project/backend` directory.
7. Run `npm install` to install all the node packages.
8. Run `npm start` to start the backend server and check there is no error in the terminal.
9. Make a copy of the `.env.example` file and rename it `.env`.
5. Go to the `project/backend` directory.
6. Run `npm install` to install all the node packages.
7. Run `npm start` to start the backend server and check there is no error in the terminal.

## FrontEnd

8. Go to the `project/frontend` directory.
9. Run `npm install` to install all the node packages.
10. Run `npm start` to run the React App and check if you can see the rendered site at http://localhost:3000/

## Development

Expand Down
2 changes: 1 addition & 1 deletion backend/controllers/emailSubscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;

mailchimp.setConfig({
apiKey: apikey,
server: "us13",
server: "us12",
});

// Audience ID: 968cfc7373
Expand Down
3 changes: 2 additions & 1 deletion backend/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import dotenv from 'dotenv';
import connectDB from './database/connect-db.js';
// import testDatabaseConnection from './database/db-test.js';
import connectMailchimp from './mailchimp/connect-mailchimp.js';
import { addContacts, getContacts } from './mailchimp/contacts.js';
// import { addContacts, getContacts } from './mailchimp/contacts.js';

// import routes
import eventRoutes from './routes/event.js';
Expand All @@ -20,6 +20,7 @@ dotenv.config();

app.use(bodyParser.json({ limit: '30mb', extended: true }));
app.use(bodyParser.urlencoded({ limit: '30mb', extended: true }));

app.use(cors());

const PORT = process.env.PORT || 5000;
Expand Down
2 changes: 1 addition & 1 deletion backend/mailchimp/connect-mailchimp.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;

mailchimp.setConfig({
apiKey: apikey,
server: "us13",
server: 'us12',
});

async function connectMailchimp() {
Expand Down
6 changes: 3 additions & 3 deletions backend/mailchimp/contacts.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;

mailchimp.setConfig({
apiKey: apikey,
server: "us13",
server: 'us12',
});

// Audience ID: 968cfc7373
Expand All @@ -19,7 +19,7 @@ const addContacts = async () => {
json: (data) => console.log(data)
})
});
console.log(data)
console.log(data);
for (const email of data) {
const response = await mailchimp.lists.addListMember('968cfc7373', {
email_address: email,
Expand All @@ -36,6 +36,6 @@ const addContacts = async () => {
const getContacts = async() => {
const response = await mailchimp.lists.getListMembersInfo('968cfc7373');
console.log(response);
}
};

export { addContacts, getContacts };
Loading