Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ProjectClient_Y1S1_tramshedTech_team15
Manage
Activity
Members
Labels
Plan
Issues
7
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arianne Bayliss
ProjectClient_Y1S1_tramshedTech_team15
Commits
e40fe70c
Commit
e40fe70c
authored
2 years ago
by
Arianne Bayliss
Browse files
Options
Downloads
Patches
Plain Diff
adding js and updating html
parent
a3092818
No related branches found
Branches containing commit
No related tags found
1 merge request
!60
Resolve "As a user I want to be authorized if I am a member"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
static/JS/login.js
+7
-0
7 additions, 0 deletions
static/JS/login.js
static/login.html
+1
-13
1 addition, 13 deletions
static/login.html
with
8 additions
and
13 deletions
static/JS/login.js
0 → 100644
+
7
−
0
View file @
e40fe70c
function
onLoad
()
{
document
.
getElementById
(
'
loginButton
'
).
addEventListener
(
'
click
'
,
clickLogin
)
}
function
clickLogin
()
{
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
static/login.html
+
1
−
13
View file @
e40fe70c
...
@@ -25,21 +25,13 @@
...
@@ -25,21 +25,13 @@
<form>
<form>
<!-- Email input -->
<!-- Email input -->
<div
class=
"form-outline mb-4"
>
<div
class=
"form-outline mb-4"
>
<
<<<<<<
HEAD
<input
type=
"email"
id=
"recordEmail"
class=
"form-control"
/>
<input
type=
"email"
id=
"recordEmail"
class=
"form-control"
/>
=======
<input
type=
"email"
id=
"form2Example1"
class=
"form-control"
/>
>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
<label
class=
"form-label"
for=
"form2Example1"
>
Email address
</label>
<label
class=
"form-label"
for=
"form2Example1"
>
Email address
</label>
</div>
</div>
<!-- Password input -->
<!-- Password input -->
<div
class=
"form-outline mb-4"
>
<div
class=
"form-outline mb-4"
>
<
<<<<<<
HEAD
<input
type=
"password"
id=
"recordPassword"
class=
"form-control"
/>
<input
type=
"password"
id=
"recordPassword"
class=
"form-control"
/>
=======
<input
type=
"password"
id=
"form2Example2"
class=
"form-control"
/>
>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
<label
class=
"form-label"
for=
"form2Example2"
>
Password
</label>
<label
class=
"form-label"
for=
"form2Example2"
>
Password
</label>
</div>
</div>
...
@@ -59,7 +51,7 @@
...
@@ -59,7 +51,7 @@
</div>
</div>
<!-- Submit button -->
<!-- Submit button -->
<button
onclick=
"window.location.href='landingpage.html';"
type=
"button"
class=
"btn btn-light"
>
<button
onclick=
"window.location.href='landingpage.html';"
type=
"button"
class=
"btn btn-light"
id=
"loginButton"
>
<span
class=
"spinner-grow spinner-grow-sm"
></span>
<span
class=
"spinner-grow spinner-grow-sm"
></span>
Sign in
Sign in
</button>
</button>
...
@@ -68,8 +60,4 @@
...
@@ -68,8 +60,4 @@
<p>
Not a member?
<a
href=
"#!"
>
Register
</a></p>
<p>
Not a member?
<a
href=
"#!"
>
Register
</a></p>
</form>
</form>
</body>
</body>
<
<<<<<<
HEAD
</html>
</html>
=======
</html>
>>>>>>> 9c7255d510762a8f16afeba2657cad4a0f8b8239
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment