Commit 9e65ca73 authored by marius david's avatar marius david
Browse files

GitLab migration

parent f54e92ac
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ body:
  - type: markdown
    attributes:
      value: |
        Make sure you have prepared your JSON data that you get after editing. If you haven't, [CONTRIBUTING.md](https://github.com/marius851000/lemmy-canvas-2024-atlas/blob/master/CONTRIBUTING.md) has a guide for editing an existing entry.
        Make sure you have prepared your JSON data that you get after editing. If you haven't, [CONTRIBUTING.md](https://git.sc07.company/marius851000/fediverse-canvas-atlas-2024/-/blob/main/CONTRIBUTING.md) has a guide for editing an existing entry.
  - type: textarea
    id: description
    attributes:
+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ let
      flake = "gitlab:marius851000/fediverse-canvas-atlas-2024/merge-requests/${info.iid}/head?host=git.sc07.company";
    }
  ) prs;
	# test counter: 1
  /*mkFlakeJobset = branch: {
    description = "Build ${branch} branch of Simple NixOS MailServer";
    checkinterval = "60";
+7 −7
Original line number Diff line number Diff line
@@ -35,16 +35,16 @@ You will need to post that message to the `!2024lemmycanvasatlas@toast.ooo` comm

Past the whole JSON file in the body, and then post it. Eventually, a bot should answer that your post has been processed (or not) in less than 30 minutes. If that does not happen after 1 hour, then this is a bug, and you can report it. You can also use the second contributionn method.

### Through GitHub (TODO:lemmy adapatation DOCUMENTATION UNFINISHED: WHAT ABOUT THE ID AND REPLACING?)
### Through the forge

If you know about Git and how to create a pull request on GitHub, you can create a patch that will be merged as-is in the repo.
If you know about Git, and know how to create a pull request on GitLab, you can create a patch that will be merged as-is in the repo.

You can try pressing the <kbd>Submit Direct to GitHub</kbd> button, which will open a page with the patch file already been prepared to you. 
For that, you first need to create an account on the forge used, [git.sc07.company](https://git.sc07.company), if you do not already have one. This instance is managed by grant, and have manual approval to avoid spam.

If that didn't work, copy the entire JSON text and [create a new patch file to the repository through GitHub](https://github.com/marius851000/lemmy-canvas-2024-atlas/new/main/entries?filename=ENTRY-SLUG-HERE.json
). Upon opening, replace the `ENTRY-SLUG-HERE` into the title of the entry (with the slug format, if possible, e.g. `foo-bar`). You don't need to add any other text; just directly send the patch. 
The, you can fork the repository, create a local clone of it, and then:

If you haven't forked the repository, you would need to fork it with the provided instruction shown on the page. You may add attribution by adding an `_author` key, explained in the next paragraphs.
  - If you create a new entry, just crate a new file ending in .json in that folder, and paste the JSON
  - If you modify an existing entry, find the file with the same "id" in it, and replace it with the JSON

The commit message and description doesn't matter, but you may change it into something more descriptive to make it easier for checking (e.g. <kbd>Add Foo Bar</kbd> or <kbd>Edit Foo Bar</kbd> for the commit message). However, we suggest you to edit the title (at least) and the description of the pull request, containing the changes that you want to do (something like <kbd>Add Foo Bar</kbd> or <kbd>Edit Foo Bar</kbd> for the title, similar to the commit message, is also sufficient).

@@ -56,7 +56,7 @@ Hereforth is an example of the structured entry data (from the original r/place

```json5
{
	"id": 1,
	"id": 33949813,
	"name": "An entry",
	"description": "This is an entry, it is remarkable.",
	"links": {
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ window.instanceId = instanceId
const instanceSubreddit = null
window.instanceSubreddit = instanceSubreddit

const instanceRepo = "https://github.com/marius851000/lemmy-canvas-2024-atlas"
const instanceRepo = null
window.instanceRepo = instanceRepo

const pageTitle = "The 2024 Fediverse canvas Atlas"
+20 −16
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ function initDraw() {

		// GitHub

		if (instanceRepo != null) {
			let githubPostJsonString = prettyJsonString
			let githubPostUrl = `${instanceRepo}/new/main/entries?filename=${slugify(exportObject.name ?? entry.name)}.json&value=`

@@ -396,6 +397,9 @@ function initDraw() {
				githubPostButton.dataset.bsTitle = ""
			}
			githubPostButton.href = githubPostUrl
		} else {
			githubPostButton.classList.add("collapse")
		}

		exportModal.show()
	}
Loading