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.

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

feature/ add profile page #97

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

feature/ add profile page #97

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
8 changes: 2 additions & 6 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
node_modules
<<<<<<< HEAD
config.env
=======

.env

config.env
config.js
.sass-cache
.sass-cache/*
>>>>>>> 460b977edaa8b3b39602e028f62a4e83d8120eba
55 changes: 36 additions & 19 deletions public/css/components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
// insert buttons style

.btn__arrow-right {
border: none;
background: none;
margin: 0;
// padding: var(--space-xs);
align-self: center;
cursor: pointer;
border: none;
background: none;
margin: 0;
// padding: var(--space-xs);
align-self: center;
cursor: pointer;
}

.btn__round-large {
display: inline-flex;
position: relative;
white-space: nowrap;
text-decoration: none;
line-height: 1;
cursor: pointer;
padding: var(--space-md) var(--space-md);
border: 2px solid var(--yellow);
border-radius: var(--btn-radius);
font-size: var(--btn-font-size);
// color: var(--color-link);
background: white;
}
display: inline-flex;
position: relative;
white-space: nowrap;
text-decoration: none;
line-height: 1;
cursor: pointer;
padding: var(--space-md) var(--space-md);
border: 2px solid var(--yellow);
border-radius: var(--btn-radius);
font-size: var(--btn-font-size);
// color: var(--color-link);
background: white;
}

.btn__round {
display: inline-flex;
background-color: var(--yellow);
height: 6rem;
width: 6rem;
border-radius: 50%;
border: 3px solid white;
text-align: center;
margin: 5% 10% 5% 10%;
}

.input-box {
height: 10rem;
width: 80%;
margin: 5% 10% 5% 10%;
}
7 changes: 7 additions & 0 deletions public/css/components/_grids.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@
.main-paragraph {
text-align: center;
}

.p-border {
background-color: lightgray;
border-radius: 20px;
padding: 0.4rem 1rem 0.4rem 1rem;
margin: 1% 0% 0 1%;
}
8 changes: 8 additions & 0 deletions public/css/components/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@
height: 2.5rem;
width: auto;
}

.arrow-icon {
transform: rotate(180deg);
height: 3rem;
width: auto;
position: absolute;
top: 4%;
}
11 changes: 11 additions & 0 deletions public/css/components/_images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
border: 2px solid var(--grey);
}

.profile-img {
border-radius: 50%;
height: 10em;
width: 10em;
display: flex;
justify-content: center;
background-color: var(--grey-light);
border: 2px solid var(--grey);
margin: 0 auto;
}

.add {
font-size: var(--text-xxl);
padding-bottom: var(--space-xl);
Expand Down
13 changes: 13 additions & 0 deletions public/css/layout/_containers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,16 @@
top: -9999px !important;
left: -9999px !important;
}

.container {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
margin: 2% 10% 2% 10%;
}

.container-btn {
display: flex;
justify-content: center;
flex-wrap: wrap;
}
73 changes: 73 additions & 0 deletions public/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/controller/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ const signup = require("./signupPage");
const createProfilePage = require("./createProfilePage");
const location = require("./location");
const matchBuddiesPage = require("./matchBuddiesPage");
const userProfilePage = require("./userProfilePage");

router.post("/locate", location.post);
router.get("/", splash.get);
router.get("/conduct-page", conductPage.get);
router.get("/sign-up", signup.get);
router.get("/match-buddies-page", matchBuddiesPage.get);
router.get("/user-profile", userProfilePage.get);

router.post("/:gender-gender/:time-time", (req, res, next) => {
// console.log('params', req.params);
Expand Down
3 changes: 3 additions & 0 deletions src/controller/userProfilePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.get = (req, res) => {
res.render("userProfilePage", { layout: "userProfile" });
};
13 changes: 13 additions & 0 deletions src/views/layouts/userProfile.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
{{> htmlHead}}

<body class="flex-body">
<div class="container-content">
{{> header}}
{{{ body }}}
</div>
</body>
{{> footer}}

</html>
17 changes: 17 additions & 0 deletions src/views/userProfilePage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<img class='arrow-icon' src="./assets/right-arrow.png" alt="arrow">
<h1 class="sub-title">Profile</h1>
<img src="./assets/profile-pic.png" alt="Ryan" class="profile-img">
<p class="main-paragraph">Ryan McAvoy, 28</p>
<div class="container">
<p class="p-border">Morning</p>
<p class="p-border">Beginner</p>
<p class="p-border">Lose Weight</p>
<p class="p-border">Build Muscle</p>
</div>

<input type="text" placeholder="BIO..." class="input-box">

<div class="container-btn">
<button class="btn__round">Maybe Not</button>
<button class="btn__round">GymBuddy</button>
</div>