Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
decfde13
Commit
decfde13
authored
Jan 09, 2019
by
Fernando Arias
Committed by
Mike Greiling
Jan 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First pass at updated profile empty state
parent
3f01f0c5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
6 deletions
+20
-6
app/assets/javascripts/pages/users/user_overview_block.js
app/assets/javascripts/pages/users/user_overview_block.js
+3
-2
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+6
-1
changelogs/unreleased/profile-project-empty-state.yml
changelogs/unreleased/profile-project-empty-state.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/dashboard/shortcuts_spec.rb
spec/features/dashboard/shortcuts_spec.rb
+1
-1
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+1
-1
spec/features/users/overview_spec.rb
spec/features/users/overview_spec.rb
+1
-1
No files found.
app/assets/javascripts/pages/users/user_overview_block.js
View file @
decfde13
...
@@ -15,7 +15,8 @@ export default class UserOverviewBlock {
...
@@ -15,7 +15,8 @@ export default class UserOverviewBlock {
}
}
loadData
()
{
loadData
()
{
const
loadingEl
=
document
.
querySelector
(
`
${
this
.
container
}
.loading`
);
const
containerEl
=
document
.
querySelector
(
this
.
container
);
const
loadingEl
=
containerEl
.
querySelector
(
`.loading`
);
loadingEl
.
classList
.
remove
(
'
hide
'
);
loadingEl
.
classList
.
remove
(
'
hide
'
);
...
@@ -42,7 +43,7 @@ export default class UserOverviewBlock {
...
@@ -42,7 +43,7 @@ export default class UserOverviewBlock {
const
nothingHereBlock
=
containerEl
.
querySelector
(
'
.nothing-here-block
'
);
const
nothingHereBlock
=
containerEl
.
querySelector
(
'
.nothing-here-block
'
);
if
(
nothingHereBlock
)
{
if
(
nothingHereBlock
)
{
nothingHereBlock
.
classList
.
add
(
'
text-left
'
,
'
p-0
'
);
nothingHereBlock
.
classList
.
add
(
'
p-5
'
);
}
}
}
}
...
...
app/views/shared/projects/_list.html.haml
View file @
decfde13
...
@@ -33,4 +33,9 @@
...
@@ -33,4 +33,9 @@
%span
you have no access to.
%span
you have no access to.
=
paginate_collection
(
projects
,
remote:
remote
)
unless
skip_pagination
=
paginate_collection
(
projects
,
remote:
remote
)
unless
skip_pagination
-
else
-
else
.nothing-here-block
No projects found
.nothing-here-block
.svg-content.svg-130
=
image_tag
'illustrations/profile-page/personal-project.svg'
%div
%span
=
s_
(
'UserProfile|This user doesn\'t have any personal projects'
)
changelogs/unreleased/profile-project-empty-state.yml
0 → 100644
View file @
decfde13
---
title
:
Added empty project illustration and updated text to user profile overview
merge_request
:
23973
author
:
Fernando Arias
type
:
changed
locale/gitlab.pot
View file @
decfde13
...
@@ -7476,6 +7476,9 @@ msgstr ""
...
@@ -7476,6 +7476,9 @@ msgstr ""
msgid "UserProfile|Subscribe"
msgid "UserProfile|Subscribe"
msgstr ""
msgstr ""
msgid "UserProfile|This user doesn't have any personal projects"
msgstr ""
msgid "UserProfile|This user has a private profile"
msgid "UserProfile|This user has a private profile"
msgstr ""
msgstr ""
...
...
spec/features/dashboard/shortcuts_spec.rb
View file @
decfde13
...
@@ -49,7 +49,7 @@ describe 'Dashboard shortcuts', :js do
...
@@ -49,7 +49,7 @@ describe 'Dashboard shortcuts', :js do
find
(
'body'
).
send_keys
([
:shift
,
'P'
])
find
(
'body'
).
send_keys
([
:shift
,
'P'
])
find
(
'.nothing-here-block'
)
find
(
'.nothing-here-block'
)
expect
(
page
).
to
have_content
(
'
No projects found
'
)
expect
(
page
).
to
have_content
(
'
This user doesn\'t have any personal projects
'
)
end
end
end
end
...
...
spec/features/dashboard/user_filters_projects_spec.rb
View file @
decfde13
...
@@ -38,7 +38,7 @@ describe 'Dashboard > User filters projects' do
...
@@ -38,7 +38,7 @@ describe 'Dashboard > User filters projects' do
it
'returns message when starred projects fitler returns no results'
do
it
'returns message when starred projects fitler returns no results'
do
fill_in
'project-filter-form-field'
,
with:
'Beta\n'
fill_in
'project-filter-form-field'
,
with:
'Beta\n'
expect
(
page
).
to
have_content
(
'
No projects found
'
)
expect
(
page
).
to
have_content
(
'
This user doesn\'t have any personal projects
'
)
expect
(
page
).
not_to
have_content
(
'You don\'t have starred projects yet'
)
expect
(
page
).
not_to
have_content
(
'You don\'t have starred projects yet'
)
end
end
end
end
...
...
spec/features/users/overview_spec.rb
View file @
decfde13
...
@@ -96,7 +96,7 @@ describe 'Overview tab on a user profile', :js do
...
@@ -96,7 +96,7 @@ describe 'Overview tab on a user profile', :js do
it
'it shows an empty project list with an info message'
do
it
'it shows an empty project list with an info message'
do
page
.
within
(
'.projects-block'
)
do
page
.
within
(
'.projects-block'
)
do
expect
(
page
).
to
have_selector
(
'.loading'
,
visible:
false
)
expect
(
page
).
to
have_selector
(
'.loading'
,
visible:
false
)
expect
(
page
).
to
have_content
(
'
No projects found
'
)
expect
(
page
).
to
have_content
(
'
This user doesn\'t have any personal projects
'
)
expect
(
page
).
not_to
have_selector
(
'.project-row'
)
expect
(
page
).
not_to
have_selector
(
'.project-row'
)
end
end
end
end
...
...
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