Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mcotton-v1
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mCotton
mcotton-v1
Commits
74bf9627
Commit
74bf9627
authored
Dec 07, 2016
by
Hao Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change git url
parent
64072c39
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
129 additions
and
87 deletions
+129
-87
workspace.xml
.idea/workspace.xml
+128
-86
home.js
app/client/templates/home/home.js
+1
-1
No files found.
.idea/workspace.xml
View file @
74bf9627
...
...
@@ -2,20 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"2e5af44c-1b55-4cba-bd4e-692506760c8b"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/.gitignore"
/>
<change
type=
"DELETED"
beforePath=
"$PROJECT_DIR$/public/datapoints/lightness——0.png"
afterPath=
""
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/jsLibraryMappings.xml"
afterPath=
"$PROJECT_DIR$/.idea/jsLibraryMappings.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/mcotton-v1.iml"
afterPath=
"$PROJECT_DIR$/.idea/mcotton-v1.iml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/misc.xml"
afterPath=
"$PROJECT_DIR$/.idea/misc.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.meteor/.finished-upgraders"
afterPath=
"$PROJECT_DIR$/.meteor/.finished-upgraders"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.meteor/packages"
afterPath=
"$PROJECT_DIR$/.meteor/packages"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.meteor/release"
afterPath=
"$PROJECT_DIR$/.meteor/release"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.meteor/versions"
afterPath=
"$PROJECT_DIR$/.meteor/versions"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/client/templates/home/home.js"
afterPath=
"$PROJECT_DIR$/app/client/templates/home/home.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/lib/collections/0_globalconst.js"
afterPath=
"$PROJECT_DIR$/app/lib/collections/0_globalconst.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/server/fixtures.js"
afterPath=
"$PROJECT_DIR$/app/server/fixtures.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/package.json"
afterPath=
"$PROJECT_DIR$/package.json"
/>
</list>
<ignored
path=
"mcotton-v1.iws"
/>
<ignored
path=
".idea/workspace.xml"
/>
...
...
@@ -35,28 +23,8 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf>
<file
leaf-file-name=
"0_globalconst.js"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/lib/collections/0_globalconst.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"236"
>
<caret
line=
"130"
column=
"95"
lean-forward=
"false"
selection-start-line=
"130"
selection-start-column=
"95"
selection-end-line=
"130"
selection-end-column=
"95"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"control_point.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/projects/control_point.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"project_detail.js"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/projects/project_detail.js"
>
<file
leaf-file-name=
"home.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/home/home.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
...
...
@@ -65,33 +33,11 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"
project_detail.html"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/
projects/project_detail.html
"
>
<file
leaf-file-name=
"
home.js"
pinned=
"false"
current-in-tab=
"tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/
home/home.js
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1457"
>
<caret
line=
"158"
column=
"18"
lean-forward=
"true"
selection-start-line=
"158"
selection-start-column=
"18"
selection-end-line=
"158"
selection-end-column=
"18"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"fixtures.js"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/server/fixtures.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"165"
>
<caret
line=
"24"
column=
"13"
lean-forward=
"true"
selection-start-line=
"24"
selection-start-column=
"13"
selection-end-line=
"24"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"n#!!doc"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
".gitignore"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/.gitignore"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"6"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"6"
selection-end-line=
"0"
selection-end-column=
"6"
/>
<state
relative-caret-position=
"176"
>
<caret
line=
"48"
column=
"14"
lean-forward=
"true"
selection-start-line=
"48"
selection-start-column=
"14"
selection-end-line=
"48"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
...
...
@@ -122,10 +68,10 @@
<list>
<option
value=
"$PROJECT_DIR$/package.json"
/>
<option
value=
"$PROJECT_DIR$/.meteor/packages"
/>
<option
value=
"$PROJECT_DIR$/app/client/templates/home/home.js"
/>
<option
value=
"$PROJECT_DIR$/app/lib/collections/0_globalconst.js"
/>
<option
value=
"$PROJECT_DIR$/app/server/fixtures.js"
/>
<option
value=
"$PROJECT_DIR$/.gitignore"
/>
<option
value=
"$PROJECT_DIR$/app/client/templates/home/home.js"
/>
</list>
</option>
</component>
...
...
@@ -185,6 +131,86 @@
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"app"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"app"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"client"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"app"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"client"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"templates"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"app"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"client"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"templates"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"home"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
"mcotton-v1"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
<PATH_ELEMENT>
<option
name=
"myItemId"
value=
".meteor"
/>
<option
name=
"myItemType"
value=
"com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode"
/>
</PATH_ELEMENT>
...
...
@@ -296,12 +322,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1470845079618
</updated>
<workItem
from=
"1481118331939"
duration=
"
3800
000"
/>
<workItem
from=
"1481118331939"
duration=
"
4082
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"
3800
000"
/>
<option
name=
"totallyTimeSpent"
value=
"
4082
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"54"
y=
"23"
width=
"1276"
height=
"777"
extended-state=
"0"
/>
...
...
@@ -368,34 +394,44 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/
home/home
.js"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/
projects/data_point
.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
341
"
>
<caret
line=
"5
9"
column=
"33"
lean-forward=
"false"
selection-start-line=
"59"
selection-start-column=
"33"
selection-end-line=
"59"
selection-end-column=
"3
3"
/>
<state
relative-caret-position=
"
75
"
>
<caret
line=
"5
"
column=
"23"
lean-forward=
"false"
selection-start-line=
"5"
selection-start-column=
"23"
selection-end-line=
"5"
selection-end-column=
"2
3"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
app/client/templates/projects/data_point.js
"
>
<entry
file=
"file://$PROJECT_DIR$/
.meteor/release
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
75
"
>
<caret
line=
"
5"
column=
"23"
lean-forward=
"false"
selection-start-line=
"5"
selection-start-column=
"23"
selection-end-line=
"5"
selection-end-column=
"23
"
/>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"
0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
app/lib/collections/0_globalconst.js
"
>
<entry
file=
"file://$PROJECT_DIR$/
.gitignore
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
236
"
>
<caret
line=
"
130"
column=
"95"
lean-forward=
"false"
selection-start-line=
"130"
selection-start-column=
"95"
selection-end-line=
"130"
selection-end-column=
"95
"
/>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"
0"
column=
"6"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"6"
selection-end-line=
"0"
selection-end-column=
"6
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/
client/templates/projects/control_point.html
"
>
<entry
file=
"file://$PROJECT_DIR$/app/
server/fixtures.js
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"165"
>
<caret
line=
"24"
column=
"13"
lean-forward=
"true"
selection-start-line=
"24"
selection-start-column=
"13"
selection-end-line=
"24"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"n#!!doc"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/projects/project_detail.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1457"
>
<caret
line=
"158"
column=
"18"
lean-forward=
"true"
selection-start-line=
"158"
selection-start-column=
"18"
selection-end-line=
"158"
selection-end-column=
"18"
/>
<folding
/>
</state>
</provider>
...
...
@@ -408,28 +444,34 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/projects/
project_detail
.html"
>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/projects/
control_point
.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
1457
"
>
<caret
line=
"
158"
column=
"18"
lean-forward=
"true"
selection-start-line=
"158"
selection-start-column=
"18"
selection-end-line=
"158"
selection-end-column=
"18
"
/>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"
0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0
"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/
server/fixtures
.js"
>
<entry
file=
"file://$PROJECT_DIR$/app/
lib/collections/0_globalconst
.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"165"
>
<caret
line=
"24"
column=
"13"
lean-forward=
"true"
selection-start-line=
"24"
selection-start-column=
"13"
selection-end-line=
"24"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"n#!!doc"
expanded=
"true"
/>
</folding>
<state
relative-caret-position=
"236"
>
<caret
line=
"130"
column=
"95"
lean-forward=
"false"
selection-start-line=
"130"
selection-start-column=
"95"
selection-end-line=
"130"
selection-end-column=
"95"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
.gitignore
"
>
<entry
file=
"file://$PROJECT_DIR$/
app/client/templates/home/home.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"0"
column=
"6"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"6"
selection-end-line=
"0"
selection-end-column=
"6"
/>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/client/templates/home/home.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"176"
>
<caret
line=
"48"
column=
"14"
lean-forward=
"true"
selection-start-line=
"48"
selection-start-column=
"14"
selection-end-line=
"48"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
...
...
app/client/templates/home/home.js
View file @
74bf9627
...
...
@@ -44,7 +44,7 @@ Template.home.helpers({
"title"
:
"<strong> Open Source Software </strong>"
,
"description"
:
"We built full stack open sources software for open sources hardware"
,
"buttons"
:
[
{
label
:
"Fork from Git
hub"
,
href
:
"https://github.com/iascchen/mCotton
"
}
{
label
:
"Fork from Git
"
,
href
:
"https://git.microduino.cn/mCotton/mcotton-v1
"
}
]
},
{},
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment