search

twelve-of-code-official / website

The source code for the Twelve of Code website
https://mesure.x10.mx/twelve-of-code
GNU General Public License v3.0
0 stars 0 forks source link

12oc hashtag url navigation #96

Closed BeepBot99 closed 7 months ago

BeepBot99 commented 7 months ago

Resolves #64 Resolves #78

netlify[bot] commented 7 months ago

Deploy Preview for m73l-twelve-of-code-dev ready!

Name Link
Latest commit ccf4b82b9b8c214b001c7ff6650667210f70ca3e
Latest deploy log https://app.netlify.com/sites/m73l-twelve-of-code-dev/deploys/65c301bfc02e7000086e39b6
Deploy Preview https://deploy-preview-96--m73l-twelve-of-code-dev.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

BeepBot99 commented 7 months ago

I believe that I have fixed all of the bugs. The merge conflict has been resolved. However, #2023-jan still doesn't work as expected.

Mesure73L commented 7 months ago

However, #2023-jan still doesn't work as expected.

I will look into that later

Mesure73L commented 7 months ago

#2023-jan does work as expected.

Mesure73L commented 7 months ago

@BeepBot99 Please review this as soon as possible.

BeepBot99 commented 7 months ago

#2023-jan does work as expected.

Are you sure you pushed to origin in the 12oc-hashtag-url-navigation branch? This is what is in the code currently: image When the hash #2023-jan is used, this is the result: image The expected result would be for the hash to be automatically changed to #2023 and this to be shown: image

Mesure73L commented 7 months ago

Yes, I did push to origin, however you broke it.

Mesure73L commented 7 months ago

DO NOT EDIT THIS.

BeepBot99 commented 7 months ago

Yes, I did push to origin, however you broke it.

When, I did not. You can see I merged the develop branch into this branch. LOOK AT THE COMMIT. ALL I WAS CHANGING WAS RESOLVING THE CONFLICTS IN THE script.js. LOOK AT WHAT FILES I CHANGED.

BeepBot99 commented 7 months ago

Please stop blaming me for things that I did not do without any evidence.

BeepBot99 commented 7 months ago

This looks good. I can't review it because I made the pull request. However, in the future, please do these two things:

BeepBot99 commented 7 months ago

I am going to remove an empty line from the README.md so you are able to review it.

Mesure73L commented 7 months ago

Look. This is the commit where you broke it. image

Mesure73L commented 7 months ago

My unsynced codespace worked with the feature until I synced it. I did not edit this outside of the codespace.

Mesure73L commented 7 months ago

I very much do have proof.

BeepBot99 commented 7 months ago

Yeah. Two days ago. You said you did this yesterday.

Mesure73L commented 7 months ago

I did not work on this yesterday.

Mesure73L commented 7 months ago

That line that you removed was the exact line that I needed to patch that bug. You deleted it.

BeepBot99 commented 7 months ago

My unsynced codespace worked with the feature until I synced it.

Exactly, when you synced, it you pulled and pushed instead of pushing. Just pushing should be the default option, but if it isn't, click the drop down arrow next to the sync button and select the option to only push and overwrite.

Mesure73L commented 7 months ago

My unsynced codespace worked with the feature until I synced it.

Exactly, when you synced, it you pulled and pushed instead of pushing. Just pushing should be the default option, but if it isn't, click the drop down arrow next to the sync button and select the option to only push and overwrite.

It did not upload anything to GitHub. All commits I made were already pushed to origin.

BeepBot99 commented 7 months ago

What do you mean they were already synced to the origin? I never said you uploaded them. When you make a commit in the codespace, these things happen:

  1. It pulls the origin to the codespace
  2. It pushes the codespaces to the origin

Instead of that, you have to just do step 2.

Mesure73L commented 7 months ago

Okay, so here's what happened: On Thursday or Friday I fixed that bug, by adding that line. I pushed it to origin, check commit history. 2 days ago (Saturday) you removed that line. I undid all of your commits and that fixed the issue. You broke it and I have proof.

BeepBot99 commented 7 months ago

Wasn't Saturday when we vced?

Mesure73L commented 7 months ago

We vacuum cleanered on Friday.

BeepBot99 commented 7 months ago

In addition, please never blame anyone no matter what. It does not create a constructive environment, and it doesn't help in any way.

Mesure73L commented 7 months ago

In addition, please never blame anyone no matter what. It does not create a constructive environment, and it doesn't help in any way.

I was just pointing out that I already fixed it. I was not trying to argue. You started arguing.

Mesure73L commented 7 months ago

In the future, please do not edit a branch that I created unless I tell you to and only for that exact thing.

BeepBot99 commented 7 months ago

No, remember, on Friday, when there was the merge conflict that we couldn't fix without breaking it, you asked me to fix it? I did not know that the one line I removed (which I had written in the first place a month ago) would relate at all to what you were doing. Furthermore, you are blaming me. I just want to let you know so that you don't do it in the future.

Mesure73L commented 7 months ago

No, remember, on Friday, when there was the merge conflict that we couldn't fix without breaking it, you asked me to fix it?

What do you mean, when did I say that, and what was the merge conflict?

I did not know that the one line I removed (which I had written in the first place a month ago) would relate at all to what you were doing.

That line was not there before. I added it because it helped make the hash system easier to code.

Furthermore, you are blaming me. I just want to let you know so that you don't do it in the future.

I am not blaming you in a bad way. I just want to let you know so that you don't do it in the future.

In addition, please be more descriptive with commits. I am not sure what bugs you removed because all you said is "Removed bugs." If you specified what bugs, I would've gone in and seen if I could fix it a different way.

image

Mesure73L commented 7 months ago

Either way, can this be merged?

BeepBot99 commented 7 months ago

You need to review it first.

Mesure73L commented 7 months ago

Once I review it, can it be merged? This is technically you who's supposed to review this but since you created the PR you can't review it.

BeepBot99 commented 7 months ago

Yes, it can, I already said that.

BeepBot99 commented 7 months ago

For script.js, keep this version.

Mesure73L commented 7 months ago

For script.js, keep this version.

k

BeepBot99 commented 7 months ago

k

Nevermind, DO NOT DO THAT. Look through each of the seven conflicts. Some need to be kept, and some don't. I can resolve them if you want. I have already carefully read through each and every one of them.

BeepBot99 commented 7 months ago

In addition, some of the conflicts need a combined version of both. Do one of these two things:

BeepBot99 commented 7 months ago

Which one would you like to do?

Mesure73L commented 7 months ago

I would prefer to vacuum cleaner and work through it together, you pretending you don't know anything about it. That way I can learn and practice resolving conflicts so I can do it by myself in the future.

Mesure73L commented 7 months ago

I can vacuum cleaner tomorrow at -8:00.

BeepBot99 commented 7 months ago

Is that supposed to be - 8:00?

BeepBot99 commented 7 months ago

I would prefer to vacuum cleaner and work through it together, you pretending you don't know anything about it. That way I can learn and practice resolving conflicts so I can do it by myself in the future.

Okay.

Mesure73L commented 7 months ago

Is that supposed to be - 8:00?

Yes, the - is a negative sign.

BeepBot99 commented 7 months ago

Is that supposed to be - 8:00?

Yes, the - is a negative sign.

Does that mean 16:00 then? Because if so, then no, I can't.

Mesure73L commented 7 months ago

Can you vacuum cleaner on Thursday at -54:195? (i hope thats correct lol)

BeepBot99 commented 7 months ago

Can you vacuum cleaner on Thursday at -54:195? (i hope thats correct lol)

Not until you tell me the correct time.

Mesure73L commented 7 months ago

Can you vacuum cleaner on Thursday at -54:195? (i hope thats correct lol)

Not until you tell me the correct time.

Can you visual communicator at 21:15ish?

BeepBot99 commented 7 months ago

Can you vacuum cleaner on Thursday at -54:195? (i hope thats correct lol)

Not until you tell me the correct time.

Can you visual communicator at 21:15ish?

Sure.

BeepBot99 commented 7 months ago

@Mesure73L Review this and merge when ready.