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

Pico 3.0 #54

Closed
wants to merge 0 commits into from
Closed

Pico 3.0 #54

wants to merge 0 commits into from

Conversation

mayamcdougall
Copy link
Collaborator

@mayamcdougall mayamcdougall commented Feb 7, 2022

Since the issues with our old dependencies kinda got out of hand lately (see picocms/Pico#528, picocms/Pico#534 and picocms/Pico@8a44584), it's time to kick-start development of Pico 3.0 🎉

Major changes are going to be updated dependencies (Twig 3.0+ and Symfony YAML 5.0+) and lifting the requirements to PHP 7.2.5+. We […] [will] focus on lazy page discovery and loading.

As always, feedback is highly appreciated! ❤️

Please use this PR for code reviews only, for a list of major changes and for comments please refer to picocms/Pico#535

@PhrozenByte
Copy link
Collaborator

Great initial draft, thanks Maya! ❤️

Instead of doing a review with suggestions for basically all lines (all of them rather small improvements and additions), I figured it probably makes more sense to simply commit the changes to your fork. See https://github.com/picocms/picocms.github.io/pull/54/files/079df54faa06581dc5543dad91bc75af88cd8c7d..c4d26bebf9803bdf2f10e009060733225a6adc1d for a diff. Please simply change anything that needs further improvement.

That's enough for today. I didn't write anything new, just tried to improve the things you already wrote. My next step will be updating Pico's CHANGELOG.md and then incorporating the changelog here.

@mayamcdougall
Copy link
Collaborator Author

Looks pretty good. I'll still want to run through and edit it sometime, as I noticed a few minor typos and grammatical issues as I went. Nothing major though.

Not gonna lie, I was a little upset when I first saw this hit my inbox, as it looked like you just deleted half the document at first glance. Git does not handle rearranging file contents well. 😂

Been a little behind on everything lately, as you might have noticed. I'm going to hopefully try to catch up with things a little over the next few days though. 😅

@PhrozenByte
Copy link
Collaborator

Not gonna lie, I was a little upset when I first saw this hit my inbox, as it looked like you just deleted half the document at first glance. Git does not handle rearranging file contents well. 😂

Yeah, it does not 🙈 Besides the list of changes it's basically all yours. Looking forward to your further improvements 👍

Been a little behind on everything lately, as you might have noticed. I'm going to hopefully try to catch up with things a little over the next few days though. sweat_smile

Dito 😄 I had no time the last two weekends either, but will likely have some next weekend. My next step will be to include the changes from CHANGELOG.md (not much I presume) and maybe a section about Pico CMS for Nextcloud v1.1 (still needs some changes for Pico 3.0). Before publishing a first beta Pico 3.0 needs some testing and we've to check whether the docs need updates. But besides that we're basically done. We're very close...

@mayamcdougall
Copy link
Collaborator Author

Yeah, it does not 🙈 Besides the list of changes it's basically all yours.

I did figure that out eventually! It was just the face-value shock of seeing all the paragraphs in red. 😨

I was like "What did you do to my document?!" 😱

After a few lines, I realized I was actually just seeing the upgrade instructions moving up. 🤦🏻‍♀️

Anyway, I've just been doing things at my own pace. Taking it a little slow since I've been feeling a little overwhelmed in general lately. Not about Pico stuff, just in general. It's definitely been impacting my motivation though.

So, just let me know if we hit "crunch time" with this, and I'll make a point to stop dragging my feet and get some work done. 😉😅

@PhrozenByte
Copy link
Collaborator

Here we go 👍

I've just updated the upgrade docs to include everything I could think of and also updated Pico's sample contents to include the latest changes. I also synced these with the website. The only thing missing from my side is some testing. I likely won't do this today, but next weekend - and then publish the first beta.

So, if you find some time it would be great if you can look through all this ❤️

@PhrozenByte
Copy link
Collaborator

@mayamcdougall I just recently got an email from Justin (unfortunately I don't know his GitHub nick) that he's trying to get in touch with you about the docs rewrite, he wants to contribute. In the course of this conversation I noticed that I don't have a recent email address of yours. Can you send me your current email address via [email protected] please? Thanks! 👍

@mayamcdougall
Copy link
Collaborator Author

Sorry for the unintentional radio silence. 😓

I’ve been super overwhelmed for this last month and I don’t even know where the time has gone.

On top of already falling behind on things… my wife brought home a puppy. 😳

So… um… yeah. He’s a good boy… but he’s very much been forcefully rearranging both my sleep schedule and my productivity time. 😅

At the moment, I’m still trying to get back into my productivity mindset. But, you know how it goes… the longer you put something down for, or put something off for, the harder it becomes to get started. 😫

I could probably say more here, but I’ve had this comment half-typed in a text editor for a week now, and I really just need to post it to let you know where I’ve been at. 😅

@PhrozenByte
Copy link
Collaborator

Haha, no worries, as you see I didn't really stick to my time schedule either 😅 😉 Take your time 👍

Since Justin is waiting for a reply, I just wanna point you to this:

@mayamcdougall I just recently got an email from Justin (unfortunately I don't know his GitHub nick) that he's trying to get in touch with you about the docs rewrite, he wants to contribute. In the course of this conversation I noticed that I don't have a recent email address of yours. Can you send me your current email address via [email protected] please? Thanks! 👍

@mayamcdougall
Copy link
Collaborator Author

*email notification noises* 🔔

@mayamcdougall
Copy link
Collaborator Author

Um... well... that happened. 👀

I reorganized my personal repo today, and that made GitHub automatically close this. 🤦🏻‍♀️

I get why it happened, since that branch has changed, but I wasn't even notified about it closing. I got messaged about it by someone else! It just feels like there should have been a warning or something. "Hey, this repo changed, and now the PR is invalid so it's being closed."

Nope, nothing. And I can't reopen it either. Any idea if it's possible to point this PR to a new branch, or is this thread just dead now? 😣

@PhrozenByte
Copy link
Collaborator

🙈

You can't change a PR's source branch, but you can restore your commits using git reset --hard bd63dc9 and then push with git push -f. It should be possible to reopen the PR then. Careful, git reset --hard overwrites all uncommited changes in your working tree.

@mayamcdougall
Copy link
Collaborator Author

The work isn't lost, it's just moved over to a 3.0-testing branch.

It wasn't ever really supposed to be on master to begin with, that just happened by accident.

My local repo was turning into a mess of conflicting changes and uncommitted files, so I had to clean things up a bit. 😅

Now I've got separate branches for master (to stay in line with upstream), testing, 3.0-testing and the docs rewrite. Hopefully now I can stop doing the "unstaged file dance" that I'd worked myself into.

You would just think that GitHub would have a way to change the PR branch without closing the whole thread. 😩

But yeah, nothing was lost, it's just on the 3.0-testing branch now. 😉

@PhrozenByte
Copy link
Collaborator

Makes sense 👍 You wanna open a new PR for the Pico 3.0 changes then?

By the way, you can now also change the branch which is used to generate the live deployment. Check out "Source" below Settings -> Code and automation -> Pages of your repo.

@mayamcdougall
Copy link
Collaborator Author

mayamcdougall commented Jun 15, 2022

Makes sense 👍 You wanna open a new PR for the Pico 3.0 changes then?

Done. 😉

By the way, you can now also change the branch which is used to generate the live deployment. Check out "Source" below Settings -> Code and automation -> Pages of your repo.

I know, lol, that's why I'm always saying my Docs Rewrite links aren't permalinks. 😂

I switch it quite a bit. Though I do try to leave it on the Rewrite content just because I've mentioned it so often.

Btw, I haven't heard back from Justin since his initial email (though, admittedly it took me almost a month to reply to him in the first place, so by comparison, he's still got some time, lol 😅). Is he someone you know personally or just someone you met elsewhere online?

@PhrozenByte
Copy link
Collaborator

Makes sense +1 You wanna open a new PR for the Pico 3.0 changes then?

Done. 😉

Thanks 👍

Btw, I haven't heard back from Justin since his initial email (though, admittedly it took me almost a month to reply to him in the first place, so by comparison, he's still got some time, lol 😅). Is he someone you know personally or just someone you met elsewhere online?

No, he just sent me an email. I'm sure he'll come back to his ideas at some point 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants