From 2475467dd058516699689d226292b0de3b0ee47e Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Wed, 12 Sep 2018 10:30:29 +0530
Subject: [PATCH 01/18] Fixes #677
---
client/modules/IDE/components/Console.jsx | 12 ++++++++++--
client/modules/IDE/components/Preferences.jsx | 2 ++
client/modules/IDE/pages/IDEView.jsx | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 4f394f13..bc2e0d5d 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -23,6 +23,11 @@ class Console extends React.Component {
this.props.clearConsole();
this.props.dispatchConsoleEvent(this.props.consoleEvents);
}
+
+ if(this.props.consoleFontSize !== prevProps.consoleFontSize){
+ this.props.clearConsole();
+ this.props.dispatchConsoleEvent(this.props.consoleEvents);
+ }
}
getConsoleFeedStyle(theme, times) {
@@ -31,13 +36,16 @@ class Console extends React.Component {
LOG_WARN_ICON: `url(${warnLightUrl})`,
LOG_ERROR_ICON: `url(${errorLightUrl})`,
LOG_DEBUG_ICON: `url(${debugLightUrl})`,
- LOG_INFO_ICON: `url(${infoLightUrl})`
+ LOG_INFO_ICON: `url(${infoLightUrl})`,
+ BASE_FONT_SIZE: `${this.props.consoleFontSize}`
};
const CONSOLE_FEED_DARK_ICONS = {
LOG_WARN_ICON: `url(${warnDarkUrl})`,
LOG_ERROR_ICON: `url(${errorDarkUrl})`,
LOG_DEBUG_ICON: `url(${debugDarkUrl})`,
- LOG_INFO_ICON: `url(${infoDarkUrl})`
+ LOG_INFO_ICON: `url(${infoDarkUrl})`,
+ BASE_FONT_SIZE: `${this.props.consoleFontSize}`
+
};
if (times > 1) {
Object.assign(style, CONSOLE_FEED_WITHOUT_ICONS);
diff --git a/client/modules/IDE/components/Preferences.jsx b/client/modules/IDE/components/Preferences.jsx
index 2f7b2b0b..130d2745 100644
--- a/client/modules/IDE/components/Preferences.jsx
+++ b/client/modules/IDE/components/Preferences.jsx
@@ -131,6 +131,7 @@ class Preferences extends React.Component {
Indentation amount
From 28e7425fb8a197372c8c3748ba519e3b0f0d0a41 Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Thu, 13 Sep 2018 07:42:50 +0530
Subject: [PATCH 06/18] small error fix
---
client/modules/IDE/components/Console.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index b93bcf95..755f3a31 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -135,7 +135,7 @@ Console.propTypes = {
clearConsole: PropTypes.func.isRequired,
dispatchConsoleEvent: PropTypes.func.isRequired,
theme: PropTypes.string.isRequired,
- consoleFontSize: PropTypes.number.isRequired
+ fontSize: PropTypes.number.isRequired
};
Console.defaultProps = {
From b8f43dec78e0cca6d61cd064c4b7ecc91a00dea9 Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Thu, 13 Sep 2018 21:20:07 +0530
Subject: [PATCH 07/18] variable added
---
client/modules/IDE/components/Console.jsx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 755f3a31..420f8619 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -37,25 +37,27 @@ class Console extends React.Component {
LOG_ERROR_ICON: `url(${errorLightUrl})`,
LOG_DEBUG_ICON: `url(${debugLightUrl})`,
LOG_INFO_ICON: `url(${infoLightUrl})`,
- BASE_FONT_SIZE: `${this.props.fontSize}`
};
const CONSOLE_FEED_DARK_ICONS = {
LOG_WARN_ICON: `url(${warnDarkUrl})`,
LOG_ERROR_ICON: `url(${errorDarkUrl})`,
LOG_DEBUG_ICON: `url(${debugDarkUrl})`,
LOG_INFO_ICON: `url(${infoDarkUrl})`,
+ };
+ const CONSOLE_FEED_FONT = {
BASE_FONT_SIZE: `${this.props.fontSize}`
};
+
if (times > 1) {
Object.assign(style, CONSOLE_FEED_WITHOUT_ICONS);
}
switch (theme) {
case 'light':
- return Object.assign(CONSOLE_FEED_LIGHT_STYLES, CONSOLE_FEED_LIGHT_ICONS, style);
+ return Object.assign(CONSOLE_FEED_LIGHT_STYLES, CONSOLE_FEED_LIGHT_ICONS, CONSOLE_FEED_FONT, style);
case 'dark':
- return Object.assign(CONSOLE_FEED_DARK_STYLES, CONSOLE_FEED_DARK_ICONS, style);
+ return Object.assign(CONSOLE_FEED_DARK_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_FONT, style);
case 'contrast':
- return Object.assign(CONSOLE_FEED_CONTRAST_STYLES, CONSOLE_FEED_DARK_ICONS, style);
+ return Object.assign(CONSOLE_FEED_CONTRAST_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_FONT, style);
default:
return '';
}
From d3be437dce28a92898b6ea0959f0dfbc75b052fc Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Thu, 13 Sep 2018 23:44:58 +0530
Subject: [PATCH 08/18] size related changes
---
client/modules/IDE/components/Console.jsx | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 420f8619..2ddc3d63 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -36,16 +36,21 @@ class Console extends React.Component {
LOG_WARN_ICON: `url(${warnLightUrl})`,
LOG_ERROR_ICON: `url(${errorLightUrl})`,
LOG_DEBUG_ICON: `url(${debugLightUrl})`,
- LOG_INFO_ICON: `url(${infoLightUrl})`,
+ LOG_INFO_ICON: `url(${infoLightUrl})`
};
const CONSOLE_FEED_DARK_ICONS = {
LOG_WARN_ICON: `url(${warnDarkUrl})`,
LOG_ERROR_ICON: `url(${errorDarkUrl})`,
LOG_DEBUG_ICON: `url(${debugDarkUrl})`,
- LOG_INFO_ICON: `url(${infoDarkUrl})`,
+ LOG_INFO_ICON: `url(${infoDarkUrl})`
};
- const CONSOLE_FEED_FONT = {
- BASE_FONT_SIZE: `${this.props.fontSize}`
+ const CONSOLE_FEED_SIZES = {
+ BASE_FONT_SIZE: this.props.fontSize,
+ TREENODE_LINE_HEIGHT: 1.5,
+ ARROW_FONT_SIZE: this.props.fontSize,
+ // this line can't change icon size
+ LOG_ICON_WIDTH: this.props.fontSize,
+ LOG_ICON_HEIGHT: this.props.fontSize
};
if (times > 1) {
@@ -53,11 +58,11 @@ class Console extends React.Component {
}
switch (theme) {
case 'light':
- return Object.assign(CONSOLE_FEED_LIGHT_STYLES, CONSOLE_FEED_LIGHT_ICONS, CONSOLE_FEED_FONT, style);
+ return Object.assign(CONSOLE_FEED_LIGHT_STYLES, CONSOLE_FEED_LIGHT_ICONS, CONSOLE_FEED_SIZES, style);
case 'dark':
- return Object.assign(CONSOLE_FEED_DARK_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_FONT, style);
+ return Object.assign(CONSOLE_FEED_DARK_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_SIZES, style);
case 'contrast':
- return Object.assign(CONSOLE_FEED_CONTRAST_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_FONT, style);
+ return Object.assign(CONSOLE_FEED_CONTRAST_STYLES, CONSOLE_FEED_DARK_ICONS, CONSOLE_FEED_SIZES, style);
default:
return '';
}
From 80d77a6860e64d2319054969dfaaf647281b6dda Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Fri, 14 Sep 2018 13:41:38 +0530
Subject: [PATCH 09/18] scalable svg icons
---
client/images/console-debug-dark.svg | 55 ++++++++++++++++++++++-
client/images/console-debug-light.svg | 55 ++++++++++++++++++++++-
client/images/console-error-dark.svg | 55 ++++++++++++++++++++++-
client/images/console-error-light.svg | 55 ++++++++++++++++++++++-
client/images/console-info-dark.svg | 55 ++++++++++++++++++++++-
client/images/console-info-light.svg | 55 ++++++++++++++++++++++-
client/images/console-warn-dark.svg | 55 ++++++++++++++++++++++-
client/images/console-warn-light.svg | 55 ++++++++++++++++++++++-
client/modules/IDE/components/Console.jsx | 5 +--
9 files changed, 434 insertions(+), 11 deletions(-)
diff --git a/client/images/console-debug-dark.svg b/client/images/console-debug-dark.svg
index 58aebc9d..aa962842 100644
--- a/client/images/console-debug-dark.svg
+++ b/client/images/console-debug-dark.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-debug-light.svg b/client/images/console-debug-light.svg
index 65a0b0a8..8bdc7ae3 100644
--- a/client/images/console-debug-light.svg
+++ b/client/images/console-debug-light.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-error-dark.svg b/client/images/console-error-dark.svg
index 56caaebc..4b27283f 100644
--- a/client/images/console-error-dark.svg
+++ b/client/images/console-error-dark.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-error-light.svg b/client/images/console-error-light.svg
index 7ddff356..88bb91c0 100644
--- a/client/images/console-error-light.svg
+++ b/client/images/console-error-light.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-info-dark.svg b/client/images/console-info-dark.svg
index 37e75260..c116d093 100644
--- a/client/images/console-info-dark.svg
+++ b/client/images/console-info-dark.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-info-light.svg b/client/images/console-info-light.svg
index f239a82f..24b74263 100644
--- a/client/images/console-info-light.svg
+++ b/client/images/console-info-light.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-warn-dark.svg b/client/images/console-warn-dark.svg
index bcfcb475..60c51a17 100644
--- a/client/images/console-warn-dark.svg
+++ b/client/images/console-warn-dark.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/images/console-warn-light.svg b/client/images/console-warn-light.svg
index 83a70db4..6e76d14a 100644
--- a/client/images/console-warn-light.svg
+++ b/client/images/console-warn-light.svg
@@ -1 +1,54 @@
-
\ No newline at end of file
+
+
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 2ddc3d63..d74c745d 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -48,9 +48,8 @@ class Console extends React.Component {
BASE_FONT_SIZE: this.props.fontSize,
TREENODE_LINE_HEIGHT: 1.5,
ARROW_FONT_SIZE: this.props.fontSize,
- // this line can't change icon size
- LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: this.props.fontSize
+ LOG_ICON_WIDTH: `${this.props.fontSize}px`,
+ LOG_ICON_HEIGHT: `${this.props.fontSize}px`,
};
if (times > 1) {
From 7777e25990ee2844cd04ca63bde340c8a519d73b Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Fri, 14 Sep 2018 22:14:41 +0530
Subject: [PATCH 10/18] minor changes
---
client/modules/IDE/components/Console.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index d74c745d..54d234b2 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -45,11 +45,11 @@ class Console extends React.Component {
LOG_INFO_ICON: `url(${infoDarkUrl})`
};
const CONSOLE_FEED_SIZES = {
- BASE_FONT_SIZE: this.props.fontSize,
TREENODE_LINE_HEIGHT: 1.5,
+ BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
- LOG_ICON_WIDTH: `${this.props.fontSize}px`,
- LOG_ICON_HEIGHT: `${this.props.fontSize}px`,
+ LOG_ICON_WIDTH: this.props.fontSize,
+ LOG_ICON_HEIGHT: this.props.fontSize,
};
if (times > 1) {
From 14d01ae01c1cd47d0f84bfaad8bb2a24776684fb Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Sat, 15 Sep 2018 23:33:42 +0530
Subject: [PATCH 11/18] misaligned height and logged number size fix
---
client/modules/IDE/components/Console.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 54d234b2..a3dd61a5 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -49,7 +49,7 @@ class Console extends React.Component {
BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: this.props.fontSize,
+ LOG_ICON_HEIGHT: 1.8*this.props.fontSize,
};
if (times > 1) {
@@ -115,7 +115,7 @@ class Console extends React.Component {
return (
{ times > 1 &&
-
{times}
+
{times}
}
Date: Sat, 15 Sep 2018 23:39:48 +0530
Subject: [PATCH 12/18] misaligned height and logged number size fix
---
client/modules/IDE/components/Console.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index a3dd61a5..f6dee27e 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -49,7 +49,7 @@ class Console extends React.Component {
BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: 1.8*this.props.fontSize,
+ LOG_ICON_HEIGHT: 1.8 * this.props.fontSize,
};
if (times > 1) {
@@ -115,7 +115,7 @@ class Console extends React.Component {
return (
{ times > 1 &&
-
{times}
+
{times}
}
Date: Sun, 16 Sep 2018 12:03:45 +0530
Subject: [PATCH 13/18] css update
---
client/styles/components/_console.scss | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/styles/components/_console.scss b/client/styles/components/_console.scss
index abd8a4f0..7715a24f 100644
--- a/client/styles/components/_console.scss
+++ b/client/styles/components/_console.scss
@@ -88,11 +88,11 @@
}
.preview-console__logged-times {
- font-size: #{10 / $base-font-size}rem;
+
font-weight: bold;
margin: #{2 / $base-font-size}rem 0 0 #{8 / $base-font-size}rem;
- border-radius: 10px;
- padding: #{1 / $base-font-size}rem #{4 / $base-font-size}rem;
+ border-radius: #{$base-font-size*10}px;
+ padding: #{4 / $base-font-size}rem #{4 / $base-font-size}rem;
z-index: 100;
left: 0;
position: absolute;
@@ -117,4 +117,4 @@
background-color: getThemifyVariable('console-error-background-color');
}
}
-}
\ No newline at end of file
+}
From 5a8d8142287ddccaa1ab3c25cc727706e753ec12 Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Sun, 16 Sep 2018 14:15:40 +0530
Subject: [PATCH 14/18] css update
---
client/modules/IDE/components/Console.jsx | 4 ++--
client/styles/components/_console.scss | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index f6dee27e..7002f3ca 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -49,7 +49,7 @@ class Console extends React.Component {
BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: 1.8 * this.props.fontSize,
+ LOG_ICON_HEIGHT: 1.3 * this.props.fontSize,
};
if (times > 1) {
@@ -115,7 +115,7 @@ class Console extends React.Component {
return (
{ times > 1 &&
-
{times}
+
{times}
}
Date: Sun, 16 Sep 2018 14:24:48 +0530
Subject: [PATCH 15/18] perfectly aligned
---
client/modules/IDE/components/Console.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 7002f3ca..40c0e47a 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -45,11 +45,11 @@ class Console extends React.Component {
LOG_INFO_ICON: `url(${infoDarkUrl})`
};
const CONSOLE_FEED_SIZES = {
- TREENODE_LINE_HEIGHT: 1.5,
+ TREENODE_LINE_HEIGHT: 1.25,
BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: 1.3 * this.props.fontSize,
+ LOG_ICON_HEIGHT: 1.4 * this.props.fontSize,
};
if (times > 1) {
From de9749b892dcd3e9aebefc9af6ec2df575697268 Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Sun, 16 Sep 2018 14:27:05 +0530
Subject: [PATCH 16/18] lint fixes
---
client/modules/IDE/components/Console.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 40c0e47a..4501f9e9 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -115,7 +115,7 @@ class Console extends React.Component {
return (
{ times > 1 &&
-
{times}
+
{times}
}
Date: Mon, 17 Sep 2018 20:44:00 +0530
Subject: [PATCH 17/18] css change
---
client/styles/components/_console.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/styles/components/_console.scss b/client/styles/components/_console.scss
index e2ed9424..53048614 100644
--- a/client/styles/components/_console.scss
+++ b/client/styles/components/_console.scss
@@ -91,7 +91,7 @@
font-weight: bold;
margin: #{2 / $base-font-size}rem 0 0 #{8 / $base-font-size}rem;
- padding: #{4 / $base-font-size}rem #{4 / $base-font-size}rem;
+ padding: #{1 / $base-font-size}rem #{4 / $base-font-size}rem;
z-index: 100;
left: 0;
position: absolute;
From 9f6ce5fa8d71ba41ddae779c552bc0ffba8ebd83 Mon Sep 17 00:00:00 2001
From: Meru Patel <2017180@iiitdmj.ac.in>
Date: Sun, 23 Sep 2018 12:26:39 +0530
Subject: [PATCH 18/18] alignment fix
---
client/modules/IDE/components/Console.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/modules/IDE/components/Console.jsx b/client/modules/IDE/components/Console.jsx
index 4501f9e9..997878ea 100644
--- a/client/modules/IDE/components/Console.jsx
+++ b/client/modules/IDE/components/Console.jsx
@@ -45,11 +45,11 @@ class Console extends React.Component {
LOG_INFO_ICON: `url(${infoDarkUrl})`
};
const CONSOLE_FEED_SIZES = {
- TREENODE_LINE_HEIGHT: 1.25,
+ TREENODE_LINE_HEIGHT: 1.2,
BASE_FONT_SIZE: this.props.fontSize,
ARROW_FONT_SIZE: this.props.fontSize,
LOG_ICON_WIDTH: this.props.fontSize,
- LOG_ICON_HEIGHT: 1.4 * this.props.fontSize,
+ LOG_ICON_HEIGHT: 1.45 * this.props.fontSize,
};
if (times > 1) {