Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
forsbergplustwo committed Sep 20, 2023
1 parent 6cf8ee6 commit 5ab1c72
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/controllers/imports/globes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def show
private

def globe_data
payments = @import.payments.pluck(:shop_country, :charge_type).last(80)
payments = @import.payments.pluck(:shop_country, :charge_type).last(72)
globe_data = []
payments.each do |c|
globe_data << {countryCode: c[0], reverse: c[1] == "refund"}
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/globe_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ARC_ALTITUDES = [0.5, 0.55, 0.55, 0.6, 0.6];
const ARC_DASH_LENGTHS = [1.5, 1.8, 1.9, 1.9, 2, 2.2];
const ARC_SPEEDS = [0.6, 0.65, 0.75, 0.95, 1];

const ARCS_AT_ONCE = 8;
const ARCS_AT_ONCE = 6;
const ARC_EMIT_DELAY = 300;

export default class extends Controller {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/libraries/globe/country-data.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Vector3 } from "three";
import { Vector3 } from "three"

var CountryData = (function () {

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"polaris-view-components": "^1.1.0"
},
"scripts": {
"build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets"
"build": "esbuild app/javascript/*.* --bundle --minify --outdir=app/assets/builds --public-path=/assets"
}
}
1 change: 1 addition & 0 deletions test/fixtures/users.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
regular:
email: regular@example.com
encrypted_password: <%= User.new.send(:password_digest, 'password') %>
import: Complete
import_status: 100
partner_api_access_token: "abcdefg"
Expand Down
3 changes: 2 additions & 1 deletion test/system/home_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ class HomeTest < ApplicationSystemTestCase
assert_selector ".Polaris-Button__Text", text: "Forgot password"

fill_in "Email", with: user.email
fill_in "Password", with: user.password
fill_in "Password", with: "password"

click_on "Log in"

assert_text "Signed in successfully."
assert current_path, metrics_path
end
end

0 comments on commit 5ab1c72

Please sign in to comment.