Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codespace ideal trout 69g76p56g9j7hx4rg #45

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"editor.defaultFormatter": "ms-python.autopep8"
},
"[javascript]": {
"editor.defaultFormatter": "ms-vsliveshare.vsliveshare"
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
4 changes: 2 additions & 2 deletions src/front/js/component/navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const Navbar = () => {
window.location.href = "/login";
};
return (
<nav className="navbar navbar-expand-lg navbar-dark bg-dark">
<nav className="navbar navbar-expand-lg navbar-dark bg-dark pe-3">
<a className="navbar-brand justify-content-center ms-3" href="/">
<img src={Logo} width="40" height="30" alt="Logo" />
</a>
Expand All @@ -55,7 +55,7 @@ export const Navbar = () => {
{!sessionStorage.getItem("token") ? (
<>
<Link to="/login">
<button className="btn btn-primary">Login</button>
<button className="btn btn-primary me-3">Login</button>
</Link>
<Link to="/register">
<button className="btn btn-secondary ">Register</button>
Expand Down
98 changes: 55 additions & 43 deletions src/front/js/pages/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,60 +8,72 @@ export const Home = () => {

return (
<div className="content-wrapper h-100">
<div className="container mt-5">
{/* Hero Section */}
<div className="row">
<div className="col-12">
<div className="text-center">
<h1 className="blue-text"><b>Serenity Scribe</b></h1>
<p>
<img src={ssLogo} className="img-fluid" alt="Responsive image" />
</p>
<div className="container mt-5">
{/* Hero Section */}
<div className="row">
<div className="col-12">
<div className="text-center">
<h1
className="blue-text"
style={{
fontSize: "3rem",
fontFamily: "Brush Script MT, cursive",
}}
>
<b>Serenity Scribe</b>
</h1>
<p>
<img
src={ssLogo}
className="img-fluid"
alt="Responsive image"
/>
</p>
</div>
</div>
</div>
</div>

{/* Testimonial Cards Section */}
<div className="row">
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Janet Smith</h5>
<p className="card-text">

"Love the analytics to see where my well being has been at
lately. Definately a great tool to have. I have been telling my friends and family about it."
</p>
{/* Testimonial Cards Section */}
<div className="row">
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Janet Smith</h5>
<p className="card-text">
"Love the analytics to see where my well being has been at
lately. Definately a great tool to have. I have been telling
my friends and family about it."
</p>
</div>
</div>
</div>
</div>
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Marko Guiterez</h5>
<p className="card-text">
"This site is the most a fantastic part of my day."
</p>
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Marko Guiterez</h5>
<p className="card-text">
"This site is the most a fantastic part of my day."
</p>
</div>
</div>
</div>
</div>
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Sally Brown</h5>
<p className="card-text">
"Serenity Scribe has been very helpful to me. Being able to keep
a digital journal in an easy format is great, much better than
my old pen and paper method"
</p>
<div className="col-md-4 my-3">
<div className="card">
{/* <img src="..." className="card-img-top" alt="..." /> */}
<div className="card-body">
<h5 className="card-title">Sally Brown</h5>
<p className="card-text">
"Serenity Scribe has been very helpful to me. Being able to
keep a digital journal in an easy format is great, much better
than my old pen and paper method"
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
);
};
2 changes: 1 addition & 1 deletion src/front/js/pages/journal.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const Journal = () => {
<div style={{ width: "100%" }}>
<div className="col-md-6">
<div className="editorContainer text-center">
<h1 className="mb-3 mt-3">Journal</h1>
<h2 className="mb-5 mt-5">Your New Journal Entry</h2>
<div className="mt-3 d-flex flex-column align-items-center justify-content-center">
<MoodSelector
moods={moodOptions}
Expand Down