From 45daa9153683eedc0477f21f5b93b05f3cffc600 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 1 Aug 2016 23:08:14 +0200 Subject: [PATCH 1/5] typo fixes --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0da045b..92091e9 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ of the original MINI, made by [JaoNoctus](https://github.com/JaoNoctus). Big tha - PHP 5.6 or PHP 7.0 - MySQL -- mod_rewrite activated +- mod_rewrite activated (see below for tutorials) ## Installation (in Vagrant, 100% automatic) @@ -55,7 +55,7 @@ will run 100% automatically. If you are stuck somehow, also have a look into thi it's basically the same installation process: [Install MINI3 in 30 seconds inside Ubuntu 14.04 LTS](http://www.dev-metal.com/install-mini-30-seconds-inside-ubuntu-14-04-lts/) -## Manuel installation +## Manual Installation 1. Edit the database credentials in `application/config/config.php` 2. Execute the .sql statements in the `_install/`-folder (with PHPMyAdmin for example). @@ -66,7 +66,7 @@ it's basically the same installation process: [AMPPS on Windows/Mac OS](http://www.softaculous.com/board/index.php?tid=3634&title=AMPPS_rewrite_enable/disable_option%3F_please%3F), [XAMPP for Windows](http://www.leonardaustin.com/blog/technical/enable-mod_rewrite-in-xampp/), [MAMP on Mac OS](http://stackoverflow.com/questions/7670561/how-to-get-htaccess-to-work-on-mamp) -4. Run `composer install` in the project's folder to create the PSR-4 autoloading stuff from Composer automatically. +4. Install composer and run `composer install` in the project's folder to create the PSR-4 autoloading stuff from Composer automatically. If you have no idea what this means: Remember the "good" old times when we were using "include file.php" all over our projects to include and use something ? PSR-0/4 is the modern, clean and automatic version of that. Please have a google research if that's important for you. @@ -216,7 +216,7 @@ class SongsController $songs = $Song->getAllSongs(); $amount_of_songs = $Song->getAmountOfSongs(); - // load view. within the view files we can echo out $songs and $amount_of_songs easily + // load view. within the view files we can echo out $songs and $amount_of_songs easily require APP . 'views/_templates/header.php'; require APP . 'views/songs/index.php'; require APP . 'views/_templates/footer.php'; From 89fdb8fe3d8fb5c6b7c40c12d0bd413f20e3b025 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 1 Aug 2016 23:19:12 +0200 Subject: [PATCH 2/5] css fixes --- application/view/songs/index.php | 9 +++------ public/css/style.css | 14 ++++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/application/view/songs/index.php b/application/view/songs/index.php index 6b8549c..d025df4 100644 --- a/application/view/songs/index.php +++ b/application/view/songs/index.php @@ -16,14 +16,11 @@
-

Amount of songs (data from second model)

-
- -
+

Amount of songs:

Amount of songs (via AJAX)

+
- -
+

List of songs (data from first model)

diff --git a/public/css/style.css b/public/css/style.css index be7a7ed..dacfe74 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,6 +1,7 @@ body { - font-family: Arial; + font-family: Arial, sans-serif; font-size: 14px; + color: #454545; } .logo { width: 200px; @@ -21,15 +22,16 @@ body { text-transform: uppercase; font-weight: bold; border: 1px solid #454545; - background: #454545; - color: #fff; -} -.navigation a:hover { color: #454545; background: transparent; } +.navigation a:hover { + background: #454545; + color: #fff; +} .container { - border: 1px solid #ddd; + border: 1px solid #454545; + border-radius: 3px; padding: 20px; margin: 33px; } From 09c261baa86e27685b7f5554ebbc1f8e72fd1694 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 2 Aug 2016 00:01:15 +0200 Subject: [PATCH 3/5] text fix --- application/view/songs/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/view/songs/index.php b/application/view/songs/index.php index d025df4..cbedeb0 100644 --- a/application/view/songs/index.php +++ b/application/view/songs/index.php @@ -22,7 +22,7 @@
-

List of songs (data from first model)

+

List of songs (data from model)

From 309224f263fce64d84bd26428ac6b4efd48c57a2 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 2 Aug 2016 00:01:51 +0200 Subject: [PATCH 4/5] new set of demo data (meaning: weird and awesome track, music videos and other stuff from my vinyl crate) --- .../03-insert-demo-data-into-table-song.sql | 46 ++++++++----------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/_install/03-insert-demo-data-into-table-song.sql b/_install/03-insert-demo-data-into-table-song.sql index 13e22b4..712c09f 100644 --- a/_install/03-insert-demo-data-into-table-song.sql +++ b/_install/03-insert-demo-data-into-table-song.sql @@ -1,31 +1,21 @@ INSERT INTO `mini`.`song` (`id`, `artist`, `track`, `link`) VALUES -(1, 'Dena', 'Cash, Diamond Ring, Swimming Pools', 'http://www.youtube.com/watch?v=r4CDc9yCAqE'), -(2, 'Jessy Lanza', 'Kathy Lee', 'http://vimeo.com/73455369'), -(3, 'The Orwells', 'In my Bed (live)', 'http://www.youtube.com/watch?v=8tA_2qCGnmE'), -(4, 'L''Orange & Stik Figa', 'Smoke Rings', 'https://www.youtube.com/watch?v=Q5teohMyGEY'), -(5, 'Labyrinth Ear', 'Navy Light', 'http://www.youtube.com/watch?v=a9qKkG7NDu0'), -(6, 'Bon Hiver', 'Wolves (Kill them with Colour Remix)', 'http://www.youtube.com/watch?v=5GXAL5mzmyw'), +(1, 'Rin', 'Ljubav/Beichtstuhl', 'https://www.youtube.com/watch?v=MDHJMirQ5PI'), +(2, 'Jeremih feat. Natasha Mosley', 'F*** U All The Time', 'https://www.youtube.com/watch?v=6-Bq7PCKCJ4'), +(3, 'Nao', 'In the Morning', 'https://www.youtube.com/watch?v=uuocmqLRgOM'), +(4, 'Sofi / Tukker', 'Matadora', 'https://www.youtube.com/watch?v=d6GJeap4Oqo'), +(5, 'Yung Hurn', 'Nein', 'https://www.youtube.com/watch?v=22m5eU6uxeQ'), +(6, 'Rin', 'Error', 'https://www.youtube.com/watch?v=VzajBMa-2P8'), (7, 'Detachments', 'Circles (Martyn Remix)', 'http://www.youtube.com/watch?v=UzS7Gvn7jJ0'), -(8, 'Dillon & Dirk von Loetzow', 'Tip Tapping (Live at ZDF Aufnahmezustand)', 'https://www.youtube.com/watch?v=hbrOLsgu000'), -(9, 'Dillon', 'Contact Us (Live at ZDF Aufnahmezustand)', 'https://www.youtube.com/watch?v=E6WqTL2Up3Y'), -(10, 'Tricky', 'Hey Love (Promo Edit)', 'http://www.youtube.com/watch?v=OIsCGdW49OQ'), -(11, 'Compuphonic', 'Sunset feat. Marques Toliver (DJ T. Remix)', 'http://www.youtube.com/watch?v=Ue5ZWSK9r00'), -(12, 'Ludovico Einaudi', 'Divenire (live @ Royal Albert Hall London)', 'http://www.youtube.com/watch?v=X1DRDcGlSsE'), +(8, 'Survive', 'Hourglass', 'https://www.youtube.com/watch?v=JVOe2oGoHLk'), +(9, 'Big Narstie', 'Hello Hi', 'https://www.youtube.com/watch?v=q10WwZJmPew'), +(10, 'Sleaford Mods', 'Tarantula Deadly Cargo', 'https://www.youtube.com/watch?v=E-gvxxhcS8s'), +(11, 'Mykki Blanco & Woodkid', 'Highschool never ends', 'https://www.youtube.com/watch?v=cNGR4ciDmTA'), +(12, 'Secondcity & Tyler Rowe', 'I Enter', 'https://www.youtube.com/watch?v=vAmDJAxNMi0'), (13, 'Maxxi Soundsystem', 'Regrets we have no use for (Radio1 Rip)', 'https://soundcloud.com/maxxisoundsystem/maxxi-soundsystem-ft-name-one'), -(14, 'Beirut', 'Nantes (Fredo & Thang Remix)', 'https://www.youtube.com/watch?v=ojV3oMAgGgU'), -(15, 'Buku', 'All Deez', 'http://www.youtube.com/watch?v=R0bN9JRIqig'), -(16, 'Pilocka Krach', 'Wild Pete', 'http://www.youtube.com/watch?v=4wChP_BEJ4s'), -(17, 'Mount Kimbie', 'Here to stray (live at Pitchfork Music Festival Paris)', 'http://www.youtube.com/watch?v=jecgI-zEgIg'), -(18, 'Kool Savas', 'King of Rap (2012) / Ein Wunder', 'http://www.youtube.com/watch?v=mTqc6UTG1eY&hd=1'), -(19, 'Chaim feat. Meital De Razon', 'Love Rehab (Original Mix)', 'http://www.youtube.com/watch?v=MJT1BbNFiGs'), -(20, 'Emika', 'Searching', 'http://www.youtube.com/watch?v=oscuSiHfbwo'), -(21, 'Emika', 'Sing to me', 'http://www.youtube.com/watch?v=k9sDBZm8pgk'), -(22, 'George Fitzgerald', 'Thinking of You', 'http://www.youtube.com/watch?v=-14B8l49iKA'), -(23, 'Disclosure', 'You & Me (Flume Edit)', 'http://www.youtube.com/watch?v=OUkkaqSNduU'), -(24, 'Crystal Castles', 'Doe Deer', 'http://www.youtube.com/watch?v=zop0sWrKJnQ'), -(25, 'Tok Tok vs. Soffy O.', 'Missy Queens Gonna Die', 'http://www.youtube.com/watch?v=EN0Tnw5zy6w'), -(26, 'Fink', 'Maker (Synapson Remix)', 'http://www.youtube.com/watch?v=Dyd-cUkj4Nk'), -(27, 'Flight Facilities (ft. Christine Hoberg)', 'Clair De Lune', 'http://www.youtube.com/watch?v=Jcu1AHaTchM'), -(28, 'Karmon', 'Turning Point (Original Mix)', 'https://www.youtube.com/watch?v=-tB-zyLSPEo'), -(29, 'Shuttle Life', 'The Birds', 'http://www.youtube.com/watch?v=-I3m3cWDEtM'), -(30, 'Santé', 'Homegirl (Rampa Mix)', 'http://www.youtube.com/watch?v=fnhMNOWxLYw'); +(14, 'Jamie T', 'Don''t you find', 'https://www.youtube.com/watch?v=-tmoaFAT108'), +(15, 'Sierra Kid', 'Ein Fan von Dir', 'https://www.youtube.com/watch?v=dfabdmbpQeQ'), +(16, 'SSIO', 'Nullkommaneun', 'https://www.youtube.com/watch?v=Slei8n08Cqk'), +(17, 'Pupkulies & Rebecca', 'ICI', 'https://www.youtube.com/watch?v=60tebPRj_D0'), +(18, 'Color War', 'Shapeshifting', 'https://vimeo.com/111250184'), +(19, 'RÜFÜS', 'Innerbloom', 'https://www.youtube.com/watch?v=IA1liCmUsAM'), +(20, 'RÜFÜS', 'Tonight', 'https://www.youtube.com/watch?v=GCa_TKn9ghI'); \ No newline at end of file From 54ce1135fb3e5d8e847f3ddd8b7e365f5d7d053d Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 2 Aug 2016 00:03:15 +0200 Subject: [PATCH 5/5] links to old MINI versions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 92091e9..95e6514 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you just want to show some pages, do a few database calls and a little-bit of reading in massive documentations of highly complex professional frameworks, then MINI3 might be very useful for you. MINI3 is easy to install, runs nearly everywhere and doesn't make things more complicated than necessary. -MINI (original version) and MINI2 (used Slim router) were built by me (panique), MINI3 is an excellent and improved version +[MINI](https://github.com/panique/mini) (original version) and [MINI2](https://github.com/panique/mini2) (used Slim router) were built by me (panique), MINI3 is an excellent and improved version of the original MINI, made by [JaoNoctus](https://github.com/JaoNoctus). Big thanks, man! :) ## Features