Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
41770ad5
Commit
41770ad5
authored
Oct 21, 2015
by
Ray Schamp
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #94 from thisandagain/bugfix/messages
Fix messages XHR request and prop defaults
parents
0e515c14
9ed814cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
28 deletions
+30
-28
src/components/adminpanel/adminpanel.jsx
src/components/adminpanel/adminpanel.jsx
+3
-1
src/components/carousel/carousel.json
src/components/carousel/carousel.json
+24
-23
src/components/navigation/navigation.jsx
src/components/navigation/navigation.jsx
+0
-1
src/components/thumbnail/thumbnail.jsx
src/components/thumbnail/thumbnail.jsx
+3
-3
No files found.
src/components/adminpanel/adminpanel.jsx
View file @
41770ad5
...
...
@@ -11,7 +11,9 @@ var AdminPanel = React.createClass({
Session
],
getInitialState
:
function
()
{
return
{
showPanel
:
true
};
return
{
showPanel
:
false
};
},
handleToggleVisibility
:
function
(
e
)
{
e
.
preventDefault
();
...
...
src/components/carousel/carousel.json
View file @
41770ad5
...
...
@@ -2,48 +2,49 @@
{
"id"
:
1
,
"type"
:
"project"
,
"title"
:
"
Example
Project"
,
"thumbnailUrl"
:
"
http://www.lorempixel.com/144/108/
"
,
"creator"
:
"
raimondious
"
,
"href"
:
"
/projects/1000/
"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"
#
"
},
{
"id"
:
2
,
"type"
:
"project"
,
"title"
:
"Example Project"
,
"thumbnailUrl"
:
"http://www.lorempixel.com/144/108/"
,
"href"
:
"/projects/1000/"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"#"
},
{
"id"
:
3
,
"type"
:
"project"
,
"title"
:
"
Example
Project"
,
"thumbnailUrl"
:
"
http://www.lorempixel.com/144/108/
"
,
"creator"
:
"
raimondious
"
,
"href"
:
"
/projects/1000/
"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"
#
"
},
{
"id"
:
4
,
"type"
:
"project"
,
"title"
:
"
Example
Project"
,
"thumbnailUrl"
:
"
http://www.lorempixel.com/144/108/
"
,
"creator"
:
"
raimondious
"
,
"href"
:
"
/projects/1000/
"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"
#
"
},
{
"id"
:
5
,
"type"
:
"project"
,
"title"
:
"
Example
Project"
,
"thumbnailUrl"
:
"
http://www.lorempixel.com/144/108/
"
,
"creator"
:
"
raimondious
"
,
"href"
:
"
/projects/1000/
"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"
#
"
},
{
"id"
:
6
,
"type"
:
"project"
,
"title"
:
"
Example
Project"
,
"thumbnailUrl"
:
"
http://www.lorempixel.com/144/108/
"
,
"creator"
:
"
raimondious
"
,
"href"
:
"
/projects/1000/
"
"title"
:
"Project"
,
"thumbnailUrl"
:
""
,
"creator"
:
""
,
"href"
:
"
#
"
}
]
src/components/navigation/navigation.jsx
View file @
41770ad5
...
...
@@ -82,7 +82,6 @@ var Navigation = React.createClass({
getMessageCount
:
function
()
{
this
.
api
({
method
:
'
get
'
,
host
:
''
,
uri
:
'
/proxy/users/
'
+
this
.
state
.
session
.
user
.
username
+
'
/activity/count
'
},
function
(
err
,
body
)
{
if
(
body
)
{
...
...
src/components/thumbnail/thumbnail.jsx
View file @
41770ad5
...
...
@@ -10,9 +10,9 @@ var Thumbnail = React.createClass({
},
getDefaultProps
:
function
()
{
return
{
href
:
'
/projects/1000/
'
,
title
:
'
Example
Project
'
,
src
:
'
http://www.lorempixel.com/144/108/
'
,
href
:
'
#
'
,
title
:
'
Project
'
,
src
:
''
,
type
:
'
project
'
,
showLoves
:
false
,
showRemixes
:
false
...
...
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