From b0a2efea1b9c43a32a92d6db1dbdc315e2e0ae2f Mon Sep 17 00:00:00 2001 From: Angel Odiel Trevino Villanueva Date: Mon, 15 Jul 2019 11:43:58 -0500 Subject: [PATCH] Adding principal views for the user --- app/client/assets/images/cross.png | Bin 0 -> 1317 bytes app/client/assets/images/mark-white.png | Bin 0 -> 1825 bytes app/client/assets/images/mark.png | Bin 0 -> 1007 bytes app/client/stylesheets/_dashboard.scss | 12 +++- app/client/stylesheets/_page.scss | 4 +- app/client/views/dashboard/dashboard.html | 78 +++++++++++++++++++++- 6 files changed, 89 insertions(+), 5 deletions(-) create mode 100755 app/client/assets/images/cross.png create mode 100755 app/client/assets/images/mark-white.png create mode 100755 app/client/assets/images/mark.png diff --git a/app/client/assets/images/cross.png b/app/client/assets/images/cross.png new file mode 100755 index 0000000000000000000000000000000000000000..a391305fdeb3589bdd39a55f67e3e36920046c01 GIT binary patch literal 1317 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 literal 0 HcmV?d00001 diff --git a/app/client/stylesheets/_dashboard.scss b/app/client/stylesheets/_dashboard.scss index f22b17891..eac855832 100644 --- a/app/client/stylesheets/_dashboard.scss +++ b/app/client/stylesheets/_dashboard.scss @@ -64,4 +64,14 @@ margin-bottom: 24px; } } -} \ No newline at end of file + + .team-list { + width: 100%; + text-align: left; + margin-bottom: 24px; + display:inline-block; + } + .team-member { + padding-left: 30px; + } +} diff --git a/app/client/stylesheets/_page.scss b/app/client/stylesheets/_page.scss index 3526e567b..8f1019ab8 100644 --- a/app/client/stylesheets/_page.scss +++ b/app/client/stylesheets/_page.scss @@ -4,7 +4,7 @@ .title { font-family: $font-header; text-transform: uppercase; - font-size: 2.5em; + font-size: 1.8em; text-align: center; color: $page-header-color; letter-spacing: 8px; @@ -49,4 +49,4 @@ font-size: 1.25em; } } -} \ No newline at end of file +} diff --git a/app/client/views/dashboard/dashboard.html b/app/client/views/dashboard/dashboard.html index b107314ab..8cfce7a39 100644 --- a/app/client/views/dashboard/dashboard.html +++ b/app/client/views/dashboard/dashboard.html @@ -1,6 +1,6 @@
-
- Dashboard +
+ Welcomo to hackmty, {{ user.profile.name.substr(0, user.profile.name.indexOf(' ')) }}!
@@ -235,4 +235,78 @@

+ + +
+
+
+ +
+ Team Overview +
+ +
+

+ Mi Equipo +

+
+ +
+

+ + +

+

+ {{user.profile.name}} +

+
+
+

+ + +

+

+ Carolina Peyrot +

+
+
+

+ + +

+

+ Mariana Villanueva +

+
+
+

+ + +

+

+ Noe Campos +

+
+ + +
+ Check In +
+ +
+ +

+ Checked In +

+
+ +
+ Everyone is check in your table is #34 +
+ +
+ +
+
+