Skip to content

Commit

Permalink
Merge pull request #37 from calluswhatyouwant/spotify-models
Browse files Browse the repository at this point in the history
Create index for the Spotify models
  • Loading branch information
JoseRenan authored Dec 24, 2018
2 parents 9e7dd97 + 64f74c1 commit 74620fe
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 33 deletions.
4 changes: 1 addition & 3 deletions src/lib/albums.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';
import Album from './models/album/album';
import TrackSimplified from './models/track/track-simplified';
import Page from './models/paging/page';
import { Album, TrackSimplified, Page } from './models';

export const getAlbum = async (id: string, market?: string): Promise<Album> => {
const params = { params: { market } };
Expand Down
5 changes: 1 addition & 4 deletions src/lib/artists.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';
import Artist from './models/artist/artist';
import Track from './models/track/track';
import Page from './models/paging/page';
import AlbumSimplified from './models/album/album-simplified';
import { Artist, Track, Page, AlbumSimplified } from './models';

export const getArtist = async (id: string): Promise<Artist> => {
const response = await getAxiosSpotifyInstance().get(`/artists/${id}`);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/follow.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';
import Artist from './models/artist/artist';
import { Artist } from './models';

export const getFollowedArtists = async (
limit: number = 20,
Expand Down
1 change: 1 addition & 0 deletions src/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ export * from './playlists';
export * from './player';
export * from './search';
export * from './tracks';
export * from './models';
29 changes: 29 additions & 0 deletions src/lib/models/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export { default as Album } from './album/album';
export { default as AlbumSimplified } from './album/album-simplified';
export { default as Artist } from './artist/artist';
export { default as ArtistSimplified } from './artist/artist-simplified';
export { default as Category } from './browse/category';
export { default as RecommendationSeed } from './browse/recommendation-seed';
export { default as Recommendations } from './browse/recommendations';
export { default as Copyright } from './common/copyright';
export { default as Error } from './common/error';
export { default as Followers } from './common/followers';
export { default as Image } from './common/image';
export { default as SavedAlbum } from './library/saved-album';
export { default as SavedTrack } from './library/saved-track';
export { default as TrackLink } from './other/track-link';
export { default as CursorBasedPage } from './paging/cursor-based-page';
export { default as Page } from './paging/page';
export { default as Context } from './player/context';
export { default as CurrentlyPlaying } from './player/currently-playing';
export { default as PlayHistory } from './player/play-history';
export { default as Playlist } from './playlist/playlist';
export { default as PlaylistSimplified } from './playlist/playlist-simplified';
export { default as PlaylistTrack } from './playlist/playlist-track';
export { default as SearchResults } from './search/search-results';
export { default as AudioAnalysis } from './track/audio-analysis';
export { default as AudioFeatures } from './track/audio-features';
export { default as Track } from './track/track';
export { default as TrackSimplified } from './track/track-simplified';
export { default as PrivateUser } from './user/user-private';
export { default as PublicUser } from './user/user-public';
4 changes: 2 additions & 2 deletions src/lib/models/user/user-private.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Followers from '../common/followers';
import Image from '../common/image';

class PublicUser {
class PrivateUser {
birthdate: string;

country: string;
Expand Down Expand Up @@ -42,4 +42,4 @@ class PublicUser {
}
}

export default PublicUser;
export default PrivateUser;
5 changes: 1 addition & 4 deletions src/lib/personalization.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';

import Page from './models/paging/page';
import Artist from './models/artist/artist';
import Track from './models/track/track';
import { Artist, Page, Track } from './models';

export const getCurrentUserTopArtists = async (params?: {
limit?: number;
Expand Down
5 changes: 1 addition & 4 deletions src/lib/player.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';

import PlayHistory from './models/player/play-history';
import CursorBasedPage from './models/paging/cursor-based-page';
import CurrentlyPlaying from './models/player/currently-playing';
import { PlayHistory, CursorBasedPage, CurrentlyPlaying } from './models';

export const getCurrentUserRecentlyPlayedTracks = async (params?: {
limit?: number;
Expand Down
5 changes: 1 addition & 4 deletions src/lib/playlists.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';
import Playlist from './models/playlist/playlist';
import PlaylistTrack from './models/playlist/playlist-track';
import Page from './models/paging/page';
import PlaylistSimplified from './models/playlist/playlist-simplified';
import { Playlist, PlaylistTrack, PlaylistSimplified, Page } from './models';

export const getPlaylist = async (id: string) => {
const response = await getAxiosSpotifyInstance().get(`/playlists/${id}`);
Expand Down
15 changes: 8 additions & 7 deletions src/lib/search.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { getAxiosSpotifyInstance } from './driver';

import AlbumSimplified from './models/album/album-simplified';
import Artist from './models/artist/artist';
import Page from './models/paging/page';
import PlaylistSimplified from './models/playlist/playlist-simplified';
import Track from './models/track/track';
import SearchResults from './models/search/search-results';
import {
AlbumSimplified,
Artist,
Page,
PlaylistSimplified,
Track,
SearchResults,
} from './models';

const genericSearch = async (params: {
q: string;
Expand Down
5 changes: 1 addition & 4 deletions src/lib/tracks.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { getAxiosSpotifyInstance } from './driver';

import Track from './models/track/track';
import AudioAnalysis from './models/track/audio-analysis';
import AudioFeatures from './models/track/audio-features';
import { Track, AudioAnalysis, AudioFeatures } from './models';

export const getSeveralTracks = async (
ids: string[],
Expand Down

0 comments on commit 74620fe

Please sign in to comment.