Skip to content

Commit

Permalink
Merge pull request #25 from UMassACM/app-dev
Browse files Browse the repository at this point in the history
App dev
  • Loading branch information
itsGovindC authored Jan 15, 2021
2 parents 5026c46 + 314d042 commit 9e77b4c
Show file tree
Hide file tree
Showing 66 changed files with 3,078 additions and 3,010 deletions.
3 changes: 3 additions & 0 deletions .cpanel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
deployment:
tasks:
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Website
The Official Website of the UMass ACM
# The Official Website of the UMass ACM
22 changes: 22 additions & 0 deletions Update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# The Official Website of the UMass ACM

## Development log.

### April 20, 2020
#### Home Page
1. [home-sigs-section] Update responsiveness of the icon when screen is small.

### Bottom Bar
1. [bottom-bar-navibar] Center Items when screen is small.

### April 19, 2020
#### General
1. Make font lighter.
2. Refactor project: Each SIG will have it own folder.

#### Home Page
1. [home-page-header] Fix background is not centered.
2. [home-page-header] Move text a little bit up.

#### About page.
1. Implement the about page.
25 changes: 25 additions & 0 deletions htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

RewriteOptions inherit
# BEGIN LSCACHE
## LITESPEED WP CACHE PLUGIN - Do not edit the contents of this block! ##
<IfModule LiteSpeed>
RewriteEngine on
CacheLookup on
RewriteRule .* - [E=Cache-Control:no-autoflush]
RewriteRule min/\w+\.(css|js) - [E=cache-control:no-vary]

### marker CACHE RESOURCE start ###
RewriteRule wp-content/.*/[^/]*(responsive|css|js|dynamic|loader|fonts)\.php - [E=cache-control:max-age=3600]
### marker CACHE RESOURCE end ###

### marker FAVICON start ###
RewriteRule favicon\.ico$ - [E=cache-control:max-age=86400]
### marker FAVICON end ###

</IfModule>
## LITESPEED WP CACHE PLUGIN - Do not edit the contents of this block! ##
# END LSCACHE

RewriteCond %{HTTP_HOST} ^umass\.acm\.org$ [OR]
RewriteCond %{HTTP_HOST} ^www\.umass\.acm\.org$

4,768 changes: 1,858 additions & 2,910 deletions package-lock.json

Large diffs are not rendered by default.

69 changes: 37 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
{
"name": "umass-acm-website",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-scripts": "3.4.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
"name": "umass-acm-website",
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"googleapis": "^39.2.0",
"node": "^14.8.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
"react-scripts": "^3.4.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"homepage": "http://umass.acm.org"
}
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Blockchain/Leaders/ApurvShah.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Blockchain/Leaders/DanCline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Blockchain/blockchain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Companies/cisco.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Companies/facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Companies/google.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Companies/mathlab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/Leaders/AleahCremer.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/Leaders/GabyNugent.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/Leaders/IanAdler.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/Leaders/RoshanShetty.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/Leaders/TenzinIngsel.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Design/design.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Gamedev/Leaders/AlexVukovic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Gamedev/Leaders/VinayRamesh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Gamedev/gamedevelopment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ICPC/Leaders/AdityaAgarwal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ICPC/Leaders/SattwikDas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ICPC/icpc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Leaders/AayushiBerry.png
Binary file added public/images/Leaders/AndrewDunhom.png
Binary file added public/images/Leaders/ArielSimnegar.png
Binary file added public/images/Leaders/AyushKhandewal.png
Binary file added public/images/Leaders/BenjaminXu.png
Binary file added public/images/Leaders/SaakshatSingh.png
Binary file added public/images/Leaders/ShardoolParthak.png
Binary file added public/images/ML/Leaders/CooperSigrist.png
Binary file added public/images/ML/Leaders/PrakharChaturvedi.png
Binary file added public/images/ML/Leaders/RenosZabounidis.png
Binary file added public/images/ML/Leaders/ShreyansBabel.png
Binary file added public/images/ML/ml.png
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>UMass ACM</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file removed public/logo192.png
Diff not rendered.
Binary file removed public/logo512.png
Diff not rendered.
Loading

0 comments on commit 9e77b4c

Please sign in to comment.