Skip to content

Commit

Permalink
Merge pull request #60 from MyaTaheri/master
Browse files Browse the repository at this point in the history
Update School Name
  • Loading branch information
JonathanOppenheimer authored Sep 12, 2023
2 parents b0b5e97 + 78e4513 commit e0f87ff
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: plain
title: 404
description: The 404 page for the APC at George Mason High School
description: The 404 page for the APC at Meridian High School
stylesheets:
- err
---
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 GMHS Advanced Programming Club
Copyright (c) 2020 MHS Advanced Programming Club

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
title: Advanced Programming Club Website
email: apc.gmhs@gmail.com
description: >- # this means to ignore newlines until "baseurl:"
Website for the Advanced Programming Club at George Mason High School. We're here to educate and enlighten.
Website for the Advanced Programming Club at Meridian High School. We're here to educate and enlighten.
baseurl: '' # the subpath of your site, e.g. /blog
url: 'http://apc-gm.com/' # the base hostname & protocol for your site, e.g. http://example.com
url: 'http://apc-mhs.com/' # the base hostname & protocol for your site, e.g. http://example.com
github_username: jekyll

# Build settings
Expand Down
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="footer">
<p class="inline">
Advanced Programming Club. <a href="https://github.com/apc-gmhs" target="_blank"> <img src="/assets/images/git_icon.png" /> Github</a>
Advanced Programming Club. <a href="https://github.com/apc-mhs" target="_blank"> <img src="/assets/images/git_icon.png" /> Github</a>
</p>
</div>
12 changes: 6 additions & 6 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<span class="nav-item has-children">
Featured Projects
<ul class="nav-dropdown">
<li><a class="dropdown-item" href="https://github.com/apc-gmhs/can-you-hear-me" target="_blank">can-you-hear-me</a></li>
<li><a class="dropdown-item" href="https://github.com/apc-gmhs/twitter-app" target="_blank">Twitter API</a></li>
<li><a class="dropdown-item" href="https://github.com/apc-gmhs/apc-website" target="_blank">APC Website</a></li>
<!-- <li><a class="dropdown-item" href="https://github.com/apc-gmhs/seniormap" target="_blank">Senior Map</a></li> -->
<li><a class="dropdown-item" href="https://github.com/apc-mhs/can-you-hear-me" target="_blank">can-you-hear-me</a></li>
<li><a class="dropdown-item" href="https://github.com/apc-mhs/twitter-app" target="_blank">Twitter API</a></li>
<li><a class="dropdown-item" href="https://github.com/apc-mhs/apc-mhs.github.io" target="_blank">APC Website</a></li>
<!-- <li><a class="dropdown-item" href="https://github.com/apc-mhs/seniormap" target="_blank">Senior Map</a></li> -->
</ul>
</span>
<a class="nav-item link" href="/seniormap">Senior Map</a>
Expand All @@ -17,8 +17,8 @@
External Websites
<ul class="nav-dropdown">
<li><a href="https://fccps.schoology.com/group/2428165656" target="_blank">School Group</a></li>
<li><a href="https://www.masonathletics.org/page/5389" target="_blank">Mason Athletics Club Page</a></li>
<li><a href="https://gm.fccps.org/" target="_blank">GMHS Website</a></li>
<li><a href="https://mustangsports.org/" target="_blank">Meridian Athletics Page</a></li>
<li><a href="https://gm.fccps.org/" target="_blank">MHS Website</a></li>
</ul>
</span>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
title: Home
description: The Home page for the APC at George Mason High School
description: The Home page for the APC at Meridian High School
stylesheets:
- index
scripts:
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "apc-website",
"version": "1.0.0",
"description": "Repo for the apc website at GMHS",
"description": "Repo for the apc website at MHS",
"main": "_automation_scripts/form_submitted_customizer.js",
"dependencies": {
"axios": "^0.19.2",
Expand All @@ -14,12 +14,12 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/apc-gmhs/apc-website.git"
"url": "git+https://github.com/apc-mhs/apc-mhs.github.io"
},
"author": "Rohan, Andrew, Jonathan, Danny",
"license": "MIT",
"bugs": {
"url": "https://github.com/apc-gmhs/apc-website/issues"
"url": "https://github.com/apc-mhs/apc-mhs.github.io/issues"
},
"homepage": "https://github.com/apc-gmhs/apc-website#readme"
"homepage": "https://github.com/apc-mhs/apc-mhs.github.io#readme"
}

0 comments on commit e0f87ff

Please sign in to comment.