Skip to content

Commit

Permalink
Merge pull request #90 from hackjunction/fix/challenges
Browse files Browse the repository at this point in the history 
Fixed faulty challenges
  • Loading branch information
@Earlo
Earlo authored Oct 28, 2020
2 parents 215d222 + c9f9057 commit 9607394
Show file tree
Hide file tree
Showing 5 changed files with 766 additions and 300 deletions.
125 changes: 21 additions & 104 deletions frontend/app/src/components/ChallengeGrid/ChallengeItem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import './style.scss'
import Markdown from '../Markdown'
import { requirePropFactory } from '@material-ui/core'

import DesktopLayout from './DesktopLayout'
import MobileLayout from './MobileLayout'

const ChallengeItem = ({ item }) => {
//Animation duration
const aDur = 0.6
Expand All @@ -20,114 +23,28 @@ const ChallengeItem = ({ item }) => {
insightimage,
tags,
key,
icon,
support,
} = item
var { cardbackground, icon } = item
if (!cardbackground) {
cardbackground = { url: '' }
}
if (!icon) {
icon = { url: '' }
}
const [open, toggleOpen] = useState(false)
const [clicable, toggleClicable] = useState(true)

const flipStyle = (e, state) => {
e.currentTarget.classList.toggle('flip', state)
e.currentTarget.doneAnimating = !state
}
const flipCard = (e) => {
console.log('===', clicable)
if (!clicable) {
return
}
let duration = aDur * 1000
flipStyle(e, true)
setTimeout(() => toggleOpen(!open), duration / 2)
window.mobileCheck = function () {
let check = false
;(function (a) {
if (
/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
a
) ||
/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
a.substr(0, 4)
)
)
check = true
})(navigator.userAgent || navigator.vendor || window.opera)
return check
}
const mobile = window.mobileCheck()

if (open) {
return (
<div className="Blur" onClick={(e) => flipCard(e)}>
<div
className="ChallengeItem open flip"
style={{ animationDuration: aDur + 's' }}
onAnimationEnd={(e) => flipStyle(e, false)}
onMouseEnter={(e) => {
toggleClicable(false)
}}
onMouseLeave={(e) => {
toggleClicable(true)
}}
>
<div className="ChallengeItem--text">
<img class="ChallengeIco open" src={icon.url} />
<span
href="#"
class="close"
onMouseEnter={(e) => {
toggleClicable(true)
}}
onMouseLeave={(e) => {
toggleClicable(false)
}}
></span>
<span className="ChallengeItem--title">{name}</span>
<p className="ChallengeItem--description">{shorttext}</p>
<Markdown
className="ChallengeItem--description"
source={long_text}
/>
<div className="ChallengeItem--subsection">
<p className="ChallengeItem--left">The Challenge</p>
<Markdown
className="ChallengeItem--right"
source={thechallenge}
/>
</div>
<div className="ChallengeItem--subsection">
<p className="ChallengeItem--left">Insights</p>
<Markdown className="ChallengeItem--right" source={insights} />
</div>
{insightimage && <img class="InsightImg" src={insightimage.url} />}
<div className="ChallengeItem--subsection">
<p className="ChallengeItem--left">The Prize</p>
<Markdown className="ChallengeItem--right" source={price} />
</div>
<div className="ChallengeItem--subsection">
<p className="ChallengeItem--left">Judging Criteria</p>
<Markdown className="ChallengeItem--right" source={judging} />
</div>
<div className="ChallengeItem--subsection">
<p className="ChallengeItem--left">About the company</p>
<Markdown
className="ChallengeItem--right"
source={aboutcompany}
/>
</div>
</div>
</div>
</div>
)
}
return (
<div
className="ChallengeItem closed flip"
style={{
backgroundImage: 'url(' + cardbackground.url + ')',
animationDuration: aDur + 's',
}}
onAnimationEnd={(e) => flipStyle(e, false)}
onClick={(e) => flipCard(e)}
>
<div className="ChallengeItem--logowpr">
<img class="ChallengeIco" src={icon.url} />
</div>
<div className="ChallengeItem--text">
<span className="ChallengeItem--title">{name}</span>
<p className="ChallengeItem--description">{shorttext}</p>
</div>
</div>
)
return !mobile ? <DesktopLayout {...item} /> : <MobileLayout {...item} />
}

export default ChallengeItem
116 changes: 116 additions & 0 deletions frontend/app/src/components/ChallengeGrid/DesktopLayout.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import React, { useState } from 'react'
import './style.scss'

import Markdown from '../Markdown'
import { requirePropFactory } from '@material-ui/core'

const DesktopLayout = (props) => {
//Animation duration

// var { cardbackground, icon } = item
// if (!cardbackground) {
// cardbackground = { url: '' }
// }
if (!props.cardbackground) {
props.cardbackground = { url: '' }
}
// const [open, toggleOpen] = useState(false)
// const [clicable, toggleClicable] = useState(true)

// const flipStyle = (e, state) => {
// e.currentTarget.classList.toggle('flip', state)
// e.currentTarget.doneAnimating = !state
// }
// const flipCard = (e) => {
// console.log('===', clicable)
// if (!clicable) {
// return
// }
// let duration = aDur * 1000
// flipStyle(e, true)
// setTimeout(() => toggleOpen(!open), duration / 2)
// }

// if (open) {
return (
<div className="ChallengeItem">
<div className="ChallengeItem--head">
<img className="ChallengeItem--image" src={props.cardbackground.url} />
<div className="ChallengeItem--title-container">
<span className="ChallengeItem--title">{props.name}</span>
</div>
<div className="ChallengeItem--shorttext-container">
<span className="ChallengeItem--shorttext"> {props.shorttext}</span>
</div>
<div className="ChallengeItem--longtext-container">
<Markdown
className="ChallengeItem--longtext"
source={props.long_text}
/>
</div>
<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left">The Challenge</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.thechallenge}
/>
</div>
{props.insights && (
<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left"> Insights</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.insights}
/>
</div>
)}

{props.support && (
<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left"> Support</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.support}
/>
</div>
)}
{/* {insightimage && <img class="InsightImg" src={insightimage.url} />} */}
{props.price && (
<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left"> The Prize</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.price}
/>
</div>
)}

{props.judging && (
<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left">
{' '}
Judging Criteria
</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.judging}
/>
</div>
)}

<div className="ChallengeItem--subsection">
<span className="ChallengeItem--subsection-left">
{' '}
About the company
</span>
<Markdown
className="ChallengeItem--subsection-right"
source={props.aboutcompany}
/>
</div>
</div>
</div>
)
}

export default DesktopLayout
Loading

0 comments on commit 9607394

Please sign in to comment.