From 4c86468e50142026ca72fd0ea87535fe931f3701 Mon Sep 17 00:00:00 2001
From: Jake Dexheimer <jakedex@gmail.com>
Date: Sun, 25 Feb 2018 10:25:29 -0600
Subject: [PATCH] Rename ResolutionSelect

---
 ...esolutionSelect.js => ExportSizeSelect.js} | 30 +++++++++----------
 components/Settings.js                        |  8 ++---
 lib/constants.js                              | 12 ++++----
 lib/routing.js                                |  2 +-
 pages/editor.js                               | 16 +++++-----
 5 files changed, 34 insertions(+), 34 deletions(-)
 rename components/{ResolutionSelect.js => ExportSizeSelect.js} (69%)

diff --git a/components/ResolutionSelect.js b/components/ExportSizeSelect.js
similarity index 69%
rename from components/ResolutionSelect.js
rename to components/ExportSizeSelect.js
index af754d3..e881fd3 100644
--- a/components/ResolutionSelect.js
+++ b/components/ExportSizeSelect.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { COLORS } from '../lib/constants'
 import Checkmark from './svg/Checkmark'
-import { RESOLUTIONS } from '../lib/constants'
+import { EXPORT_SIZES } from '../lib/constants'
 
 export default class extends React.Component {
   constructor(props) {
@@ -11,9 +11,9 @@ export default class extends React.Component {
     this.toggle = this.toggle.bind(this)
   }
 
-  select(resolution) {
-    if (this.props.selected !== resolution) {
-      this.props.onChange(resolution)
+  select(exportSize) {
+    if (this.props.selected !== exportSize) {
+      this.props.onChange(exportSize)
     }
   }
 
@@ -21,12 +21,12 @@ export default class extends React.Component {
     this.setState({ isVisible: !this.state.isVisible })
   }
 
-  renderResolutions() {
-    return RESOLUTIONS.map((resolution, i) => {
+  renderExportSizes() {
+    return EXPORT_SIZES.map((exportSize, i) => {
       return (
-        <div className="list-item" key={i} onClick={this.select.bind(null, resolution.id)}>
-          <span style={{ Resolution: resolution.id }}>{resolution.name}</span>
-          {this.props.selected === resolution.id ? <Checkmark /> : null}
+        <div className="list-item" key={i} onClick={this.select.bind(null, exportSize.id)}>
+          <span style={{ ExportSize: exportSize.id }}>{exportSize.name}</span>
+          {this.props.selected === exportSize.id ? <Checkmark /> : null}
           <style jsx>{`
             .list-item {
               display: flex;
@@ -51,18 +51,18 @@ export default class extends React.Component {
   }
 
   render() {
-    const selectedResolution =
-      RESOLUTIONS.filter(resolution => resolution.id === this.props.selected)[0] || {}
+    const selectedExportSize =
+      EXPORT_SIZES.filter(exportSize => exportSize.id === this.props.selected)[0] || {}
     return (
-      <div className="resolution-select-container">
+      <div className="export-size-select-container">
         <div
           onClick={this.toggle}
           className={`display ${this.state.isVisible ? 'is-visible' : ''}`}
         >
-          <span className="label">Resolution</span>
-          <span style={{ resolution: selectedResolution.id }}>{selectedResolution.name}</span>
+          <span className="label">Export Size</span>
+          <span style={{ exportSize: selectedExportSize.id }}>{selectedExportSize.name}</span>
         </div>
-        <div className="list">{this.renderResolutions()}</div>
+        <div className="list">{this.renderExportSizes()}</div>
         <style jsx>{`
           .display {
             display: flex;
diff --git a/components/Settings.js b/components/Settings.js
index d6775c0..edebcaf 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -3,7 +3,7 @@ import enhanceWithClickOutside from 'react-click-outside'
 import SettingsIcon from './svg/Settings'
 import ThemeSelect from './ThemeSelect'
 import FontSelect from './FontSelect'
-import ResolutionSelect from './ResolutionSelect'
+import ExportSizeSelect from './ExportSizeSelect'
 import Slider from './Slider'
 import Toggle from './Toggle'
 import WindowPointer from './WindowPointer'
@@ -100,9 +100,9 @@ class Settings extends React.Component {
               enabled={this.props.enabled.squaredImage}
               onChange={this.props.onChange.bind(null, 'squaredImage')}
             />
-            <ResolutionSelect
-              selected={this.props.enabled.resolution || '2x'}
-              onChange={this.props.onChange.bind(null, 'resolution')}
+            <ExportSizeSelect
+              selected={this.props.enabled.exportSize || '2x'}
+              onChange={this.props.onChange.bind(null, 'exportSize')}
             />
             <Toggle
               label="Reset settings"
diff --git a/lib/constants.js b/lib/constants.js
index a2f4154..4386b86 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -386,13 +386,13 @@ export const LANGUAGES = [
   }
 ]
 
-export const RESOLUTIONS = [
-  { id: '4x', name: '4x', value: '4' },
+export const EXPORT_SIZES = [
+  { id: '1x', name: '1x', value: '1' },
   { id: '2x', name: '2x', value: '2' },
-  { id: '1x', name: '1x', value: '1' }
+  { id: '4x', name: '4x', value: '4' }
 ]
 
-export const RESOLUTIONS_HASH = toHash(RESOLUTIONS)
+export const EXPORT_SIZES_HASH = toHash(EXPORT_SIZES)
 
 export const LANGUAGE_MIME_HASH = toHash(LANGUAGES, 'mime')
 export const LANGUAGE_MODE_HASH = toHash(LANGUAGES, 'mode')
@@ -401,7 +401,7 @@ export const LANGUAGE_NAME_HASH = toHash(LANGUAGES, 'short')
 export const DEFAULT_LANGUAGE = 'auto'
 export const DEFAULT_THEME = THEMES_HASH.seti
 export const DEFAULT_BG_COLOR = 'rgba(171, 184, 195, 1)'
-export const DEFAULT_RESOLUTION = RESOLUTIONS_HASH['2x']
+export const DEFAULT_EXPORT_SIZE = EXPORT_SIZES_HASH['2x']
 
 export const COLORS = {
   BLACK: '#121212',
@@ -458,5 +458,5 @@ export const DEFAULT_SETTINGS = {
   windowControls: true,
   widthAdjustment: true,
   lineNumbers: false,
-  resolution: '2x'
+  exportSize: '2x'
 }
diff --git a/lib/routing.js b/lib/routing.js
index 9c6f385..d04390e 100644
--- a/lib/routing.js
+++ b/lib/routing.js
@@ -34,7 +34,7 @@ const mappings = [
   { field: 'fs:fontSize' },
   { field: 'si:squaredImage', type: 'bool' },
   { field: 'code:code' },
-  { field: 'rs:resolution' }
+  { field: 'es:exportSize' }
 ]
 
 const reverseMappings = mappings.map(mapping =>
diff --git a/pages/editor.js b/pages/editor.js
index ea5d68d..f1fb5b1 100644
--- a/pages/editor.js
+++ b/pages/editor.js
@@ -24,10 +24,10 @@ import {
   LANGUAGE_NAME_HASH,
   DEFAULT_LANGUAGE,
   DEFAULT_THEME,
-  DEFAULT_RESOLUTION,
+  DEFAULT_EXPORT_SIZE,
   COLORS,
-  RESOLUTIONS,
-  RESOLUTIONS_HASH,
+  EXPORT_SIZES,
+  EXPORT_SIZES_HASH,
   DEFAULT_CODE,
   DEFAULT_BG_COLOR,
   DEFAULT_SETTINGS
@@ -102,18 +102,18 @@ class Editor extends React.Component {
   getCarbonImage() {
     const node = document.getElementById('export-container')
 
-    const resolutionRatio = (RESOLUTIONS_HASH[this.state.resolution] || DEFAULT_RESOLUTION).value
+    const exportSize = (EXPORT_SIZES_HASH[this.state.exportSize] || DEFAULT_EXPORT_SIZE).value
     const config = {
       style: {
-        transform: `scale(${resolutionRatio})`,
+        transform: `scale(${exportSize})`,
         'transform-origin': 'center',
         background: this.state.squaredImage ? this.state.backgroundColor : 'none'
       },
       filter: n => (n.className ? String(n.className).indexOf('eliminateOnRender') < 0 : true),
-      width: node.offsetWidth * resolutionRatio,
+      width: node.offsetWidth * exportSize,
       height: this.state.squaredImage
-        ? node.offsetWidth * resolutionRatio
-        : node.offsetHeight * resolutionRatio
+        ? node.offsetWidth * exportSize
+        : node.offsetHeight * exportSize
     }
 
     return domtoimage.toPng(node, config)