Skip to content

Commit cd2bac6

Browse files
The-DevBlogThe-DevBlog
committed
update icons
1 parent cac062c commit cd2bac6

File tree

25 files changed

+151
-78
lines changed

25 files changed

+151
-78
lines changed

‎devblog/devblog/ClientApp/src/components/styles/Comment.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.comment {
2-
border: .15em solid rgb(70, 68, 60);
32
border-radius: .5em;
43
display: "flex";
54
margin-bottom: .25em;

‎devblog/devblog/client/src/components/comment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn comment(props: &Props) -> Html {
4141
};
4242

4343
html! {
44-
<div class={style}>
44+
<div class={{style}}>
4545
<div class="comment">
4646
<div class="comment-info">
4747
// USERNAME

‎devblog/devblog/client/src/components/comment_add.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{helpers, store::Store, Api, CommentModel};
22
use gloo::console::log;
3-
use gloo_net::http::{Headers, Method};
3+
use gloo_net::http::Method;
44
use std::ops::Deref;
55
use stylist::Style;
66
use web_sys::{Event, HtmlTextAreaElement, SubmitEvent};
@@ -40,10 +40,7 @@ pub fn add_comment(props: &Props) -> Html {
4040
let store = store.clone();
4141
Callback::from(move |e: SubmitEvent| {
4242
e.prevent_default();
43-
let auth = format!("Bearer {}", store.token);
44-
let hdrs = Headers::new();
45-
hdrs.append("Authorization", &auth);
46-
hdrs.append("content-type", "application/json");
43+
let hdrs = helpers::create_auth_header(&store.token);
4744

4845
let new_comment = CommentModel::new(
4946
post_id,

‎devblog/devblog/client/src/components/comment_delete.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::{store::Store, Api};
2-
use gloo_net::http::{Headers, Method};
1+
use crate::{helpers, icons::icons::TrashIcon, store::Store, Api};
2+
use gloo_net::http::Method;
33
use stylist::Style;
44
use yew::{function_component, html, Callback, Html, Properties};
55
use yewdux::use_store_value;
@@ -21,9 +21,7 @@ pub fn delete_comment(props: &Props) -> Html {
2121
let id = props.id.clone();
2222
let callback = props.on_comment_delete.clone();
2323
Callback::from(move |_| {
24-
let auth = format!("Bearer {}", store.token.clone());
25-
let hdrs = Headers::new();
26-
hdrs.append("Authorization", &auth);
24+
let hdrs = helpers::create_auth_header(&store.token);
2725
let callback = callback.clone();
2826

2927
wasm_bindgen_futures::spawn_local(async move {
@@ -44,7 +42,9 @@ pub fn delete_comment(props: &Props) -> Html {
4442

4543
html! {
4644
<span class={style}>
47-
<button class="delete-comment-btn" onclick={delete}>{"X"}</button>
45+
<span class="delete-comment-btn" onclick={delete}>
46+
<TrashIcon />
47+
</span>
4848
</span>
4949
}
5050
}

‎devblog/devblog/client/src/components/comment_edit.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
use gloo::console::log;
2-
use gloo_net::http::{Headers, Method};
1+
use crate::{helpers, icons::icons::EditIcon, store::Store, Api};
2+
use gloo_net::http::Method;
33
use std::ops::Deref;
44
use stylist::Style;
55
use web_sys::{Event, HtmlTextAreaElement};
6-
use yew::{
7-
function_component, html, use_effect_with, use_state, Callback, Html, Properties, TargetCast,
8-
};
6+
use yew::{function_component, html, use_state, Callback, Html, Properties, TargetCast};
97
use yewdux::use_store_value;
108

11-
use crate::{helpers, store::Store, Api};
12-
139
const STYLE: &str = include_str!("styles/commentEdit.css");
1410

1511
#[derive(Properties, PartialEq)]
@@ -53,11 +49,8 @@ pub fn edit_comment(props: &Props) -> Html {
5349
on_is_editing.emit(false);
5450
let content = content.clone();
5551
let on_save = on_save.clone();
56-
let auth = format!("Bearer {}", store.deref().token);
57-
let hdrs = Headers::new();
58-
hdrs.append("Authorization", &auth);
59-
hdrs.append("content-type", "application/json");
6052
let body = Some(helpers::to_jsvalue(content.deref().clone()));
53+
let hdrs = helpers::create_auth_header(&store.token);
6154

6255
wasm_bindgen_futures::spawn_local(async move {
6356
let response = Api::EditComment(id)
@@ -81,7 +74,9 @@ pub fn edit_comment(props: &Props) -> Html {
8174
html! {
8275
<div class={style}>
8376
if !props.is_editing {
84-
<button class="edit-comment-btn" onclick={edit}>{"*"}</button>
77+
<span class="edit-comment-btn" onclick={edit}>
78+
<EditIcon />
79+
</span>
8580
}
8681

8782
if props.is_editing {

‎devblog/devblog/client/src/components/pager.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use stylist::Style;
22
use yew::{function_component, html, Callback, Html, Properties};
3+
4+
use crate::icons::icons::{ArrowLeft, ArrowRight};
35
// use gloo::console::log;
46

57
const STYLE: &str = include_str!("styles/pager.css");
@@ -29,12 +31,14 @@ pub fn pager(props: &Props) -> Html {
2931
<div class="pager">
3032
// PAGE LEFT
3133
if props.page_num > 1 {
32-
<span onclick={page(-1)}>{"back"}</span>
34+
<span onclick={page(-1)}><ArrowLeft /></span>
3335
}
3436

37+
// <span>{props.page_num}</span>
38+
3539
// PAGE RIGHT
3640
if props.page_num < props.total_pages {
37-
<span onclick={page(1)}>{"next"}</span>
41+
<span onclick={page(1)}><ArrowRight /></span>
3842
}
3943
</div>
4044
</div>

‎devblog/devblog/client/src/components/post_delete.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::{store::Store, Api};
2-
use gloo_net::http::{Headers, Method};
1+
use crate::{helpers, icons::icons::TrashIcon, store::Store, Api};
2+
use gloo_net::http::Method;
33
use stylist::Style;
44
use yew::{function_component, html, Callback, Html, Properties};
55
use yewdux::use_store_value;
@@ -22,9 +22,7 @@ pub fn delete_post(props: &Props) -> Html {
2222
let token = store.token.clone();
2323
let callback = props.on_post_delete.clone();
2424
Callback::from(move |_| {
25-
let auth = format!("Bearer {}", token);
26-
let hdrs = Headers::new();
27-
hdrs.append("Authorization", &auth);
25+
let hdrs = helpers::create_auth_header(&token);
2826
let callback = callback.clone();
2927

3028
wasm_bindgen_futures::spawn_local(async move {
@@ -46,7 +44,9 @@ pub fn delete_post(props: &Props) -> Html {
4644
html! {
4745
if store.admin {
4846
<span class={style}>
49-
<button onclick={delete} class="delete-post-btn">{"X"}</button>
47+
<span onclick={delete} class="delete-post-btn">
48+
<TrashIcon />
49+
</span>
5050
</span>
5151
}
5252
}

‎devblog/devblog/client/src/components/styles/comment.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.comment {
2-
border: .15em solid rgb(70, 68, 60);
32
border-radius: .5em;
43
display: "flex";
54
margin-bottom: .25em;

‎devblog/devblog/client/src/components/styles/commentDelete.css

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
.delete-comment-btn:hover {
2-
color: red;
3-
cursor: pointer;
4-
}
5-
61
.delete-comment-btn {
72
padding: 0px 5px;
3+
}
4+
5+
.delete-comment-btn>svg {
6+
height: 12;
7+
8+
}
9+
10+
.delete-comment-btn>svg:hover {
11+
cursor: pointer;
12+
fill: red;
813
}

‎devblog/devblog/client/src/components/styles/commentEdit.css

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
.edit-comment-btn:hover {
2-
color: greenyellow;
1+
.edit-comment-btn svg:hover {
32
cursor: pointer;
3+
fill: greenyellow;
4+
}
5+
6+
.edit-comment-btn svg {
7+
fill: white;
8+
height: 12;
49
}
510

611
.edit-comment-btn {
@@ -9,8 +14,8 @@
914

1015
.edit-comment textarea,
1116
.edit-comment button {
12-
padding: 8px;
1317
margin-right: 5px;
18+
padding: 8px;
1419
}
1520

1621
.edit-comment div {

0 commit comments

Comments
 (0)