forked from CSC207-UofT/course-project-super-turtle-hackers
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into rue-cleanup
- Loading branch information
Showing
30 changed files
with
179 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../java/com/amigo/app/AmigoApplication.java → ...a/com/amigo/control/AmigoApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,80 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <!DOCTYPE html><!-- This site was created in Webflow. http:https://www.webflow.com --> | ||
| <!-- Last Published: Thu Nov 11 2021 22:18:47 GMT+0000 (Coordinated Universal Time) --> | ||
| <html lang="en" xmlns:th="http:https://www.thymeleaf.org"> | ||
|
|
||
| <head> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | ||
| <title>Test</title> | ||
| <meta charset="utf-8"> | ||
| <title>CSC207 webapp final</title> | ||
| <meta content="width=device-width, initial-scale=1" name="viewport"> | ||
| <meta content="Webflow" name="generator"> | ||
| <link href="css/normalize.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/webflow.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/csc207-webapp-final.webflow.css" rel="stylesheet" type="text/css"> | ||
| <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js" type="text/javascript"></script> | ||
| <script | ||
| type="text/javascript">WebFont.load({ google: { families: ["Raleway:regular,500,300italic,italic", "Just Me Again Down Here:regular", "Roboto:regular"] } });</script> | ||
| <script | ||
| type="text/javascript">!function (o, c) { var n = c.documentElement, t = " w-mod-"; n.className += t + "js", ("ontouchstart" in o || o.DocumentTouch && c instanceof DocumentTouch) && (n.className += t + "touch") }(window, document);</script> | ||
| <link href="images/favicon.ico" rel="shortcut icon" type="image/x-icon"> | ||
| <link href="images/webclip.png" rel="apple-touch-icon"> | ||
| </head> | ||
| <body> | ||
| <p>Get your greeting <a href="/greeting">here</a></p> | ||
|
|
||
| <body class="body"> | ||
| <div class="navigator-div"> | ||
| <a href="index.html" aria-current="page" class="button-2 w-button w--current"><strong>Amigos</strong></a> | ||
| <a href="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/CSC207-UofT/course-project-super-turtle-hackers" target="_blank" | ||
| class="button w-button"><strong>SuperTurtleHackers</strong></a> | ||
| <link rel="prefetch" href="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/CSC207-UofT/course-project-super-turtle-hackers"><img | ||
| src="images/github.png" loading="lazy" width="38" alt="" class="image-9"> | ||
| </div> | ||
| <div class="columns-3 w-row"> | ||
| <div class="column-3 w-col w-col-6"> | ||
| <div class="title-div-block"> | ||
| <h1 class="amigos-title">Amigos</h1> | ||
| <div class="normal-text-style">From classmates to Amigos</div> | ||
| </div> | ||
| </div> | ||
| <div class="column-4 w-col w-col-6"> | ||
| <div class="login-div-block-copy"><img src="images/Step1.png" loading="lazy" width="344" | ||
| sizes="(max-width: 479px) 72vw, (max-width: 767px) 344px, (max-width: 991px) 38vw, 344px" | ||
| srcset="images/Step1-p-500.png 500w, images/Step1-p-800.png 800w, images/Step1-p-1080.png 1080w, images/Step1.png 1440w" | ||
| alt=""> | ||
| <div class="w-form"> | ||
| <form id="email-form" name="email-form" data-name="Email Form" | ||
| redirect="https://csc207-webapp-final.webflow.io/create-account-1" | ||
| data-redirect="https://csc207-webapp-final.webflow.io/create-account-1" class="form"> | ||
| <label for="name">Create Account</label> | ||
| <input type="email" class="text-field w-input" maxlength="256" | ||
| name="name" data-name="Name" placeholder="[email protected]" id="name" | ||
| required=""> | ||
| <input type="text" class="text-field w-input" maxlength="256" name="First-Name" | ||
| data-name="First Name" placeholder="First Name" id="First-Name" required=""> | ||
| <input type="text" | ||
| class="text-field w-input" maxlength="256" name="Last-Name" data-name="Last Name" placeholder="Last Name" | ||
| id="Last-Name" required=""> | ||
| <input type="text" class="text-field w-input" maxlength="256" name="Password" | ||
| data-name="Password" placeholder="Password" id="Password" required=""> | ||
| <input type="text" | ||
| class="text-field w-input" maxlength="256" name="Confirm-Password" data-name="Confirm Password" | ||
| placeholder="Confirm Password" id="Confirm-Password" required=""> | ||
| <input type="submit" value="Register" | ||
| data-wait="Please wait..." class="submit-button-3 w-button"> | ||
| </form> | ||
| <div class="w-form-done"> | ||
| <div>Thank you! Your submission has been received!</div> | ||
| </div> | ||
| <div class="w-form-fail"> | ||
| <div>Oops! Something went wrong while submitting the form.</div> | ||
| </div> | ||
| </div> | ||
| <a href="/login" class="button-4 w-button">Sign in</a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <script src="https://d3e54v103j8qbb.cloudfront.net/js/jquery-3.5.1.min.dc5e7f18c8.js?site=6186d05657b40287f8dd3978" | ||
| type="text/javascript" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" | ||
| crossorigin="anonymous"></script> | ||
| <script src="js/webflow.js" type="text/javascript"></script> | ||
| </body> | ||
|
|
||
| </html> |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
app/src/test/java/com/amigo/app/AmigoApplicationTests.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.