Skip to content
Snippets Groups Projects
Commit 77770642 authored by Santiago González's avatar Santiago González
Browse files

ClassItemWrapper -> ClassItem

parent 80c9ca0a
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ import { CourseClassPlayer } from "../../components/courseclassplayer/CourseClas ...@@ -6,7 +6,7 @@ import { CourseClassPlayer } from "../../components/courseclassplayer/CourseClas
import { Grid, HSpacing, List, WiderThan } from "../../stylesheets/Mixins"; import { Grid, HSpacing, List, WiderThan } from "../../stylesheets/Mixins";
import { px } from "../../stylesheets/Units"; import { px } from "../../stylesheets/Units";
import { Breakpoint } from "../../stylesheets/Variables"; import { Breakpoint } from "../../stylesheets/Variables";
import { ClassItemWrapper } from "./classitemwrapper/ClassItemWrapper"; import { ClassItem } from "./classitem/ClassItem";
import { CourseBase } from "./CourseBase"; import { CourseBase } from "./CourseBase";
export class Course extends CourseBase { export class Course extends CourseBase {
...@@ -102,7 +102,7 @@ export class Course extends CourseBase { ...@@ -102,7 +102,7 @@ export class Course extends CourseBase {
public renderContent() { public renderContent() {
const { match } = this.props; const { match } = this.props;
const { params } = match; const { params } = match;
const { courseCode, classNo } = params; const { classNo } = params;
const { courseState } = this.store; const { courseState } = this.store;
const { currentCourse } = courseState; const { currentCourse } = courseState;
...@@ -155,7 +155,7 @@ export class Course extends CourseBase { ...@@ -155,7 +155,7 @@ export class Course extends CourseBase {
{!_.isNil(currentCourse.value) && {!_.isNil(currentCourse.value) &&
!_.isNil(currentCourse.value.classes) && !_.isNil(currentCourse.value.classes) &&
currentCourse.value.classes.map(clazz => ( currentCourse.value.classes.map(clazz => (
<ClassItemWrapper <ClassItem
key={clazz.code} key={clazz.code}
course={currentCourse.value!} course={currentCourse.value!}
clazz={clazz} clazz={clazz}
......
...@@ -3,9 +3,9 @@ import { NavLink } from "react-router-dom"; ...@@ -3,9 +3,9 @@ import { NavLink } from "react-router-dom";
import styled from "styled-components"; import styled from "styled-components";
import { HSpacing, ListItem } from "../../../stylesheets/Mixins"; import { HSpacing, ListItem } from "../../../stylesheets/Mixins";
import { px } from "../../../stylesheets/Units"; import { px } from "../../../stylesheets/Units";
import { ClassItemWrapperBase } from "./ClassItemWrapperBase"; import { ClassItemBase } from "./ClassItemBase";
export class ClassItemWrapper extends ClassItemWrapperBase { export class ClassItem extends ClassItemBase {
protected Code = styled.div` protected Code = styled.div`
font-weight: bold; font-weight: bold;
justify-self: center; justify-self: center;
...@@ -17,7 +17,7 @@ export class ClassItemWrapper extends ClassItemWrapperBase { ...@@ -17,7 +17,7 @@ export class ClassItemWrapper extends ClassItemWrapperBase {
justify-self: start; justify-self: start;
`; `;
protected InnerDiv = styled.div` protected Content = styled.div`
display: flex; display: flex;
${HSpacing(px(20))}; ${HSpacing(px(20))};
`; `;
...@@ -43,17 +43,17 @@ export class ClassItemWrapper extends ClassItemWrapperBase { ...@@ -43,17 +43,17 @@ export class ClassItemWrapper extends ClassItemWrapperBase {
public render() { public render() {
const { course, clazz } = this.props; const { course, clazz } = this.props;
const { Code, Title, InnerDiv, Wrapper } = this; const { Code, Title, Content, Wrapper } = this;
return ( return (
<Wrapper <Wrapper
activeClassName="active" activeClassName="active"
to={`/courses/${course.code}/${clazz.code}`}> to={`/courses/${course.code}/${clazz.code}`}>
<InnerDiv> <Content>
<Code>{clazz.code}</Code> <Code>{clazz.code}</Code>
<Title>{clazz.title}</Title> <Title>{clazz.title}</Title>
</InnerDiv> </Content>
</Wrapper> </Wrapper>
); );
} }
......
...@@ -5,14 +5,14 @@ import { ...@@ -5,14 +5,14 @@ import {
BaseComponentState BaseComponentState
} from "../../../components/BaseComponent"; } from "../../../components/BaseComponent";
export interface ClassItemWrapperProps extends BaseComponentProps { export interface ClassItemProps extends BaseComponentProps {
course: Models.Course; course: Models.Course;
clazz: Models.CourseClass; clazz: Models.CourseClass;
} }
export interface ClassItemWrapperState extends BaseComponentState {} export interface ClassItemState extends BaseComponentState {}
export abstract class ClassItemWrapperBase< export abstract class ClassItemBase<
P extends ClassItemWrapperProps = ClassItemWrapperProps, P extends ClassItemProps = ClassItemProps,
S extends ClassItemWrapperState = ClassItemWrapperState S extends ClassItemState = ClassItemState
> extends BaseComponent<P, S> {} > extends BaseComponent<P, S> {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment