Style fixes

2019-07-03 00:18:27 +03:00
parent 0f14531f15
commit 03531b35ed
26 changed files with 99 additions and 98 deletions
@@ -35,7 +35,7 @@ class Accordion extends React.Component<AccordionProps, AccordionState> {
    const { isOpen } = this.state;
    return (
      <div className="accordion">
-        <button onClick={() => this.handleClick()}>
+        <button type="button" onClick={() => this.handleClick()}>
          <AccordionIcon open={isOpen} />
          <h5>{this.props.title}</h5>
        </button>
@@ -1,5 +1,4 @@
-import * as React from "react";
-import { Fragment } from "react";
+import React, { Fragment, Component } from "react";
 import { Link } from "react-router-dom";
 // @ts-ignore
 import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png";
@@ -8,7 +7,7 @@ import "./AdminHeader.scss";
 export interface AdminHeaderProps { }
 export interface AdminHeaderState { }

-class AdminHeader extends React.Component<AdminHeaderProps, AdminHeaderState> {
+class AdminHeader extends Component<AdminHeaderProps, AdminHeaderState> {
  render() {
    return (
      <Fragment>
@@ -21,7 +21,7 @@ export default class Button extends React.Component<ButtonProps, undefined> {
    const { type } = this.props;
    const className = `button ${buttonClassNames.get(type)}`;
    return (
-      <button onClick={this.props.onClick} className={className}>
+      <button type="button" onClick={this.props.onClick} className={className}>
        {this.props.children}
      </button>
    );
@@ -16,7 +16,7 @@ export interface CardState { }
 class Card extends React.Component<CardProps, CardState> {
  render() {
    const { title, text, link, image, button } = this.props;
-    let options = {
+    const options = {
      day: "numeric",
      month: "numeric",
      year: "numeric",
@@ -38,18 +38,16 @@ class Card extends React.Component<CardProps, CardState> {
          <div className="card__button">{button}</div>
        </Anchor>
      );
-    } else {
-      return (
-        <div className="card">
-          {imageElem}
-          <div className="card__datetime">{datetime}</div>
-          <div className="card__title">{title}</div>
-          <div className="card__text">{text}</div>
-          {button}
-        </div>
-      );
    }
-
+    return (
+      <div className="card">
+        {imageElem}
+        <div className="card__datetime">{datetime}</div>
+        <div className="card__title">{title}</div>
+        <div className="card__text">{text}</div>
+        {button}
+      </div>
+    );
  }
 }

@@ -9,13 +9,14 @@ export interface DatetimeWidgetProps {
  required: boolean;
  disabled: boolean;
 }
-export interface DatetimeWidgetState {}
+export interface DatetimeWidgetState { }

 class DatetimeWidget extends React.Component<DatetimeWidgetProps, DatetimeWidgetState> {
  render() {
    const { value, onChange, onFocus, onBlur, required, disabled } = this.props;

-    let date, time;
+    let date;
+    let time;
    if (value && value.length !== 0) {
      let rest;
      [date, rest] = value.split("T");
@@ -1,5 +1,4 @@
-import * as React from "react";
-import { Fragment } from "react";
+import React, { Fragment, Component } from "react";
 import { Link } from "react-router-dom";
 import "./Header.scss";
 import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink";
@@ -8,12 +7,12 @@ import Navigation from "../Navigation";
 // @ts-ignore
 import * as TitleImage from "../../assets/img/SIK_RGB_W_side.png";

-export interface HeaderProps {}
+export interface HeaderProps { }
 export interface HeaderState {
  mobileMenuOpen: boolean;
 }

-class Header extends React.Component<HeaderProps, HeaderState> {
+class Header extends Component<HeaderProps, HeaderState> {
  constructor(props) {
    super(props);
    this.state = {
@@ -48,7 +47,7 @@ class Header extends React.Component<HeaderProps, HeaderState> {
          <NavbarChildLink to="/kilta/arkisto">Arkisto</NavbarChildLink>
        </NavbarDropdownLink>
        <NavbarDropdownLink to="/opinnot_ja_ura" text="Opinnot ja ura" exploded />
-        <NavbarDropdownLink to="/yritysyhteistyo" text="Yritysyhteistyö" exploded/>
+        <NavbarDropdownLink to="/yritysyhteistyo" text="Yritysyhteistyö" exploded />
        <NavbarDropdownLink to="/yhteystiedot" text="Yhteystiedot" exploded>
          {/* <NavbarChildLink to="https://en.wikipedia.org/wiki/Gay">Simo Höglund</NavbarChildLink> */}
        </NavbarDropdownLink>
@@ -13,7 +13,7 @@ export interface IconProps {
  link?: string;
  onClick?: (event?: any) => void;
 }
-export interface IconState {}
+export interface IconState { }

 const nameToIcon = (name: IconType): JSX.Element => {
  if (name === IconType.Facebook) {
@@ -25,7 +25,8 @@ const nameToIcon = (name: IconType): JSX.Element => {
        <path d="M22.676 0H1.324C.593 0 0 .593 0 1.324v21.352C0 23.408.593 24 1.324 24h11.494v-9.294H9.689v-3.621h3.129V8.41c0-3.099 1.894-4.785 4.659-4.785 1.325 0 2.464.097 2.796.141v3.24h-1.921c-1.5 0-1.792.721-1.792 1.771v2.311h3.584l-.465 3.63H16.56V24h6.115c.733 0 1.325-.592 1.325-1.324V1.324C24 .593 23.408 0 22.676 0" />
      </svg>
    );
-  } else if (name === IconType.Instagram) {
+  }
+  if (name === IconType.Instagram) {
    return (
      <svg role="img"
        viewBox="0 0 24 24"
@@ -34,7 +35,8 @@ const nameToIcon = (name: IconType): JSX.Element => {
        <path d="M12 0C8.74 0 8.333.015 7.053.072 5.775.132 4.905.333 4.14.63c-.789.306-1.459.717-2.126 1.384S.935 3.35.63 4.14C.333 4.905.131 5.775.072 7.053.012 8.333 0 8.74 0 12s.015 3.667.072 4.947c.06 1.277.261 2.148.558 2.913.306.788.717 1.459 1.384 2.126.667.666 1.336 1.079 2.126 1.384.766.296 1.636.499 2.913.558C8.333 23.988 8.74 24 12 24s3.667-.015 4.947-.072c1.277-.06 2.148-.262 2.913-.558.788-.306 1.459-.718 2.126-1.384.666-.667 1.079-1.335 1.384-2.126.296-.765.499-1.636.558-2.913.06-1.28.072-1.687.072-4.947s-.015-3.667-.072-4.947c-.06-1.277-.262-2.149-.558-2.913-.306-.789-.718-1.459-1.384-2.126C21.319 1.347 20.651.935 19.86.63c-.765-.297-1.636-.499-2.913-.558C15.667.012 15.26 0 12 0zm0 2.16c3.203 0 3.585.016 4.85.071 1.17.055 1.805.249 2.227.415.562.217.96.477 1.382.896.419.42.679.819.896 1.381.164.422.36 1.057.413 2.227.057 1.266.07 1.646.07 4.85s-.015 3.585-.074 4.85c-.061 1.17-.256 1.805-.421 2.227-.224.562-.479.96-.899 1.382-.419.419-.824.679-1.38.896-.42.164-1.065.36-2.235.413-1.274.057-1.649.07-4.859.07-3.211 0-3.586-.015-4.859-.074-1.171-.061-1.816-.256-2.236-.421-.569-.224-.96-.479-1.379-.899-.421-.419-.69-.824-.9-1.38-.165-.42-.359-1.065-.42-2.235-.045-1.26-.061-1.649-.061-4.844 0-3.196.016-3.586.061-4.861.061-1.17.255-1.814.42-2.234.21-.57.479-.96.9-1.381.419-.419.81-.689 1.379-.898.42-.166 1.051-.361 2.221-.421 1.275-.045 1.65-.06 4.859-.06l.045.03zm0 3.678c-3.405 0-6.162 2.76-6.162 6.162 0 3.405 2.76 6.162 6.162 6.162 3.405 0 6.162-2.76 6.162-6.162 0-3.405-2.76-6.162-6.162-6.162zM12 16c-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4-1.79 4-4 4zm7.846-10.405c0 .795-.646 1.44-1.44 1.44-.795 0-1.44-.646-1.44-1.44 0-.794.646-1.439 1.44-1.439.793-.001 1.44.645 1.44 1.439z" />
      </svg>
    );
-  } else if (name === IconType.LinkedIn) {
+  }
+  if (name === IconType.LinkedIn) {
    return (
      <svg role="img"
        viewBox="0 0 24 24"
@@ -43,7 +45,8 @@ const nameToIcon = (name: IconType): JSX.Element => {
        <path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z" />
      </svg>
    );
-  } else if (name === IconType.HamburgerMenu) {
+  }
+  if (name === IconType.HamburgerMenu) {
    return (
      <svg role="img"
        viewBox="0 0 32 32"
@@ -70,13 +73,12 @@ class Icon extends React.Component<IconProps, IconState> {
          {elem}
        </a>
      );
-    } else {
-      return (
-        <span onClick={onClick}>
-          {elem}
-        </span>
-      );
    }
+    return (
+      <span onClick={onClick}>
+        {elem}
+      </span>
+    );
  }
 }

@@ -8,8 +8,9 @@ class InfoBox extends React.Component<InfoBoxProps, InfoBoxState> {
  constructor(props: InfoBoxProps) {
    super(props);
  }
+
  render() {
-    const {children} = this.props;
+    const { children } = this.props;
    return (
      <div className="info-box">
        {children}
@@ -9,6 +9,7 @@ class MainSection extends React.Component<MainSectionProps & ColorDivProps, Main
  constructor(props: MainSectionProps) {
    super(props);
  }
+
  render() {
    const { children, className, ...props } = this.props;
    const classNames = [
@@ -1,13 +1,12 @@
-import * as React from "react";
+import React, { Fragment } from "react";
 import "./NavbarDropdownLink.scss";
-import { Fragment } from "react";
 import DropDownBox from "../DropDownBox/DropDownBox";
 import Anchor from "../Anchor";

 export interface NavbarDropdownLinkProps {
  to: string;
  text: string;
-  exploded?: boolean;  // if exploded, show items directly underneath without a dropdown menu
+  exploded?: boolean; // if exploded, show items directly underneath without a dropdown menu
 }
 export interface NavbarDropdownLinkState {
  mouseOverLink: Boolean;
@@ -15,7 +14,6 @@ export interface NavbarDropdownLinkState {
 }

 class NavbarDropdownLink extends React.Component<NavbarDropdownLinkProps, NavbarDropdownLinkState> {
-
  constructor(props) {
    super(props);
    this.state = {
@@ -1,7 +1,6 @@
-import * as React from "react";
-import { Fragment } from "react";
+import React, { Fragment } from "react";
 import "./Navigation.scss";
-import NavbarDropdownLink  from "../NavbarDropdownLink/NavbarDropdownLink";
+import NavbarDropdownLink from "../NavbarDropdownLink/NavbarDropdownLink";
 import NavbarChildLink from "../NavbarChildLink/NavbarChildLink";
 import Icon from "../Icon";
 import { IconType } from "../Icon/Icon";
@@ -5,7 +5,7 @@ import ColorDiv, { ColorDivProps } from "../ColorDiv/ColorDiv";
 export interface PageSectionProps {
  center?: boolean;
  bottomBorder?: boolean;
-  cardSection?: boolean;  // does section contain a grid of cards
+  cardSection?: boolean; // does section contain a grid of cards
  fullSize?: boolean;
 }
 export interface PageSectionState { }
@@ -28,7 +28,7 @@ class OptionsWidget extends React.Component<OptionsWidgetProps, OptionsWidgetSta
      return null;
    }

-    else if (type === "radiobutton") {
+    if (type === "radiobutton") {
      const lst = value as string[];
      const joinedValue = lst.join(",");
      return <input
@@ -1,5 +1,4 @@
-import { Component } from "react";
-import * as React from "react";
+import React, { Component } from "react";

 export interface QuestionProps {
  children: any;
@@ -12,7 +11,7 @@ class Question extends Component<QuestionProps> {

    return (
      <div>
-        <button className="remove" onClick={onRemove}>Delete</button>
+        <button type="button" className="remove" onClick={onRemove}>Delete</button>
        {children}
      </div>
    );
@@ -1,5 +1,4 @@
-import * as React from "react";
-import { Fragment } from "react";
+import React, { Component } from "react";
 import * as shortid from "shortid";
 import { Draggable } from "react-beautiful-dnd";
 import { Question, InputProps, optionTypes, SignupQuestionError } from "./index";
@@ -15,7 +14,7 @@ export interface QuestionListProps {
 }
 export interface QuestionListState { }

-class QuestionList extends React.Component<QuestionListProps, QuestionListState> {
+class QuestionList extends Component<QuestionListProps, QuestionListState> {
  renderTextWidget = ({ questions, value, index }: InputProps) => (
    <input type="text" value={value} onChange={this.handleNameInputChange(questions, index)} />
  )
@@ -45,22 +44,22 @@ class QuestionList extends React.Component<QuestionListProps, QuestionListState>
      const typeSelectWidget = <TypeWidget inputProps={dataProps} onChange={onChange} />;
      return (
        <Draggable draggableId={q.id} key={q.id} index={index}>
-        {(provided) => (
-          <div
-            className="signup-questions-widget-row"
-            {...provided.draggableProps}
-            {...provided.dragHandleProps}
-            ref={provided.innerRef}
-          >
-            <QuestionElement
-              onRemove={this.handleElementRemove(questions, index)}
+          {(provided) => (
+            <div
+              className="signup-questions-widget-row"
+              {...provided.draggableProps}
+              {...provided.dragHandleProps}
+              ref={provided.innerRef}
            >
-              {nameWidget}
-              {typeSelectWidget}
-              {optionsWidget}
-            </QuestionElement>
-          </div>
-        )}
+              <QuestionElement
+                onRemove={this.handleElementRemove(questions, index)}
+              >
+                {nameWidget}
+                {typeSelectWidget}
+                {optionsWidget}
+              </QuestionElement>
+            </div>
+          )}
        </Draggable>
      );
    });
@@ -71,8 +70,8 @@ class QuestionList extends React.Component<QuestionListProps, QuestionListState>

    return (
      <div ref={innerRef}>
-        { this.renderQuestions() }
-        { placeholder }
+        {this.renderQuestions()}
+        {placeholder}
      </div>
    );
  }
@@ -1,3 +1,3 @@
-declare module "*.jpeg" { export default '' as string; };
-declare module '*.css' { export default '' as string; };
-declare module '*.png' { export default '' as string; };
+declare module "*.jpeg" { export default "" as string; }
+declare module "*.css" { export default "" as string; }
+declare module "*.png" { export default "" as string; }
@@ -103,7 +103,6 @@ class AdminFeedPage extends React.Component<AdminFeedPageProps, AdminFeedPageSta
  }

  render() {
-
    return (
      <div className="admin-feed-page">
        <Helmet>
@@ -5,6 +5,10 @@ import { ColorEnum } from "../../components/ColorDiv/ColorDiv";
 import { StaticContext } from "../../server/StaticContext";
 import PageLink from "../../components/PageLink/PageLink";
 import Card from "../../components/Card";
+<<<<<<< HEAD
+=======
+import { BackgroundColor as PageSectionColor } from "../../components/PageSection/PageSection";
+>>>>>>> Style fixes
 import PageSection from "../../components/PageSection";
 import HeroMainSection from "../../components/HeroMainSection";
 import ContactCard from "../../components/ContactCard";
@@ -70,7 +74,7 @@ class ContactsPage extends React.Component<ContactsPageProps, ContactsPageState>
          <h1>Aalto-yliopiston Sähköinsinöörikilta</h1>
          <p>
            lorem ipsum dolor est
-            </p>
+          </p>
        </HeroMainSection>
        <PageSection backgroundColor={ColorEnum.White}>
          {contacts.map(contact => (
@@ -215,17 +215,17 @@ class FeedCreatePage extends React.Component<FeedCreatePageProps, FeedCreatePage
          <link rel="canonical" href="https://sik.ayy.fi/admin/feed/create" />
        </Helmet>
        <h1>{title}</h1>
-        { statusMessage && <div className="success">{ statusMessage }</div>}
+        {statusMessage && <div className="success">{statusMessage}</div>}
        <Form schema={schema}
-              uiSchema={uiSchema}
-              formData={formData}
-              idPrefix="rjsf"
-              widgets={widgets}
-              onChange={this.onChange}
-              onSubmit={this.onSubmit}
-              onError={this.onError}
-              onFocus={this.onFocus} />
-        { error && <div className="error">{error}</div> }
+          uiSchema={uiSchema}
+          formData={formData}
+          idPrefix="rjsf"
+          widgets={widgets}
+          onChange={this.onChange}
+          onSubmit={this.onSubmit}
+          onError={this.onError}
+          onFocus={this.onFocus} />
+        {error && <div className="error">{error}</div>}
      </div>
    );
  }
@@ -146,7 +146,7 @@ class GuildPage extends React.Component<GuildPageProps, GuildPageState> {
              <p>Kiltatoimintaa järjestää ja ylläpitää kilta-aktiivit, <TextAnchor textColor={ColorEnum.White} hoverColor={ColorEnum.Blue} size={TextSize.Ribbon} to="/toimikunnat">toimikunnat</TextAnchor> ja <TextAnchor textColor={ColorEnum.White} hoverColor={ColorEnum.Blue} size={TextSize.Ribbon} to="/jaokset">jaokset</TextAnchor>.</p>
            </Ribbon>
          </PageSection>
-          <div style={{ display: "flex", }}>
+          <div style={{ display: "flex" }}>
            <AsideSection textColor={ColorEnum.DarkBlue} backgroundColor={ColorEnum.LightTurquoise}>
              <h6>Miksi alkaa kilta-aktiiviksi?</h6>
              <p>
@@ -1,2 +1,3 @@
 import InEnglishPage from "./InEnglishPage";
+
 export default InEnglishPage;
@@ -2,9 +2,9 @@ import * as React from "react";
 import Helmet from "react-helmet";
 import "./NotFoundPage.scss";

-export interface NotFoundPageProps {}
+export interface NotFoundPageProps { }

- class NotFoundPage extends React.Component<NotFoundPageProps, undefined> {
+class NotFoundPage extends React.Component<NotFoundPageProps, undefined> {
  render() {
    return (
      <div className="not-found-page">
@@ -137,7 +137,7 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
          title: "Questions",
          default: "[]",
        },
-      }
+      },
    };
    return schema;
  }
@@ -175,17 +175,17 @@ class SignupCreatePage extends React.Component<SignupCreatePageProps, SignupCrea
          <link rel="canonical" href="https://sik.ayy.fi/admin/feed/create" />
        </Helmet>
        <h1>{title}</h1>
-        { statusMessage && <div className="success">{ statusMessage }</div>}
+        {statusMessage && <div className="success">{statusMessage}</div>}
        <Form schema={schema}
-              uiSchema={uiSchema}
-              formData={formData}
-              idPrefix="rjsf"
-              widgets={widgets}
-              onChange={this.onChange}
-              onSubmit={this.onSubmit}
-              onError={this.onError}
-              onFocus={this.onFocus} />
-        { error && <div className="error">{error}</div> }
+          uiSchema={uiSchema}
+          formData={formData}
+          idPrefix="rjsf"
+          widgets={widgets}
+          onChange={this.onChange}
+          onSubmit={this.onSubmit}
+          onError={this.onError}
+          onFocus={this.onFocus} />
+        {error && <div className="error">{error}</div>}
      </div>
    );
  }
@@ -1,5 +1,4 @@
-import * as React from "react";
-import { Component, Fragment } from "react";
+import React, { Component, Fragment } from "react";
 import { Switch, Route, Redirect } from "react-router-dom";
 import Helmet from "react-helmet";
 import FrontPage from "./pages/FrontPage";
@@ -7,6 +7,7 @@ import * as helmet from "helmet";
 import * as compression from "compression";

 import * as dotenv from "dotenv";
+
 dotenv.config();

 console.log(`API_URL: ${process.env.API_URL}`);
@@ -1,5 +1,6 @@
 {
  "compilerOptions": {
+    "esModuleInterop": true,
    "outDir": "./dist/",
    "sourceMap": true,
    "noImplicitAny": false,