瀏覽代碼

completed lab

mpierse 7 年之前
父節點
當前提交
e2cc063fde
共有 6 個檔案被更改,包括 299 行新增12 行删除
  1. 9
    0
      .idea/JSON-Lab-1.iml
  2. 6
    0
      .idea/misc.xml
  3. 8
    0
      .idea/modules.xml
  4. 6
    0
      .idea/vcs.xml
  5. 257
    0
      .idea/workspace.xml
  6. 13
    12
      js/colors.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>

+ 6
- 0
.idea/misc.xml 查看文件

@@ -0,0 +1,6 @@
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
+</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>

+ 257
- 0
.idea/workspace.xml 查看文件

@@ -0,0 +1,257 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="d1b1e59d-1250-47ba-9137-caa479de2283" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/js/colors.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/colors.js" afterDir="false" />
7
+    </list>
8
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9
+    <option name="SHOW_DIALOG" value="false" />
10
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
11
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
12
+    <option name="LAST_RESOLUTION" value="IGNORE" />
13
+  </component>
14
+  <component name="FUSProjectUsageTrigger">
15
+    <session id="-492280157">
16
+      <usages-collector id="statistics.lifecycle.project">
17
+        <counts>
18
+          <entry key="project.open.time.2" value="1" />
19
+          <entry key="project.opened" value="1" />
20
+        </counts>
21
+      </usages-collector>
22
+      <usages-collector id="statistics.file.extensions.open">
23
+        <counts>
24
+          <entry key="css" value="1" />
25
+          <entry key="gitignore" value="1" />
26
+          <entry key="html" value="1" />
27
+          <entry key="jpg" value="1" />
28
+          <entry key="js" value="2" />
29
+          <entry key="md" value="1" />
30
+          <entry key="png" value="1" />
31
+        </counts>
32
+      </usages-collector>
33
+      <usages-collector id="statistics.file.types.open">
34
+        <counts>
35
+          <entry key="CSS" value="1" />
36
+          <entry key="HTML" value="1" />
37
+          <entry key="Image" value="2" />
38
+          <entry key="JavaScript" value="2" />
39
+          <entry key="Markdown" value="1" />
40
+          <entry key="PLAIN_TEXT" value="1" />
41
+        </counts>
42
+      </usages-collector>
43
+      <usages-collector id="statistics.file.extensions.edit">
44
+        <counts>
45
+          <entry key="js" value="28" />
46
+        </counts>
47
+      </usages-collector>
48
+      <usages-collector id="statistics.file.types.edit">
49
+        <counts>
50
+          <entry key="JavaScript" value="28" />
51
+        </counts>
52
+      </usages-collector>
53
+    </session>
54
+  </component>
55
+  <component name="FileEditorManager">
56
+    <leaf>
57
+      <file pinned="false" current-in-tab="true">
58
+        <entry file="file://$PROJECT_DIR$/js/colors.js">
59
+          <provider selected="true" editor-type-id="text-editor">
60
+            <state relative-caret-position="375">
61
+              <caret line="25" column="10" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
62
+            </state>
63
+          </provider>
64
+        </entry>
65
+      </file>
66
+      <file pinned="false" current-in-tab="false">
67
+        <entry file="file://$PROJECT_DIR$/js/index.js">
68
+          <provider selected="true" editor-type-id="text-editor">
69
+            <state relative-caret-position="246">
70
+              <caret line="19" column="26" lean-forward="true" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
71
+            </state>
72
+          </provider>
73
+        </entry>
74
+      </file>
75
+      <file pinned="false" current-in-tab="false">
76
+        <entry file="file://$PROJECT_DIR$/index.html">
77
+          <provider selected="true" editor-type-id="text-editor" />
78
+        </entry>
79
+      </file>
80
+      <file pinned="false" current-in-tab="false">
81
+        <entry file="file://$PROJECT_DIR$/css/style.css">
82
+          <provider selected="true" editor-type-id="text-editor">
83
+            <state relative-caret-position="-84" />
84
+          </provider>
85
+        </entry>
86
+      </file>
87
+    </leaf>
88
+  </component>
89
+  <component name="Git.Settings">
90
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
91
+  </component>
92
+  <component name="IdeDocumentHistory">
93
+    <option name="CHANGED_PATHS">
94
+      <list>
95
+        <option value="$PROJECT_DIR$/js/index.js" />
96
+        <option value="$PROJECT_DIR$/js/colors.js" />
97
+      </list>
98
+    </option>
99
+  </component>
100
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
101
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
102
+  <component name="JsGulpfileManager">
103
+    <detection-done>true</detection-done>
104
+    <sorting>DEFINITION_ORDER</sorting>
105
+  </component>
106
+  <component name="ProjectFrameBounds">
107
+    <option name="y" value="38" />
108
+    <option name="width" value="1439" />
109
+    <option name="height" value="797" />
110
+  </component>
111
+  <component name="ProjectView">
112
+    <navigator proportions="" version="1">
113
+      <foldersAlwaysOnTop value="true" />
114
+    </navigator>
115
+    <panes>
116
+      <pane id="Scope" />
117
+      <pane id="PackagesPane" />
118
+      <pane id="ProjectPane">
119
+        <subPane>
120
+          <expand>
121
+            <path>
122
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
123
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
124
+            </path>
125
+            <path>
126
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
127
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
128
+              <item name="css" type="462c0819:PsiDirectoryNode" />
129
+            </path>
130
+            <path>
131
+              <item name="JSON-Lab-1" type="b2602c69:ProjectViewProjectNode" />
132
+              <item name="JSON-Lab-1" type="462c0819:PsiDirectoryNode" />
133
+              <item name="js" type="462c0819:PsiDirectoryNode" />
134
+            </path>
135
+          </expand>
136
+          <select />
137
+        </subPane>
138
+      </pane>
139
+    </panes>
140
+  </component>
141
+  <component name="PropertiesComponent">
142
+    <property name="WebServerToolWindowFactoryState" value="false" />
143
+    <property name="aspect.path.notification.shown" value="true" />
144
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
145
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
146
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
147
+  </component>
148
+  <component name="RunDashboard">
149
+    <option name="ruleStates">
150
+      <list>
151
+        <RuleState>
152
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
153
+        </RuleState>
154
+        <RuleState>
155
+          <option name="name" value="StatusDashboardGroupingRule" />
156
+        </RuleState>
157
+      </list>
158
+    </option>
159
+  </component>
160
+  <component name="SvnConfiguration">
161
+    <configuration />
162
+  </component>
163
+  <component name="TaskManager">
164
+    <task active="true" id="Default" summary="Default task">
165
+      <changelist id="d1b1e59d-1250-47ba-9137-caa479de2283" name="Default Changelist" comment="" />
166
+      <created>1543364453574</created>
167
+      <option name="number" value="Default" />
168
+      <option name="presentableId" value="Default" />
169
+      <updated>1543364453574</updated>
170
+      <workItem from="1543364455630" duration="1652000" />
171
+    </task>
172
+    <servers />
173
+  </component>
174
+  <component name="TimeTrackingManager">
175
+    <option name="totallyTimeSpent" value="1652000" />
176
+  </component>
177
+  <component name="ToolWindowManager">
178
+    <frame x="0" y="38" width="1439" height="797" extended-state="0" />
179
+    <editor active="true" />
180
+    <layout>
181
+      <window_info id="Image Layers" />
182
+      <window_info id="Designer" />
183
+      <window_info id="UI Designer" />
184
+      <window_info id="Capture Tool" />
185
+      <window_info id="Favorites" side_tool="true" />
186
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24982105" />
187
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
188
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
189
+      <window_info anchor="bottom" id="Version Control" />
190
+      <window_info anchor="bottom" id="Terminal" />
191
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
192
+      <window_info anchor="bottom" id="Message" order="0" />
193
+      <window_info anchor="bottom" id="Find" order="1" />
194
+      <window_info anchor="bottom" id="Run" order="2" />
195
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
196
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
197
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
198
+      <window_info anchor="bottom" id="TODO" order="6" />
199
+      <window_info anchor="right" id="Palette" />
200
+      <window_info anchor="right" id="Theme Preview" />
201
+      <window_info anchor="right" id="Capture Analysis" />
202
+      <window_info anchor="right" id="Palette&#9;" />
203
+      <window_info anchor="right" id="Database" />
204
+      <window_info anchor="right" id="Maven Projects" />
205
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
206
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
207
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
208
+    </layout>
209
+  </component>
210
+  <component name="TypeScriptGeneratedFilesManager">
211
+    <option name="version" value="1" />
212
+  </component>
213
+  <component name="VcsContentAnnotationSettings">
214
+    <option name="myLimit" value="2678400000" />
215
+  </component>
216
+  <component name="editorHistoryManager">
217
+    <entry file="file://$PROJECT_DIR$/images/logos/zip_logo.jpg">
218
+      <provider selected="true" editor-type-id="images" />
219
+    </entry>
220
+    <entry file="file://$PROJECT_DIR$/images/logos/js_logo.png">
221
+      <provider selected="true" editor-type-id="images" />
222
+    </entry>
223
+    <entry file="file://$PROJECT_DIR$/css/style.css">
224
+      <provider selected="true" editor-type-id="text-editor">
225
+        <state relative-caret-position="-84" />
226
+      </provider>
227
+    </entry>
228
+    <entry file="file://$PROJECT_DIR$/.gitignore">
229
+      <provider selected="true" editor-type-id="text-editor" />
230
+    </entry>
231
+    <entry file="file://$PROJECT_DIR$/README.md">
232
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
233
+        <state split_layout="SPLIT">
234
+          <first_editor />
235
+          <second_editor />
236
+        </state>
237
+      </provider>
238
+    </entry>
239
+    <entry file="file://$PROJECT_DIR$/index.html">
240
+      <provider selected="true" editor-type-id="text-editor" />
241
+    </entry>
242
+    <entry file="file://$PROJECT_DIR$/js/index.js">
243
+      <provider selected="true" editor-type-id="text-editor">
244
+        <state relative-caret-position="246">
245
+          <caret line="19" column="26" lean-forward="true" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
246
+        </state>
247
+      </provider>
248
+    </entry>
249
+    <entry file="file://$PROJECT_DIR$/js/colors.js">
250
+      <provider selected="true" editor-type-id="text-editor">
251
+        <state relative-caret-position="375">
252
+          <caret line="25" column="10" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
253
+        </state>
254
+      </provider>
255
+    </entry>
256
+  </component>
257
+</project>

+ 13
- 12
js/colors.js 查看文件

@@ -1,5 +1,5 @@
1
-var colorsArray : {
2
-    colors=[
1
+var colorsArray = {
2
+    colors: [
3 3
         {
4 4
             "name":"green",
5 5
             "red":"64",
@@ -13,11 +13,11 @@ 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",
@@ -25,9 +25,10 @@ var colorsArray : {
25 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
+}