thulasi 6 년 전
부모
커밋
2ded52156d
9개의 변경된 파일243개의 추가작업 그리고 22개의 파일을 삭제
  1. 9
    0
      .idea/JSON-Lab-1.iml
  2. 7
    0
      .idea/misc.xml
  3. 8
    0
      .idea/modules.xml
  4. 6
    0
      .idea/vcs.xml
  5. 193
    0
      .idea/workspace.xml
  6. 1
    4
      css/style.css
  7. 1
    1
      index.html
  8. 14
    13
      js/colors.js
  9. 4
    4
      js/index.js

+ 9
- 0
.idea/JSON-Lab-1.iml 파일 보기

@@ -0,0 +1,9 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$" />
6
+    <orderEntry type="inheritedJdk" />
7
+    <orderEntry type="sourceFolder" forTests="false" />
8
+  </component>
9
+</module>

+ 7
- 0
.idea/misc.xml 파일 보기

@@ -0,0 +1,7 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="JavaScriptSettings">
4
+    <option name="languageLevel" value="ES6" />
5
+  </component>
6
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
7
+</project>

+ 8
- 0
.idea/modules.xml 파일 보기

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/JSON-Lab-1.iml" filepath="$PROJECT_DIR$/.idea/JSON-Lab-1.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml 파일 보기

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="" vcs="Git" />
5
+  </component>
6
+</project>

+ 193
- 0
.idea/workspace.xml 파일 보기

@@ -0,0 +1,193 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="a86ab34e-6e77-43d7-b42b-8318f8069cd9" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/.idea/JSON-Lab-1.iml" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/style.css" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/js/colors.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/colors.js" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/js/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/index.js" afterDir="false" />
13
+    </list>
14
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
15
+    <option name="SHOW_DIALOG" value="false" />
16
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
17
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
18
+    <option name="LAST_RESOLUTION" value="IGNORE" />
19
+  </component>
20
+  <component name="FUSProjectUsageTrigger">
21
+    <session id="-1017267300">
22
+      <usages-collector id="statistics.lifecycle.project">
23
+        <counts>
24
+          <entry key="project.closed" value="1" />
25
+          <entry key="project.open.time.1" value="1" />
26
+          <entry key="project.opened" value="1" />
27
+        </counts>
28
+      </usages-collector>
29
+    </session>
30
+  </component>
31
+  <component name="Git.Settings">
32
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
33
+  </component>
34
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
35
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
36
+  <component name="JsGulpfileManager">
37
+    <detection-done>true</detection-done>
38
+    <sorting>DEFINITION_ORDER</sorting>
39
+  </component>
40
+  <component name="ProjectFrameBounds">
41
+    <option name="y" value="23" />
42
+    <option name="width" value="1280" />
43
+    <option name="height" value="709" />
44
+  </component>
45
+  <component name="ProjectView">
46
+    <navigator proportions="" version="1">
47
+      <foldersAlwaysOnTop value="true" />
48
+    </navigator>
49
+    <panes>
50
+      <pane id="ProjectPane">
51
+        <subPane>
52
+          <expand>
53
+            <path>
54
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
55
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
56
+            </path>
57
+          </expand>
58
+          <select />
59
+        </subPane>
60
+      </pane>
61
+      <pane id="PackagesPane" />
62
+      <pane id="Scope" />
63
+    </panes>
64
+  </component>
65
+  <component name="PropertiesComponent">
66
+    <property name="WebServerToolWindowFactoryState" value="false" />
67
+    <property name="aspect.path.notification.shown" value="true" />
68
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
69
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
70
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
71
+    <property name="project.structure.last.edited" value="SDKs" />
72
+    <property name="project.structure.proportion" value="0.0" />
73
+    <property name="project.structure.side.proportion" value="0.2" />
74
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
75
+  </component>
76
+  <component name="RunDashboard">
77
+    <option name="ruleStates">
78
+      <list>
79
+        <RuleState>
80
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
81
+        </RuleState>
82
+        <RuleState>
83
+          <option name="name" value="StatusDashboardGroupingRule" />
84
+        </RuleState>
85
+      </list>
86
+    </option>
87
+  </component>
88
+  <component name="SvnConfiguration">
89
+    <configuration />
90
+  </component>
91
+  <component name="TaskManager">
92
+    <task active="true" id="Default" summary="Default task">
93
+      <changelist id="a86ab34e-6e77-43d7-b42b-8318f8069cd9" name="Default Changelist" comment="" />
94
+      <created>1543465178339</created>
95
+      <option name="number" value="Default" />
96
+      <option name="presentableId" value="Default" />
97
+      <updated>1543465178339</updated>
98
+      <workItem from="1543465180250" duration="211000" />
99
+    </task>
100
+    <servers />
101
+  </component>
102
+  <component name="TimeTrackingManager">
103
+    <option name="totallyTimeSpent" value="211000" />
104
+  </component>
105
+  <component name="ToolWindowManager">
106
+    <frame x="0" y="23" width="1280" height="709" extended-state="0" />
107
+    <layout>
108
+      <window_info id="Designer" order="0" />
109
+      <window_info id="UI Designer" order="1" />
110
+      <window_info id="Capture Tool" order="2" />
111
+      <window_info id="Favorites" order="3" side_tool="true" />
112
+      <window_info id="Image Layers" order="4" />
113
+      <window_info active="true" content_ui="combo" id="Project" order="5" sideWeight="0.49497488" visible="true" weight="0.19063005" />
114
+      <window_info id="Structure" order="6" sideWeight="0.50502515" side_tool="true" visible="true" weight="0.19063005" />
115
+      <window_info anchor="bottom" id="Version Control" order="0" />
116
+      <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.32996634" />
117
+      <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
118
+      <window_info anchor="bottom" id="Message" order="3" />
119
+      <window_info anchor="bottom" id="Find" order="4" />
120
+      <window_info anchor="bottom" id="Run" order="5" />
121
+      <window_info anchor="bottom" id="Database Changes" order="6" show_stripe_button="false" />
122
+      <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
123
+      <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
124
+      <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
125
+      <window_info anchor="bottom" id="TODO" order="10" />
126
+      <window_info anchor="right" id="Capture Analysis" order="0" />
127
+      <window_info anchor="right" id="Theme Preview" order="1" />
128
+      <window_info anchor="right" id="Palette&#9;" order="2" />
129
+      <window_info anchor="right" id="Database" order="3" />
130
+      <window_info anchor="right" id="Maven Projects" order="4" weight="0.3296875" />
131
+      <window_info anchor="right" id="Palette" order="5" />
132
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
133
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
134
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
135
+    </layout>
136
+  </component>
137
+  <component name="TypeScriptGeneratedFilesManager">
138
+    <option name="version" value="1" />
139
+  </component>
140
+  <component name="VcsContentAnnotationSettings">
141
+    <option name="myLimit" value="2678400000" />
142
+  </component>
143
+  <component name="masterDetails">
144
+    <states>
145
+      <state key="GlobalLibrariesConfigurable.UI">
146
+        <settings>
147
+          <splitter-proportions>
148
+            <option name="proportions">
149
+              <list>
150
+                <option value="0.2" />
151
+              </list>
152
+            </option>
153
+          </splitter-proportions>
154
+        </settings>
155
+      </state>
156
+      <state key="JdkListConfigurable.UI">
157
+        <settings>
158
+          <last-edited>1.8</last-edited>
159
+          <splitter-proportions>
160
+            <option name="proportions">
161
+              <list>
162
+                <option value="0.2" />
163
+              </list>
164
+            </option>
165
+          </splitter-proportions>
166
+        </settings>
167
+      </state>
168
+      <state key="ProjectJDKs.UI">
169
+        <settings>
170
+          <last-edited>1.8</last-edited>
171
+          <splitter-proportions>
172
+            <option name="proportions">
173
+              <list>
174
+                <option value="0.2" />
175
+              </list>
176
+            </option>
177
+          </splitter-proportions>
178
+        </settings>
179
+      </state>
180
+      <state key="ProjectLibrariesConfigurable.UI">
181
+        <settings>
182
+          <splitter-proportions>
183
+            <option name="proportions">
184
+              <list>
185
+                <option value="0.2" />
186
+              </list>
187
+            </option>
188
+          </splitter-proportions>
189
+        </settings>
190
+      </state>
191
+    </states>
192
+  </component>
193
+</project>

+ 1
- 4
css/style.css 파일 보기

@@ -47,7 +47,7 @@ a:hover, a:active {
47 47
 .main-header {
48 48
     width: 100%;
49 49
     height: 150px;
50
-    
50
+
51 51
     background-color: #144e64;}
52 52
 
53 53
 .main-header .title {
@@ -116,6 +116,3 @@ ol {list-style-type: lower-alpha; margin-left:15px}
116 116
 ol li {margin-bottom: 15px;}
117 117
 ul li {margin-left: 20px; margin-bottom: 0;}
118 118
 #result {border: 1px #aaa solid; height: 300px; width:100%; background:#eee; margin-bottom: 15px;}
119
-
120
-
121
-

+ 1
- 1
index.html 파일 보기

@@ -28,4 +28,4 @@
28 28
     <script type="text/javascript" src="js/colors.js"></script>
29 29
     <script type="text/javascript" src="js/index.js"></script>
30 30
 </body>
31
-</html>
31
+</html>

+ 14
- 13
js/colors.js 파일 보기

@@ -1,5 +1,5 @@
1
-var colorsArray : {
2
-    colors=[
1
+colorsArray = {
2
+    colors : [
3 3
         {
4 4
             "name":"green",
5 5
             "red":"64",
@@ -13,21 +13,22 @@ var colorsArray : {
13 13
             "blue":"62"
14 14
         },
15 15
         {
16
-            name:"red",
17
-            red:"192",
18
-            green:"46",
19
-            blue:"35"
20
-        }
16
+            "name":"red",
17
+            "red":"192",
18
+            "green":"46",
19
+            "blue":"35"
20
+        },
21 21
         {
22 22
             "name":"blue",
23 23
             "red":"19",
24 24
             "green":"71",
25
-            "blue":"144",
25
+            "blue":"144"
26 26
         },
27 27
         {
28
-            "name"="orange",
29
-            "red"="253",
30
-            "green"="92",
31
-            "blue"="48"
32
-        },
28
+            "name":"orange",
29
+            "red":"253",
30
+            "green":"92",
31
+            "blue":"48"
32
+        }
33 33
     ]
34
+  }

+ 4
- 4
js/index.js 파일 보기

@@ -2,7 +2,7 @@
2 2
 var randomInt = function (min, max) {
3 3
   return Math.floor(Math.random() * (max - min + 1)) + min;
4 4
 }
5
-
5
+var randomColor;
6 6
 window.onload = function()
7 7
 {
8 8
 	// lets git the HTML canvas element so we draw on it
@@ -44,7 +44,7 @@ window.onload = function()
44 44
 		this.g = colorsArray.colors[this.randomColor].green;
45 45
 		this.b = colorsArray.colors[this.randomColor].blue;
46 46
 
47
-		console.log(colorsArray);
47
+		//console.log(colorsArray);
48 48
 
49 49
 
50 50
 		this.rgba = "rgba("+this.r+","+this.g+","+this.b+",1)";
@@ -112,7 +112,7 @@ window.onload = function()
112 112
 	{
113 113
 		//Background
114 114
 		ctx.globalCompositeOperation = "source-over";
115
-		ctx.fillStyle = 'rgba(32,38,57,0.5)';
115
+		ctx.fillStyle = 'rgba(32,38,57,1)';
116 116
 		ctx.fillRect(0,0,W,H);
117 117
 
118 118
 		ctx.globalCompositeOperation = "lighter";
@@ -136,4 +136,4 @@ window.onload = function()
136 136
 	//set interval so we can draw then update our drawing
137 137
 	// every 30 milisecond
138 138
 	setInterval(draw,30);
139
-}
139
+}