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.

Sign up for GitHub

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

Jump to bottom

feat(website): automatically publish latest blog posts to website #13027

Merged
merged 57 commits into from
Feb 15, 2023
Merged

feat(website): automatically publish latest blog posts to website #13027

merged 57 commits into from
Feb 15, 2023

Conversation

Jaapiehetaapie
Copy link
Contributor

@wolfderechter
Copy link
Contributor

wolfderechter commented Jan 23, 2023 •
edited

image
The author name should be pink.

I don't think the authors dictionary is such a good idea..

wolfderechter
wolfderechter suggested changes Jan 23, 2023
View reviewed changes
packages/website/components/BlogSection.tsx Outdated Show resolved Hide resolved
packages/website/components/BlogSection.tsx Outdated Show resolved Hide resolved
dantaik
dantaik previously approved these changes Jan 24, 2023
View reviewed changes
@Jaapiehetaapie @wolfderechter
Update packages/website/components/BlogSection.tsx
b705a84 
Co-authored-by: wolfderechter <60930264+wolfderechter@users.noreply.github.com>
@Jaapiehetaapie @wolfderechter
Update packages/website/components/BlogSection.tsx
e64c1cf 
Co-authored-by: wolfderechter <60930264+wolfderechter@users.noreply.github.com>
@dantaik
Copy link
Contributor

dantaik commented Jan 24, 2023

@Jaapiehetaapie thank you for working on this. Could you please resolve the conflits?

@dantaik
Copy link
Contributor

dantaik commented Jan 24, 2023

The author name should be pink.
I don't think the authors dictionary is such a good idea..

Lets remove the author's name and avatar.

@Jaapiehetaapie
Copy link
Contributor Author

The other dependicies are needed for my code. Is their a way to resolve these confilcts?

wolfderechter
wolfderechter suggested changes Jan 24, 2023
View reviewed changes
packages/website/components/getPosts.ts Outdated Show resolved Hide resolved
packages/website/components/getImgURLs.ts Outdated Show resolved Hide resolved
@Jaapiehetaapie
Revert "resolve"
4c553f9 
This reverts commit f210b29.
@Jaapiehetaapie
Copy link
Contributor Author

Jaapiehetaapie commented Feb 10, 2023 •
edited

I'm having problems resolving the conflict, does anyone know how to do this? I manged to resolve all the conflicts except for the arweave one, is there a way i can do this? Managed to do it!

@Jaapiehetaapie
Squashed commit of the following:
1946322 
commit 0214b36
Author: Luuk <luukhonselaar@gmail.com>
Date:   Sun Feb 12 17:36:07 2023 +0100

    fix

commit 72ac56f
Author: Luuk <luukhonselaar@gmail.com>
Date:   Sun Feb 12 17:32:31 2023 +0100

    fix

commit 3dfa86d
Author: Luuk <luukhonselaar@gmail.com>
Date:   Sun Feb 12 17:30:37 2023 +0100

    add arweave

commit 91ee883
Author: Luuk <luukhonselaar@gmail.com>
Date:   Sun Feb 12 17:24:02 2023 +0100

    resolve without arweave
@Jaapiehetaapie Jaapiehetaapie requested review from dantaik and d1onys1us and removed request for dantaik and d1onys1us February 13, 2023 21:02
@cyberhorsey
Copy link
Contributor

@dantaik i think you are queued to review this, this PR is quite old now.

@d1onys1us d1onys1us added this pull request to the merge queue Feb 15, 2023
Merged via the queue into taikoxyz:main with commit 9fbf102 Feb 15, 2023
@gitpoap-bot
Copy link

gitpoap-bot bot commented Feb 15, 2023

Congrats, your important contribution to this open-source project has earned you a GitPOAP!

GitPOAP: 2023 Taiko Contributor:

GitPOAP: 2023 Taiko Contributor GitPOAP Badge

Head to gitpoap.io & connect your GitHub account to mint!

Learn more about GitPOAPs here.

@github-actions github-actions bot mentioned this pull request Feb 15, 2023
Merged
d1onys1us added a commit that referenced this pull request Feb 16, 2023
@d1onys1us
Revert "feat(website): automatically publish latest blog posts to web…
0c735c5 
…site (#13027)"

This reverts commit 9fbf102.
d1onys1us added a commit that referenced this pull request Feb 16, 2023
@d1onys1us
Revert "Revert "feat(website): automatically publish latest blog post…
901ac4c 
…s to website (#13027)""

This reverts commit 0c735c5.
@d1onys1us d1onys1us mentioned this pull request Jun 3, 2023
Closed
@Gustishodik0 Gustishodik0 mentioned this pull request Jul 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wolfderechter wolfderechter wolfderechter requested changes

@d1onys1us d1onys1us d1onys1us approved these changes

@dantaik dantaik dantaik approved these changes

Assignees
No one assigned
Labels
area.website
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Jaapiehetaapie @wolfderechter @dantaik @d1onys1us @cyberhorsey @davidtaikocha