Skip to content

Commit 88c1283

Browse files
William-McGonagleWilliam-McGonagle
authored
Merge pull request #12 from MassiGy/master
Signup Front End Setup Completed.
2 parents 487f41c + 7ffbf8c commit 88c1283

File tree

2 files changed

+88
-96
lines changed

2 files changed

+88
-96
lines changed

‎src/auth/login/index.html‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,54 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<title>Login to the Fairfield Programming Association</title>
5-
<include src="./includes/head.html"></include>
6-
<link rel="stylesheet" href="../style.css" />
7-
</head>
8-
<body class="text-center">
9-
<main class="form-signin">
10-
<form>
11-
<a href="/">
12-
<img class="mb-4" alt="" width="240" src="/resources/logo.svg" />
13-
</a>
14-
<h1 class="h3 mb-3 fw-normal">Login Below</h1>
153

16-
<div class="form-floating">
17-
<input
18-
type="email"
19-
class="form-control"
20-
id="floatingInput"
21-
placeholder="[email protected]"
22-
/>
23-
<label for="floatingInput">Email address</label>
24-
</div>
25-
<div class="form-floating">
26-
<input
27-
type="password"
28-
class="form-control"
29-
id="floatingPassword"
30-
placeholder="Password"
31-
/>
32-
<label for="floatingPassword">Password</label>
33-
</div>
34-
<!--
4+
<head>
5+
<title>Login to the Fairfield Programming Association</title>
6+
<include src="./includes/head.html"></include>
7+
<link rel="stylesheet" href="../style.css" />
8+
</head>
9+
10+
<body class="text-center">
11+
<main class="form-signin">
12+
<!-- For testing within my local machine -->
13+
<form action="http://localhost:8080/user/login" method="POST">
14+
15+
<!-- you should probably use this version in production though -->
16+
<!-- <form action="/user/login" method="POST"> -->
17+
<!-- <form action="https://fairfield-programming.herokuapp.com/user/login" method="POST"> -->
18+
19+
<a href="/">
20+
<img class="mb-4" alt="" width="240" src="/resources/logo.svg" />
21+
</a>
22+
<h1 class="h3 mb-3 fw-normal">Login Below</h1>
23+
24+
<div class="form-floating">
25+
<input type="text" name="username" class="form-control" id="floatingInput" placeholder="Username" />
26+
<label for="floatingPassword">Username</label>
27+
</div>
28+
<div class="form-floating">
29+
<input type="email" name="email" class="form-control" id="floatingInput" placeholder="[email protected]" />
30+
<label for="floatingInput">Email address</label>
31+
</div>
32+
<div class="form-floating">
33+
<input type="password" name="password" class="form-control" id="floatingPassword" placeholder="Password" />
34+
<label for="floatingPassword">Password</label>
35+
</div>
36+
<!--
3537
<div class="checkbox mb-3">
3638
<label>
3739
<input type="checkbox" value="remember-me" /> Remember me
3840
</label>
3941
</div> -->
4042

41-
<button class="w-100 btn btn-lg btn-primary" type="submit">
42-
Login
43-
</button>
44-
<a class="w-100 text-muted p-4" href="/auth/signup" type="submit">
45-
Go to Signup
46-
</a>
47-
<p class="mt-5 mb-3 text-muted">© 2021-2022</p>
48-
</form>
49-
</main>
50-
</body>
51-
</html>
43+
<button class="w-100 btn btn-lg btn-primary" type="submit">
44+
Login
45+
</button>
46+
<a class="w-100 text-muted p-4" href="/auth/signup" type="submit">
47+
Go to Signup
48+
</a>
49+
<p class="mt-5 mb-3 text-muted">© 2021-2022</p>
50+
</form>
51+
</main>
52+
</body>
53+
54+
</html>

‎src/auth/signup/index.html‎

Lines changed: 43 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,47 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<title>Sign Up to the Fairfield Programming Association</title>
5-
<include src="./includes/head.html"></include>
6-
<link rel="stylesheet" href="../style.css" />
7-
</head>
8-
<body class="text-center">
9-
<main class="form-signin">
10-
<form>
11-
<div class="alert alert-primary" role="alert">
12-
As the website is under construction, this feature is temporarily
13-
unavailable.
14-
</div>
15-
<a href="/">
16-
<img class="mb-4" alt="" width="240" src="/resources/logo.svg" />
17-
</a>
18-
<h1 class="h3 mb-3 fw-normal">Signup Below</h1>
193

20-
<div class="form-floating">
21-
<input
22-
type="email"
23-
class="form-control"
24-
id="floatingInput"
25-
placeholder="[email protected]"
26-
/>
27-
<label for="floatingInput">Email address</label>
28-
</div>
29-
<div class="form-floating">
30-
<input
31-
type="text"
32-
class="form-control"
33-
id="floatingInput"
34-
placeholder="jane-smith"
35-
/>
36-
<label for="floatingInput">Username</label>
37-
</div>
38-
<div class="form-floating">
39-
<input
40-
type="password"
41-
class="form-control"
42-
id="floatingPassword"
43-
placeholder="Password"
44-
/>
45-
<label for="floatingPassword">Password</label>
46-
</div>
4+
<head>
5+
<title>Sign Up to the Fairfield Programming Association</title>
6+
<include src="./includes/head.html"></include>
7+
<link rel="stylesheet" href="../style.css" />
8+
</head>
479

48-
<button class="w-100 btn btn-lg btn-primary" type="submit">
49-
Signup
50-
</button>
51-
<a class="w-100 text-muted p-4" href="/auth/login" type="submit">
52-
Go to Login
53-
</a>
54-
<p class="mt-5 mb-3 text-muted">© 2021-2022</p>
55-
</form>
56-
</main>
57-
</body>
58-
</html>
10+
<body class="text-center">
11+
<main class="form-signin">
12+
<!-- For testing within my local machine -->
13+
<form action="http://localhost:8080/user/signup" method="POST">
14+
15+
<!-- you should probably use this version in production though -->
16+
<!-- <form action="/user/signup" method="POST"> -->
17+
<!-- <form action="https://fairfield-programming.herokuapp.com/user/signup" method="POST"> -->
18+
19+
<a href="/">
20+
<img class="mb-4" alt="" width="240" src="/resources/logo.svg" />
21+
</a>
22+
<h1 class="h3 mb-3 fw-normal">Signup Below</h1>
23+
24+
<div class="form-floating">
25+
<input type="text" name="username" class="form-control" id="floatingInput" placeholder="Username" />
26+
<label for="floatingPassword">Username</label>
27+
</div>
28+
<div class="form-floating">
29+
<input type="email" name="email" class="form-control" id="floatingInput" placeholder="[email protected]" />
30+
<label for="floatingInput">Email address</label>
31+
</div>
32+
<div class="form-floating">
33+
<input type="password" name="password" class="form-control" id="floatingPassword" placeholder="Password" />
34+
<label for="floatingPassword">Password</label>
35+
</div>
36+
<button class="w-100 btn btn-lg btn-primary" type="submit">
37+
Signup
38+
</button>
39+
<a class="w-100 text-muted p-4" href="/auth/login" type="submit">
40+
Go to Login
41+
</a>
42+
<p class="mt-5 mb-3 text-muted">© 2021-2022</p>
43+
</form>
44+
</main>
45+
</body>
46+
47+
</html>

0 commit comments

Comments
 (0)