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

Reorganize the website structure #73

Merged
merged 7 commits into from Mar 5, 2020
Merged

Reorganize the website structure #73

merged 7 commits into from Mar 5, 2020

Conversation

ebetica
Copy link
Collaborator

@ebetica ebetica commented Feb 26, 2020

This PR reorganizes the website structure, so we now have:

en/
  index.md
  about.dm
  week01/
  week02/
  ...
zh/
  index.md
  about.md
  week01/
  week02/
  ...
...

Hopefully it's less messy and easier to work with.

After this is merged, I will pull the images out into a global directory as well.

Also fixes some broken links in zh/index.md

@@ -37,30 +37,31 @@ kramdown:

exclude:
- jekyllbook
- en/index.md
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is a hack since the default language has a special index.md. We symlink it and exclude en/index.md.

@ebetica ebetica requested a review from Atcold February 26, 2020 01:50
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/en/week02/02-3.md Outdated Show resolved Hide resolved
docs/zh/index.md Outdated Show resolved Hide resolved
docs/zh/index.md Outdated Show resolved Hide resolved
@Atcold
Copy link
Owner

Atcold commented Feb 26, 2020

I believe there are many many broken links now, pointing to the original chapters which now has to become weekXX.

@ebetica
Copy link
Collaborator Author

ebetica commented Feb 26, 2020

Fixed all of them, grep -r 'en/0' and grep -r 'zh/0' gives nothing now.

@Atcold
Copy link
Owner

Atcold commented Feb 28, 2020

Can you plz rebase on top of master? There have been updates to 01-1.md and 01-2.md.

@ebetica
Copy link
Collaborator Author

ebetica commented Feb 28, 2020

Yes, it has been rebased.

@Atcold
Copy link
Owner

Atcold commented Feb 29, 2020

I don't think you've rebased.

Screenshot 2020-02-29 15 48 38

Screenshot 2020-02-29 15 49 30

@ebetica ebetica force-pushed the reorg branch 3 times, most recently from 7aeaaad to 8da8bd7 Compare March 2, 2020 22:03
@ebetica
Copy link
Collaborator Author

ebetica commented Mar 2, 2020

I rebased again - I found the problem, the .gitignore was ignoring all the image files, so I enabled it for the docs/ dir.

@Atcold
Copy link
Owner

Atcold commented Mar 3, 2020

Okay, how about we coordinate on Messenger your rebase with my merging?
Here I cannot get this to join master.
Or just drop by my office?

@ebetica
Copy link
Collaborator Author

ebetica commented Mar 3, 2020

I could just hit the merge button, if you trust I won't introduce any new bugs in the rebase? Otherwise if this happens again (I can ping you|you can ping me) on messenger about it. As long as no other PRs are merged I think the button will stay green:

image

Everybody with an open PR will unfortunately have to rebase.

@Atcold Atcold merged commit a9d8be9 into Atcold:master Mar 5, 2020
@Atcold
Copy link
Owner

Atcold commented Mar 5, 2020

Let's get the images out now! 😬

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.

None yet

2 participants