Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/improve-code-…
Browse files Browse the repository at this point in the history
…and-more-components
  • Loading branch information
luyangliuable committed Feb 3, 2024
2 parents 5d2ac7f + 9deaa0d commit b08794c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@ const NavBurgerPanel: React.FC<INavBurgerPanelProps> = ({ burgerPanel, links })


export default NavBurgerPanel;


6 changes: 3 additions & 3 deletions client/src/components/Navbar/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@
background: linear-gradient(
90deg,
#00bfff 0%,
#4f87f7 35%,
#897ed3 50%,
#4f87f7 65%,
#4f87f7 35%,
#897ed3 50%,
#4f87f7 65%,
#00bfff 100%
);
background-size: 200% 200%;
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Waves/Waves.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
position: absolute;
top: 4%;
left: 45%;
width: 110%;
width: 110%;
height: auto;
padding-bottom: 100%;
margin-left: -50%;
Expand Down
10 changes: 5 additions & 5 deletions server/src/models/post_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use crate::models::utils::date_format::date_format;
pub struct Post {
#[serde(rename = "_id", skip_serializing_if = "Option::is_none")]
pub id: Option<ObjectId>,
pub heading: String,
pub author: String,
pub description: Option<String>,
pub post_type: String,
pub heading: String,
pub author: String,
pub description: Option<String>,
pub post_type: String,
pub year: i32,
pub month: i32,
#[serde(with = "date_format", default)]
Expand All @@ -25,5 +25,5 @@ pub struct Post {
pub active: Option<bool>,
pub image: Option<ObjectId>,
pub checksum: Option<String>,
pub body: String
pub body: String,
}

0 comments on commit b08794c

Please sign in to comment.