search

spaceconcordia / spaceconcordia.github.io

Contains the static website for the Space Concordia society
6 stars 5 forks source link

Reorganize folder structure 12 - v2 #14

Closed PeterGhimself closed 7 years ago

PeterGhimself commented 7 years ago

This PR is related to issue #12 and a redemption PR for the break in #13

The problem

When merging #13 I noticed that going to spaceconcordia.github.io brought me to a page that just rendered the README file. I reverted the merge commit on master right away after seeing that and our site was back to normal: serving index.html first. Apparently, by default github pages will search for any index.html within the root directory and load it, and if it fails to find one it will search for the next best thing and load that instead.

The solution

What I have done here is simply put the index.html out of src/html/ and back in the root folder and updated all the references to index.html and within html.index, which should fix the README showing up in our homepage instead of the index.html page. This required me to also make some changes to expandableLinks.js. I also fixed some unupdated references to map.js.

About merging

~~I understand that this branch can't automatically merge yet, but I believe all I have to do is revert the revert merge commit I made to master, and then I should be able to merge this without any issues. Of course, if I revert the commit on master, then the site will be bringing visitors to our README file. I'll wait till I get your comments/approvals for this PR, then I'll revert the revert merge commit and then swiftly merge this branch to hopefully resolve the issue.~~

PeterGhimself commented 7 years ago

GREAT SUCCESS!

By the way, instead of reverting the revert merge commit what I did was: