Merge branch 'master' into patch-1

This commit is contained in:
Aeywoo 2022-04-05 12:57:27 +09:30 committed by GitHub
commit ff06dc0ca3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 20 deletions

23
CONTRIBUTING.md Normal file
View file

@ -0,0 +1,23 @@
# How To Contribute
## Contributing to the Map
To contribute to the map, we require a certain format for artwork region and labels. This can be generated on the [contributing page](/index.html?mode=draw) on the website.
You can either post this contribution to the subreddit, or make a Pull Request on the GitHub repo.
### Reddit Submission
1. Follow the instructions on the [contributing page](/index.html?mode=draw), then click "Post Direct to Reddit".
2. Flair your post with the "New Entry" tag.
3. A moderator will accept your contribution shortly.
### GitHub Submission
1. Create a fork of our repo.
2. Enter your data into the `web/_js/atlas.js` file, with the correct format and ID number.
3. Create a Pull Request.
## Contributing to the Project
This project is open source. You may contribute to the project by submitting a Pull Request on the GitHub repo.

View file

@ -41,6 +41,11 @@ html, body {
width: 100%;
}
p {
line-height: 1.5em;
margin-bottom: 1em;
}
body {
overflow: hidden;
overflow-x: hidden;
@ -980,10 +985,15 @@ #about h2 {
margin-bottom: 10px;
}
#about h3 {
line-height: 1.4em;
text-align: center;
}
#contributors {
text-align: justify;
margin-top: 15px;
margin-bottom: 60px;
margin-bottom: 15px;
}
#contributors a {

View file

@ -226,7 +226,8 @@ var atlas = [
{"id":176,"name": "Interlingue", "description": "Flag of Interlingue, an IAL to communicate between Western European languages.", "website": "https://occidental-lang.com", "subreddit": "/r/interlingue", "center": [ 768.5, 328.5 ], "path": [ [ 765.5, 326.5 ], [ 770.5, 326.5 ], [ 770.5, 329.5 ], [ 765.5, 329.5 ] ] },
{"id":177, "name": "Viossa", "description": "Flag of the conpidgin Viossa.", "website": "", "subreddit": "/r/viossa", "center": [ 775.5, 296.5 ], "path": [ [ 769.5, 290.5 ], [ 780.5, 290.5 ], [ 780.5, 301.5 ], [ 769.5, 301.5 ] ] },
{"id":178, "name": "Lojban", "description": "Flag of Lojban", "website": "https://lojban.org", "subreddit": "/r/lojban", "center": [ 760.5, 328.5 ], "path": [ [ 763.5, 326.5 ], [ 757.5, 326.5 ], [ 757.5, 330.5 ], [ 763.5, 330.5 ] ] },
{"id":179, "name": "The Vineshroom", "description": "The mascot of the Vinesauce Twitch channel.", "website": "https://twitch.tv/Vinesauce", "subreddit": "/r/Vinesauce", "center": [76.5, 675.5], "path": [ [73.5, 676.5], [73.5, 683.5], [74.5, 684.5], [78.5, 684.5], [79.5, 683.5], [79.5, 676.5], [81.5, 676.5], [82.5, 675.5], [82.5, 672.5], [81.5, 671.5], [81.5, 670.5], [80.5, 669.5], [79.5, 668.5], [73.5, 668.5], [72.5, 669.5], [71.5, 670.5], [71.5, 671.5], [70.5, 672.5], [70.5, 676.5], [73.5, 676.5]]}
{"id":179,"name":"The University of Texas at Austin","description":"The hand-sign, mascot, and the main tower of the University of Texas at Austin. Hook 'Em!","website":"https://utexas.edu","subreddit":"/r/UTAustin","center":[583.5,961.5],"path":[[594.5,974.5],[593.5,948.5],[573.5,948.5],[573.5,973.5],[594.5,974.5]]}
{"id":180, "name": "The Vineshroom", "description": "The mascot of the Vinesauce Twitch channel.", "website": "https://twitch.tv/Vinesauce", "subreddit": "/r/Vinesauce", "center": [76.5, 675.5], "path": [ [73.5, 676.5], [73.5, 683.5], [74.5, 684.5], [78.5, 684.5], [79.5, 683.5], [79.5, 676.5], [81.5, 676.5], [82.5, 675.5], [82.5, 672.5], [81.5, 671.5], [81.5, 670.5], [80.5, 669.5], [79.5, 668.5], [73.5, 668.5], [72.5, 669.5], [71.5, 670.5], [71.5, 671.5], [70.5, 672.5], [70.5, 676.5], [73.5, 676.5]]}
];
//console.log("There are "+atlas.length+" entries in the Atlas.");

View file

@ -67,30 +67,32 @@ <h2>My Bitcoin Address</h2>
<div id="aboutContainer">
<a id="aboutBackButton" href="./">&lt; Back to the Atlas</a>
<div id="about">
<h2 id="abouth2">The /r/place Atlas</h2>
<p>This is an Atlas aiming to chart all the artworks created during the <a href="https://www.reddit.com/r/place/">/r/place</a> April's fools event on <a href="https://www.reddit.com/" target="_blank">Reddit</a> in 2022.</p>
<p>The code was developed by <a href="/" target="_blank" rel="author">Roland Rytz</a> (<a href="mailto:roland.rytz@gmail.com" target="_blank">mail</a>, <a href="https://reddit.com/user/draemmli/" target="_blank">reddit</a>) and is available under the free <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL license</a> on <a target="_blank" href="https://github.com/RolandR/place-atlas">GitHub</a>. (<a target="_blank" href="https://github.com/Codixer/place-atlas">Modified GitHub for 2022 version</a>) | Image's provided by <a target="_blank" href="https://place.thatguyalex.com/">Alex Tsernoh</a></p>
<h2 id="abouth2">The /r/Place Atlas</h2>
<h3>The /r/Place Atlas project aims to chart all the artworks created during the <a href="https://www.reddit.com/r/place/">/r/place</a> April Fools's day event on <a href="https://www.reddit.com/" target="_blank">Reddit</a> in 2022.</h3>
<br>
<p>Roland Rytz worked on the Atlas full-time (and more!) for over two weeks.</p>
<p>If you'd like to support Roland, you can do so by <a target="_blank" href="https://paypal.me/draemmli">PayPal</a> or via <a title="Click to see his address." id="bitcoinButton" role="button">Bitcoin</a>.</p>
<p>If you donate more than 10(€/$/CHF/mBTC), He'll (hopefully) send you a nice sticker of the Place canvas! (2017 one)</p>
<p id="bitcoinNotice">If you donate by Bitcoin and want a 2017 sticker, please send him a<br>message with your Bitcoin address <i>before</i> you make the transaction!</a>
<p>The first incarnation of r/Place Atlas for 2017 was developed by <a href="https://draemm.li" target="_blank" rel="author">Roland Rytz</a> (<a href="mailto:roland.rytz@gmail.com" target="_blank">mail</a>, <a href="https://reddit.com/user/draemmli/" target="_blank">reddit</a>) and is available under the free <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank">AGPL license</a> on <a target="_blank" href="https://github.com/RolandR/place-atlas">GitHub</a>. If you'd like to support Roland, you can do so by <a target="_blank" href="https://paypal.me/draemmli">PayPal</a> or via <a title="Click to see his address." id="bitcoinButton" role="button">Bitcoin</a>. If you donate more than 10(€/$/CHF/mBTC), He'll (hopefully) send you a nice sticker of the 2017 r/Place canvas! <span id="bitcoinNotice">If you donate by Bitcoin and want a 2017 sticker, please send him a message with your Bitcoin address <i>before</i> you make the transaction!</span></p>
The project was started again for the second incarnation or r/Place for 2022 April Fools by <a href="https://stefanocoding.me" target="_blank" rel="author">Stefano Haagmans</a>, and is also available on <a target="_blank" href="https://github.com/Codixer/place-atlas">GitHub</a>.</p>
Images are provided by <a target="_blank" href="https://place.thatguyalex.com/">Alex Tsernoh</a>.</p>
<h2>How to contribute</h2>
<p>Everybody is encouraged to collaborate in mapping all of /r/place on the Atlas.</p>
<p>Please read <a href="https://www.reddit.com/r/placeAtlas2/comments/tu203o/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p>
<p>The /r/Place Atlas project relies on user contributions.</p>
<p>To contribute a label for an artwork, please read <a href="https://www.reddit.com/r/placeAtlas2/comments/tu203o/how_to_contribute/" target="_blank">this post on reddit</a> to learn how to submit a new entry.</p>
<p>Alternatively, contributions can be made directly on <a href="https://github.com/Codixer/place-atlas/blob/master/CONTRIBUTING.md">GitHub</a>.</p>
<p>The <a href="https://reddit.com/r/placeAtlas2/" target="_blank">/r/placeAtlas2</a> subreddit is also the place to submit all bug reports, feature requests or questions.</p>
<h2>r/placeAtlas2 (Current) Contributors</h2>
<p>The 2022 Atlas would not have been possible without the help of the following (number still not known) reddit users.</p>
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
<h2>r/placeAtlas2 (Current) Contributors and Maintainers</h2>
<div id="contributors">
<a href="https://reddit.com/user/TCOOfficiall" target="_blank">TCOOfficiall (Current Maintainer)</a>
<a href="https://reddit.com/user/prosto_sanja" target="_blank">prosto_sanja (Provided Images)</a> - <a href="https://place.thatguyalex.com/" target="_blank">Website</a>
<a href="https://reddit.com/user/electric-blue" target="_blank">electric-blue</a>
<a href="https://reddit.com/user/m654zy" target="_blank">m654zy</a>
<a href="https://reddit.com/user/TCOOfficiall" target="_blank">TCOOfficiall (Current Maintainer)</a> ·
<a href="https://reddit.com/user/prosto_sanja" target="_blank">prosto_sanja (Provided Images)</a> - <a href="https://place.thatguyalex.com/" target="_blank">Website</a> ·
<a href="https://reddit.com/user/electric-blue" target="_blank">electric-blue</a> ·
<a href="https://reddit.com/user/m654zy" target="_blank">m654zy</a> ·
<a href="https://reddit.com/user/xXLInkster17Xx" target="_blank">xXLInkster17Xx</a>
</div>
<p>The 2022 Atlas would not have been possible without the help of our reddit contributors. This section will be updated with all of the contributor's usernames.</p>
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
<h2>r/placeAtlas Contributors</h2>
<p>The (original) Atlas would not have been possible without the help of the following 775 reddit users.</p>
<p>The original Atlas project would not have been possible without the help of the following 775 reddit users.</p>
<p>Thank you to everyone who submitted new entries, amended existing ones, reported bugs and just supported the project in general.</p>
<div id="contributors">
<a href="https://reddit.com/user/0011110000110011" target="_blank">0011110000110011</a>