Small changes asked from customer

jleblond · Apr 3, 2021 · 291f65b · 291f65b
1 parent c75bba1
commit 291f65b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/app/assets/images/default_background.png b/app/assets/images/default_background.png
diff --git a/app/javascript/packs/mindmap/canvas.js b/app/javascript/packs/mindmap/canvas.js
@@ -60,9 +60,6 @@ export class Canvas{
 
     displayBubbles = (ctx) => {
         this.redrawBackground(ctx)
-        this.bubbles.forEach(function(bubble) {
-            bubble.display(ctx)
-        });
     }
 }
 

diff --git a/app/javascript/packs/mindmap/canvasDraw.js b/app/javascript/packs/mindmap/canvasDraw.js
@@ -12,6 +12,13 @@ export class CanvasDraw extends Canvas {
         this.loadData(ctx);
     }
 
+    displayBubbles = (ctx) => {
+        this.redrawBackground(ctx)
+        this.bubbles.forEach(function(bubble) {
+            bubble.display(ctx)
+        });
+    }
+
     createIdea(x, y){
         this.bubbles.push(new BubbleIdea(undefined, x, y,
             DEFAULT_WIDTH, DEFAULT_HEIGHT,

diff --git a/app/javascript/packs/mindmap/constants.js b/app/javascript/packs/mindmap/constants.js
@@ -1,6 +1,6 @@
 // Canvas
-export const DEFAULT_CANVAS_WIDTH = 1820;
-export const DEFAULT_CANVAS_HEIGHT = 1024;
+export const DEFAULT_CANVAS_WIDTH = 1244;
+export const DEFAULT_CANVAS_HEIGHT = 700;
 
 
 // Idea

diff --git a/app/javascript/packs/mindmap/idea.js b/app/javascript/packs/mindmap/idea.js
@@ -57,11 +57,6 @@ export class BubbleIdea{
 
     // Display the Idea
     drawLabel(ctx) {
-        ctx.clearRect(this.left, this.top, this.width/2, this.height/2);
-        ctx.fillStyle = this.background_color;
-        ctx.fillRect(this.left, this.top, this.width/2, this.height/2);
-
-
         ctx.font = "16px Georgia";
         ctx.fillStyle = this.text_color;
         ctx.fillText(this.name, this.left + this.width/8, this.top + this.height/4);

diff --git a/app/views/ideas/_form.html.erb b/app/views/ideas/_form.html.erb
@@ -11,12 +11,12 @@
         <%= f.label :url, "Link (URL)" %>
         <%= f.text_field :url, class:"form-control" %>
       </div>
-      <div class="form-group">
-        <%= f.label :background_color, "Background Color", class: "control-label" %>
-        <div style="width: 30%;">
-          <%= f.color_field :background_color, class:"form-control"%>
-        </div>
-      </div>
+<!--      <div class="form-group">-->
+        <%#= f.label :background_color, "Background Color", class: "control-label" %>
+<!--        <div style="width: 30%;">-->
+          <%#= f.color_field :background_color, class:"form-control"%>
+<!--        </div>-->
+<!--      </div>-->
       <div class="form-group">
         <%= f.label :text_color, "Text Color", class: "control-label" %>
         <div style="width: 30%;">