noraatfedora/fnb-roc-website
1
0
Fork 2
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

rearrange repo a bit #1

Open
scott wants to merge 0 commits from scott/fnb-roc-website:repo-fixes into master
pull from: scott/fnb-roc-website:repo-fixes
merge into: noraatfedora:master
Conversation 0 Commits - Files changed -
scott commented 2025-05-23 08:40:27 -04:00
First-time contributor
Copy link

Just a few thoughts:

  • index.html, blog.html and the posts/ directory should be a part of a subdirectory, which will be served by a webserver (e.g. nginx). This way we aren't also serving up builder.py and .gitignore and stuff alongside index.html. Hence, builder.py now outputs to the static directory which is added to .gitignore instead of the posts subdir which is now under that at static/posts
  • scraper.py (or whatever the python script is that did the scraping was called) was left out, hopefully the changes I made to the .gitignore will allow that to be seen, if you merge and then git add . on your end.
  • since index.html and blog.html are generated from templates they shouldn't be committed.

I'm wondering if maybe the whole scraper folder should be included since it's not part of the generated content and can't reasonably be re-scraped? Or maybe just leave that until we receive another source of truth i.e. an rss feed or webdav dirs?

Just a few thoughts: - `index.html`, `blog.html` and the `posts/` directory should be a part of a subdirectory, which will be served by a webserver (e.g. nginx). This way we aren't also serving up `builder.py` and `.gitignore` and stuff alongside `index.html`. Hence, `builder.py` now outputs to the `static` directory which is added to `.gitignore` instead of the `posts` subdir which is now under that at `static/posts` - `scraper.py` (or whatever the python script is that did the scraping was called) was left out, hopefully the changes I made to the `.gitignore` will allow that to be seen, if you merge and then `git add .` on your end. - since `index.html` and `blog.html` are generated from templates they shouldn't be committed. I'm wondering if maybe the whole scraper folder should be included since it's not part of the generated content and can't reasonably be re-scraped? Or maybe just leave that until we receive another source of truth i.e. an rss feed or webdav dirs?
scott added 1 commit 2025-05-23 08:40:28 -04:00
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u repo-fixes:scott-repo-fixes
git checkout scott-repo-fixes

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff scott-repo-fixes
git checkout master
git merge --ff-only scott-repo-fixes
git checkout scott-repo-fixes
git rebase master
git checkout master
git merge --no-ff scott-repo-fixes
git checkout master
git merge --squash scott-repo-fixes
git checkout master
git merge --ff-only scott-repo-fixes
git checkout master
git merge scott-repo-fixes
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: noraatfedora/fnb-roc-website#1
No description provided.
Delete branch "scott/fnb-roc-website:repo-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?