From 599dfe2ed3d63df6fd445b5f59ff089d39524bc6 Mon Sep 17 00:00:00 2001 From: llaske Date: Sat, 1 Dec 2018 16:47:38 +0100 Subject: [PATCH 1/3] Use buddy background and foreground color for list and template screen --- src/containers/Builders/Template.js | 11 +++++++---- src/containers/ExerciseList.js | 5 +++-- src/css/ExerciseList.css | 1 - src/css/NewExerciseTemplate.css | 1 - 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/containers/Builders/Template.js b/src/containers/Builders/Template.js index 32ecb18e..5dde7c26 100644 --- a/src/containers/Builders/Template.js +++ b/src/containers/Builders/Template.js @@ -30,10 +30,11 @@ class Template extends Component { reorderSelected = () => { this.props.history.push('/new/reorder') }; - +; render() { + let styles = { "background-color": this.props.current_user.colorvalue.stroke }; return ( -
+
@@ -92,8 +93,10 @@ class Template extends Component { } function mapStateToProps(state) { - return {}; + return { + current_user: state.current_user + }; } -export default withRouter(connect(mapStateToProps)(Template)); \ No newline at end of file +export default withRouter(connect(mapStateToProps)(Template)); diff --git a/src/containers/ExerciseList.js b/src/containers/ExerciseList.js index 2f6ec822..1f695a72 100644 --- a/src/containers/ExerciseList.js +++ b/src/containers/ExerciseList.js @@ -110,6 +110,7 @@ class ExerciseList extends Component { stroke = current_user.colorvalue.stroke; fill = current_user.colorvalue.fill; } + let styles = {"background-color": fill}; let userIcon=""; @@ -153,7 +154,7 @@ class ExerciseList extends Component { } return ( -
+
{userIcon} {userAdmin}
@@ -182,4 +183,4 @@ function MapStateToProps(state) { export default withRouter( connect(MapStateToProps, {removeExercises, editExercise, addSharedExercise, removeSharedExercise} - )(ExerciseList)); \ No newline at end of file + )(ExerciseList)); diff --git a/src/css/ExerciseList.css b/src/css/ExerciseList.css index 80beff78..a90d31bd 100644 --- a/src/css/ExerciseList.css +++ b/src/css/ExerciseList.css @@ -70,5 +70,4 @@ .home-container{ height: auto; min-height: 100%; - background-color: lightblue; } diff --git a/src/css/NewExerciseTemplate.css b/src/css/NewExerciseTemplate.css index 9f74f9d2..8e92cbb5 100644 --- a/src/css/NewExerciseTemplate.css +++ b/src/css/NewExerciseTemplate.css @@ -60,7 +60,6 @@ .template-container{ height: 100%; padding-top: 5%; - background-color: lightyellow; } .card-body{ From e815754b1c123fc1c179f91bd53f25f8e47997ff Mon Sep 17 00:00:00 2001 From: llaske Date: Wed, 30 Jan 2019 16:50:34 +0100 Subject: [PATCH 2/3] Fix outdated sugar-web env.js file - don't include standalone mode --- lib/sugar-web/activity/activity.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/sugar-web/activity/activity.js b/lib/sugar-web/activity/activity.js index 3466a30d..b1a99db9 100644 --- a/lib/sugar-web/activity/activity.js +++ b/lib/sugar-web/activity/activity.js @@ -14,7 +14,7 @@ define(["../../webL10n", var presenceCallback = null; var presenceResponse = null; - + var activity = {}; activity.setup = function () { @@ -25,7 +25,7 @@ define(["../../webL10n", function sendPauseEvent() { var pauseEvent = document.createEvent("CustomEvent"); pauseEvent.initCustomEvent('activityPause', false, false, { - 'cancelable': true + 'cancelable': true }); window.dispatchEvent(pauseEvent); } @@ -38,7 +38,7 @@ define(["../../webL10n", function sendStopEvent() { var stopEvent = document.createEvent("CustomEvent"); stopEvent.initCustomEvent('activityStop', false, false, { - 'cancelable': true + 'cancelable': true }); var result = window.dispatchEvent(stopEvent); if (result) { @@ -87,7 +87,7 @@ define(["../../webL10n", presence.joinSharedActivity(environment.sharedId, function() { var group_color = presence.getSharedInfo().colorvalue; icon.colorize(activityButton, group_color); - datastoreObject.setMetadata({"buddy_color":group_color}); + datastoreObject.setMetadata({"buddy_color":group_color}); datastoreObject.save(function() {}); }); } @@ -103,6 +103,9 @@ define(["../../webL10n", activityPalette.setTitleDescription(metadata); }); }); + if (environment.standAlone) { + document.getElementById("stop-button").style.visibility = "hidden"; + }; }); }; @@ -119,7 +122,7 @@ define(["../../webL10n", } return presence; }; - + activity.getXOColor = function (callback) { function onResponseReceived(error, result) { if (error === null) { From 5bbe952a2337843d534e4796ec1e223555a73ac2 Mon Sep 17 00:00:00 2001 From: imdhruvgupta Date: Sun, 17 Feb 2019 16:08:13 +0530 Subject: [PATCH 3/3] Added symlink to lib directory --- src/containers/Sugarizer.js | 6 +++--- src/lib | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 src/lib diff --git a/src/containers/Sugarizer.js b/src/containers/Sugarizer.js index 7659c174..1d819f92 100644 --- a/src/containers/Sugarizer.js +++ b/src/containers/Sugarizer.js @@ -13,9 +13,9 @@ import locale_es from 'react-intl/locale-data/es'; import default_activities from "../default_activities"; // Sugarizer Dependencies -import activity from 'lib/sugar-web/activity/activity' -import env from 'lib/sugar-web/env' -import presencepalette from 'lib/sugar-web/graphics/presencepalette' +import activity from '../lib/sugar-web/activity/activity' +import env from '../lib/sugar-web/env' +import presencepalette from '../lib/sugar-web/graphics/presencepalette' //Components import Main from "./Router"; diff --git a/src/lib b/src/lib new file mode 120000 index 00000000..dc598c56 --- /dev/null +++ b/src/lib @@ -0,0 +1 @@ +../lib \ No newline at end of file