From 6f392bed0293e5fe3069b6d6132c7f00caad5040 Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Thu, 1 Aug 2013 12:35:16 -0500 Subject: [PATCH 1/4] blegh --- app/commands/MigrateOldData.php | 13 ++++++------- app/library/{PfmAuth.php => PFMAuthtemp.php} | 0 2 files changed, 6 insertions(+), 7 deletions(-) rename app/library/{PfmAuth.php => PFMAuthtemp.php} (100%) diff --git a/app/commands/MigrateOldData.php b/app/commands/MigrateOldData.php index cfca2836..50c04c27 100644 --- a/app/commands/MigrateOldData.php +++ b/app/commands/MigrateOldData.php @@ -136,21 +136,20 @@ class MigrateOldData extends Command { 'slug' => $playlist->slug, 'id' => $playlist->id, 'user_id' => $playlist->user_id, - 'is_pinned' => true, 'is_public' => true ]); } $this->info('Syncing Playlist Tracks'); - $oldPlaylistTracks = $oldDb->table('playlist_tracks'); + $oldPlaylistTracks = $oldDb->table('playlist_track'); foreach ($oldPlaylistTracks as $playlistTrack) { DB::table('playlist_tracks')->insert([ 'id' => $playlistTrack['id'], - 'created_at' => $playlistTrack['created_at'], - 'updated_at' => $playlistTrack['updated_at'], - 'position' => $playlistTrack['position'], - 'playlist_id' => $playlistTrack['playlist_id'], - 'track_id' => $playlistTrack['track_id'] + 'created_at' => $playlistTrack->created_at, + 'updated_at' => $playlistTrack->updated_at, + 'position' => $playlistTrack->position, + 'playlist_id' => $playlistTrack->playlist_id, + 'track_id' => $playlistTrack->track_id ]); } diff --git a/app/library/PfmAuth.php b/app/library/PFMAuthtemp.php similarity index 100% rename from app/library/PfmAuth.php rename to app/library/PFMAuthtemp.php From c17980287e19000f1a20b53d5212c865177dd0af Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Thu, 1 Aug 2013 12:35:38 -0500 Subject: [PATCH 2/4] Fixed casing --- app/library/{PFMAuthtemp.php => PFMAuth.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/library/{PFMAuthtemp.php => PFMAuth.php} (100%) diff --git a/app/library/PFMAuthtemp.php b/app/library/PFMAuth.php similarity index 100% rename from app/library/PFMAuthtemp.php rename to app/library/PFMAuth.php From 353fee693dd5b928b5c659615948a78947c8d58f Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Thu, 1 Aug 2013 13:09:23 -0500 Subject: [PATCH 3/4] trying something --- app/commands/MigrateOldData.php | 8 ++++---- public/asset.php | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/commands/MigrateOldData.php b/app/commands/MigrateOldData.php index 50c04c27..4bef8f5c 100644 --- a/app/commands/MigrateOldData.php +++ b/app/commands/MigrateOldData.php @@ -141,10 +141,10 @@ class MigrateOldData extends Command { } $this->info('Syncing Playlist Tracks'); - $oldPlaylistTracks = $oldDb->table('playlist_track'); + $oldPlaylistTracks = $oldDb->table('playlist_track')->get(); foreach ($oldPlaylistTracks as $playlistTrack) { DB::table('playlist_tracks')->insert([ - 'id' => $playlistTrack['id'], + 'id' => $playlistTrack->id, 'created_at' => $playlistTrack->created_at, 'updated_at' => $playlistTrack->updated_at, 'position' => $playlistTrack->position, @@ -154,7 +154,7 @@ class MigrateOldData extends Command { } $this->info('Syncing Comments'); - $oldComments = $oldDb->table('comments'); + $oldComments = $oldDb->table('comments')->get(); foreach ($oldComments as $fav) { DB::table('comments')->insert([ 'id' => $fav->id, @@ -171,7 +171,7 @@ class MigrateOldData extends Command { } $this->info('Syncing Favourites'); - $oldFavs = $oldDb->table('favourites'); + $oldFavs = $oldDb->table('favourites')->get(); foreach ($oldFavs as $fav) { DB::table('favourites')->insert([ 'id' => $fav->id, diff --git a/public/asset.php b/public/asset.php index 8efe5c23..0c4eea00 100644 --- a/public/asset.php +++ b/public/asset.php @@ -44,7 +44,8 @@ } else { $filePath = trim($_GET['file'], '/'); $lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]); - $bundle = new AssetCollection([new FileAsset($filePath), new CacheBusterAsset($lastModifiedCollection->getLastModified())], [new LessFilter('node')]); + $bundle = new AssetCollection([new FileAsset($filePath), new CacheBusterAsset($lastModifiedCollection->getLastModified())], + [new LessFilter(Config::get('app.node'), Config::get('app.node_paths'))]); $bundle->setTargetPath($filePath); } From 858c685cfc078afa319c3d474bda3ea1ded32238 Mon Sep 17 00:00:00 2001 From: Adam Lavin Date: Fri, 2 Aug 2013 02:00:43 +0000 Subject: [PATCH 4/4] Less file now compiles on the server --- public/styles/app.less | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/styles/app.less b/public/styles/app.less index bcbb0f21..5d65a583 100644 --- a/public/styles/app.less +++ b/public/styles/app.less @@ -1,11 +1,11 @@ -@import-once 'base/bootstrap/bootstrap'; -@import-once 'base/font-awesome/font-awesome'; -@import-once 'mixins'; -@import-once 'layout'; -@import-once 'home'; -@import-once 'account-content'; -@import-once 'components'; -@import-once 'forms'; -@import-once 'tracks'; -@import-once 'albums'; -@import-once 'animations'; \ No newline at end of file +@import 'base/bootstrap/bootstrap'; +@import 'base/font-awesome/font-awesome'; +@import 'mixins'; +@import 'layout'; +@import 'home'; +@import 'account-content'; +@import 'components'; +@import 'forms'; +@import 'tracks'; +@import 'albums'; +@import 'animations'; \ No newline at end of file