diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..9119366d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.rulers": [80] +} diff --git a/app/assets/images/pardon-our-dust/header.png b/app/assets/images/pardon-our-dust/header.png new file mode 100644 index 00000000..5b01032a Binary files /dev/null and b/app/assets/images/pardon-our-dust/header.png differ diff --git a/app/assets/images/pardon-our-dust/worker.png b/app/assets/images/pardon-our-dust/worker.png new file mode 100644 index 00000000..6746530a Binary files /dev/null and b/app/assets/images/pardon-our-dust/worker.png differ diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 9401bfc8..420625ad 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -23,6 +23,7 @@ @import outfits/show @import pets/bulk @import static/image_mode +@import static/pardon_our_dust @import static/terms @import swf_assets/links @import users/top_contributors diff --git a/app/assets/stylesheets/outfits/_new.sass b/app/assets/stylesheets/outfits/_new.sass index 9065efde..d25b58ee 100644 --- a/app/assets/stylesheets/outfits/_new.sass +++ b/app/assets/stylesheets/outfits/_new.sass @@ -3,6 +3,38 @@ body.outfits-new +campaign-progress + .pardon-our-dust + border: 1px solid #3d8bfd + border-radius: .5em + color: #084298 + padding: .25em .5em + margin-bottom: 1em + + display: grid + grid-template-areas: "thumbnail header" "thumbnail body1" "thumbnail body2" + grid-template-columns: auto 1fr + column-gap: .75em + align-items: center + + .thumbnail + grid-area: thumbnail + border: 1px solid #cfe2ff + border-radius: .25em + width: 60px + height: 60px + + header + grid-area: header + font-weight: bold + font-size: 1.25em + + p + margin-bottom: 0 + line-height: 1.75 + + a + color: #0a58ca + #pet-not-found, #neopia-error display: none diff --git a/app/assets/stylesheets/static/_pardon_our_dust.sass b/app/assets/stylesheets/static/_pardon_our_dust.sass new file mode 100644 index 00000000..fb60b549 --- /dev/null +++ b/app/assets/stylesheets/static/_pardon_our_dust.sass @@ -0,0 +1,8 @@ +body.static-pardon_our_dust + .header-image + max-width: 100% + + main + ul + padding-left: 2em + margin-bottom: 1em diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 69bcf616..e5d6fc76 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -167,7 +167,11 @@ module ApplicationHelper end def show_title_header? - params[:controller] != 'items' + params[:controller] != 'items' && !@hide_title_header + end + + def hide_title_header + @hide_title_header = true end def signed_in_meta_tag diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 8038dce2..5c32fa6a 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -5,6 +5,16 @@ %p#pet-not-found.alert= t 'pets.load.not_found' %p#neopia-error.alert= t 'pets.load.neopia_error' +%section.pardon-our-dust + = image_tag 'pardon-our-dust/worker.png', class: 'thumbnail', + alt: 'A blue Kacheek wearing a construction hat, pencil over ear, looking at a blueprint' + %header Pardon our dust! + %p + A surprise tech issue shut down the site, oops! We're fixing it by releasing this beta version a bit early! + %p + There's some rough edges, and also some new things we think you'll like, too! + = link_to "Here's the details.", pardon_our_dust_path + #outfit-forms - localized_cache :action_suffix => 'outfit_forms_intro' do #pet-preview diff --git a/app/views/static/pardon_our_dust.html.haml b/app/views/static/pardon_our_dust.html.haml new file mode 100644 index 00000000..7852f71c --- /dev/null +++ b/app/views/static/pardon_our_dust.html.haml @@ -0,0 +1,93 @@ +- title 'Pardon our dust!' +- hide_title_header + += image_tag 'pardon-our-dust/header.png', class: 'header-image', + alt: 'Fyora directing a Yurble worker, as other faeries help rebuild Faerieland in the background' + +%h1#title Pardon our dust! + +%main + :markdown + Hi, friends! There's a few interesting things happening right now, sorry for + the mess! Here's what's up. + + ## Welcome to the new-old site! + + After working on our new-ish [Impress 2020][impress-2020] site the past + few years, we've decided it's not entirely the direction we want to go + after all. But also not entirely *not*? We love the HTML5 support, we love + how it looks on mobile, and we love some of the new trading features. But + in hindsight, we don't think the tech we used is a good choice for the + long-term, and we want to help Neopets customization stick around for + decades to come. + + **So, we're merging the best parts of Impress 2020 into the original site!** + We finally caught up on *many* years of technical upgrades, and cleaned up a + *lot* of ancient rubble, so the original site can be a strong foundation for + us again—and then we copied over Impress 2020's most important bits of UI, to + keep things bright and breezy! + + Here's what you should notice already: + + - **New outfit editor:** The outfit editor is entirely replaced with Impress + 2020's modern editor, with support for HTML5 wearables and for mobile! + - **Simplified login:** We used to have a weird second website for login and + account management. That's all merged into the main site now! + - **Improved item page:** We copied over Impress 2020's item previewer, so + you'll be able to see animated items, and get better support for special + colors like Maraquan and Baby! + + And behind the scenes, we've made this site's code a *lot* simpler and a + lot more up-to-date, and dependent on fewer external services, so it should + be a lot easier to maintain going forward. + + We're still missing some really important things because we're launching + sooner than expected (like outfit saving), but we hope to fill in those + gaps soon! + + ## Wait, why the sudden update? + + One of our service providers recently made a change that's been a long time + coming, but is unusually difficult to work around. In this case, it would + require us to upgrade a *lot* of components of our system that, frankly, + we're years behind on updating. + + But this new-old beta site? It's already running on the latest tech, and + depends on a lot fewer external services to begin with. So, as a team with + limited resources, it felt like a better idea to just skip forward to the + beta version that already works, than to split the original site into + *another* version of DTI and have *three* copies of the site we're + maintaining 😅 + + For the most part, I hope you mostly don't feel much of a difference, and + that most of the changes feel good? But I also know we're shipping it out + earlier than we planned and that's always a bit rough; and I know there are + things about the new outfit editor that still aren't ideal for everyone, + and I hope we can get those attended to once we have our stronger + foundation. + + ## And sorry about all this… + + Sorry for the delay on getting this fixed, there's been a lot of family + things to attend to lately, I hope everyone's been doing okay in the + meantime!! + + Earlier this year I put out a call for extra help, and I haven't really + made good on that either, and I'm sorry for that too… soon after, I + realized the help I asked for (continuing to invest in Impress 2020's + missing features) didn't actually feel like the right path forward for the + site long-term—and that the next step for us (unifying the sites) would + kinda be the *worst* time to bring in someone new 😬 + + It can be a challenging thing, to have a site going for more than ten years + and to not always be in a phase of life to give it the attention it + deserves… and to have the weight of your ten-years-younger self's decisions + to carry around with it 😅 My hope is that, by cleaning up this decade-long + complex sprawling thing, we can build a site that isn't quite so dependent + on the ebb and flow of my own personal life… I don't think we're there yet, + but I'll do my best to get us there! + + Sorry for the disruption, and I hope these new changes find you well, friends! + —*Matchu* + + [impress-2020]: https://impress-2020.openneo.net/ diff --git a/config/routes.rb b/config/routes.rb index b2bf3d2c..800f5105 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,6 +94,7 @@ OpenneoImpressItems::Application.routes.draw do get 'users/top_contributors' => redirect('/users/top-contributors') get 'image-mode' => 'static#image_mode', :as => :image_mode + get '/pardon-our-dust' => 'static#pardon_our_dust', :as => :pardon_our_dust get '/terms' => redirect("https://impress-2020.openneo.net/terms"), :as => :terms get '/sitemap.xml' => 'sitemap#index', :as => :sitemap, :format => :xml