Skip to content

Commit

Permalink
Merge pull request #4 from gdscustp/dev
Browse files Browse the repository at this point in the history
Update dependencies and add a workflow on CI/CD pipeline
  • Loading branch information
gdgoc-ustp authored Sep 30, 2024
2 parents 8df0d8f + b49f7a0 commit 23fa03e
Show file tree
Hide file tree
Showing 9 changed files with 7,462 additions and 6,098 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Trigger Vercel Deployment

on:
push: # This will trigger the action on every commit (push)
branches:
- main # You can specify which branch to monitor (e.g., "main" or any other branch)

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- name: Trigger Vercel Deploy
run: curl -X POST "https://api.vercel.com/v1/integrations/deploy/prj_Wlv8UGIoHjqDNr58Y9OaRPDGxg38/YkeQakRRLu"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# local
run.bat

# dependencies
/node_modules
/.pnp
Expand Down
13,430 changes: 7,387 additions & 6,043 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@react-spring/parallax": "^9.6.1",
"@react-spring/web": "^9.6.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.6.2",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@react-spring/parallax": "^9.7.4",
"@react-spring/web": "^9.7.4",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"nth-check": "^2.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.2",
"react-scripts": "^5.0.1",
"web-vitals": "^4.2.3"
},
"scripts": {
"start": "react-scripts start",
Expand Down
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />

<meta
name="description"
content="Web site created using create-react-app"
Expand Down
57 changes: 29 additions & 28 deletions src/components/footer.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
html, body {
height: 100%;
margin: 0;
}

body {
display: flex;
flex-direction: column;
}

.footer {
display: flex;
color: #ffffff;
width: 100%;
background-color: #212121;
justify-content: center;
align-items: center;
flex-direction: column;
margin-top: auto;
}

.lower {
width: 100%;
text-align: center;
padding: 25px 0;
background: #4285F4;
font-weight: 300;
}

html, body {
height: 100%;
margin: 0;
}

body {
display: flex;
flex-direction: column;
}

.footer {
display: flex;
color: #ffffff;
width: 100%;
background-color: #212121;
justify-content: center;
align-items: center;
flex-direction: column;
margin-top: auto;
}

.lower {
width: 100%;
text-align: center;
padding: 25px 0;
background: #4285F4;
font-weight: 300;
}
22 changes: 11 additions & 11 deletions src/components/footer.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import './footer.css';

export default function Footer() {
return (
<footer className='footer'>
<div className='lower'>
<p>&copy; {new Date().getFullYear()} GDSC USTP. -Univeristy of Science and Technology of Southern Philippines - CDO</p>
</div>
</footer>
);
}
import './footer.css';

export default function Footer() {
return (
<footer className='footer'>
<div className='lower'>
<p>&copy; {new Date().getFullYear()} GDSC USTP. -Univeristy of Science and Technology of Southern Philippines - CDO</p>
</div>
</footer>
);
}
2 changes: 1 addition & 1 deletion src/pages/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ body {

.banner h1 #gradient {
/* TODO: Swap the percentages per color randomly after implementing the banner svg animations. (https://www.figma.com/proto/XiTdSq6rnkDkqZpkr27d4Q/GDSC.USTP?node-id=76-353&t=DJG1gSu4UqrGKlev-1&scaling=min-zoom&content-scaling=fixed&page-id=76%3A351&starting-point-node-id=76%3A353) */
background: linear-gradient(90deg,
background: linear-gradient(270deg,
#4EA865 25%, /* 25% for green */
#FBC10E 50%, /* 50% for yellow */
#EB483B 75%, /* 75% for red */
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function Home() {

<div className="about-content">
<div className="about-left">
<img src={About} alt='About us' />
<img src={About} alt='About us' draggable={false}/>
</div>

<div className="about-right">
Expand Down Expand Up @@ -76,7 +76,7 @@ export default function Home() {
</div>

<div className="team-right">
<img src={About} alt='About us' />
<img src={About} alt='About us' draggable={false}/>



Expand Down

0 comments on commit 23fa03e

Please sign in to comment.