Editing:Atlas Editing - Revision history

Artillect: Reorganized article a bit

2022-04-10T16:16:31Z

Reorganized article a bit

7automaton: Removed a header level from Troubleshooting

2022-04-09T03:41:16Z

Removed a header level from Troubleshooting

← Older revision		Revision as of 05:41, 9 April 2022
Line 118:		Line 118:
	Congratulations! You've just pushed a pull request to the cleanup branch of the main repository. A moderator will verify your change and help you merge it into the Atlas!		Congratulations! You've just pushed a pull request to the cleanup branch of the main repository. A moderator will verify your change and help you merge it into the Atlas!

	=====Troubleshooting=====		====Troubleshooting====

	If you face any of these issues, then please back up your changes, delete your fork and retry this walkthrough:		If you face any of these issues, then please back up your changes, delete your fork and retry this walkthrough:

7automaton: Added pushing your changes section

2022-04-09T03:40:43Z

Added pushing your changes section

← Older revision		Revision as of 05:40, 9 April 2022
Line 107:		Line 107:

	Once your commit title and descriptions look accurate, click the green "Commit changes" button.		Once your commit title and descriptions look accurate, click the green "Commit changes" button.

			====Pushing your changes====

			Now that you've committed your changes, there's one last step! Click on the "Pull requests" tab at the very top of your fork. Then hit the green "New pull request" button.

			At this point, you'll see several different buttons, with an arrow pointing from "head repository" to "base repository". Set the buttons that say "master" on them to "cleanup"; do this for both sides (next to both the base repository and head repository buttons). Once you've switched these, click "Create pull request".

			Make sure the title and description are correct, then click "Create pull request" one more time.

			Congratulations! You've just pushed a pull request to the cleanup branch of the main repository. A moderator will verify your change and help you merge it into the Atlas!

			=====Troubleshooting=====

			If you face any of these issues, then please back up your changes, delete your fork and retry this walkthrough:

			* You've done your changes on the master branch of your fork instead of the cleanup branch. Your pull request will not be accepted from master to cleanup.
			* You see a red "Unable to merge" error towards the end of the process. If you can't fix these merge conflicts, or don't know how, then please restart the walkthrough.

	===Requesting support===		===Requesting support===

7automaton: Added merging section

2022-04-09T02:23:41Z

Added merging section

← Older revision		Revision as of 04:23, 9 April 2022
Line 91:		Line 91:

	After editing your community's new information, save the file by going into File > Save, or press Ctrl + S.		After editing your community's new information, save the file by going into File > Save, or press Ctrl + S.

			====Committing your changes====

			At this point, you've now removed all duplicates and edited your entries and saved your changes into your new and improved {{#tag:code\|atlas.json}}. Now you'll need to take your changes and push them to your forked repository, which we'll then push into the main repository you forked from.

			Go back to your repository into the {{#tag:code\|web}} folder, where you initially got the {{#tag:code\|atlas.json}} file. Click the button that says "Add file", and choose "Upload files":

			[[File:Upload files button.png\|frameless\|none\|The button is located on the top right corner of the file browser.]]

			From here, you'll see a file upload menu. Choose your newly edited {{#tag:code\|atlas.json}} file, or drag it into the area to upload your revision.

			Next, we'll be "committing" the file to a tracked list of changes made on your fork. Choose a descriptive commit title, such as "(Community name here) Cleanup". Write whatever you changed in the description of the commit; for instance, if you only edited a section, then only add that to the description:

			[[File:Cleanup commit name and description.png\|frameless\|none\|Here's a good example with both an edit and duplicate removals.]]

			Once your commit title and descriptions look accurate, click the green "Commit changes" button.

	===Requesting support===		===Requesting support===

7automaton: Added duplicate/editing entries sections

2022-04-09T01:38:19Z

Added duplicate/editing entries sections

@@ Line 64: / Line 64: @@
 [[File:Download button.png|frameless|none|alt=Click the Download button from within the file itself.]]
-Then, right click the page and save {{#tag:code|atlas.json}} somewhere that's accessible on your computer, such as your Desktop. Make sure you don't rename it to anything else.
+Then, right click the page of text that appears and save {{#tag:code|atlas.json}} somewhere that's accessible on your computer, such as your Desktop. Make sure you don't rename it to anything else.
 From here on, you'll need a good text editor for code. We will be using [https://code.visualstudio.com/ Visual Studio Code] for reading the {{#tag:code|atlas.json}} file you just downloaded to find and edit your submission.
 ===Requesting support===

7automaton: Less tech jargon

2022-04-08T02:57:44Z

Less tech jargon

← Older revision		Revision as of 04:57, 8 April 2022
Line 99:		Line 99:
	====Submitting to Reddit====		====Submitting to Reddit====

	Once you've generated ~~JSON code~~ for your new area, head over to [https://www.reddit.com/r/placeAtlas2/ r/placeAtlas2]. Create a new post there with nothing in it at all besides the ~~JSON code you just~~ generated. Other desired notes may be added in the comments section.		Once you've generated the data for your new area, head over to [https://www.reddit.com/r/placeAtlas2/ r/placeAtlas2]. Create a new post there with nothing in it at all besides the text that was generated. Other desired notes may be added in the comments section.

	'''Don't forget to flare your post with "New Entry"''' - that way, it's not missed by moderators looking to review your submission.		'''Don't forget to flare your post with "New Entry"''' - that way, it's not missed by moderators looking to review your submission.

7automaton: Added tools section

2022-04-08T02:56:16Z

Added tools section

← Older revision		Revision as of 04:56, 8 April 2022
Line 28:		Line 28:

	If you're new to this, then don't worry: this guide will walk you through making a change step-by-step.		If you're new to this, then don't worry: this guide will walk you through making a change step-by-step.

			====Required tools====

			To follow this walkthrough, you will need:

			* A [https://github.com/signup GitHub account]
			* [https://code.visualstudio.com/ Visual Studio Code] (or any other code editor which you are comfortable with)

	====Copying the repository====		====Copying the repository====
Line 57:		Line 64:
	[[File:Download button.png\|frameless\|none\|alt=Click the Download button from within the file itself.]]		[[File:Download button.png\|frameless\|none\|alt=Click the Download button from within the file itself.]]

	Then, right click the page and save it somewhere that's accessible on your computer, such as your Desktop.		Then, right click the page and save {{#tag:code\|atlas.json}} somewhere that's accessible on your computer, such as your Desktop. Make sure you don't rename it to anything else.

	~~====Removing duplicate submissions====~~

	~~(WIP)~~		From here on, you'll need a good text editor for code. We will be using [https://code.visualstudio.com/ Visual Studio Code] for reading the {{#tag:code\|atlas.json}} file you just downloaded to find and edit your submission.

	===Requesting support===		===Requesting support===

7automaton: Added request method bottom text

2022-04-08T02:34:50Z

Added request method bottom text

← Older revision		Revision as of 04:34, 8 April 2022
Line 12:		Line 12:
	You can do this by forking the [https://github.com/placeAtlas/atlas r/place 2022 Atlas GitHub repository], and following the guide below. If you don't feel comfortable doing this, then we highly recommend you find a representative from your community that knows GitHub who can help you submit your change.		You can do this by forking the [https://github.com/placeAtlas/atlas r/place 2022 Atlas GitHub repository], and following the guide below. If you don't feel comfortable doing this, then we highly recommend you find a representative from your community that knows GitHub who can help you submit your change.

	The other two ways let you request assistance from other developers to get your submission edited through GitHub. These are the slower, but less technical approaches to submitting a change. You can do this in two ways ~~(Please see [[#requesting support\|Requesting support]] for a full breakdown)~~:		The other two ways let you request assistance from other developers to get your submission edited through GitHub. These are the slower, but less technical approaches to submitting a change. You can do this in two ways:

	* Leaving information generated from a new Atlas entry in the [https://www.reddit.com/r/placeAtlas2/ r/placeAtlas2 subreddit] and flairing it with Edit Entry...		* Leaving information generated from a new Atlas entry in the [https://www.reddit.com/r/placeAtlas2/ r/placeAtlas2 subreddit] and flairing it with Edit Entry...
	* ...Or by describing your issue in the [https://discord.gg/WfGAy6PKm9 r/placeAtlas2 Discord server] in #atlas-edits.		* ...Or by describing your issue in the [https://discord.gg/WfGAy6PKm9 r/placeAtlas2 Discord server] in #atlas-edits.

			If you're planning to submit a Reddit/Discord request, please see [[#requesting support\|Requesting support]] for a full breakdown:

	===Using GitHub to submit a change===		===Using GitHub to submit a change===

7automaton: Changed submission method text

2022-04-08T02:32:10Z

Changed submission method text

← Older revision		Revision as of 04:32, 8 April 2022
Line 7:		Line 7:
	==Editing existing entries==		==Editing existing entries==

	There are ~~two~~ ways you ~~may~~ get your ~~entry added:~~		There are three ways you can get your submissions edited. Every way to submit is moderated by the r/placeAtlas2 Archival Team.

	~~# '''Modifying entries manually via~~ the [https://github.com/placeAtlas/atlas r/place 2022 Atlas GitHub repository] ~~(recommended)~~.'~~'' Manually editing~~ your change through the ~~JSON code is the faster (more~~ technical~~) approach~~ to ~~updating descriptions~~. ~~Keep reading~~ for a full ~~walkthrough on pushing your community's~~ new ~~description manually~~.		The recommended option involves the use of GitHub to push your edit through the code on your own.<br />
	~~# '''Requesting support via the thread~~ in the [https://discord.gg/WfGAy6PKm9 r/placeAtlas2 Discord server]~~.''' Although much slower than pushing an update manually, this is the only non~~-technical way to request support to modify entries for your community's art. However, this takes time, and you may not receive the support you need in a reasonably quick amount of time. We highly recommend you find a spokesperson who knows GitHub and JSON editing on behalf of a community leader who can make the edit for you on GitHub if you would like a faster way to push any sort of edit.		You can do this by forking the [https://github.com/placeAtlas/atlas r/place 2022 Atlas GitHub repository], and following the guide below. If you don't feel comfortable doing this, then we highly recommend you find a representative from your community that knows GitHub who can help you submit your change.

			The other two ways let you request assistance from other developers to get your submission edited through GitHub. These are the slower, but less technical approaches to submitting a change. You can do this in two ways (Please see [[#requesting support\|Requesting support]] for a full breakdown):

			* Leaving information generated from a new Atlas entry in the [https://www.reddit.com/r/placeAtlas2/ r/placeAtlas2 subreddit] and flairing it with Edit Entry...
			* ...Or by describing your issue in the [https://discord.gg/WfGAy6PKm9 r/placeAtlas2 Discord server] in #atlas-edits.

	===Using GitHub to submit a change===		===Using GitHub to submit a change===
Line 52:		Line 57:
	Then, right click the page and save it somewhere that's accessible on your computer, such as your Desktop.		Then, right click the page and save it somewhere that's accessible on your computer, such as your Desktop.

	====Removing duplicate ~~descriptions~~====		====Removing duplicate submissions====

	(WIP)		(WIP)

	===Requesting support ~~via thread~~===		===Requesting support===

	You may choose to regenerate JSON for your area to add to the Reddit section.		You may choose to regenerate JSON for your area to add to the Reddit section.

7automaton: Added part 1 of the GitHub section

2022-04-08T01:10:19Z

Added part 1 of the GitHub section

@@ Line 11: / Line 11: @@
 # '''Modifying entries manually via the [https://github.com/placeAtlas/atlas r/place 2022 Atlas GitHub repository] (recommended).''' Manually editing your change through the JSON code is the faster (more technical) approach to updating descriptions. Keep reading for a full walkthrough on pushing your community's new description manually.
 # '''Requesting support via the thread in the [https://discord.gg/WfGAy6PKm9 r/placeAtlas2 Discord server].''' Although much slower than pushing an update manually, this is the only non-technical way to request support to modify entries for your community's art. However, this takes time, and you may not receive the support you need in a reasonably quick amount of time. We highly recommend you find a spokesperson who knows GitHub and JSON editing on behalf of a community leader who can make the edit for you on GitHub if you would like a faster way to push any sort of edit.
 ====What is GitHub?====
-WIP! Check back later.
+GitHub is a platform used for storing code for apps. Code is stored in different projects called ''repositories''.
-====Requesting support via thread====
+===Requesting support via thread===
 You may choose to regenerate JSON for your area to add to the Reddit section.