Skip to content

Modified-user profile page #106

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.

Sign up for GitHub

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

Open
PalakKumari wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified-user profile page #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16,616 changes: 28 additions & 16,588 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function App() {
<div className="App">
<br />
<br />
{/* <Carousel /> */}
{/* <Carousel /> */}
<br />
<Navbar />
<br />
Expand Down Expand Up @@ -126,6 +126,7 @@ export default function App() {
/>
</Switch>
</center>

<br />
<Footer />
</div>
Expand Down
1 change: 1 addition & 0 deletions client/src/components/Login-page/Login-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export const Loginpage = () => {
{passError}
</span>
<br></br>
<br></br>
<div style={{ textAlign: "center" }}>
<input
type="checkbox"
Expand Down
88 changes: 55 additions & 33 deletions client/src/components/User-profile/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import Feature from "./feature.js";
import Activity from "./Activity.js";
import image from "./user-icon.png";
import "./Userstyle.css";
import "bootstrap/dist/css/bootstrap.min.css";
import "bootstrap/dist/css/bootstrap-grid.css";
Expand All @@ -11,7 +12,7 @@ function User() {
<div className="User-profile-head">
<div className="Userprofile-head-img">
<img
src="//placehold.it/100"
src={image}
alt="Organization "
class="avatar User-profile-top-img"
/>
Expand All @@ -36,63 +37,63 @@ function User() {
{/* Activity SECTION */}

<div className="User-profile-middle">
<div className="row">
<div className="col-md-3">
{/* <div className="row"> */}
{/* <div className="col-md-3">
<div className="User-profile-boxs ">
<div className=" User-profile-box-side">
{/* <div className=" User-profile-box-side">
<div className="User-profile-inside">
<p>
" Around 200 people have joined our organization. Hoping to
expand help as much we can"
</p>
</div>
</div>
</div>
</div>
</div>
</div> */}

<div class="col-md-6 ">
<div className="User-profile-boxs User-profile-boxs-center">
<h1 className="User-profile-activities-head">Activities</h1>
<div className=" User-profile-activities">
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="First Activity"
/>
<br />
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="Second Activity"
/>
<br />
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="Third Activity"
/>
</div>
</div>
{/* <div class="col-md-6 "> */}
<div className="User-profile-boxs User-profile-boxs-center">
<h1 className="User-profile-activities-head">Activities</h1>
<div className=" User-profile-activities">
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="First Activity"
/>
<br />
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="Second Activity"
/>
<br />
<Activity
img="https://bootdey.com/img/Content/avatar/avatar1.png"
description="Third Activity"
/>
</div>
<div class="col-md-3 ">
</div>
{/* </div> */}
{/* <div class="col-md-3 ">
<div className="User-profile-boxs ">
<div className="User-profile-box-side">
<div className="User-profile-inside">
<p>"Aiming to reach Helping hands to the ones in need."</p>
</div>
</div>
</div>
</div>
</div>
</div> */}
{/* </div> */}
</div>
<hr />
{/* CARDS SECTION END */}

{/* Featured */}

<div className="User-profile-bottom">
<div clclassName="container">
<div className="container">
<div class="row">
<div class="col-md-6 User-profile-bottom-item">
<h4>Featured Photos : </h4>
<div class="User-profile-feature">
<h4>Featured Photos</h4>
<div class="User-profile-profile-page-block-outer clearfix">
<Feature img="https://bootdey.com/img/Content/avatar/avatar1.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar2.png" />
Expand All @@ -102,11 +103,32 @@ function User() {
<Feature img="https://bootdey.com/img/Content/avatar/avatar6.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar1.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar2.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar3.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar4.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar6.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar7.png" />
<Feature img="https://bootdey.com/img/Content/avatar/avatar5.png" />
</div>
</div>
</div>
<div class="col-md-6 User-profile-bottom-item">
<h4> Reviews </h4>
<div class="vl"></div>

<div class="col-md-3 User-profile-bottom-item User-profile-reviews-box">
<h4 style={{ marginTop: "5px" }}> Reviews </h4>
<div className="User-profile-reviews">
<p> " One of the best NGOs we can look for." </p>
</div>
<div className="User-profile-reviews">
<p> " One of the best NGOs we can look for." </p>
</div>
Expand Down
Loading