From 8100f1489bc969b98b48cd7083c502a774efe1fb Mon Sep 17 00:00:00 2001
From: sitarameez <sitarablossom@gmail.com>
Date: Fri, 13 Aug 2021 19:36:08 -0400
Subject: [PATCH 1/2] more labs like this pls

---
 .idea/.gitignore     |  8 ++++++++
 .idea/JSON-Lab-1.iml |  9 +++++++++
 .idea/misc.xml       |  6 ++++++
 .idea/modules.xml    |  8 ++++++++
 .idea/vcs.xml        |  6 ++++++
 js/colors.js         | 28 ++++++++++++++--------------
 6 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/JSON-Lab-1.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/JSON-Lab-1.iml b/.idea/JSON-Lab-1.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/JSON-Lab-1.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..639900d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a5b9dac
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/JSON-Lab-1.iml" filepath="$PROJECT_DIR$/.idea/JSON-Lab-1.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/js/colors.js b/js/colors.js
index 6e4f350..c950624 100644
--- a/js/colors.js
+++ b/js/colors.js
@@ -1,10 +1,10 @@
-var colorsArray : {
-    colors=[
+var colorsArray =[
+
         {
             "name":"green",
             "red":"64",
             "green":"175",
-            "blue":"63",
+            "blue":"63"
         },
         {
             "name":"yellow",
@@ -13,21 +13,21 @@ var colorsArray : {
             "blue":"62"
         },
         {
-            name:"red",
-            red:"192",
-            green:"46",
-            blue:"35"
-        }
+            "name":"red",
+            "red":"192",
+            "green":"46",
+            "blue":"35"
+        },
         {
             "name":"blue",
             "red":"19",
             "green":"71",
-            "blue":"144",
+            "blue":"144"
         },
         {
-            "name"="orange",
-            "red"="253",
-            "green"="92",
-            "blue"="48"
-        },
+            "name":"orange",
+            "red":"253",
+            "green":"92",
+            "blue":"48"
+        }
     ]

From 7418f5f7db275e2fdf8b10915c66ab378c0809ef Mon Sep 17 00:00:00 2001
From: sitarameez <sitarablossom@gmail.com>
Date: Tue, 17 Aug 2021 16:39:08 -0400
Subject: [PATCH 2/2] completed

---
 js/colors.js | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/js/colors.js b/js/colors.js
index c950624..7bd23ee 100644
--- a/js/colors.js
+++ b/js/colors.js
@@ -1,33 +1,34 @@
-var colorsArray =[
-
+var colorsArray = {
+    colors: [
         {
-            "name":"green",
-            "red":"64",
-            "green":"175",
-            "blue":"63"
+            "name": "green",
+            "red": "64",
+            "green": "175",
+            "blue": "63"
         },
         {
-            "name":"yellow",
-            "red":"239",
-            "green":"183",
-            "blue":"62"
+            "name": "yellow",
+            "red": "239",
+            "green": "183",
+            "blue": "62"
         },
         {
-            "name":"red",
-            "red":"192",
-            "green":"46",
-            "blue":"35"
+            "name": "red",
+            "red": "192",
+            "green": "46",
+            "blue": "35"
         },
         {
-            "name":"blue",
-            "red":"19",
-            "green":"71",
-            "blue":"144"
+            "name": "blue",
+            "red": "19",
+            "green": "71",
+            "blue": "144"
         },
         {
-            "name":"orange",
-            "red":"253",
-            "green":"92",
-            "blue":"48"
+            "name": "orange",
+            "red": "253",
+            "green": "92",
+            "blue": "48"
         }
     ]
+}
\ No newline at end of file