Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move Macrostrat homepage into this environment #206

Merged
merged 11 commits into from
Jun 6, 2024

Conversation

davidsklar99
Copy link
Collaborator

@davidsklar99 davidsklar99 commented May 15, 2024

Added new main-page for website by using content of 'homepage' repository, images stored and referenced from S3 bucket instead of being stored directly in repository

@davenquinn
Copy link
Member

davenquinn commented May 24, 2024

Looks like some good improvements going on here, but it looks like you just added a large number of static images to the git repository, which we were trying to avoid.

(This is easy to fix but we will want to make sure that we fully get rid of these before continuing. They will weigh down the repository quite a bit).

@davenquinn
Copy link
Member

To properly revert this, the best way is to do a "hard reset" git reset --hard to a commit just before the bad change, and then do git push --force to overwrite the most recent changes on Github. This is worth approaching carefully because you are deleting data, but it is a good Git learning experience. You can't mess up anything with our repository by doing this, but you could destroy your changes if you aren't careful.

@davidsklar99 davidsklar99 changed the title Test Pull Request Main Page Pull Request Jun 1, 2024
@davenquinn
Copy link
Member

To fix some of the styles bleeding over into other pages, could you include the following +config.ts file next to the +Page.ts file for this route:

export default {
  // Forces global style separation from other pages by reloading
  clientRouting: false,
};

There is probably a better way to do this long term, but this will help with the weird re-styling issues we were looking at yesterday.

@davenquinn
Copy link
Member

I'll also note for context that this PR fully brings the content of our 'homepage' repository into this framework. Instead of being stored in the repository, images are now provided via S3.

@davenquinn davenquinn changed the title Main Page Pull Request Move Macrostrat homepage into this repository Jun 4, 2024
@davenquinn davenquinn changed the title Move Macrostrat homepage into this repository Move Macrostrat homepage into this environment Jun 4, 2024
@davenquinn
Copy link
Member

Final request – it looks like you have a few duplicative stylesheets in here. Could you delete the CSS file and anything else 'extra'?

@davenquinn davenquinn merged commit ed221f3 into UW-Macrostrat:main Jun 6, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants