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

Apps doc updates #21

Closed
wants to merge 3 commits into from
Closed

Apps doc updates #21

wants to merge 3 commits into from

Conversation

andamian
Copy link
Collaborator

No description provided.

@andamian andamian marked this pull request as draft May 21, 2024 04:27
@andamian
Copy link
Collaborator Author

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

Copy link
Member

@molinaro-m molinaro-m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect! Now it works, both locally and on the webtest preview branch

@molinaro-m
Copy link
Member

@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.

@JeremyMcCormick JeremyMcCormick self-requested a review May 21, 2024 06:28
Copy link
Collaborator

@JeremyMcCormick JeremyMcCormick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict on content/_index.html needs to be fixed. There was a big update to the site style that you probably don't have integrated into your branch.

Second, more minor issue, and not to be too picky about Git stuff since we haven't broadcasted this widely yet, but apps is not a very good branch name. What we are preferring is making an issue in the tracker first, then using it in the name like iss1234 or iss1234-port-apps. I won't block the PR based on this (just the conflict needs to be fixed), but please in the future make an issue first and then name your branch after it.

@gmantele
Copy link
Member

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.

@@ -0,0 +1,108 @@
---
title: "VO Applications"
date: 2024-02-09T10:00:00+02:00
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date can be left out - this is not correct anyways and Hugo will insert it automatically.

@JeremyMcCormick
Copy link
Collaborator

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
Copy link
Member

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
Copy link
Member

By the way, should this PR stay a Draft?

@andamian
Copy link
Collaborator Author

andamian commented May 21, 2024

@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
Copy link
Collaborator

@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
Copy link
Collaborator Author

andamian commented May 21, 2024

@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
Copy link
Collaborator

JeremyMcCormick commented May 22, 2024

@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
Copy link
Member

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
Copy link
Collaborator

JeremyMcCormick commented May 22, 2024

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:

#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
Copy link
Collaborator Author

Replaced with #26

@andamian andamian closed this May 22, 2024
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.

4 participants