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

Able to click whole challenge or inventory item #101

Merged
merged 4 commits into from
Sep 21, 2018
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ typings/

#DS store
.DS_Store

#VS Code settings
.vscode
31 changes: 16 additions & 15 deletions private/sass/challenges.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
border: 1px solid #ccc;
border-top: none;
border-radius: 10px;
margin-bottom: $smallest;
}

.tab {
Expand All @@ -24,21 +25,21 @@
cursor: pointer;
}

// .tab button:hover {
// background-color: #ddd;
// border-radius: 3px;
// }

// .tab button:focus,
// .tab button:active,
// // .tab li:active
// {
// background-color: $orange1;
// color: $black;
// border: none;
// // padding: $smallest;
// border-radius: 3px;
// }
.tab button:hover {
background-color: #ddd;
border-radius: 3px;
}

.tab button:focus,
.tab button:active,
// .tab li:active
{
background-color: $orange1;
color: $black;
border: none;
// padding: $smallest;
border-radius: 3px;
}

.tab nav ul {
list-style: none;
Expand Down
8 changes: 7 additions & 1 deletion private/sass/inventory.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@
}

.items-overview {
display: block;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin: 0;
border: 2px $navy1 solid;
border-top: 1px $navy1 solid;
border-right: 1px $navy1 solid;
border-radius: 10px;
padding: $smallest;
margin-bottom: $small;
}

.bought-icon,
Expand Down
2 changes: 1 addition & 1 deletion private/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

main {
margin-top: $larger;
margin-bottom: $large;
margin-bottom: $large + 1rem;
}

body {
Expand Down
14 changes: 14 additions & 0 deletions public/css/challenges.css

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

14 changes: 13 additions & 1 deletion public/css/challenges.css.map

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

8 changes: 7 additions & 1 deletion public/css/inventory.css

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/inventory.css.map

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/style.css

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/style.css.map

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

45 changes: 45 additions & 0 deletions public/imgs/checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 31 additions & 30 deletions public/js/challenges.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
let challengePage = document.querySelector(".challenge-page");
let url = window.location.href.split("/")[3];
let h3id = document.querySelector(".accept-challenge-section");
/* eslint-disable */
let challengePage = document.querySelector('.challenge-page');
let url = window.location.href.split('/')[3];
let h3id = document.querySelector('.accept-challenge-section');

(function checkUrlandCreateForm(url) {
let f = document.createElement("form");
let s = document.createElement("input"); //input element, Submit button
let id = document.createElement("input");
let h3 = document.createElement("h3");
let f = document.createElement('form');
let s = document.createElement('input'); //input element, Submit button
let id = document.createElement('input');
let h3 = document.createElement('h3');

if (url === "new-challenges") {
f.setAttribute("method", "post");
f.setAttribute("action", "/challenge/accepted");
f.classList.add("action-section");
s.classList.add("single-page-button", "acceptBtn");
s.setAttribute("type", "submit");
s.setAttribute("value", "Yes I am! Accept that Challenge!!");
id.setAttribute("name", "challenge_id");
id.setAttribute("type", "hidden");
id.classList.add("id-hidden");
id.setAttribute("value", h3id.innerHTML);
h3.innerHTML = "Are you brave enough to accept this challenge?";
if (url === 'new-challenges') {
f.setAttribute('method', 'post');
f.setAttribute('action', '/challenge/accepted');
f.classList.add('action-section');
s.classList.add('single-page-button', 'acceptBtn');
s.setAttribute('type', 'submit');
s.setAttribute('value', 'Yes I am! Accept that Challenge!!');
id.setAttribute('name', 'challenge_id');
id.setAttribute('type', 'hidden');
id.classList.add('id-hidden');
id.setAttribute('value', h3id.innerHTML);
h3.innerHTML = 'Are you brave enough to accept this challenge?';
f.appendChild(h3);
f.appendChild(s);
f.appendChild(id);
challengePage.appendChild(f);
} else if (url === "acc-challenges") {
f.setAttribute("method", "post");
f.setAttribute("action", "/challenge/completed");
f.classList.add("action-section");
s.classList.add("single-page-button", "complBtn");
s.setAttribute("type", "submit");
s.setAttribute("value", "You bet! Woop!");
id.setAttribute("name", "challenge_id");
id.setAttribute("type", "hidden");
id.setAttribute("value", h3id.innerHTML);
h3.innerHTML = "Have you completed this challenge?";
} else if (url === 'acc-challenges') {
f.setAttribute('method', 'post');
f.setAttribute('action', '/challenge/completed');
f.classList.add('action-section');
s.classList.add('single-page-button', 'complBtn');
s.setAttribute('type', 'submit');
s.setAttribute('value', 'You bet! Woop!');
id.setAttribute('name', 'challenge_id');
id.setAttribute('type', 'hidden');
id.setAttribute('value', h3id.innerHTML);
h3.innerHTML = 'Have you completed this challenge?';
f.appendChild(h3);
f.appendChild(s);
f.appendChild(id);
Expand Down
24 changes: 12 additions & 12 deletions src/views/dashboard.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
{{!--

<body onload="document.getElementById('defaultOpen').click()"> --}}
<!-- Tabbed test -->
<!-- Tabbed test -->




<div class="tab">
<nav>
<ul>
<li><button class="tablinks" onclick="openCity(event, 'new-challenge')" id="defaultOpen">All</button></li>
<li> <button class="tablinks" onclick="openCity(event, 'accepted-challenge')">Accepted </button></li>
<li> <button class="tablinks" onclick="openCity(event, 'completed-challenge')">Completed</button></li>
</ul>
<ul>
<li><button class="tablinks" onclick="openCity(event, 'new-challenge')" id="defaultOpen">All</button></li>
<li> <button class="tablinks" onclick="openCity(event, 'accepted-challenge')">Accepted </button></li>
<li> <button class="tablinks" onclick="openCity(event, 'completed-challenge')">Completed</button></li>
</ul>
</nav>

</div>
Expand All @@ -22,7 +22,7 @@
<section id="new-challenge" class="items-container tabcontent">
<div class="bought-container">
{{#each newChallenges}}
<div class="items-overview">
<div class="items-overview" onclick="window.location.href='/new-challenges/{{this.id}}'">
{{!-- <h3 class="newChallH3">{{this.title}} : {{this.id}}</h3> --}}
<h3 class="newChallH3">{{this.title}}</h3>
<div class="icons">
Expand All @@ -43,7 +43,7 @@
<section id="accepted-challenge" class="items-container tabcontent">
<div class="challenges-container">
{{#each acceptedChallenges}}
<div class="items-overview">
<div class="items-overview" onclick="window.location.href='/acc-challenges/{{this.challenge_id}}'">
<h3 id="challenge-content" class="newChallH3">{{this.title}}</h3>
<div class="icons">
<img class="bought-icon" src='{{this.img_link}}'>
Expand All @@ -63,15 +63,15 @@
<section id="completed-challenge" class="items-container tabcontent">
<div class="challenges-container">
{{#each completedChallenges}}
<div class="items-overview">
<div class="items-overview" onclick="window.location.href='/comp-challenges/{{this.challenge_id}}'">
<h3 class="newChallH3">{{this.title}}</h3>
<div class="icons">
<img class="bought-icon" src='{{this.img_link}}'>
<button class="new-item-button" id="id-{{this.id}}" onclick="window.location.href='/comp-challenges/{{this.challenge_id}}'">
<img class="help-icon" src="../../public/imgs/help.svg" alt="">
</button>
</div>
</div>
</div>
{{/each}}
</div>
{{/each}}
</section>
Loading