Adds login page, sidebar, header and form
This commit is contained in:
parent
bda1b0a878
commit
c30546f4aa
6 changed files with 72 additions and 13 deletions
BIN
app/assets/images/auth_buttons/signin_with_google.png
Normal file
BIN
app/assets/images/auth_buttons/signin_with_google.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.9 KiB |
|
@ -1,4 +1,35 @@
|
|||
Create a new cluster
|
||||
%br
|
||||
.row
|
||||
.col-sm-8.col-sm-offset-4
|
||||
%p
|
||||
-link_to_help_page = link_to(s_('ClusterIntegration|help page'), help_page_path('TODO'), target: '_blank', rel: 'noopener noreferrer')
|
||||
= s_('ClusterIntegration|Use our %{link_to_help_page} on cluster integration.').html_safe % { link_to_help_page: link_to_help_page}
|
||||
|
||||
= form_for 'cluster' do |field|
|
||||
.form-group
|
||||
= field.label :cluster_name
|
||||
= field.text_field :cluster_name, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.label :gcp_project_id
|
||||
= field.text_field :gcp_project_id, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.label :cluster_zone
|
||||
= field.text_field :cluster_zone, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.label :cluster_size
|
||||
= field.text_field :cluster_size, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.label :project_namespace
|
||||
= field.text_field :project_namespace, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.label :machine_type
|
||||
= field.text_field :machine_type, class: 'form-control'
|
||||
|
||||
.form-group
|
||||
= field.submit s_('ClusterIntegration|Create cluster'), class: 'btn btn-save'
|
||||
|
||||
= link_to "Create on Google Container Engine", namespace_project_clusters_path(@project.namespace, @project, cluster_name: "gke-test-creation#{Random.rand(100)}", gcp_project_id: 'gitlab-internal-153318', cluster_zone: 'us-central1-a', cluster_size: '1', project_namespace: 'aaa', machine_type: '???'), method: :post
|
||||
-# gke-test-creation#{Random.rand(100)}
|
||||
|
|
15
app/views/projects/clusters/_header.html.haml
Normal file
15
app/views/projects/clusters/_header.html.haml
Normal file
|
@ -0,0 +1,15 @@
|
|||
.col-lg-8
|
||||
%h4.prepend-top-0
|
||||
= s_('ClusterIntegration|Create new cluster on Google Container Engine')
|
||||
%p
|
||||
= s_('ClusterIntegration|To create a new cluster on Google Container Engine, please sign in with your Google account:')
|
||||
%ul
|
||||
%li
|
||||
- link_to_container_engine = link_to(s_('ClusterIntegration|access to Google Container Engine'))
|
||||
= s_('ClusterIntegration|Your account must have %{link_to_container_engine}').html_safe % { link_to_container_engine: link_to_container_engine }
|
||||
%li
|
||||
- link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'))
|
||||
= s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements }
|
||||
%li
|
||||
- link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'))
|
||||
= s_('ClusterIntegration|A %{link_to_container_project} must have been created under this account').html_safe % { link_to_container_project: link_to_container_project }
|
8
app/views/projects/clusters/_sidebar.html.haml
Normal file
8
app/views/projects/clusters/_sidebar.html.haml
Normal file
|
@ -0,0 +1,8 @@
|
|||
.col-sm-4
|
||||
%h4.prepend-top-0
|
||||
= s_('ClusterIntegration|Cluster integration')
|
||||
%p
|
||||
= s_('ClusterIntegration|With cluster integration you can take advantage of Kubernetes auto deployment.')
|
||||
%p
|
||||
- link = link_to(s_('ClusterIntegration|auto deployment'), help_page_path('TODO'), target: '_blank', rel: 'noopener noreferrer')
|
||||
= s_('ClusterIntegration|Learn more about %{link_to_documentation} in GitLab').html_safe % { link_to_documentation: link }
|
|
@ -1,6 +1,10 @@
|
|||
Login
|
||||
%br
|
||||
.row.prepend-top-default
|
||||
= render 'sidebar'
|
||||
= render 'header'
|
||||
.row
|
||||
.col-sm-8.col-sm-offset-4
|
||||
- if @authorize_url
|
||||
= link_to("authenticate from here", @authorize_url)
|
||||
- else
|
||||
You have not configrued GitLab properly. So we can not proceed authentication. Please check if you have set up omniauth->providers->google_oauth2 in gitlab.yml
|
||||
%a{ href: @authorize_url }
|
||||
= image_tag('auth_buttons/signin_with_google.png')
|
||||
-# - else
|
||||
-# You have not configrued GitLab properly. So we can not proceed authentication. Please check if you have set up omniauth->providers->google_oauth2 in gitlab.yml
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
Create a cluster
|
||||
%br
|
||||
= render "form"
|
||||
.row.prepend-top-default
|
||||
= render 'sidebar'
|
||||
= render 'header'
|
||||
= render 'form'
|
||||
|
|
Loading…
Reference in a new issue