Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/placeAtlas/atlas into cle…
Browse files Browse the repository at this point in the history
…anup
  • Loading branch information
AnonymousRandomPerson committed Feb 10, 2024
2 parents 1e5f449 + f836e06 commit 7d8d985
Show file tree
Hide file tree
Showing 23 changed files with 760 additions and 631 deletions.
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@ Hereforth is an example of the structured entry data. The example has been expan

## Development

> [!IMPORTANT]
>
> Instead of here, consider directing your contributions to [The 2023 r/place Atlas](https://github.com/placeAtlas/atlas-2023).
>
> Updates from the latest Atlas would be backported occasionally for the benefit of the other instances (e.g. the 2017 Atlas and the 2022 Atlas). Furthermore, there is a great chance that what you want to do would also benefit the other instances.
>
> There may some cases where what you want to do only apply on this specific instance. In that case, you may proceed. When in doubt, don't hesitate to contact us.
Other than contributing to the Atlas data, code contributions are also accepted. Here are some information regarding some aspects on the repository.

### Web interface
Expand Down
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
[![Entry count](https://img.shields.io/badge/dynamic/json?color=blue&label=entries&query=%24.length&url=https%3A%2F%2Fgithub.com%2FplaceAtlas%2Fatlas%2Fblob%2Fmaster%2Fweb%2Fatlas.json%3Fraw%3Dtrue)](https://2022.place-atlas.stefanocoding.me/)
[![Entry count](https://img.shields.io/badge/dynamic/json?color=blue&label=entries&query=%24.length&url=https%3A%2F%2Fgithub.com%2FplaceAtlas%2Fatlas-2022%2Fblob%2Fmaster%2Fweb%2Fatlas.json%3Fraw%3Dtrue)](https://2022.place-atlas.stefanocoding.me/)
![Commit activity](https://img.shields.io/github/commit-activity/w/placeAtlas/atlas-2022)
[![Netlify](https://img.shields.io/netlify/1e7291ce-0680-45ed-9843-47a32a992bbb?logo=netlify&logoColor=white)](https://app.netlify.com/sites/place-atlas/deploys)
[![License](https://img.shields.io/github/license/placeAtlas/atlas-2022)](https://github.com/placeAtlas/atlas-2022/blob/master/LICENSE)
[![Netlify](https://img.shields.io/netlify/1e7291ce-0680-45ed-9843-47a32a992bbb?logo=netlify&logoColor=white)](https://app.netlify.com/sites/place-atlas-2022/deploys)
[![License](https://img.shields.io/github/license/placeAtlas/atlas)](https://github.com/placeAtlas/atlas-2022/blob/master/LICENSE)
[![Discord](https://img.shields.io/discord/960791635342524496?color=%235865F2&logo=discord&logoColor=white)](https://discord.gg/pJkm23b2nA)
[![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/placeAtlas2?color=%23FF4500&label=r%2FplaceAtlas2&logo=reddit&logoColor=white)](https://www.reddit.com/r/placeAtlas2/)
[![Website](https://img.shields.io/static/v1?label=website&message=2022.place-atlas.stefanocoding.me&color=blue)](https://2022.place-atlas.stefanocoding.me/)

# The 2022 r/place Atlas

The 2022 r/place Atlas is a project aiming to chart all the artworks created during the r/place April Fools event on Reddit in 2022. It is made with information to each artwork of the canvas provided by the community.
The 2022 r/place Atlas is an interactive map aiming to chart all the artworks created during the r/place April Fools event on Reddit in 2022. It is made with information to each artwork of the canvas provided by the community.

This project was established by Roland Rytz for the event in 2017, and further developed and maintained by the Place Atlas team and contributors.
This project was established by Roland Rytz for the event in 2017, and further developed and maintained by the [Place Atlas Initiative](https://place-atlas.stefanocoding.me) and [contributors](https://github.com/placeAtlas/atlas-2022/graphs/contributors).

This project is licensed under the [GNU Affero General Public License v3.0](LICENSE).

You can check out the website by visiting [2022.place-atlas.stefanocoding.me](https://2022.place-atlas.stefanocoding.me/). If you want to keep distance from GitHub, you may visit [r/placeAtlas2](https://www.reddit.com/r/placeAtlas2/).
You can check out the website by visiting [2022.place-atlas.stefanocoding.me](https://2022.place-atlas.stefanocoding.me/). The subreddit, [r/placeAtlas2](https://www.reddit.com/r/placeAtlas2/), is available for communications via Reddit.

## Contributing

This project is open source, and contributions are welcome. In fact, the Atlas relies on user contributions.

Please read [CONTRIBUTING.md](CONTRIBUTING.md) to learn how to submit a new entry, edit existing entries, or contribute to the development of the codebase.

[The r/placeAlas2 subreddit](https://reddit.com/r/placeAtlas2/) and [the Discord server](https://discord.gg/pJkm23b2nA) is also the place to submit all bug reports, feature requests, or questions.
[The r/placeAtlas2 subreddit](https://reddit.com/r/placeAtlas2/) and [the Discord server](https://discord.gg/pJkm23b2nA) is also the place to submit all bug reports, feature requests, or questions.

## Contributors

> [!NOTE]
> For more credits, including entry contributors, please see [the Credits sections on the About page](https://2022.place-atlas.stefanocoding.me/about#credits).
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat)](#contributors)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key))):
Many thanks to these wonderful people for contributing on the scope of this repository. ([emoji key](https://allcontributors.org/docs/en/emoji-key)).

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
Expand Down
91 changes: 27 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"parcel": "^2.8.3",
"parcel-namer-rewrite": "^2.0.0-rc.3",
"parcel-resolver-ignore": "^2.1.3",
"postcss": "^8.4.31",
"postcss": "^8.4.21",
"all-contributors-cli": "^6.24.0"
},
"parcel-namer-rewrite": {
Expand All @@ -18,7 +18,8 @@
},
"parcelIgnore": [
"sw.js",
"_img/.+"
"_img/.+",
"atlas.json"
],
"browserslist": [
">= 0.5%",
Expand Down
1 change: 0 additions & 1 deletion tools/ci/build-preview.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ cp -r web/_img/ dist/
cp web/atlas.json dist/
cp web/*.txt dist/
cp web/_headers dist/
cp web/_redirects dist/
cp web/favicon.ico dist/
cp web/sw.js dist/
1 change: 0 additions & 1 deletion tools/ci/build-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ cp -r web/_img/ dist/
cp web/atlas.json dist/
cp web/*.txt dist/
cp web/_headers dist/
cp web/_redirects dist/
cp web/favicon.ico dist/
cp web/sw.js dist/
3 changes: 1 addition & 2 deletions tools/unused/smallifier.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@

<!--
The 2022 r/place Atlas
Copyright (c) 2017 Roland Rytz <[email protected]>
Copyright (c) 2022 Place Atlas contributors
Copyright (c) 2022 Place Atlas Initiative and contributors
Licensed under AGPL-3.0 (https://2022.place-atlas.stefanocoding.me/license.txt)
-->

Expand Down
30 changes: 25 additions & 5 deletions web/_css/style.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* The 2022 r/place Atlas
* Copyright (c) 2017 Roland Rytz <[email protected]>
* Copyright (c) 2022 Place Atlas contributors
* Copyright (c) 2022 Place Atlas Initiative and contributors
* Licensed under AGPL-3.0 (https://2022.place-atlas.stefanocoding.me/license.txt)
*/

Expand Down Expand Up @@ -52,6 +52,14 @@ body[data-mode] {
padding-left: env(safe-area-inset-left);
}

.opacity-0 {
opacity: 0;
}

.transition-opacity {
transition: opacity .15s linear;
}

@supports (backdrop-filter: blur()) or (-webkit-backdrop-filter: blur()) {
.navbar, .offcanvas {
-webkit-backdrop-filter: saturate(180%) blur(15px);
Expand Down Expand Up @@ -258,12 +266,12 @@ body[data-init-done] .listTransitioning #innerContainer {
}

#variantControls {
flex: 1 0 auto;
flex: 2 0 auto;
}

#timeControls {
position: relative;
flex: 6 0 300px;
flex: 12 0 300px;
}

#bottomBar.no-time-slider #timeControls {
Expand Down Expand Up @@ -440,13 +448,25 @@ body:not([data-dev]) .show-only-on-dev {
display: none !important
}

#objectsList,
#offcanvasList,
#offcanvasDraw,
#closeObjectsListButton {
margin-top: var(--global-top-padding);
}

.copyleft {
display: inline-block;
transform: rotateY(180deg);
}

/* about.html */

#credits a {
#entry-contributors-wrapper a {
text-decoration: none;
}

#credits a:hover {
#entry-contributors-wrapper a:hover {
text-decoration: underline;
}

Expand Down
21 changes: 17 additions & 4 deletions web/_headers
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
/*
Access-Control-Allow-Origin: *

/_img/canvas/*/*.png
cache-control: public, max-age=604800

# Hashed resources: 1 year and immutable

/_js/*
Cache-Control: public, immutable, max-age=31536000

/_css/*
Cache-Control: public, immutable, max-age=31536000

# Canvas images: 1 year

/_img/canvas/*
Cache-Control: public, max-age=31536000

/_img/canvas/*.png
cache-control: public, max-age=604800
Cache-Control: public, max-age=31536000

/_img/canvas/*/*.png
Cache-Control: public, max-age=31536000
Loading

0 comments on commit 7d8d985

Please sign in to comment.