diff --git a/client/app/canvas/canvas.html b/client/app/canvas/canvas.html
index 29df48a..877b18f 100644
--- a/client/app/canvas/canvas.html
+++ b/client/app/canvas/canvas.html
@@ -1,25 +1,34 @@
diff --git a/client/app/config/app.templates.js b/client/app/config/app.templates.js
index 22ac274..342c03f 100644
--- a/client/app/config/app.templates.js
+++ b/client/app/config/app.templates.js
@@ -1,8 +1,8 @@
-angular.module('templates', []).run(['$templateCache', function($templateCache) {$templateCache.put('auth/auth.html','
');
-$templateCache.put('canvas/canvas.html','
\r\n\t
\r\n\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t\t
\r\n\t
\r\n\t
\r\n\t\t\r\n\t\t\r\n\t\t\r\n\t
\r\n\t
\r\n\t\t\r\n\t\t{{textTitle}} {{textAlert}}\r\n\t
\r\n
\r\n\t\r\n
\r\n\r\n\t
\r\n\t\r\n\t\r\n
\r\n\r\n');
+angular.module('templates', []).run(['$templateCache', function($templateCache) {$templateCache.put('canvas/canvas.html','
\r\n\t
\r\n\t\t- \r\n\t\t\t\r\n\t\t\t\tHome\r\n\t\t\t\r\n\t\t
\r\n\t\t\r\n\t\t\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t\t
\r\n\t\t
\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t
\r\n\t\t\r\n\t\t\t\r\n\t\t\t{{textTitle}} {{textAlert}}\r\n\t\t
\r\n\t
\r\n
\r\n\t\r\n
\r\n\r\n\t
\r\n\t\r\n\t\r\n
\r\n\r\n');
+$templateCache.put('auth/auth.html','
');
$templateCache.put('components/list-errors.html','
');
-$templateCache.put('home/home.html','
\r\n\r\n\t
\r\n\t\t
\r\n\r\n\t\t - \r\n\t\t\t\r\n\t\t\t Canvas\r\n\t\t\t\r\n\t\t
\r\n\t\t \r\n\t\t WebApps 3 Drawing Application
\r\n\r\n\t\t \r\n\t\t \r\n\t\t \r\n\r\n\t\t
\r\n\t
\r\n\t\r\n\t
\r\n\t\t
Welcome to the home page of this Drawing Application.
\r\n\t\t
This website allows you to draw alone or with other people. You can also name your drawing and save it, it will then display here on the home page.
\r\n\t\t
Below you can see a list of drawings that were already saved by other people.
\r\n\t\t
This website was developed by Thomas Buys.
\r\n\t
\r\n\t\r\n\t
\r\n\t\r\n\t
\r\n\r\n
\r\n');
$templateCache.put('layout/app-view.html','
');
$templateCache.put('layout/footer.html','');
$templateCache.put('layout/header.html','
\r\n\t\r\n\tEvil Drawing\r\n
');
-$templateCache.put('layout/sidebar.html','');}]);
\ No newline at end of file
+$templateCache.put('layout/sidebar.html','');
+$templateCache.put('home/home.html','
\r\n\r\n\t
\r\n\t\t
\r\n\r\n\t\t - \r\n\t\t\t\r\n\t\t\t Canvas\r\n\t\t\t\r\n\t\t
\r\n\t\t \r\n\t\t WebApps 3 Drawing Application
\r\n\r\n\t\t \r\n\t\t \r\n\t\t \r\n\r\n\t\t
\r\n\t
\r\n\t\r\n\t
\r\n\t\t
Welcome to the home page of this Drawing Application.
\r\n\t\t
This website allows you to draw alone or with other people. You can also name your drawing and save it, it will then display here on the home page.
\r\n\t\t
Below you can see a list of drawings that were already saved by other people.
\r\n\t\t
This website was developed by Thomas Buys.
\r\n\t
\r\n\t\r\n\t
\r\n\t\r\n\t
\r\n\r\n
\r\n');}]);
\ No newline at end of file
diff --git a/client/app/style.css b/client/app/style.css
index b50691f..fd1ed76 100644
--- a/client/app/style.css
+++ b/client/app/style.css
@@ -66,93 +66,11 @@ h1, p, ul {
background-color: #575252;
}
-select, option {
- padding-bottom: 3em;
- padding-right: 4.5em;
-}
-select {
- -webkit-appearance: none;
- -moz-appearance: none;
- text-indent: 1px;
- text-overflow: '';
-}
-
-button#changeBrushSize, button#clearCv, button#colorOptions, button#saveDrawing {
- background-color: gray !important;
- font-size: 35px;
- color: #575252 !important;
-}
-button#submitCustomColor {
- background-color: gray !important;
- font-size: 14px;
- color: #575252 !important;
- width: 24px;
- min-height: 24px;
- height: 24px;
- line-height: 24px;
-}
-
#footerText {
color: #CBCACA;
text-align: center;
}
-#colorList {
- width: 50px;
- height: auto;
- background-color: gray;
- z-index: 2;
- display: none;
- position: absolute;
- top: 5px;
- left: 10vh;
-}
-
-#black {
- background-color: #000000;
-}
-#white {
- background-color: #FFFFFF;
-}
-#green {
- background-color: #22B14C;
-}
-#yellow {
- background-color: #FFF200;
-}
-#orange {
- background-color: #FF7F27;
-}
-#red {
- background-color: #ED1C24;
-}
-#lightBlue {
- background-color: #00A2E8;
-}
-#blue {
- background-color: #3F48CC;
-}
-#purple {
- background-color: #A349A4;
-}
-
-.color {
- width: 50px;
- height: 50px;
- cursor: pointer;
-}
-.color:not(:first-child) {
- margin-top: 3px;
-}
-
-.alertCustom {
- padding: 2px;
- border-radius: 4px;
- background-color: #e56969;
- width: 25%;
- float: right;
-}
-
.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.6;filter:alpha(opacity=60);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}
button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
@@ -282,12 +200,125 @@ h1 {
/* End Home Page */
+/* Start Auth Page */
+
+.row {
+ height: 100%;
+ text-align: center;
+}
+
+.row a {
+ text-decoration: none;
+ color: #7F7E7E;
+}
+
+.row a:hover {
+ text-decoration: underline;
+}
+
+.auth-header {
+ width: 100%;
+ height: 8%;
+}
+.auth-header ul {
+ text-align: center;
+}
+.auth-header ul li {
+ width: 10%;
+}
+.auth-header ul li a {
+ color: white;
+}
+.auth-header ul li a:hover {
+ text-decoration: none;
+}
+
+.auth-title {
+ color: #191919;
+}
+
+#authForm {
+ display: block;
+ width: 30%;
+ height: auto;
+ margin: 0 auto;
+}
+
+#authForm input {
+ display: block;
+ width: 70%;
+ font-size: 1.1em;
+ margin: 3em auto;
+ padding: 1em;
+ border: 0;
+}
+
+#authForm input:focus {
+ border: 2px solid gray;
+}
+
+#authForm fieldset {
+ border: 0;
+}
+
+.authSubmit {
+ display: block;
+ width: 70%;
+ height: 50px;
+ float: initial;
+ margin: 0 auto;
+}
+
+.block {
+ width: 10%;
+ height: 100%;
+ float: right;
+}
+
+/* End Auth Page */
+
+/* Start Canvas Page */
+
+.canvasNav {
+ text-align: inherit;
+}
+.canvasNav li {
+ width: 5%;
+ text-align: center;
+}
+
+select, option {
+ padding-bottom: 3em;
+ padding-right: 4.5em;
+}
+select {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ text-indent: 1px;
+ text-overflow: '';
+}
+
+button#changeBrushSize, button#clearCv, button#colorOptions, button#saveDrawing {
+ background-color: gray !important;
+ font-size: 35px;
+ color: #575252 !important;
+}
+button#submitCustomColor {
+ background-color: gray !important;
+ font-size: 14px;
+ color: #575252 !important;
+ width: 24px;
+ min-height: 24px;
+ height: 24px;
+ line-height: 24px;
+}
+
#customColor {
display: none;
Width: 10%;
position: absolute;
top: 5px;
- left: 20vh;
+ left: 35vh;
}
.customColorLabel {
color: white;
@@ -298,4 +329,62 @@ h1 {
background-color: #575252;
color: white;
border: 1px solid gray;
-}
\ No newline at end of file
+}
+
+#colorList {
+ width: 50px;
+ height: auto;
+ background-color: gray;
+ z-index: 2;
+ display: none;
+ position: absolute;
+ top: 5px;
+ left: 25vh;
+}
+
+#black {
+ background-color: #000000;
+}
+#white {
+ background-color: #FFFFFF;
+}
+#green {
+ background-color: #22B14C;
+}
+#yellow {
+ background-color: #FFF200;
+}
+#orange {
+ background-color: #FF7F27;
+}
+#red {
+ background-color: #ED1C24;
+}
+#lightBlue {
+ background-color: #00A2E8;
+}
+#blue {
+ background-color: #3F48CC;
+}
+#purple {
+ background-color: #A349A4;
+}
+
+.color {
+ width: 50px;
+ height: 50px;
+ cursor: pointer;
+}
+.color:not(:first-child) {
+ margin-top: 3px;
+}
+
+.alertCustom {
+ padding: 2px;
+ border-radius: 4px;
+ background-color: #e56969;
+ width: 25%;
+ float: right;
+}
+
+/* End Canvas Page */
\ No newline at end of file