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

[WIP] New/request list #189

Open
wants to merge 40 commits into
base: sprint/help-requests
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2181d89
add fragmentTypes to git ignore
the-vampiire Dec 19, 2018
7e6c899
RequestList: base component functionality and todos
the-vampiire Dec 19, 2018
3154401
HelpRequestCard: base component and todos
the-vampiire Dec 19, 2018
f302b62
caught up with sprint branch
the-vampiire Dec 19, 2018
af0b724
tickets asset
serpient Dec 19, 2018
7c59fdf
extend width of button contianer
serpient Dec 19, 2018
9fc6571
RequestList: manual control of Loader
the-vampiire Dec 19, 2018
2b17ff6
caught up with sprint branch
the-vampiire Dec 19, 2018
6c9a022
HelpRequest: back button, handleSuccess, handleError, propTypes
the-vampiire Dec 19, 2018
1b24072
TicketBox: rename 'requests' to 'your tickets' in switch case
the-vampiire Dec 19, 2018
25afa0e
RequestList: add back button
the-vampiire Dec 19, 2018
86490f3
update ticket case
serpient Dec 19, 2018
cfd5cbf
fragment types
serpient Dec 19, 2018
fb599c1
merge
serpient Dec 19, 2018
b93cd70
add no ticket render case
serpient Dec 19, 2018
5acce13
remove comment
serpient Dec 19, 2018
7c8aa7c
new assets for help request
serpient Dec 20, 2018
d386bbb
add background color to request window
serpient Dec 20, 2018
8533121
styling for help cards
serpient Dec 20, 2018
4b926d4
remove todo
serpient Dec 20, 2018
f97e2b3
add additional fields for inactiveMember and changeProject query
serpient Dec 21, 2018
0ee8bfc
added inactive member and project change name to tickets
serpient Dec 21, 2018
8066195
changed styling for ticketbox
serpient Dec 21, 2018
4e4f978
adjust form text styling
serpient Dec 21, 2018
d8f1129
adjust request_options based off whether user has active cohort project
serpient Dec 21, 2018
03ba0bc
change request options in renderBaseForm()
serpient Dec 21, 2018
f4a2997
remove comment
serpient Dec 21, 2018
9931faa
update question mark icon
serpient Dec 21, 2018
8738c87
update className
serpient Dec 21, 2018
599e5dd
comment out unused
serpient Dec 21, 2018
1947d9a
add alt to img
serpient Dec 21, 2018
3e7ad02
remove unused, add img alt
serpient Dec 21, 2018
0def667
remove unused Fragment type
serpient Dec 21, 2018
77ae813
remove unused multiple_text_input
serpient Dec 21, 2018
69e4455
use subtext setup
serpient Dec 21, 2018
3fc1a87
update portal category color
serpient Dec 21, 2018
3f87468
make portal title darker
serpient Dec 21, 2018
de2c31c
set bug/suggesstion to small/transparent
serpient Dec 21, 2018
147fa79
RequestList nwtwork-only fetch policy
thinktwice13 Dec 21, 2018
cb5cefe
Merge branch 'new/request-list' of github.com:chingu-x/chingu-fronten…
thinktwice13 Dec 21, 2018
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ yarn-debug.log*
yarn-error.log*

.vs/
*.sqlite
*.sqlite

src/fragmentTypes.json
Binary file added src/assets/Artboard 4_100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Tickets-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Tickets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/inactivity_100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/team-change_100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import team_progress_sentiment_buttons from "./team_progress_sentiment_buttons.j
import voyage_application_tier_select from "./voyage_application_tier_select";
import three_buttons from './three_buttons';
import skill_setter from './SkillSetter';
import multiple_text_input from './multiple_text_input';

export default {
checkbox,
Expand All @@ -22,5 +21,5 @@ export default {
team_progress_sentiment_buttons,
three_buttons,
skill_setter,
multiple_text_input

};

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ class TierSelectRadioComponent extends React.Component {
}
]
const { answer, field_name, index, onFormChange, form_data } = this.props;
let subtext;
switch (answer.value) {
case 1:
subtext = <p>HTML / Basic Javascript / Basic Algorithms (Landing Pages)</p>;
break;
case 2:
subtext = <p>Intermediate Algorithms / Front-end Projects (Front-End)</p>;
break;
case 3:
subtext = <p>Advanced Projects / Data Visualization / Back-end (Full-Stack)</p>;
break;
default:
subtext = <p>HTML / Basic Javascript / Basic Algorithms (Landing Pages)</p>;
break;
}
return (
<div className={badges[index].btnClassName + '-container'}>
<div key={'radio-answer_' + field_name + '_' + index} className="radio-container">
Expand All @@ -28,13 +43,8 @@ class TierSelectRadioComponent extends React.Component {
<img className={badges[index].className} src={badges[index].img} alt={'badge-' + index} />
</div>
<div className="badge-title">{`Tier ${answer.text}`}</div>
{/* im sorry... */}
<div className="badge-subtext">
{
answer.value === 1 && <p>HTML / Basic Javascript / Basic Algorithms (Landing Pages)</p> ||
answer.value === 2 && <p>Intermediate Algorithms / Front-end Projects (Front-End)</p> ||
answer.value === 3 && <p>Advanced Projects / Data Visualization / Back-end (Full-Stack)</p>
}
{subtext}
</div>
<input
className="form-radio special-badge-input"
Expand Down
20 changes: 9 additions & 11 deletions src/components/FeedPortal/components/NewsFeed.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,22 @@ import Loader from "../../Loader"
import NewsfeedItems from './index';
import FeedItemContainer from './FeedItem';
import NoNews from './NoNews';
import NewsfeedStandup from "./NewsfeedStandup";
import * as ProjectCards from '../../ProjectCard';

const NewsFeed = ({ type, loading, data }) => {
const getTitle = (project) => `
${project ? `${project.team_name.toUpperCase()}` : "ALL"} NEWS
`;


const renderNewsfeedItems = items => items.map(
item => {
return FeedItemContainer({
component: NewsfeedItems[item.type],
item,
key: item.id,
})
}
);
// const renderNewsfeedItems = items => items.map(
// item => {
// return FeedItemContainer({
// component: NewsfeedItems[item.type],
// item,
// key: item.id,
// })
// }
// );

const renderStandups = standups => standups.map(
standup => (
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectCard/CohortProjectInfo.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Fragment } from "react";
import React from "react";
import dateFormatter from "../utilities/dateFormatter.js"

const CohortProjectInfo = ({ project }) => {
Expand Down
1 change: 1 addition & 0 deletions src/components/ProjectCard/ProjectImage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const ProjectImage = ({ project }) => {
return (
<Link className="project-img-container" to={`/project/${project.id}`}>
<img
alt="project-img"
className="project-img"
src={require('../../assets/Artboard 17.png')} />
<div className="project-img-text">Work In Progress</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProjectCard/ProjectInfo.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Fragment } from "react";
import React from "react";
import { Link } from "react-router-dom"

const ProjectInfo = ({ project }) => {
Expand Down
1 change: 0 additions & 1 deletion src/components/ProjectCard/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import CohortProjectInfo from './CohortProjectInfo';
import ProjectImage from './ProjectImage';
import ProjectInfo from './ProjectInfo';
import TeamButtons from './TeamButtons';
import TeamResourceLinks from './TeamResourceLinks';
import './ProjectCard.css';
import './TeamCard.css';

Expand Down
62 changes: 46 additions & 16 deletions src/components/Ticketbox/Ticketbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.ticketbox-btn--main {
background-color: $theme-green;
color: white;
font-size: 60px;
font-size: 55px;
width: 90px;
height: 90px;
border-radius: 50%;
Expand All @@ -25,18 +25,22 @@
PLACEMENT OF MODALS
==========================
*/
.bug-suggestion-box,
.ticketbox-btn-section {
.bug-suggestion-box {
position: absolute;
right: 20px;
bottom: 120px;
background-color: white;
box-shadow: $box-shadow;
padding: 30px;
width: 380px;
width: 400px;
max-height: calc(100vh - 200px);
overflow-y: auto;
}
.ticketbox-btn-section {
position: absolute;
right: 15px;
bottom: 120px;
}
/*
==========================
TICKETBOX MAIN BTN SELECTION
Expand Down Expand Up @@ -68,14 +72,17 @@ TICKETBOX MAIN BTN SELECTION
display: grid;
grid-template-columns: repeat(auto-fit, minmax(80px, 1fr));
grid-gap: 15px;
align-items: center;
justify-items: end;
}

.ticketbox-btn--container {
text-align: center;
cursor: pointer;
transition: all .075s ease-out;
display: grid;
justify-items: center;
justify-items: end;
align-items: center;
&:hover {
transform: scale(1.1);
}
Expand All @@ -84,24 +91,39 @@ TICKETBOX MAIN BTN SELECTION
transform: none;
}
}

.ticketbox-btn--text {
display: none;
color: white;
background-color: $darker-grey;
font-weight: 600;
letter-spacing: 1.2px;
text-transform: capitalize;
justify-self: end;
border-radius: 5px;
width: auto;
position: relative;
padding: 8px;
right: 70px;
margin-top: -65px;
white-space: nowrap
}
.ticketbox-btn {
width: 80px;
height: 80px;
width: 60px;
height: 60px;
border-radius: 50%;
background-color: none;
box-shadow: $box-shadow;
cursor: pointer;
&.disabled {
cursor: default;
}
&:hover + .ticketbox-btn--text {
display: block;
}

}
.ticketbox-btn--text {
color: $dark-grey;
text-transform: uppercase;
letter-spacing: 1.5px;
width: 100px;
margin-top: 10px;
}

/*
==========================
BUG & SUGGESTION FORMS
Expand All @@ -124,6 +146,10 @@ BUG & SUGGESTION FORMS
.color--help {
background-color: $help;
}

.color--tickets {
background-color: #1B1464;
}
.box-icon {
display: block;
margin: 0 auto;
Expand Down Expand Up @@ -188,9 +214,9 @@ FORM STYLING
margin-bottom: 20px;
}
.form-question {
text-transform: uppercase;
// text-transform: uppercase;
letter-spacing: 1.3px;
color: $grey;
color: $darker-grey;
padding-bottom: 5px;
font-size: 12px;
}
Expand Down Expand Up @@ -266,4 +292,8 @@ SUCCESS FORM
font-weight: 400;
line-height: 20px;
}
}

.tickets-container {
background-color: $palest-grey !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ export default props => (
{...props}
query={siteLocationEnumQuery}
component={BugSuggestion}
loader
loader={{size: 'small', color: 'rgba:(0,0,0,0)'}}
/>
);
Loading