final

yuh19027 · May 3, 2020 · 9e48e02 · 9e48e02
1 parent 1e95955
commit 9e48e02
Show file tree

Hide file tree

Showing 35 changed files with 1,322 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/final/.DS_Store b/final/.DS_Store
diff --git a/final/Signup.html b/final/Signup.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Signup</title>
+    <link href="css/signup.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Josefin+Sans&display=swap" rel="stylesheet">
+</head>
+<body>
+    <div class="logo">
+        <img src="imgs/icon-transparent.png" height="100px">
+        <h1>Chatmate</h1>
+    </div>
+
+
+
+
+    <div class="profile">
+        <img class="smallImage" src="imgs/profile.png" id="userProfilePicDisplay"/>
+        <br><br>
+        <div id="usernameDisplay"></div>
+        <br>
+        <div id="userStatusDisplay"></div>
+    </div>
+
+    <div class="edit">
+        <p>Username</p>
+        <input type="text" placeholder="Username" name="UserName" id="usernameInput">
+        <p>Email</p>
+        <input type="text" placeholder="Email" name="EmailMessage" id="emailInput">
+        <p>Password</p>
+        <input type="text" placeholder="Password" name="PasswordMessage" id="passwordInput">
+        <p>
+            <button id="profileSaveInput" onclick="window.location.href='index.html'">Sign Up</button>
+        </p>
+        <p class="login">Already have an account? <a href="login.html">Login </a>here</p>
+    </div>
+
+        <script src="https://use.fontawesome.com/0e60a59edb.js"></script>
+
+        <!-- Firebase App (the core Firebase SDK) is always required and must be listed first -->
+        <script src="https://www.gstatic.com/firebasejs/7.9.2/firebase-app.js"></script>
+
+        <!-- If you enabled Analytics in your project, add the Firebase SDK for Analytics -->
+        <script src="https://www.gstatic.com/firebasejs/7.9.2/firebase-analytics.js"></script>
+
+        <!-- Add Firebase products that you want to use -->
+        <script src="https://www.gstatic.com/firebasejs/7.9.2/firebase-auth.js"></script>
+        <script src="https://www.gstatic.com/firebasejs/7.9.2/firebase-firestore.js"></script>
+
+        <script src="js/firebase-config.js"></script>
+
+        <script src="js/register-sw.js"></script>
+
+
+        <script src="https://cdn.jsdelivr.net/gh/joelsalisbury/firebase-chat-3440@1.2/firebase-chat-functions.js"></script>
+        <script src="js/main.js"></script>
+        <script src="js/signup.js"></script>
+</body>
+</html>
diff --git a/final/css/.DS_Store b/final/css/.DS_Store
diff --git a/final/css/edit-profile.css b/final/css/edit-profile.css
@@ -0,0 +1,63 @@
+.change-profile{
+    width: 100px;
+    height: 100px;
+    margin: 0 auto;
+    /* background-color:#3e2fae; */
+    background-image: url("../imgs/change-profile.png");
+    background-size: cover;
+    border-radius: 15px;
+}
+
+body{
+    background-color: #eeeeee;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+header{
+    display: none;
+}
+#profilePicInput{
+    display: none;
+}
+
+.edit{
+    padding-top: 50px;
+    width: 80vw;
+    margin: 0 auto;
+    text-align: left;
+}
+
+.edit p{
+    margin-bottom: 10px;
+    font-size: 1.2em;
+    text-align: left;
+
+}
+
+#usernameInput{
+    font-size: 1em;
+    text-indent: 10px;
+    border-radius: 10px;
+    border: 2px solid #f9d861;
+    width: 100%;
+    height: 32px;
+
+}
+#statusInput{
+    font-size: 1em;
+    text-indent: 10px;
+    border-radius: 10px;
+    border: 2px solid #f9d861;
+    width: 100%;
+    height: 32px;
+}
+
+
+#profileSaveInput{
+    font-size: 1em;
+    background-color: #f9d861;
+    width: 100%;
+    margin-top: 20px;
+    border-radius: 10px;
+    height: 36px;
+}
diff --git a/final/css/groupchat.css b/final/css/groupchat.css
@@ -0,0 +1,44 @@
+body{
+    background-color: #3e2fae;
+    width: 90vw;
+    height: 100vh;
+    margin: 0 auto;
+}
+
+#searchMsg{
+    width:100%;
+    text-indent: 10px;
+    height: 30px;
+    background-color: #ffffff;
+    border-radius: 10px;
+	border:2px solid #f9d861;
+	font-family: 'Josefin Sans', sans-serif;
+    margin-left: 20px;
+}
+
+.flex-box{
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    margin-top: 5vh;
+}
+
+h2{
+    color: white;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+h4{
+    font-family: 'Josefin Sans', sans-serif;
+    color: black;
+    background-color: #f9d861;
+    border-radius: 10px;
+    padding: 10px 10px;
+}
+
+a{
+    text-decoration: none;
+}
+a:visited{
+    color: black;
+}
diff --git a/final/css/login.css b/final/css/login.css
@@ -0,0 +1,76 @@
+.logo{
+    margin: 0 auto;
+    text-align: center;
+    margin-top: 80px;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+body{
+    font-family: 'Josefin Sans', sans-serif;
+    background-color: #eee;
+}
+
+h1{
+    color: #3e2fae;
+}
+
+
+
+.edit{
+    padding-top: 50px;
+    width: 80vw;
+    margin: 0 auto;
+    text-align: left;
+}
+
+.edit p{
+    margin-bottom: 10px;
+    font-size: 1.2em;
+    text-align: left;
+
+}
+#usernameInput{
+    font-size: 1em;
+    text-indent: 10px;
+    border-radius: 10px;
+    border: 2px solid #f9d861;
+    width: 100%;
+    height: 32px;
+    font-family: 'Josefin Sans', sans-serif;
+
+}
+#emailInput{
+    font-size: 1em;
+    text-indent: 10px;
+    border-radius: 10px;
+    border: 2px solid #f9d861;
+    width: 100%;
+    height: 32px;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+#passwordInput{
+    font-size: 1em;
+    text-indent: 10px;
+    border-radius: 10px;
+    border: 2px solid #f9d861;
+    width: 100%;
+    height: 32px;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+#profileSaveInput{
+    font-size: 1em;
+    background-color: #f9d861;
+    width: 100%;
+    margin-top: 20px;
+    border-radius: 10px;
+    height: 36px;
+    font-family: 'Josefin Sans', sans-serif;
+}
+
+div .login{
+    font-size: 0.8em;
+    text-align: center;
+}
+