diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-25 23:36:16 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-25 23:36:16 +0000 |
| commit | 0d8073039faa903ee0f12e68064c89b5f27cdf14 (patch) | |
| tree | 221688160f73edd753a35d3d240022154078ee88 /views | |
| parent | 9f1b0d9f1c807e02a415b5b8a2509dc6445f08b3 (diff) | |
| parent | 10f1c442e27d82d1fc2c94d1bc0a2ad27917b287 (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'views')
| -rw-r--r-- | views/admin.hbs | 24 | ||||
| -rw-r--r-- | views/public_profile.hbs | 77 | ||||
| -rw-r--r-- | views/user_search.hbs | 11 |
3 files changed, 110 insertions, 2 deletions
diff --git a/views/admin.hbs b/views/admin.hbs index 12c2ba9..6b1f6af 100644 --- a/views/admin.hbs +++ b/views/admin.hbs @@ -2,7 +2,7 @@ <div class="container"> <div class="row"> <!-- Admin control Panel ---> -<div class="col-xs-12 col-sm-12 col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0 toppad cpnl-details"> +<div class="col-xs-12 col-sm-12 col-md-8 col-md-offset-2 col-xs-offset-0 col-sm-offset-0 toppad cpnl-sidetails"> {{# if messages.success }} <section class="alert alert-success custom-Alert"> <!-- Change those to banners later --> @@ -16,6 +16,28 @@ {{/if}} {{/if}} + {{# if success }} + <section class="alert alert-success"> + <!-- Change those to banners later --> + <h2>Signup Successful!</h2> + </section> + {{ else }} + {{# if errors }} + <section class="alert alert-danger"> + <ul> + {{# each errors }} + <li>{{ this.msg }}</li> + {{/each}} + </ul> + </section> + {{/if}} + {{/if}} + {{#if flashMsg}} + <section class="alert alert-danger"> + {{flashMsg}} + </section> + {{/if}} + <!-- Admin Control Panel Menu --> <nav class="navbar navbar-custom"> <div class="container-fluid"> diff --git a/views/public_profile.hbs b/views/public_profile.hbs new file mode 100644 index 0000000..d43cc66 --- /dev/null +++ b/views/public_profile.hbs @@ -0,0 +1,77 @@ +<main id="solutions-main"> + <div class="container user-info-content"> + <div class="row"> + + <!-- User Profile details --> + <div class="col-xs-12 col-sm-12 col-md-8 + col-md-offset-2 col-xs-offset-0 col-sm-offset-0 toppad prf-details"> + + + <div class="rounded"> + <div class="panel panel-info rounded"> + <div class="panel-heading"> + <h3 class="panel-title">{{ user.f_name }} {{ user.l_name }}</h3> + </div> + <div class="panel-body"> + <!--- User-Profile Pages --> + <div class="row" id="profile-general"> + <!-- User Image --> + <div class="col-md-3 col-lg-3 " align="center"> + <img alt="User Pic" src="../assets/images/avatar.png" + class="img-circle img-responsive"> + </div> + <!-- User Details --> + <div class=" col-md-9 col-lg-9 "> + <table class="table table-user-information"> + <tbody> + <tr> + <td>Username:</td> + <td>{{ user.user_name }}</td> + </tr> + <tr> + <td>Email:</td> + <td><a href="{{ user.email }}">{{ user.email }}</a></td> + </tr> + {{# if user.university }} + <tr> + <td>University:</td> + <td>{{ user.university }}</td> + </tr> + {{/if}} + {{# if user.department }} + <tr> + <td>Department:</td> + <td>{{ user.department }}</td> + </tr> + {{/if}} + <tr> + <td>Answered:</td> + <td>{{ user.answered }}</td> + </tr> + <tr> + <tr> + <td>Messages:</td> + <td>{{ user.messages }}</td> + </tr> + <tr> + <td>Comments:</td> + <td>{{ user.comments }}</td> + </tr> + </tbody> + </table> + </div> + </div> + <!-- Date, Edit, Logout (new row) --> + <div class="col-md-12 prf-sign-off"> + <p class=" text-info"> July 4 2016 </p> + <br> + </div> + </div> + </div> + </div> + + </div> + + </div> + </div> +</main>
\ No newline at end of file diff --git a/views/user_search.hbs b/views/user_search.hbs index fd08e84..59c9435 100644 --- a/views/user_search.hbs +++ b/views/user_search.hbs @@ -1,9 +1,18 @@ <main id = 'solutions-main'> <div class = 'search container' id = 'solutions-div'> + + <!--- Check to see if something went wrong db end ---> + {{# if messages.error }} + <section class="alert alert-danger custom-Alert"> + <h4>{{ messages.error }}</h4> + </section> + {{/if}} + + <h4 class='search-head'>Search results for "{{query}}"</h4> {{# if users }} {{# each users}} - <a href="/public_profile/{{this._id}}"> + <a href="/public_profile/{{this.user_name}}"> <section class = 'solutions-card'> <h3 class = 'solutions-title'>{{this.user_name}}</h3> <p class = 'solutions-time' > |