From 41339eb0306a79ea637feb2442ad5d60c8abc62a Mon Sep 17 00:00:00 2001 From: zrm99 <36284384+zrm99@users.noreply.github.com> Date: Sun, 18 Oct 2020 07:09:34 -0700 Subject: [PATCH] Default navbar converted to partial for reusability. --- Nodejs/public/html/register.html | 5 +- Nodejs/views/browser.hbs | 7 +- .../create-miniverse.hbs} | 86 +++++++++---------- Nodejs/views/miniverse-creator.hbs | 7 +- Nodejs/views/miniverse-followed.hbs | 7 +- Nodejs/views/miniverse-topic-creator.hbs | 7 +- Nodejs/views/miniverse-topic.hbs | 7 +- Nodejs/views/miniverse-unfollowed.hbs | 7 +- Nodejs/views/other-profiles-followed.hbs | 9 +- Nodejs/views/other-profiles-unfollowed.hbs | 7 +- Nodejs/views/partials/default-navbar.hbs | 6 ++ Nodejs/views/profile-customize.hbs | 7 +- Nodejs/views/search.hbs | 4 +- Nodejs/views/user-followers.hbs | 6 +- Nodejs/views/user-following.hbs | 6 +- 15 files changed, 68 insertions(+), 110 deletions(-) rename Nodejs/{public/html/create-miniverse.html => views/create-miniverse.hbs} (76%) create mode 100644 Nodejs/views/partials/default-navbar.hbs diff --git a/Nodejs/public/html/register.html b/Nodejs/public/html/register.html index 8318208..ee251e6 100644 --- a/Nodejs/public/html/register.html +++ b/Nodejs/public/html/register.html @@ -5,12 +5,13 @@ User Registration +
-
+
-
Username
+
Username
    Username must be at least 1 character and less than 20 characters. diff --git a/Nodejs/views/browser.hbs b/Nodejs/views/browser.hbs index 2f7d0bf..00ae90b 100644 --- a/Nodejs/views/browser.hbs +++ b/Nodejs/views/browser.hbs @@ -4,17 +4,20 @@ Miniverse Browser - + +
    -
    +
    Miniverse Followers diff --git a/Nodejs/public/html/create-miniverse.html b/Nodejs/views/create-miniverse.hbs similarity index 76% rename from Nodejs/public/html/create-miniverse.html rename to Nodejs/views/create-miniverse.hbs index ddf8646..1ded8a7 100644 --- a/Nodejs/public/html/create-miniverse.html +++ b/Nodejs/views/create-miniverse.hbs @@ -1,45 +1,41 @@ - - - - - - Create - - - - - -
    -
    - Logout - Profile - Browser -
    - -
    -
    Miniverse Name
    - -
      -
    • Must be 20 characters or less
      • -
    -
    -
    -
    Summary
    - -
    -
    - Type -
    - -
    - Agree to creation - terms and conditions -
    - - -
    - - + + + + + + Create + + + + + +
    + {{> default-navbar }} +
    +
    +
    Miniverse Name
    + +
      +
    • Must be 20 characters or less
      • +
    +
    +
    +
    Summary
    + +
    +
    + Type +
    + +
    + Agree to creation + terms and conditions +
    + +
    +
    + + diff --git a/Nodejs/views/miniverse-creator.hbs b/Nodejs/views/miniverse-creator.hbs index c175e6e..2ea8751 100644 --- a/Nodejs/views/miniverse-creator.hbs +++ b/Nodejs/views/miniverse-creator.hbs @@ -10,12 +10,7 @@
    -
    - Search - Logout - Profile - Browser -
    + {{> default-navbar}}
    {{miniverseName}} diff --git a/Nodejs/views/miniverse-followed.hbs b/Nodejs/views/miniverse-followed.hbs index 5e512e4..72e2931 100644 --- a/Nodejs/views/miniverse-followed.hbs +++ b/Nodejs/views/miniverse-followed.hbs @@ -10,12 +10,7 @@
    -
    - Search - Logout - Profile - Browser -
    + {{> default-navbar}}
    {{miniverseName}} diff --git a/Nodejs/views/miniverse-topic-creator.hbs b/Nodejs/views/miniverse-topic-creator.hbs index 956e79c..d5eebc9 100644 --- a/Nodejs/views/miniverse-topic-creator.hbs +++ b/Nodejs/views/miniverse-topic-creator.hbs @@ -10,12 +10,7 @@
    -
    - Logout - Search - Profile - Browser -
    + {{> default-navbar}}
    {{topicTitle}} diff --git a/Nodejs/views/miniverse-topic.hbs b/Nodejs/views/miniverse-topic.hbs index b2aa264..4de4da7 100644 --- a/Nodejs/views/miniverse-topic.hbs +++ b/Nodejs/views/miniverse-topic.hbs @@ -10,12 +10,7 @@
    -
    - Logout - Search - Profile - Browser -
    + {{> default-navbar}}
    {{topicTitle}} diff --git a/Nodejs/views/miniverse-unfollowed.hbs b/Nodejs/views/miniverse-unfollowed.hbs index d3ef54e..aeafc4b 100644 --- a/Nodejs/views/miniverse-unfollowed.hbs +++ b/Nodejs/views/miniverse-unfollowed.hbs @@ -11,12 +11,7 @@
    -
    - Search - Logout - Profile - Browser -
    + {{> default-navbar}}
    {{miniverseName}}
    diff --git a/Nodejs/views/other-profiles-followed.hbs b/Nodejs/views/other-profiles-followed.hbs index f3fe6d0..d9797cd 100644 --- a/Nodejs/views/other-profiles-followed.hbs +++ b/Nodejs/views/other-profiles-followed.hbs @@ -11,12 +11,7 @@
    +
    diff --git a/Nodejs/views/other-profiles-unfollowed.hbs b/Nodejs/views/other-profiles-unfollowed.hbs index 72e7f97..2d90f0c 100644 --- a/Nodejs/views/other-profiles-unfollowed.hbs +++ b/Nodejs/views/other-profiles-unfollowed.hbs @@ -11,12 +11,7 @@