forked from OpenNeo/impress
Update most URLs to use HTTPS
I noticed we didn't have the little lock icon in the browser, and yeah huh there's a lot of `http://` still floating around! Let's fix that!
This commit is contained in:
parent
29dd353895
commit
22e3f4240a
34 changed files with 77 additions and 73 deletions
2
Gemfile
2
Gemfile
|
@ -1,4 +1,4 @@
|
||||||
source 'http://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
ruby '3.1.4'
|
ruby '3.1.4'
|
||||||
|
|
||||||
gem 'rails', '~> 7.1', '>= 7.1.1'
|
gem 'rails', '~> 7.1', '>= 7.1.1'
|
||||||
|
|
|
@ -5,7 +5,7 @@ GIT
|
||||||
RocketAMF (1.0.0)
|
RocketAMF (1.0.0)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (7.1.1)
|
actioncable (7.1.1)
|
||||||
actionpack (= 7.1.1)
|
actionpack (= 7.1.1)
|
||||||
|
|
|
@ -344,7 +344,7 @@ var Neopia = (function ($, I18n) {
|
||||||
}
|
}
|
||||||
var itemName = this.props.item.name;
|
var itemName = this.props.item.name;
|
||||||
var imageSrc =
|
var imageSrc =
|
||||||
"http://pets.neopets.com/cpn/" +
|
"https://pets.neopets.com/cpn/" +
|
||||||
petName +
|
petName +
|
||||||
"/1/1.png?" +
|
"/1/1.png?" +
|
||||||
this.appearanceQuery();
|
this.appearanceQuery();
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
function loadNotable() {
|
function loadNotable() {
|
||||||
// TODO: add HTTPS to notables
|
// TODO: add HTTPS to notables
|
||||||
// $.getJSON('http://notables.openneo.net/api/1/days/ago/1?callback=?', function (response) {
|
// $.getJSON('https://notables.openneo.net/api/1/days/ago/1?callback=?', function (response) {
|
||||||
// var notables = response.notables;
|
// var notables = response.notables;
|
||||||
// var i = Math.floor(Math.random() * notables.length);
|
// var i = Math.floor(Math.random() * notables.length);
|
||||||
// Preview.Job.fallback = new Preview.Job.Name(notables[i].petName);
|
// Preview.Job.fallback = new Preview.Job.Name(notables[i].petName);
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
// lol lazy code for prank image :P
|
// lol lazy code for prank image :P
|
||||||
// TODO: HTTPS?
|
// TODO: HTTPS?
|
||||||
return (
|
return (
|
||||||
"http://swfimages.impress.openneo.net" +
|
"https://swfimages.impress.openneo.net" +
|
||||||
"/biology/000/000/0-2/" +
|
"/biology/000/000/0-2/" +
|
||||||
key.substr(2) +
|
key.substr(2) +
|
||||||
"/300x300.png"
|
"/300x300.png"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
function petImage(id, size) {
|
function petImage(id, size) {
|
||||||
return 'http://pets.neopets.com/' + id + '/1/' + size + '.png';
|
return 'https://pets.neopets.com/' + id + '/1/' + size + '.png';
|
||||||
}
|
}
|
||||||
|
|
||||||
var PetQuery = {},
|
var PetQuery = {},
|
||||||
|
|
|
@ -63,7 +63,7 @@ var DEBUG = (document.location.search.substr(0, 6) == '?debug');
|
||||||
}
|
}
|
||||||
|
|
||||||
function petThumbnailUrl(pet_name) {
|
function petThumbnailUrl(pet_name) {
|
||||||
return 'http://pets.neopets.com/cpn/' + pet_name + '/1/1.png';
|
return 'https://pets.neopets.com/cpn/' + pet_name + '/1/1.png';
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Items */
|
/* Items */
|
||||||
|
|
|
@ -191,7 +191,7 @@ body.campaigns-show, body.campaigns-current
|
||||||
width: $outfit-inner-width
|
width: $outfit-inner-width
|
||||||
|
|
||||||
&.banner
|
&.banner
|
||||||
background-image: url(http://images.neopets.com/themes/004_bir_a2e60/footer_bg.png)
|
background-image: url(https://images.neopets.com/themes/004_bir_a2e60/footer_bg.png)
|
||||||
background-position: 0 -60px
|
background-position: 0 -60px
|
||||||
border: 2px solid #006
|
border: 2px solid #006
|
||||||
color: white
|
color: white
|
||||||
|
|
|
@ -92,13 +92,13 @@ module ApplicationHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
JAVASCRIPT_LIBRARIES = {
|
JAVASCRIPT_LIBRARIES = {
|
||||||
:addthis => '//s7.addthis.com/js/250/addthis_widget.js#username=openneo',
|
:addthis => 'https://s7.addthis.com/js/250/addthis_widget.js#username=openneo',
|
||||||
:bitly => '//bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8',
|
:bitly => 'https://bit.ly/javascript-api.js?version=latest&login=openneo&apiKey=R_4d0438829b7a99860de1d3edf55d8dc8',
|
||||||
:html5 => '//html5shim.googlecode.com/svn/trunk/html5.js',
|
:html5 => 'https://html5shim.googlecode.com/svn/trunk/html5.js',
|
||||||
:jquery => '//ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
|
:jquery => 'https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
|
||||||
:jquery20 => '//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js',
|
:jquery20 => 'https://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js',
|
||||||
:jquery_tmpl => '//ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js',
|
:jquery_tmpl => 'https://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js',
|
||||||
:swfobject => '//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js'
|
:swfobject => 'https://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js'
|
||||||
}
|
}
|
||||||
|
|
||||||
def include_javascript_libraries(*library_names)
|
def include_javascript_libraries(*library_names)
|
||||||
|
|
|
@ -13,11 +13,11 @@ module ClosetHangersHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def send_neomail_url(neopets_username)
|
def send_neomail_url(neopets_username)
|
||||||
"http://www.neopets.com/neomessages.phtml?type=send&recipient=#{CGI.escape neopets_username}"
|
"https://www.neopets.com/neomessages.phtml?type=send&recipient=#{CGI.escape neopets_username}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def neopets_lookup_url(neopets_username)
|
def neopets_lookup_url(neopets_username)
|
||||||
"http://www.neopets.com/userlookup.phtml?user=#{CGI.escape neopets_username}"
|
"https://www.neopets.com/userlookup.phtml?user=#{CGI.escape neopets_username}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def hangers_group_visibility_field_name(owned)
|
def hangers_group_visibility_field_name(owned)
|
||||||
|
@ -75,7 +75,7 @@ module ClosetHangersHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def nc_icon_url
|
def nc_icon_url
|
||||||
"http://#{request.host}#{image_path 'nc.png'}"
|
"https://#{request.host}#{image_path 'nc.png'}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def petpage_closet_list_checked(closet_list, owned)
|
def petpage_closet_list_checked(closet_list, owned)
|
||||||
|
|
|
@ -4,7 +4,7 @@ module ClosetPagesHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def neopets_login_url
|
def neopets_login_url
|
||||||
"http://www.neopets.com/loginpage.phtml"
|
"https://www.neopets.com/loginpage.phtml"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ module ContributionHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
PET_TYPE_IMAGE_FORMAT = 'http://pets.neopets.com/cp/%s/1/3.png'
|
PET_TYPE_IMAGE_FORMAT = 'https://pets.neopets.com/cp/%s/1/3.png'
|
||||||
def contributed_pet_type(main_key, pet_type, show_image)
|
def contributed_pet_type(main_key, pet_type, show_image)
|
||||||
span = content_tag(:span, pet_type.human_name, :class => 'contributed-name')
|
span = content_tag(:span, pet_type.human_name, :class => 'contributed-name')
|
||||||
description = translate('contributions.contributed_description.parents.pet_type_html',
|
description = translate('contributions.contributed_description.parents.pet_type_html',
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
module DonationsHelper
|
module DonationsHelper
|
||||||
THANK_YOU_GREETINGS = [
|
THANK_YOU_GREETINGS = [
|
||||||
'http://images.neopets.com/new_greetings/1368.gif',
|
'https://images.neopets.com/new_greetings/1368.gif',
|
||||||
'http://images.neopets.com/new_greetings/466.gif',
|
'https://images.neopets.com/new_greetings/466.gif',
|
||||||
'http://images.neopets.com/new_greetings/48.gif',
|
'https://images.neopets.com/new_greetings/48.gif',
|
||||||
'http://images.neopets.com/new_greetings/49.gif',
|
'https://images.neopets.com/new_greetings/49.gif',
|
||||||
'http://images.neopets.com/new_greetings/64.gif',
|
'https://images.neopets.com/new_greetings/64.gif',
|
||||||
'http://images.neopets.com/new_greetings/65.gif',
|
'https://images.neopets.com/new_greetings/65.gif',
|
||||||
'http://images.neopets.com/new_greetings/66.gif',
|
'https://images.neopets.com/new_greetings/66.gif',
|
||||||
'http://images.neopets.com/new_greetings/67.gif',
|
'https://images.neopets.com/new_greetings/67.gif',
|
||||||
'http://images.neopets.com/new_greetings/69.gif',
|
'https://images.neopets.com/new_greetings/69.gif',
|
||||||
'http://images.neopets.com/new_greetings/71.gif',
|
'https://images.neopets.com/new_greetings/71.gif',
|
||||||
'http://images.neopets.com/new_greetings/72.gif',
|
'https://images.neopets.com/new_greetings/72.gif',
|
||||||
'http://images.neopets.com/new_greetings/103.gif',
|
'https://images.neopets.com/new_greetings/103.gif',
|
||||||
'http://images.neopets.com/new_greetings/420.gif'
|
'https://images.neopets.com/new_greetings/420.gif'
|
||||||
]
|
]
|
||||||
|
|
||||||
def thank_you_greeting_url
|
def thank_you_greeting_url
|
||||||
|
|
|
@ -2,7 +2,7 @@ module ItemsHelper
|
||||||
JNItemsURLFormat = 'https://items.jellyneo.net/search/?name=%s&name_type=3'
|
JNItemsURLFormat = 'https://items.jellyneo.net/search/?name=%s&name_type=3'
|
||||||
|
|
||||||
module PetTypeImage
|
module PetTypeImage
|
||||||
Format = 'http://pets.neopets.com/cp/%s/%i/%i.png'
|
Format = 'https://pets.neopets.com/cp/%s/%i/%i.png'
|
||||||
|
|
||||||
Emotions = {
|
Emotions = {
|
||||||
:happy => 1,
|
:happy => 1,
|
||||||
|
@ -85,19 +85,19 @@ module ItemsHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def shop_wizard_url_for(item)
|
def shop_wizard_url_for(item)
|
||||||
"http://www.neopets.com/market.phtml?type=wizard&string=#{CGI::escape item.name}"
|
"https://www.neopets.com/market.phtml?type=wizard&string=#{CGI::escape item.name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def super_shop_wizard_url_for(item)
|
def super_shop_wizard_url_for(item)
|
||||||
"http://www.neopets.com/portal/supershopwiz.phtml?string=#{CGI::escape item.name}"
|
"https://www.neopets.com/portal/supershopwiz.phtml?string=#{CGI::escape item.name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def trading_post_url_for(item)
|
def trading_post_url_for(item)
|
||||||
"http://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=#{CGI::escape item.name}"
|
"https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=#{CGI::escape item.name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def auction_genie_url_for(item)
|
def auction_genie_url_for(item)
|
||||||
"http://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=#{CGI::escape item.name}"
|
"https://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=#{CGI::escape item.name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def trading_closet_hangers_header(owned, count)
|
def trading_closet_hangers_header(owned, count)
|
||||||
|
|
|
@ -159,7 +159,7 @@ function ItemPageBadges({ item, isEmbedded }) {
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{item?.ncTradeValueText && (
|
{item?.ncTradeValueText && (
|
||||||
<LinkBadge href="http://www.neopets.com/~owls">
|
<LinkBadge href="https://www.neopets.com/~owls">
|
||||||
OWLS: {item?.ncTradeValueText}
|
OWLS: {item?.ncTradeValueText}
|
||||||
</LinkBadge>
|
</LinkBadge>
|
||||||
)}
|
)}
|
||||||
|
@ -169,7 +169,7 @@ function ItemPageBadges({ item, isEmbedded }) {
|
||||||
{!item?.isNc && !item?.isPb && (
|
{!item?.isNc && !item?.isPb && (
|
||||||
<LinkBadge
|
<LinkBadge
|
||||||
href={
|
href={
|
||||||
"http://www.neopets.com/shops/wizard.phtml?string=" +
|
"https://www.neopets.com/shops/wizard.phtml?string=" +
|
||||||
encodeURIComponent(item?.name)
|
encodeURIComponent(item?.name)
|
||||||
}
|
}
|
||||||
isEmbedded={isEmbedded}
|
isEmbedded={isEmbedded}
|
||||||
|
@ -182,7 +182,7 @@ function ItemPageBadges({ item, isEmbedded }) {
|
||||||
{!item?.isNc && !item?.isPb && (
|
{!item?.isNc && !item?.isPb && (
|
||||||
<LinkBadge
|
<LinkBadge
|
||||||
href={
|
href={
|
||||||
"http://www.neopets.com/portal/supershopwiz.phtml?string=" +
|
"https://www.neopets.com/portal/supershopwiz.phtml?string=" +
|
||||||
encodeURIComponent(item?.name)
|
encodeURIComponent(item?.name)
|
||||||
}
|
}
|
||||||
isEmbedded={isEmbedded}
|
isEmbedded={isEmbedded}
|
||||||
|
@ -195,7 +195,7 @@ function ItemPageBadges({ item, isEmbedded }) {
|
||||||
{!item?.isNc && !item?.isPb && (
|
{!item?.isNc && !item?.isPb && (
|
||||||
<LinkBadge
|
<LinkBadge
|
||||||
href={
|
href={
|
||||||
"http://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=" +
|
"https://www.neopets.com/island/tradingpost.phtml?type=browse&criteria=item_exact&search_string=" +
|
||||||
encodeURIComponent(item?.name)
|
encodeURIComponent(item?.name)
|
||||||
}
|
}
|
||||||
isEmbedded={isEmbedded}
|
isEmbedded={isEmbedded}
|
||||||
|
@ -208,7 +208,7 @@ function ItemPageBadges({ item, isEmbedded }) {
|
||||||
{!item?.isNc && !item?.isPb && (
|
{!item?.isNc && !item?.isPb && (
|
||||||
<LinkBadge
|
<LinkBadge
|
||||||
href={
|
href={
|
||||||
"http://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=" +
|
"https://www.neopets.com/genie.phtml?type=process_genie&criteria=exact&auctiongenie=" +
|
||||||
encodeURIComponent(item?.name)
|
encodeURIComponent(item?.name)
|
||||||
}
|
}
|
||||||
isEmbedded={isEmbedded}
|
isEmbedded={isEmbedded}
|
||||||
|
|
|
@ -622,7 +622,7 @@ const SWF_URL_PATTERN =
|
||||||
/^https?:\/\/images\.neopets\.com\/cp\/(bio|items)\/swf\/(.+?)_([a-z0-9]+)\.swf$/;
|
/^https?:\/\/images\.neopets\.com\/cp\/(bio|items)\/swf\/(.+?)_([a-z0-9]+)\.swf$/;
|
||||||
|
|
||||||
function convertSwfUrlToPossibleManifestUrls(swfUrl) {
|
function convertSwfUrlToPossibleManifestUrls(swfUrl) {
|
||||||
const match = new URL(swfUrl, "http://images.neopets.com")
|
const match = new URL(swfUrl, "https://images.neopets.com")
|
||||||
.toString()
|
.toString()
|
||||||
.match(SWF_URL_PATTERN);
|
.match(SWF_URL_PATTERN);
|
||||||
if (!match) {
|
if (!match) {
|
||||||
|
@ -636,8 +636,8 @@ function convertSwfUrlToPossibleManifestUrls(swfUrl) {
|
||||||
// TODO: There are a few potential manifest URLs in play! Long-term, we
|
// TODO: There are a few potential manifest URLs in play! Long-term, we
|
||||||
// should get this from modeling data. But these are some good guesses!
|
// should get this from modeling data. But these are some good guesses!
|
||||||
return [
|
return [
|
||||||
`http://images.neopets.com/cp/${type}/data/${folders}/manifest.json`,
|
`https://images.neopets.com/cp/${type}/data/${folders}/manifest.json`,
|
||||||
`http://images.neopets.com/cp/${type}/data/${folders}_${hash}/manifest.json`,
|
`https://images.neopets.com/cp/${type}/data/${folders}_${hash}/manifest.json`,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -493,7 +493,7 @@ function getHasAnimationsForMovieAsset({ library, libraryUrl }) {
|
||||||
// Some movie clips require you to tick to the first frame of the movie
|
// Some movie clips require you to tick to the first frame of the movie
|
||||||
// before the children mount onto the stage. If we detect animations
|
// before the children mount onto the stage. If we detect animations
|
||||||
// without doing this, we'll incorrectly say no, because we see no children!
|
// without doing this, we'll incorrectly say no, because we see no children!
|
||||||
// Example: http://images.neopets.com/cp/items/data/000/000/235/235877_6d273e217c/235877.js
|
// Example: https://images.neopets.com/cp/items/data/000/000/235/235877_6d273e217c/235877.js
|
||||||
movieClip.advance();
|
movieClip.advance();
|
||||||
|
|
||||||
const movieClipHasAnimations = hasAnimations(movieClip);
|
const movieClipHasAnimations = hasAnimations(movieClip);
|
||||||
|
|
|
@ -205,7 +205,7 @@ class NeopetsPage
|
||||||
TYPES = {
|
TYPES = {
|
||||||
'closet' => Type.new(
|
'closet' => Type.new(
|
||||||
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.closet') },
|
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.closet') },
|
||||||
get_url: lambda { |index| "http://www.neopets.com/closet.phtml?per_page=50&page=#{index}" },
|
get_url: lambda { |index| "https://www.neopets.com/closet.phtml?per_page=50&page=#{index}" },
|
||||||
parser: Parser.new(
|
parser: Parser.new(
|
||||||
selectors: {
|
selectors: {
|
||||||
items: "form[action=\"process_closet.phtml\"] tr[bgcolor!=silver][bgcolor!=\"#E4E4E4\"]",
|
items: "form[action=\"process_closet.phtml\"] tr[bgcolor!=silver][bgcolor!=\"#E4E4E4\"]",
|
||||||
|
@ -220,7 +220,7 @@ class NeopetsPage
|
||||||
),
|
),
|
||||||
'safety_deposit' => Type.new(
|
'safety_deposit' => Type.new(
|
||||||
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.safety_deposit') },
|
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.safety_deposit') },
|
||||||
get_url: lambda { |index| "http://www.neopets.com/safetydeposit.phtml?offset=#{(index - 1) * 30}" },
|
get_url: lambda { |index| "https://www.neopets.com/safetydeposit.phtml?offset=#{(index - 1) * 30}" },
|
||||||
parser: Parser.new(
|
parser: Parser.new(
|
||||||
selectors: {
|
selectors: {
|
||||||
items: "#content tr[bgcolor=\"#DFEAF7\"]",
|
items: "#content tr[bgcolor=\"#DFEAF7\"]",
|
||||||
|
@ -242,7 +242,7 @@ class NeopetsPage
|
||||||
),
|
),
|
||||||
'gallery' => Type.new(
|
'gallery' => Type.new(
|
||||||
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.gallery') },
|
get_name: lambda { I18n.translate('neopets_page_import_tasks.names.gallery') },
|
||||||
get_url: lambda { |index| "http://www.neopets.com/gallery/index.phtml?view=all" },
|
get_url: lambda { |index| "https://www.neopets.com/gallery/index.phtml?view=all" },
|
||||||
parser: Parser.new(
|
parser: Parser.new(
|
||||||
selectors: {
|
selectors: {
|
||||||
items: "form[name=gallery_form] td[valign=top]",
|
items: "form[name=gallery_form] td[valign=top]",
|
||||||
|
|
|
@ -5,7 +5,7 @@ class NeopetsUser
|
||||||
include ActiveModel::Conversion
|
include ActiveModel::Conversion
|
||||||
extend ActiveModel::Naming
|
extend ActiveModel::Naming
|
||||||
|
|
||||||
NEOPETS_URL_ORIGIN = ENV['NEOPETS_URL_ORIGIN'] || 'http://www.neopets.com'
|
NEOPETS_URL_ORIGIN = ENV['NEOPETS_URL_ORIGIN'] || 'https://www.neopets.com'
|
||||||
GATEWAY_URL = NEOPETS_URL_ORIGIN + '/amfphp/gateway.php'
|
GATEWAY_URL = NEOPETS_URL_ORIGIN + '/amfphp/gateway.php'
|
||||||
GET_PETS_METHOD = RocketAMF::RemoteGateway.new(GATEWAY_URL).
|
GET_PETS_METHOD = RocketAMF::RemoteGateway.new(GATEWAY_URL).
|
||||||
service('MobileService').action('getPets')
|
service('MobileService').action('getPets')
|
||||||
|
|
|
@ -145,7 +145,7 @@ class PetState < ApplicationRecord
|
||||||
|
|
||||||
def artist_url
|
def artist_url
|
||||||
if artist_neopets_username
|
if artist_neopets_username
|
||||||
"http://www.neopets.com/userlookup.phtml?user=#{artist_neopets_username}"
|
"https://www.neopets.com/userlookup.phtml?user=#{artist_neopets_username}"
|
||||||
else
|
else
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class PetType < ApplicationRecord
|
class PetType < ApplicationRecord
|
||||||
IMAGE_CPN_FORMAT = 'http://pets.neopets.com/cpn/%s/1/1.png';
|
IMAGE_CPN_FORMAT = 'https://pets.neopets.com/cpn/%s/1/1.png';
|
||||||
IMAGE_CP_LOCATION_REGEX = %r{^/cp/(.+?)/[0-9]+/[0-9]+\.png$};
|
IMAGE_CP_LOCATION_REGEX = %r{^/cp/(.+?)/[0-9]+/[0-9]+\.png$};
|
||||||
IMAGE_CPN_ACCEPTABLE_NAME = /^[a-z0-9_]+$/
|
IMAGE_CPN_ACCEPTABLE_NAME = /^[a-z0-9_]+$/
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,7 @@
|
||||||
-# TODO: remove me?
|
-# TODO: remove me?
|
||||||
|
|
||||||
- content_for :stylesheets do
|
- content_for :stylesheets do
|
||||||
= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/themes/south-street/jquery-ui.css'
|
= stylesheet_link_tag 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.9.0/themes/south-street/jquery-ui.css'
|
||||||
|
|
||||||
- content_for :javascripts do
|
- content_for :javascripts do
|
||||||
= include_javascript_libraries :jquery, :jquery_tmpl
|
= include_javascript_libraries :jquery, :jquery_tmpl
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#intro
|
#intro
|
||||||
%p= t '.description'
|
%p= t '.description'
|
||||||
%p= twl '.instructions',
|
%p= twl '.instructions',
|
||||||
:edit_petpage_link_url => 'http://www.neopets.com/edithomepage.phtml'
|
:edit_petpage_link_url => 'https://www.neopets.com/edithomepage.phtml'
|
||||||
|
|
||||||
= form_tag petpage_user_closet_hangers_path(@user), :method => :get, :id => 'petpage-closet-lists' do
|
= form_tag petpage_user_closet_hangers_path(@user), :method => :get, :id => 'petpage-closet-lists' do
|
||||||
= hidden_field_tag 'filter', '1'
|
= hidden_field_tag 'filter', '1'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- title "Needed items for #{@pet_type.human_name}"
|
- title "Needed items for #{@pet_type.human_name}"
|
||||||
%h2
|
%h2
|
||||||
= image_tag "http://pets.neopets.com/cpn/#{@pet_name}/1/1.png",
|
= image_tag "https://pets.neopets.com/cpn/#{@pet_name}/1/1.png",
|
||||||
:class => 'inline-image'
|
:class => 'inline-image'
|
||||||
%span.pet-name= @pet_name
|
%span.pet-name= @pet_name
|
||||||
can model…
|
can model…
|
||||||
|
@ -11,6 +11,6 @@
|
||||||
= hidden_field_tag 'name', @pet_name
|
= hidden_field_tag 'name', @pet_name
|
||||||
= submit_tag "I'm wearing one now!", :class => 'loud'
|
= submit_tag "I'm wearing one now!", :class => 'loud'
|
||||||
%li
|
%li
|
||||||
= link_to 'What do I own?', 'http://www.neopets.com/closet.phtml',
|
= link_to 'What do I own?', 'https://www.neopets.com/closet.phtml',
|
||||||
:class => 'button', :target => '_blank'
|
:class => 'button', :target => '_blank'
|
||||||
= render @items
|
= render @items
|
||||||
|
|
|
@ -60,8 +60,8 @@
|
||||||
%noscript= submit_tag 'Go'
|
%noscript= submit_tag 'Go'
|
||||||
|
|
||||||
%ul
|
%ul
|
||||||
%li= link_to t('organization_name'), 'http://openneo.net/'
|
%li= link_to t('organization_name'), 'https://openneo.net/'
|
||||||
%li= link_to t('.footer.blog'), 'http://blog.openneo.net/'
|
%li= link_to t('.footer.blog'), 'https://blog.openneo.net/'
|
||||||
%li= link_to t('.footer.source_code'), 'https://github.com/openneo/impress'
|
%li= link_to t('.footer.source_code'), 'https://github.com/openneo/impress'
|
||||||
%li= link_to t('.footer.terms'), terms_path
|
%li= link_to t('.footer.terms'), terms_path
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
- content_for :before_flashes do
|
- content_for :before_flashes do
|
||||||
%h1
|
%h1
|
||||||
= link_to items_path do
|
= link_to items_path do
|
||||||
= image_tag 'http://images.neopets.com/items/mall_floatingneggfaerie.gif'
|
= image_tag 'https://images.neopets.com/items/mall_floatingneggfaerie.gif'
|
||||||
%span= t 'infinite_closet'
|
%span= t 'infinite_closet'
|
||||||
- content_for :content do
|
- content_for :content do
|
||||||
= form_tag items_path, :method => :get do
|
= form_tag items_path, :method => :get do
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
%li
|
%li
|
||||||
= link_to bulk_pets_path do
|
= link_to bulk_pets_path do
|
||||||
= image_tag 'http://images.neopets.com/items/mall_ac_garland_spotlight.gif'
|
= image_tag 'https://images.neopets.com/items/mall_ac_garland_spotlight.gif'
|
||||||
%h3= link_to t('modeling_hub'), bulk_pets_path
|
%h3= link_to t('modeling_hub'), bulk_pets_path
|
||||||
%div
|
%div
|
||||||
%h4= t '.modeling_hub.tagline'
|
%h4= t '.modeling_hub.tagline'
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
|
|
||||||
%script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'}
|
%script#bulk-pets-submission-template{:type => 'text/x-jquery/tmpl'}
|
||||||
%li.waiting
|
%li.waiting
|
||||||
%img{:src => 'http://pets.neopets.com/cpn/${pet_name}/1/1.png'}
|
%img{:src => 'https://pets.neopets.com/cpn/${pet_name}/1/1.png'}
|
||||||
%span.name ${pet_name}
|
%span.name ${pet_name}
|
||||||
%span.waiting-message= t '.bulk_pets.waiting'
|
%span.waiting-message= t '.bulk_pets.waiting'
|
||||||
%span.loading-message= t '.bulk_pets.loading'
|
%span.loading-message= t '.bulk_pets.loading'
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
!!! XML
|
!!! XML
|
||||||
%urlset{:xmlns => "http://www.sitemaps.org/schemas/sitemap/0.9"}
|
%urlset{:xmlns => "https://www.sitemaps.org/schemas/sitemap/0.9"}
|
||||||
- for item in @items
|
- for item in @items
|
||||||
%url
|
%url
|
||||||
%loc http://#{request.host_with_port}#{url_for(item)}
|
%loc https://#{request.host_with_port}#{url_for(item)}
|
||||||
%changefreq monthly
|
%changefreq monthly
|
||||||
%priority 0.5
|
%priority 0.5
|
||||||
|
|
||||||
|
|
|
@ -49,11 +49,11 @@
|
||||||
Downloading currently only works for modern browsers that support the new
|
Downloading currently only works for modern browsers that support the new
|
||||||
canvas feature. It is, however, supported in the latest versions of,
|
canvas feature. It is, however, supported in the latest versions of,
|
||||||
|
|
||||||
* [Google Chrome](http://www.google.com/chrome)
|
* [Google Chrome](https://www.google.com/chrome)
|
||||||
* [Mozilla Firefox](http://www.firefox.com/)
|
* [Mozilla Firefox](https://www.firefox.com/)
|
||||||
* [Opera](http://www.opera.com/)
|
* [Opera](https://www.opera.com/)
|
||||||
* [Safari](http://www.apple.com/safari/)
|
* [Safari](https://www.apple.com/safari/)
|
||||||
* [Internet Explorer](http://www.microsoft.com/ie)
|
* [Internet Explorer](https://www.microsoft.com/ie)
|
||||||
|
|
||||||
However, Internet Explorer currently is having trouble running Dress to
|
However, Internet Explorer currently is having trouble running Dress to
|
||||||
Impress in general, so is not recommended.
|
Impress in general, so is not recommended.
|
||||||
|
|
|
@ -26,6 +26,9 @@ Rails.application.configure do
|
||||||
# Compress CSS using a preprocessor.
|
# Compress CSS using a preprocessor.
|
||||||
# config.assets.css_compressor = :sass
|
# config.assets.css_compressor = :sass
|
||||||
|
|
||||||
|
# Compress JS using a preprocessor.
|
||||||
|
config.assets.js_compressor = :terser
|
||||||
|
|
||||||
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
# Do not fallback to assets pipeline if a precompiled asset is missed.
|
||||||
config.assets.compile = false
|
config.assets.compile = false
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
source 'http://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
gem 'puma', '~> 6.3'
|
gem 'puma', '~> 6.3'
|
|
@ -1,11 +1,12 @@
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
nio4r (2.5.9)
|
nio4r (2.5.9)
|
||||||
puma (6.3.0)
|
puma (6.3.0)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
|
x86_64-darwin-21
|
||||||
x86_64-linux
|
x86_64-linux
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
|
|
@ -50,7 +50,7 @@ namespace :pet_types do
|
||||||
desc "Download the Rainbow Pool data for the given locale"
|
desc "Download the Rainbow Pool data for the given locale"
|
||||||
task :download_basic_image_hashes => :environment do
|
task :download_basic_image_hashes => :environment do
|
||||||
Species.find_each do |species|
|
Species.find_each do |species|
|
||||||
pool_url = "http://www.neopets.com/pool/all_pb.phtml"
|
pool_url = "https://www.neopets.com/pool/all_pb.phtml"
|
||||||
pool_options = {
|
pool_options = {
|
||||||
:cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])},
|
:cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])},
|
||||||
:params => {:lang => 'en', :f_species_id => species.id}
|
:params => {:lang => 'en', :f_species_id => species.id}
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace :translate do
|
||||||
desc "Download the Rainbow Pool data for the given locale"
|
desc "Download the Rainbow Pool data for the given locale"
|
||||||
task :pet_attributes => :environment do
|
task :pet_attributes => :environment do
|
||||||
with_given_locale do |neopets_language_code|
|
with_given_locale do |neopets_language_code|
|
||||||
pool_url = "http://www.neopets.com/pool/all_pb.phtml"
|
pool_url = "https://www.neopets.com/pool/all_pb.phtml"
|
||||||
pool_options = {
|
pool_options = {
|
||||||
:cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])},
|
:cookies => {:neologin => URI.encode(ENV['NEOLOGIN'])},
|
||||||
:params => {:lang => neopets_language_code}
|
:params => {:lang => neopets_language_code}
|
||||||
|
|
Loading…
Reference in a new issue