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
aacdc35d
Commit
aacdc35d
authored
Dec 04, 2018
by
Paul Slaughter
Committed by
Phil Hughes
Dec 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add empty and disabled web terminal tab
parent
bd0ecc71
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
132 additions
and
7 deletions
+132
-7
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+0
-1
app/assets/stylesheets/framework/alerts.scss
app/assets/stylesheets/framework/alerts.scss
+0
-4
ee/app/assets/javascripts/ide/components/panes/right.vue
ee/app/assets/javascripts/ide/components/panes/right.vue
+16
-2
ee/app/assets/javascripts/ide/components/terminal/empty_state.vue
...ssets/javascripts/ide/components/terminal/empty_state.vue
+20
-0
ee/app/assets/javascripts/ide/components/terminal/view.vue
ee/app/assets/javascripts/ide/components/terminal/view.vue
+21
-0
ee/spec/javascripts/ide/components/terminal/empty_state_spec.js
...c/javascripts/ide/components/terminal/empty_state_spec.js
+35
-0
ee/spec/javascripts/ide/components/terminal/view_spec.js
ee/spec/javascripts/ide/components/terminal/view_spec.js
+31
-0
locale/gitlab.pot
locale/gitlab.pot
+9
-0
No files found.
app/assets/stylesheets/framework.scss
View file @
aacdc35d
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
@import
'bootstrap_migration'
;
@import
'bootstrap_migration'
;
@import
'framework/layout'
;
@import
'framework/layout'
;
@import
'framework/alerts'
;
@import
'framework/animations'
;
@import
'framework/animations'
;
@import
'framework/vue_transitions'
;
@import
'framework/vue_transitions'
;
@import
'framework/avatar'
;
@import
'framework/avatar'
;
...
...
app/assets/stylesheets/framework/alerts.scss
deleted
100644 → 0
View file @
bd0ecc71
.alert-tip
{
background-color
:
$theme-gray-100
;
color
:
$theme-gray-900
;
}
ee/app/assets/javascripts/ide/components/panes/right.vue
View file @
aacdc35d
<
script
>
<
script
>
import
{
__
}
from
'
~/locale
'
;
import
RightPane
from
'
~/ide/components/panes/right.vue
'
;
import
RightPane
from
'
~/ide/components/panes/right.vue
'
;
import
TerminalView
from
'
../terminal/view.vue
'
;
export
default
{
export
default
{
name
:
'
EERightPane
'
,
name
:
'
EERightPane
'
,
components
:
{
components
:
{
RightPane
,
RightPane
,
},
},
data
()
{
return
{
// this will come from Vuex store in https://gitlab.com/gitlab-org/gitlab-ee/issues/5426
isTerminalEnabled
:
false
,
};
},
computed
:
{
computed
:
{
extensionTabs
()
{
extensionTabs
()
{
// This is empty for now, but it will be used in: https://gitlab.com/gitlab-org/gitlab-ee/issues/5426
return
[
return
[];
{
show
:
this
.
isTerminalEnabled
,
title
:
__
(
'
Terminal
'
),
views
:
[{
name
:
'
terminal
'
,
keepAlive
:
true
,
component
:
TerminalView
}],
icon
:
'
terminal
'
,
},
];
},
},
},
},
};
};
...
...
ee/app/assets/javascripts/ide/components/terminal/empty_state.vue
0 → 100644
View file @
aacdc35d
<
script
>
export
default
{
props
:
{
illustrationPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
};
</
script
>
<
template
>
<div
class=
"text-center"
>
<div
v-if=
"illustrationPath"
class=
"svg-content svg-130"
><img
:src=
"illustrationPath"
/></div>
<h4>
{{
__
(
'
Web Terminal
'
)
}}
</h4>
<p>
{{
__
(
'
Run tests against your code live using the Web Terminal
'
)
}}
</p>
<div
class=
"bs-callout text-left"
>
The Web Terminal is coming soon. Stay tuned!
</div>
</div>
</
template
>
ee/app/assets/javascripts/ide/components/terminal/view.vue
0 → 100644
View file @
aacdc35d
<
script
>
import
{
mapState
}
from
'
vuex
'
;
import
EmptyState
from
'
./empty_state.vue
'
;
export
default
{
components
:
{
EmptyState
,
},
computed
:
{
...
mapState
([
'
emptyStateSvgPath
'
]),
},
};
</
script
>
<
template
>
<div
class=
"h-100"
>
<div
class=
"h-100 d-flex flex-column justify-content-center"
>
<empty-state
:illustration-path=
"emptyStateSvgPath"
/>
</div>
</div>
</
template
>
ee/spec/javascripts/ide/components/terminal/empty_state_spec.js
0 → 100644
View file @
aacdc35d
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
import
TerminalEmptyState
from
'
ee/ide/components/terminal/empty_state.vue
'
;
const
TEST_PATH
=
`
${
TEST_HOST
}
/home.png`
;
describe
(
'
TerminalEmptyState
'
,
()
=>
{
const
factory
=
(
options
=
{})
=>
{
const
localVue
=
createLocalVue
();
return
shallowMount
(
TerminalEmptyState
,
{
localVue
,
...
options
,
});
};
it
(
'
does not show illustration, if no path specified
'
,
()
=>
{
const
wrapper
=
factory
();
expect
(
wrapper
.
find
(
'
.svg-content
'
).
exists
()).
toBe
(
false
);
});
it
(
'
shows illustration with path
'
,
()
=>
{
const
wrapper
=
factory
({
propsData
:
{
illustrationPath
:
TEST_PATH
,
},
});
const
img
=
wrapper
.
find
(
'
.svg-content img
'
);
expect
(
img
.
exists
()).
toBe
(
true
);
expect
(
img
.
attributes
(
'
src
'
)).
toEqual
(
TEST_PATH
);
});
});
ee/spec/javascripts/ide/components/terminal/view_spec.js
0 → 100644
View file @
aacdc35d
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
import
TerminalView
from
'
ee/ide/components/terminal/view.vue
'
;
import
TerminalEmptyState
from
'
ee/ide/components/terminal/empty_state.vue
'
;
const
TEST_SVG_PATH
=
`
${
TEST_HOST
}
/illustration.svg`
;
const
localVue
=
createLocalVue
();
localVue
.
use
(
Vuex
);
describe
(
'
TerminalView
'
,
()
=>
{
const
factory
=
()
=>
{
const
store
=
new
Vuex
.
Store
({
state
:
{
emptyStateSvgPath
:
TEST_SVG_PATH
,
},
});
return
shallowMount
(
TerminalView
,
{
localVue
,
store
});
};
it
(
'
renders empty state
'
,
()
=>
{
const
wrapper
=
factory
();
expect
(
wrapper
.
find
(
TerminalEmptyState
).
props
()).
toEqual
({
illustrationPath
:
TEST_SVG_PATH
,
});
});
});
locale/gitlab.pot
View file @
aacdc35d
...
@@ -7226,6 +7226,9 @@ msgstr ""
...
@@ -7226,6 +7226,9 @@ msgstr ""
msgid "Run CI/CD pipelines for external repositories"
msgid "Run CI/CD pipelines for external repositories"
msgstr ""
msgstr ""
msgid "Run tests against your code live using the Web Terminal"
msgstr ""
msgid "Run untagged jobs"
msgid "Run untagged jobs"
msgstr ""
msgstr ""
...
@@ -8202,6 +8205,9 @@ msgstr ""
...
@@ -8202,6 +8205,9 @@ msgstr ""
msgid "Templates"
msgid "Templates"
msgstr ""
msgstr ""
msgid "Terminal"
msgstr ""
msgid "Terminal for environment"
msgid "Terminal for environment"
msgstr ""
msgstr ""
...
@@ -9316,6 +9322,9 @@ msgstr ""
...
@@ -9316,6 +9322,9 @@ msgstr ""
msgid "Web IDE"
msgid "Web IDE"
msgstr ""
msgstr ""
msgid "Web Terminal"
msgstr ""
msgid "Web terminal"
msgid "Web terminal"
msgstr ""
msgstr ""
...
...
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