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

New pages directory and repo clean up #1260

Merged
merged 7 commits into from
Mar 19, 2021

Conversation

akibrhast
Copy link
Member

@akibrhast akibrhast commented Mar 18, 2021

Please refer to the commit message in regards to what has been changes

This pull request is a to test the feasibility of the changes asked in #1138

It also tries to do some clean up work
Please pull this branch for test purposes and try hardest to break it! If possible this should be merged before we start getting in more issues and prs

Closes #1255

- Moved all pages to be under the pages directory
- Modified the _config.yml to be more explicit rather than previous implicit also added descriptive comments to it
- Removed a previously arbitary collections to be inside the within _data directory inside because thats where it was supposed to go
  https://jekyllrb.com/docs/datafiles/
- Removed all surveys to a single survey folder
- Deleted some markdown files that were not being used anyhwere
Copy link
Member

@drubgrubby drubgrubby left a comment

Choose a reason for hiding this comment

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

@akibrhast -> That looks pretty great. I wasn't able to break it, or really to find anything at all that doesn't look like the current site.

That said, there's a weird thing going on where there's a second wins directory that's showing all of these files with a .icloud extension. ????

Weird wins directory Screen Shot 2021-03-18 at 4 52 02 PM

I'm guessing this is just on my machine. I tried deleting the branch, restarting everything, and downloading the branch again, and it's still there. Does anyone else get this?

@akibrhast
Copy link
Member Author

@akibrhast -> That looks pretty great. I wasn't able to break it, or really to find anything at all that doesn't look like the current site.

That said, there's a weird thing going on where there's a second wins directory that's showing all of these files with a .icloud extension. ????

Weird wins directory
Screen Shot 2021-03-18 at 4 52 02 PM
I'm guessing this is just on my machine. I tried deleting the branch, restarting everything, and downloading the branch again, and it's still there. Does anyone else get this?

It's a mac thing -I believe @drubgrubby >

https://stackoverflow.com/questions/62385234/git-keeps-duplicating-files-and-appending-2-at-end-of-filename
https://stackoverflow.com/questions/59308049/icloud-drive-desktop-sync-vs-git-deleted-files-reappear-and-duplicates-with-n

@akibrhast akibrhast added the Status: Urgent Needs to be worked on immediately label Mar 19, 2021
@akibrhast akibrhast changed the title New director pages New pages directory and repo clean up Mar 19, 2021
Copy link
Member

@cnk cnk left a comment

Choose a reason for hiding this comment

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

The toolkit resources are not data in the way the other items are data. Please move them back out of the data subdirectory - either back to _toolkitResources, or even better to a name that isn't camelCase

@akibrhast
Copy link
Member Author

There was a discussion between me and @cnk over slack regarding this issue. For documentation purposes I am going to paste the content of the discussion below. The conclusion of that discussion was

So make this PR a consistent change to move pages into a subdirectory. Get that approved. Then refactor the current data into data/external (including fixing the GH actions that populate it) Then as a 3rd step a new proposal to reorganize the data-only collections under a data subdirectory

Discussion details as copy pasted from slack DM's

Discussion.pdf

@akibrhast akibrhast requested a review from cnk March 19, 2021 18:52
@cnk cnk merged commit ffaabff into hackforla:gh-pages Mar 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Urgent Needs to be worked on immediately
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change Join Us page URL
3 participants