Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
shells
signup-site
Commits
e517ef4a
Commit
e517ef4a
authored
Jul 17, 2017
by
Cool Fire
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some logic + error page with redirect back
parent
f8b3f23c
Pipeline
#326
failed with stages
in 2 minutes and 1 second
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
10 deletions
+39
-10
content/check-code.yaml
content/check-code.yaml
+2
-0
routes/code.rb
routes/code.rb
+7
-8
routes/details.rb
routes/details.rb
+1
-1
routes/error.rb
routes/error.rb
+13
-0
signup_site.rb
signup_site.rb
+1
-0
views/enter_code.erb
views/enter_code.erb
+5
-0
views/enter_details.erb
views/enter_details.erb
+1
-1
views/error.erb
views/error.erb
+9
-0
No files found.
content/check-code.yaml
0 → 100644
View file @
e517ef4a
---
error_message
:
The invite code does not appear to be valid. Please go back and try again.
routes/code.rb
View file @
e517ef4a
...
...
@@ -12,14 +12,13 @@ class SignupSite < Sinatra::Base
end
post
'/check-code'
do
if
(
!
params
.
key?
:input_invite
)
||
params
[
:input_invite
].
empty?
||
params
[
:input_invite
]
!~
/^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}$/
@header
=
'Insomnia 24/7 shells signup'
@body
=
'Invite code appears to be invalid. Please try again.'
@progress
=
25
erb
:index
if
params
[
:input_invite
]
!~
/^\w{8}-\w{4}-\w{4}-\w{4}-\w{12}$/
cc
=
YAML
.
load_file
(
'content/check-code.yaml'
)
session
[
:error_message
]
=
cc
[
'error_message'
]
session
[
:error_location
]
=
'/enter-code'
session
[
:error_progress
]
=
25
session
[
:error_data
]
=
Rack
::
Utils
.
escape_html
(
params
[
:input_invite
])
redirect
'/error'
,
302
else
session
[
:invite
]
=
Rack
::
Utils
.
escape_html
(
params
[
:input_invite
])
redirect
'/enter-details'
,
302
...
...
routes/details.rb
View file @
e517ef4a
...
...
@@ -13,6 +13,6 @@ class SignupSite < Sinatra::Base
end
post
'/check-details'
do
# Some checking stuff
'Not yet implemented.'
end
end
routes/error.rb
0 → 100644
View file @
e517ef4a
# frozen_string_literal: true
# Invite code handling
class
SignupSite
<
Sinatra
::
Base
get
'/error'
do
@header
=
'Oh no!'
@body
=
session
[
:error_message
]
@form
=
erb
:error
@progress
=
session
[
:error_progress
]
session
[
:error_reload_form
]
=
true
erb
:index
end
end
signup_site.rb
View file @
e517ef4a
...
...
@@ -21,3 +21,4 @@ end
require_relative
'routes/code'
require_relative
'routes/details'
require_relative
'routes/error'
views/enter_code.erb
View file @
e517ef4a
...
...
@@ -3,7 +3,12 @@
<div
class=
"form-group"
>
<label
for=
"input_invite"
class=
"col-lg-2 control-label"
>
Invite code
</label>
<div
class=
"col-lg-10"
>
<%
if
session
[
:error_reload_form
]
%>
<input
type=
"text"
class=
"form-control"
id=
"input_invite"
name=
"input_invite"
value=
"
<%=
session
[
:error_data
]
%>
"
>
<%
session
[
:error_reload_form
]
=
false
%>
<%
else
%>
<input
type=
"text"
class=
"form-control"
id=
"input_invite"
name=
"input_invite"
placeholder=
"1234abcd-1234-5678-9abc-432abc987def"
>
<%
end
%>
</div>
</div>
<div
class=
"form-group"
>
...
...
views/enter_details.erb
View file @
e517ef4a
<form
class=
"form-horizontal"
>
<form
class=
"form-horizontal"
method=
"POST"
action=
"/check-details"
>
<fieldset>
<div
class=
"form-group"
>
<label
for=
"input_username"
class=
"col-lg-2 control-label"
>
User name
</label>
...
...
views/error.erb
0 → 100644
View file @
e517ef4a
<form
class=
"form-horizontal"
method=
"GET"
action=
"
<%=
session
[
:error_location
]
%>
"
>
<fieldset>
<div
class=
"form-group"
>
<div
class=
"col-lg-10 col-lg-offset-2"
>
<button
type=
"submit"
class=
"btn btn-info"
>
Go back
</button>
</div>
</div>
</fieldset>
</form>
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