diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 3d7cae211..4119dbcc9 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -167,4 +167,13 @@ body{ bottom: 15px; left: 20px; z-index: -1; +} + +.box { + border: 1px solid black; + padding: 20px; +} + +.box:hover { + box-shadow: 4px 4px 4px grey; } \ No newline at end of file diff --git a/views/home/index.hbs b/views/home/index.hbs index 770e3c2e6..892e606c2 100644 --- a/views/home/index.hbs +++ b/views/home/index.hbs @@ -5,16 +5,18 @@ -

You've been logged out, please log in to continue.

+
+

Please log in or sign up


-
+ +

- - + +
- -

+ +

{{#if accountCreated}} Account created! Please sign in. {{/if}} @@ -35,16 +37,16 @@
{{!-- password and user prompts for incorrect --}}
-
+

- +

{{!-- currently doesn't work needs to have a new route added with a form --}}
- +

- +
\ No newline at end of file diff --git a/views/layout.hbs b/views/layout.hbs index 65a7bf65d..1a6064b1a 100644 --- a/views/layout.hbs +++ b/views/layout.hbs @@ -1,7 +1,7 @@ - + Catbook diff --git a/views/posts/explore.hbs b/views/posts/explore.hbs index 557a3f085..dffe53b4e 100644 --- a/views/posts/explore.hbs +++ b/views/posts/explore.hbs @@ -3,6 +3,11 @@ @@ -138,79 +145,103 @@ +
-
- User - -

{{user.username}}

-

Welcome {{user.username}} -

-
-
- -
- {{!-- for each of the posts array, the message and date is posted and a button - rendered - the button has a onclick method that runs a method from the script, - each button has a data-post-id attached in which the posts.id is attached to. - the item with likes count is given an idea which is also associated with posts.id --}} - {{#each posts }} -
-
- {{ this.message }}
- -

{{ this.author }}

- -
- {{ this.date }} -
- {{!-- adds a little meow with the like counter, associated with this.id and showing this.likes_count --}} -
- 😻 - {{ this.likes }} +
+ {{#if user.profilepic }} + + {{else}} + User + {{/if}} + +

{{user.username}}

+

Welcome {{user.username}} +

+
+ +
- 🐾 - {{ this.loves }} +
+ {{!-- for each of the posts array, the message and date is posted and a button + rendered - the button has a onclick method that runs a method from the script, + each button has a data-post-id attached in which the posts.id is attached to. + the item with likes count is given an idea which is also associated with posts.id --}} + {{#each posts }} +
+
+
+ {{ this.message }}
+
+ + {{#if this.image }} + image not found! + {{else}} +

+ {{/if}} + +
+ +

{{ this.author }}

+ {{!-- {{#if }} + image not found! + {{else}} +

+ {{/if}} --}} + +
+
+ {{ this.date }} +
+ {{!-- adds a little meow with the like counter, associated with this.id and showing this.likes_count --}} +
+ +
+ 😻 + {{ this.likes }} + + 🐾 + {{ this.loves }} -
- {{!-- set the data-post-id as posts.id onto this button --}} +
+ {{!-- set the data-post-id as posts.id onto this button --}} -
- -
-
-
+
+ + +
+
{{!-- adds a little meow with the like counter, associated with this.id and showing this.likes_count --}} {{!-- set the data-post-id as posts.id onto this button --}} - -
-
Comments
+
+
+
Comments:
{{#each this.comments}} - "{{this.comment}}" - {{this.user}}, {{this.date}} -
+
+ "{{this.comment}}" - {{this.user}}, {{this.date}}
+ {{/each}} -
+

+
+ style="height:50px; width:200px; display: inline-block; margin-left: 30px; border: 2px solid black; border-radius: 20px;" + type="text" id="comment-" +{{ this.id }} name="comment" placeholder=" Enter your comment here">
- - {{/each}} -
+
+ {{/each}} +
+ +
diff --git a/views/posts/index.hbs b/views/posts/index.hbs index 9abd1c468..b054461b1 100644 --- a/views/posts/index.hbs +++ b/views/posts/index.hbs @@ -168,7 +168,7 @@ div {text-align: center;} each button has a data-post-id attached in which the posts.id is attached to. the item with likes count is given an idea which is also associated with posts.id --}} {{#each posts }} - +
{{ this.message }}
@@ -237,9 +237,9 @@ div {text-align: center;} - +
{{/each}} - +

diff --git a/views/sessions/new.hbs b/views/sessions/new.hbs index 0ab38b6cf..892e606c2 100644 --- a/views/sessions/new.hbs +++ b/views/sessions/new.hbs @@ -1,27 +1,52 @@ - - - - -
- - - -

- - -

-
+ + - -

- + +
+

Please log in or sign up

+
+
+
- -
- - - + + +
+ +

+ {{#if accountCreated}} + Account created! Please sign in. + {{/if}} + {{#if emailExists}} + Email already exists!
+ Please try to log in, or try to sign up with a different email. + {{/if}} + {{#if usernameExists}} + Username already exists!
+ Please try to log in, or try to sign up with a different username. + {{/if}} + {{#if wronguser}} + User does not exist, please sign up! + {{/if}} + {{#if wrongpass}} + Password is incorrect, please try again. + {{/if}} +
+ {{!-- password and user prompts for incorrect --}} +
+
+
+
+ +

+{{!-- currently doesn't work needs to have a new route added with a form --}} +
+ +

+
+
+ + \ No newline at end of file