Skip to content

Commit

Permalink
refactor: prettier fix
Browse files Browse the repository at this point in the history
  • Loading branch information
remigallego committed Dec 22, 2019
1 parent fdab344 commit 9a7103f
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 45 deletions.
4 changes: 2 additions & 2 deletions js/actions/playback.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Dispatch } from "react";
import { Action } from "redux";
import { PLAY } from "../reducers/playback";
import WebampControls from "../spotifymedia/controls";
import { TrackFile } from "../types";
import { setWebampDataTransfer } from "./dataTransfer";
import { formatMetaToWebampMeta } from "../utils/dataTransfer";
import WebampControls from "../spotifymedia/controls";
import { setWebampDataTransfer } from "./dataTransfer";

export function playTrack(file: TrackFile): any {
return (dispatch: Dispatch<Action>) => {
Expand Down
8 changes: 4 additions & 4 deletions js/components/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useState, useEffect } from "react";
import React, { useEffect, useState } from "react";
import ReactGA from "react-ga";
import { useDispatch } from "react-redux";
import { setWebampInstance } from "../actions/webamp";
import Desktop from "./Desktop";
import DeveloperPanel from "./DeveloperPanel";
import SelectionBox from "./Reusables/SelectionBox";
import WindowsManager from "./WindowsManager";
import { useDispatch } from "react-redux";
import { setWebampInstance } from "../actions/webamp";
import Webamp from "./Webamp";
import WindowsManager from "./WindowsManager";

export default () => {
const [selectionBox, setSelectionBox] = useState({
Expand Down
2 changes: 1 addition & 1 deletion js/components/Desktop/FileContextMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { Menu, Item, Separator } from "react-contexify";
import { Item, Menu, Separator } from "react-contexify";
import "react-contexify/dist/ReactContexify.min.css";

interface Props {
Expand Down
2 changes: 1 addition & 1 deletion js/components/Desktop/FileItem.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from "react";
import { MenuProvider } from "react-contexify";
import styled, { keyframes } from "styled-components";
import { GenericFile } from "../../types";
import "./file.css";
import bigWinampIcon from "./images/bigWinampIcon.png";
import folderclosed from "./images/folderclosed.png";
import InputRenaming from "./InputRenaming";
import styled, { keyframes } from "styled-components";

interface Props {
file: GenericFile;
Expand Down
18 changes: 9 additions & 9 deletions js/components/Desktop/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import React, { useState, useEffect } from "react";
import { useSelector, useDispatch } from "react-redux";
import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { MenuProvider } from "../../../node_modules/react-contexify";
import { setWebampDataTransfer } from "../../actions/dataTransfer";
import { setItems } from "../../actions/explorer";
import { openImage } from "../../actions/images";
import { playTrack } from "../../actions/playback";
import { AppState } from "../../reducers";
import { DesktopState } from "../../reducers/desktop";
import {
ACTION_TYPE,
ActionFile,
Expand All @@ -31,8 +33,6 @@ import {
} from "./../../actions/desktop";
import FileContextMenu from "./FileContextMenu";
import FileItem from "./FileItem";
import { setWebampDataTransfer } from "../../actions/dataTransfer";
import { DesktopState } from "../../reducers/desktop";

interface Props {
selectionBox: any;
Expand Down Expand Up @@ -95,8 +95,8 @@ export default (props: Props) => {
const isNewFile = (file: GenericFile) =>
desktop.byId[file.id] === undefined || desktop.byId[file.id] === null;

let offsetX = 0,
offsetY = 0;
let offsetX = 0;
let offsetY = 0;

// Checking if the file already exists on the Desktop. If not, we create it. If yes, we move the existing.
files.forEach((file: GenericFile) => {
Expand Down Expand Up @@ -133,9 +133,9 @@ export default (props: Props) => {
draggable={!file.isRenaming}
onDragStart={e => {
const selectedFilesWithDerivedData = allFiles
.filter(file => selectedFilesIds.indexOf(file.id) > -1)
.map((file: GenericFile) => {
const derivedFile: any = file;
.filter(_file => selectedFilesIds.indexOf(_file.id) > -1)
.map((_file: GenericFile) => {
const derivedFile: any = _file;
derivedFile.deltaX = derivedFile.x - e.clientX;
derivedFile.deltaY = derivedFile.y - e.clientY;
derivedFile.name = derivedFile.title;
Expand Down
10 changes: 5 additions & 5 deletions js/components/Explorer/ContentWindow/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { useState, useEffect } from "react";
import { useSelector, useDispatch } from "react-redux";
import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { BeatLoader } from "react-spinners";
import { setWebampDataTransfer } from "../../../actions/dataTransfer";
import {
selectFile,
setItems,
unsetFocusExplorer,
setMoreSearchResults
setMoreSearchResults,
unsetFocusExplorer
} from "../../../actions/explorer";
import { openImage } from "../../../actions/images";
import { playTrack } from "../../../actions/playback";
Expand All @@ -29,7 +30,6 @@ import { formatMetaToWebampMeta } from "../../../utils/dataTransfer";
import ContentLoading from "../../Reusables/ContentLoading";
import ExplorerFile from "../ExplorerFile";
import styles from "./styles";
import { setWebampDataTransfer } from "../../../actions/dataTransfer";

const { container } = styles;

Expand Down
2 changes: 1 addition & 1 deletion js/components/Explorer/ExplorerFile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ interface Props {
selected: boolean;
onClick: () => void;
onDoubleClick: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
onDrag(e: React.DragEvent<HTMLDivElement>): void;
children: ReactNode;
onDrag(e: React.DragEvent<HTMLDivElement>): void;
}

export default function(props: Props) {
Expand Down
2 changes: 1 addition & 1 deletion js/components/Explorer/Icons/CloseIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { FaTimes } from "react-icons/fa";
import { redError, redErrorDark } from "../../../styles/colors";
import styled from "styled-components";
import { redError, redErrorDark } from "../../../styles/colors";

interface Props {
onClick: () => void | null;
Expand Down
2 changes: 1 addition & 1 deletion js/components/Explorer/TitleBar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";
import styled from "styled-components";
import { blueTitleBar } from "../../../styles/colors";
import CloseIcon from "../Icons/CloseIcon";
import { dragHandleClassName } from "../vars";
import styled from "styled-components";

interface Props {
onClose?: () => void | null;
Expand Down
3 changes: 1 addition & 2 deletions js/components/Explorer/Toolbar/SearchInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ import { FaSearch } from "react-icons/fa";
import { GiSettingsKnobs } from "react-icons/gi";
import Popover from "react-tiny-popover";

import store from "../../../store";
import { blueTitleBar } from "../../../styles/colors";
import FilterPopover from "../FilterPopover";
import { Provider } from "react-redux";
import store from "../../../store";

interface Props {
onChange: (text: string, e: ChangeEvent<HTMLInputElement>) => void;
Expand Down
6 changes: 3 additions & 3 deletions js/components/Explorer/Toolbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

import { jsx } from "@emotion/core";
import _ from "lodash";
import { Menu, MenuProvider, Item, Submenu } from "react-contexify";
import { Item, Menu, MenuProvider, Submenu } from "react-contexify";
import { FaChevronLeft, FaSpotify } from "react-icons/fa";
import { useSelector, useDispatch } from "react-redux";
import { useDispatch, useSelector } from "react-redux";
import styled from "styled-components";
import {
goPreviousState,
setItems,
Expand All @@ -14,7 +15,6 @@ import { AppState } from "../../../reducers";
import { blueTitleBar, greenSpotify, greyLight } from "../../../styles/colors";
import { ACTION_TYPE } from "../../../types";
import SearchInput from "./SearchInput";
import styled from "styled-components";
interface Props {
id: string;
}
Expand Down
6 changes: 3 additions & 3 deletions js/components/Explorer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import React from "react";
import { useDispatch } from "react-redux";
import Rnd, { DraggableData } from "react-rnd";
import styled from "styled-components";
import {
closeExplorer,
updatePosition,
updateSize,
closeExplorer
updateSize
} from "../../actions/explorer";
import { SingleExplorerState } from "../../reducers/explorer";
import "./animations.css";
import ContentWindow from "./ContentWindow";
import TitleBar from "./TitleBar";
import ExplorerToolbar from "./Toolbar";
import { dragHandleClassName } from "./vars";
import styled from "styled-components";

interface Props {
explorer: SingleExplorerState;
Expand Down
4 changes: 2 additions & 2 deletions js/components/ImageDialog/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState, useEffect } from "react";
import React, { useEffect, useState } from "react";
import Draggable from "react-draggable";
import styled, { css, keyframes } from "styled-components";
import { ImageDialogType } from "../../types";
import TitleBar from "../Explorer/TitleBar";
import styled, { css, keyframes } from "styled-components";

interface Props {
image: ImageDialogType;
Expand Down
4 changes: 2 additions & 2 deletions js/components/Webamp/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect } from "react";
import { AppState } from "../../reducers";
import { useSelector, useDispatch } from "react-redux";
import { useDispatch, useSelector } from "react-redux";
import { openWebamp } from "../../actions/webamp";
import { AppState } from "../../reducers";

export default () => {
const dispatch = useDispatch();
Expand Down
8 changes: 4 additions & 4 deletions js/reducers/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { combineReducers } from "redux";
import auth, { AuthState, initialStateAuth } from "./auth";
import dataTransfer, {
DataTransferState,
initialStateDataTransfer
} from "./dataTransfer";
import desktop, { DesktopState, initialStateDesktop } from "./desktop";
import explorer, { ExplorerState, initialStateExplorerState } from "./explorer";
import images, { ImagesState, initialStateImages } from "./images";
Expand All @@ -11,10 +15,6 @@ import searchPagination, {
import user, { initialStateUser, UserState } from "./user";
import webamp, { initialStateWebamp, WebampState } from "./webamp";
import windowsReducer, { initialStateWindows, WindowsState } from "./windows";
import dataTransfer, {
initialStateDataTransfer,
DataTransferState
} from "./dataTransfer";

export const APPLY_SNAPSHOT = "APPLY_SNAPSHOT";

Expand Down
4 changes: 2 additions & 2 deletions js/store.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { applyMiddleware, createStore, Action } from "redux";
import { Action, applyMiddleware, createStore } from "redux";
import { composeWithDevTools } from "redux-devtools-extension";
import { createLogger } from "redux-logger";
import { createMigrate, createTransform, persistReducer } from "redux-persist";
import storage from "redux-persist/lib/storage";
import thunk, { ThunkMiddleware, ThunkAction } from "redux-thunk";
import thunk from "redux-thunk";
import reducer, { AppState, initialStateApp } from "./reducers";

const transform = createTransform(
Expand Down
4 changes: 2 additions & 2 deletions js/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ export type ImageFile = File<ImageData>;
export type ActionFile = File<ActionData>;

// Files need to be formatted a certain way before being recognized by Webamp
export type WebampTrackFormat = {
export interface WebampTrackFormat {
duration: number;
metaData: {
artist: string;
title: string;
};
url: string;
};
}

export interface StyleCollection {
[val: string]: React.CSSProperties | undefined;
Expand Down

0 comments on commit 9a7103f

Please sign in to comment.