search

ivoa / ivoa-web

ivoa.net website static web pages
Creative Commons Attribution Share Alike 4.0 International
3 stars 2 forks source link

Apps doc updates #21

Closed andamian closed 3 months ago

andamian commented 3 months ago

@molinaro-m - this looks better. Thanks for the tip.

molinaro-m commented 3 months ago

@molinaro-m - this looks better. Thanks for the tip.

it's more like what we will operate tomorrow. I think the fork+PR will need to be the forward mechanism when this goes production.

gmantele commented 3 months ago

This conflict is because of my last commit. All the links are now in a different file: layout/partials/sitemap.html. This way, it can be put at the bottom of all pages.

JeremyMcCormick commented 3 months ago

This conflict is because of my last commit. All the links are now in a different file: layout/partials/sitemap.html. This way, it can be put at the bottom of all pages.

Okay, maybe you could resolve this then instead of @andamian ?

gmantele commented 3 months ago

I can, indeed. I will probably wait for the PR #23 to be merged first, as it touches as well the sitemap.html file in the way it is done in this PR.

gmantele commented 3 months ago

By the way, should this PR stay a Draft?

andamian commented 3 months ago

@gmantele and @JeremyMcCormick - thanks for the feedback. This is a draft PR that I've started in preparation for the hackathon. I can probably solve the conflict at the end when the PR is ready which right now is not. The Apps page has not been worked on.

JeremyMcCormick commented 3 months ago

@gmantele and @JeremyMcCormick - thanks for the feedback. This is a draft PR that I've started in preparation for the hackathon. I can probably solve the conflict at the end when the PR is ready which right now is not. The page Apps page has not been worked on.

Understood, we can look at this tomorrow then. 👍

andamian commented 3 months ago

@JeremyMcCormick - I'm probably jumping the gun here without having clear directions on how we are going to proceed. I just assumed that in this PR we will fix all the issues raised in https://docs.google.com/spreadsheets/d/15TE9LCNdDyBhAQF_TyX2AqXSXW8RxQqHkU_bBKxQK7I/edit#gid=0. I will adapt later if that's not the case.

JeremyMcCormick commented 3 months ago

@JeremyMcCormick - I'm probably jumping the gun here without having clear directions on how we are going to proceed. I just assumed that in this PR we will fix all the issues raised in https://docs.google.com/spreadsheets/d/15TE9LCNdDyBhAQF_TyX2AqXSXW8RxQqHkU_bBKxQK7I/edit#gid=0. I will adapt later if that's not the case.

Yes, we are hoping to fix at least some of those issues.

Please read the contribution guide:

https://github.com/ivoa/ivoa-web/blob/main/CONTRIBUTING.md

It may clear some things for you in terms of recommended developer workflow.

gmantele commented 3 months ago

Now that the main conflicting changes are done, maybe we should try to fix the conflict in this branch so that the editing team can work with no problem this afternoon.

JeremyMcCormick commented 3 months ago

Now that the main conflicting changes are done, maybe we should try to fix the conflict in this branch so that the editing team can work with no problem this afternoon.

@gmantele @andamian

I have a strong preference that we do not use freeform branch names for major updates to the site.

Can we instead put these changes on a branch that references an issue in the tracker and then open a new PR?

I have made a new issue for adding the applications page:

https://github.com/ivoa/ivoa-web/issues/25

@andamian You may keep existing changes by branching from your existing one like git checkout apps && git checkout -b iss25, which will keep your work. Then you can just open a PR on the new branch. This will be useful for bookkeeping so we can easily see how branches are connected to which issues.

andamian commented 3 months ago

Replaced with #26