Skip to content

Commit

Permalink
Merge branch 'main' into rebecca
Browse files Browse the repository at this point in the history
  • Loading branch information
dsneddon00 committed Nov 13, 2021
2 parents b1c84ec + 3b2da39 commit f25c1fc
Show file tree
Hide file tree
Showing 3 changed files with 128 additions and 0 deletions.
Binary file added Client/.index.html.swp
Binary file not shown.
90 changes: 90 additions & 0 deletions Client/home.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
.login {
min-height: 50vh;

background-color: rgba(245, 245, 245, 1);
color: rgba(0,0,0,1);
opacity: .7;
font-weight: 630;
font-size:17px;
}
.bg-image {
background-image: url('https://source.unsplash.com/WEQbe2jBg40');
background-size: cover;
background-position: center;
min-height: 100vh;

}
.logo-image {
width:240px;

}

.button {
background: transparent;
border: none;
color: black;
padding: 10px;
margin-left: 1050px;
margin-top: -400px;
text-align: center;
font-size: 16px;
}

p {
outline-color:grey;
}

p.solid {
border-radius: 25px;
background-color: grey;
width: 800px;
height: 100px;
left: 150px;
bottom: 95px;
outline-style: solid;
outline-width: thin;
position: relative;
text-align: center;
}

p.solid2 {
border-radius: 25px;
background-color: grey;
width: 445px;
height: 100px;
left: 20px;
top: 10px;
outline-style: solid;
outline-width: thin;
position: relative;
text-align: center;
font-size: 14px;
}

p.solid3 {
border-radius: 25px;
background-color: grey;
width: 450px;
height: 100px;
left: 235px;
top: 10px;
outline-style: solid;
outline-width: thin;
position: relative;
text-align: center;
font-size: 14px;
}

p.solid4 {
border-radius: 25px;
background-color: grey;
width: 650px;
height: 100px;
left: 250px;
top:55px;
outline-style: solid;
outline-width: thin;
position: relative;
text-align: center;
}

38 changes: 38 additions & 0 deletions Client/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<title>Bootstrap 101 Template</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="home.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" >
<title>E.R.I.K.A Home</title>
</head>
<div class="container-fluid ps-md-0 bg-image align-items-center">

<div class="row g-0">

<div class="container p-0" >
<div class="row">
<img src="images/logo2.png" class="logo-image mx-auto">
</div>

<div class="row login pt-5 pb-5 mx-auto" style="width:100%; border-radius:22px;">

<button class="button">Sign In</button>

<p class="solid">Hello, I am an Empathetic Reciprocating Intelligent Konnection Agent, or Erika for short. I’m here to help, because life is sometimes just exhausting.</p>
<p class="solid2">Talking with me, Erika, is easy! All you need to do is click the signup/login button in the top right hand corner, enter your credentials, and simply start typing messages! I can talk with you about many topics regarding your mental health and help you come back to center.</p>
<p class="solid3">I am not a professional counselor, but I will do my very best to help make you feel better. I am in no way able to replace the insight a psychologist could give you about your situation so please see qualified personnel if you need it</p>
<p class="solid4">
Derek Sneddon - Full Stack, Project Lead, Duck Guy
Rebecca Winn - Full Stack, Machine Learning Engineer, Metal Head
Langhui He - Backend, Server Maestro, Yoda Shirt Guy
Ben Betts - Front End, OS Guru, The Fourth Guy
</p>

</body>
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script> </body>
<script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.1/css/font-awesome.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js">
</html>

0 comments on commit f25c1fc

Please sign in to comment.