From 0942850832393bef351bebf561da3ac9657ab4a0 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:14:43 +0000 Subject: [PATCH 01/16] Set theme jekyll-theme-tactile --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 00000000..259a24e4 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-tactile \ No newline at end of file From a38cb3284a512259a84620a0ff1de63031be120a Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:45:44 +0000 Subject: [PATCH 02/16] Create README.md --- docs/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/README.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 00000000..c643d99e --- /dev/null +++ b/docs/README.md @@ -0,0 +1 @@ +# Heimdall From fea3eb2aa4980a6e00493fa9fa95950a43c0c0fc Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:50:30 +0000 Subject: [PATCH 03/16] Set theme jekyll-theme-merlot --- docs/_config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/_config.yml diff --git a/docs/_config.yml b/docs/_config.yml new file mode 100644 index 00000000..c50ff38d --- /dev/null +++ b/docs/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-merlot \ No newline at end of file From 44e1c495c8448808c40165c20682cdb40bc835fc Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:51:45 +0000 Subject: [PATCH 04/16] Set theme jekyll-theme-tactile --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index c50ff38d..259a24e4 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1 +1 @@ -theme: jekyll-theme-merlot \ No newline at end of file +theme: jekyll-theme-tactile \ No newline at end of file From 250ac1142df20a4ffee5e8379336a0ed182453ac Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:55:26 +0000 Subject: [PATCH 05/16] Update README.md --- docs/README.md | 107 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/docs/README.md b/docs/README.md index c643d99e..6c05862c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1 +1,108 @@ # Heimdall + + +*Tactile is a Jekyll theme for GitHub Pages. You can [preview the theme to see what it looks like](http://pages-themes.github.io/tactile), or even [use it today](#usage).* + +![Thumbnail of Tactile](thumbnail.png) + +## Usage + +To use the Tactile theme: + +1. Add the following to your site's `_config.yml`: + + ```yml + theme: jekyll-theme-tactile + ``` + +2. Optionally, if you'd like to preview your site on your computer, add the following to your site's `Gemfile`: + + ```ruby + gem "github-pages", group: :jekyll_plugins + ``` + +## Customizing + +### Configuration variables + +Tactile will respect the following variables, if set in your site's `_config.yml`: + +```yml +title: [The title of your site] +description: [A short description of your site's purpose] +``` + +Additionally, you may choose to set the following optional variables: + +```yml +show_downloads: ["true" or "false" to indicate whether to provide a download URL] +google_analytics: [Your Google Analytics tracking ID] +``` + +### Stylesheet + +If you'd like to add your own custom styles: + +1. Create a file called `/assets/css/style.scss` in your site +2. Add the following content to the top of the file, exactly as shown: + ```scss + --- + --- + + @import "{{ site.theme }}"; + ``` +3. Add any custom CSS (or Sass, including imports) you'd like immediately after the `@import` line + +*Note: If you'd like to change the theme's Sass variables, you must set new values before the `@import` line in your stylesheet.* + +### Layouts + +If you'd like to change the theme's HTML layout: + +1. [Copy the original template](https://github.com/pages-themes/tactile/blob/master/_layouts/default.html) from the theme's repository
(*Pro-tip: click "raw" to make copying easier*) +2. Create a file called `/_layouts/default.html` in your site +3. Paste the default layout content copied in the first step +4. Customize the layout as you'd like + +### Overriding GitHub-generated URLs + +Templates often rely on URLs supplied by GitHub such as links to your repository or links to download your project. If you'd like to override one or more default URLs: + +1. Look at [the template source](https://github.com/pages-themes/tactile/blob/master/_layouts/default.html) to determine the name of the variable. It will be in the form of `{{ site.github.zip_url }}`. +2. Specify the URL that you'd like the template to use in your site's `_config.yml`. For example, if the variable was `site.github.url`, you'd add the following: + ```yml + github: + zip_url: http://example.com/download.zip + another_url: another value + ``` +3. When your site is built, Jekyll will use the URL you specified, rather than the default one provided by GitHub. + +*Note: You must remove the `site.` prefix, and each variable name (after the `github.`) should be indent with two space below `github:`.* + +For more information, see [the Jekyll variables documentation](https://jekyllrb.com/docs/variables/). + +## Roadmap + +See the [open issues](https://github.com/pages-themes/tactile/issues) for a list of proposed features (and known issues). + +## Project philosophy + +The Tactile theme is intended to make it quick and easy for GitHub Pages users to create their first (or 100th) website. The theme should meet the vast majority of users' needs out of the box, erring on the side of simplicity rather than flexibility, and provide users the opportunity to opt-in to additional complexity if they have specific needs or wish to further customize their experience (such as adding custom CSS or modifying the default layout). It should also look great, but that goes without saying. + +## Contributing + +Interested in contributing to Tactile? We'd love your help. Tactile is an open source project, built one contribution at a time by users like you. See [the CONTRIBUTING file](docs/CONTRIBUTING.md) for instructions on how to contribute. + +### Previewing the theme locally + +If you'd like to preview the theme locally (for example, in the process of proposing a change): + +1. Clone down the theme's repository (`git clone https://github.com/pages-themes/tactile`) +2. `cd` into the theme's directory +3. Run `script/bootstrap` to install the necessary dependencies +4. Run `bundle exec jekyll serve` to start the preview server +5. Visit [`localhost:4000`](http://localhost:4000) in your browser to preview the theme + +### Running tests + +The theme contains a minimal test suite, to ensure a site with the theme would build successfully. To run the tests, simply run `script/cibuild`. You'll need to run `script/bootstrap` one before the test script will work. From 24e1559051a6c32c8d6a71105098f1594323fddb Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:58:30 +0000 Subject: [PATCH 06/16] Update README.md --- docs/README.md | 126 ++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 91 deletions(-) diff --git a/docs/README.md b/docs/README.md index 6c05862c..a02d4498 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,108 +1,52 @@ # Heimdall +![alt text](https://i.imgur.com/aUpMns5.jpg) -*Tactile is a Jekyll theme for GitHub Pages. You can [preview the theme to see what it looks like](http://pages-themes.github.io/tactile), or even [use it today](#usage).* +## About -![Thumbnail of Tactile](thumbnail.png) +An Application dashboard and launcher -## Usage +## Video +If you want to see a quick video of it in use, go to https://drive.google.com/file/d/1cijXgmjem_q2OfKMp36qVuXRiyOzvhWC/view -To use the Tactile theme: +## Web Server Configuration -1. Add the following to your site's `_config.yml`: +### Apache +A .htaccess file ships with the app, however, if it does not work with your Apache installation, try this alternative: - ```yml - theme: jekyll-theme-tactile - ``` - -2. Optionally, if you'd like to preview your site on your computer, add the following to your site's `Gemfile`: - - ```ruby - gem "github-pages", group: :jekyll_plugins - ``` - -## Customizing - -### Configuration variables - -Tactile will respect the following variables, if set in your site's `_config.yml`: - -```yml -title: [The title of your site] -description: [A short description of your site's purpose] ``` +Options +FollowSymLinks +RewriteEngine On -Additionally, you may choose to set the following optional variables: - -```yml -show_downloads: ["true" or "false" to indicate whether to provide a download URL] -google_analytics: [Your Google Analytics tracking ID] +RewriteCond %{REQUEST_FILENAME} !-d +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^ index.php [L] ``` -### Stylesheet - -If you'd like to add your own custom styles: - -1. Create a file called `/assets/css/style.scss` in your site -2. Add the following content to the top of the file, exactly as shown: - ```scss - --- - --- - - @import "{{ site.theme }}"; - ``` -3. Add any custom CSS (or Sass, including imports) you'd like immediately after the `@import` line - -*Note: If you'd like to change the theme's Sass variables, you must set new values before the `@import` line in your stylesheet.* - -### Layouts - -If you'd like to change the theme's HTML layout: - -1. [Copy the original template](https://github.com/pages-themes/tactile/blob/master/_layouts/default.html) from the theme's repository
(*Pro-tip: click "raw" to make copying easier*) -2. Create a file called `/_layouts/default.html` in your site -3. Paste the default layout content copied in the first step -4. Customize the layout as you'd like - -### Overriding GitHub-generated URLs +### Nginx +If you are using Nginx, the following directive in your site configuration will direct all requests to the index.php front controller: -Templates often rely on URLs supplied by GitHub such as links to your repository or links to download your project. If you'd like to override one or more default URLs: - -1. Look at [the template source](https://github.com/pages-themes/tactile/blob/master/_layouts/default.html) to determine the name of the variable. It will be in the form of `{{ site.github.zip_url }}`. -2. Specify the URL that you'd like the template to use in your site's `_config.yml`. For example, if the variable was `site.github.url`, you'd add the following: - ```yml - github: - zip_url: http://example.com/download.zip - another_url: another value - ``` -3. When your site is built, Jekyll will use the URL you specified, rather than the default one provided by GitHub. - -*Note: You must remove the `site.` prefix, and each variable name (after the `github.`) should be indent with two space below `github:`.* - -For more information, see [the Jekyll variables documentation](https://jekyllrb.com/docs/variables/). - -## Roadmap - -See the [open issues](https://github.com/pages-themes/tactile/issues) for a list of proposed features (and known issues). - -## Project philosophy - -The Tactile theme is intended to make it quick and easy for GitHub Pages users to create their first (or 100th) website. The theme should meet the vast majority of users' needs out of the box, erring on the side of simplicity rather than flexibility, and provide users the opportunity to opt-in to additional complexity if they have specific needs or wish to further customize their experience (such as adding custom CSS or modifying the default layout). It should also look great, but that goes without saying. - -## Contributing - -Interested in contributing to Tactile? We'd love your help. Tactile is an open source project, built one contribution at a time by users like you. See [the CONTRIBUTING file](docs/CONTRIBUTING.md) for instructions on how to contribute. - -### Previewing the theme locally +``` +location / { + try_files $uri $uri/ /index.php?$query_string; +} +``` +Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from /web so their location was interferring with the /webfonts. -If you'd like to preview the theme locally (for example, in the process of proposing a change): +Therefore, if your fonts aren't showing because you have a location for /web add the following +``` +location /webfonts { + try_files $uri $uri/; +} +``` +If there are any other locations which might interefere with any of the folders in the /public folder, you might have to do the same for those as well, but it's a super fringe case. -1. Clone down the theme's repository (`git clone https://github.com/pages-themes/tactile`) -2. `cd` into the theme's directory -3. Run `script/bootstrap` to install the necessary dependencies -4. Run `bundle exec jekyll serve` to start the preview server -5. Visit [`localhost:4000`](http://localhost:4000) in your browser to preview the theme +## Credits +- PHP Framework - [Laravel](https://laravel.com/) +- Icons - [FonteAwesome 5](https://fontawesome.com/) +- Javascript - [jQuery](https://jquery.com/) +- Colour picker - [Huebee](http://huebee.buzz/) -### Running tests +## License -The theme contains a minimal test suite, to ensure a site with the theme would build successfully. To run the tests, simply run `script/cibuild`. You'll need to run `script/bootstrap` one before the test script will work. +This app is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). From 831ab4a844ecda0f24fe621b33e178629488d2c3 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 10:58:58 +0000 Subject: [PATCH 07/16] Update _config.yml --- docs/_config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 259a24e4..dbd0168a 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1 +1,2 @@ -theme: jekyll-theme-tactile \ No newline at end of file +theme: jekyll-theme-tactile +show_downloads: "true" From 88949c08859a9078224c15275d49c73dcf6659a0 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 11:01:51 +0000 Subject: [PATCH 08/16] Update README.md --- docs/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index a02d4498..43af7c5e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,3 @@ -# Heimdall - ![alt text](https://i.imgur.com/aUpMns5.jpg) ## About From 7a0cf5716cde2e79656ce0a39dffbfc6a986fcc5 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 11:11:25 +0000 Subject: [PATCH 09/16] Update readme.md --- readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 43af7c5e..425ce62a 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,11 @@ ## About -An Application dashboard and launcher +Heimdall is a way to organise all those links to your most used web sites and web applications in a simple way. + +Simplicity is the key to Heimdall. + +Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo. ## Video If you want to see a quick video of it in use, go to https://drive.google.com/file/d/1cijXgmjem_q2OfKMp36qVuXRiyOzvhWC/view From 40b80983aad999d3e55b31950a2160d31f08e48a Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 11:13:41 +0000 Subject: [PATCH 10/16] Delete _config.yml --- docs/_config.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 docs/_config.yml diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index dbd0168a..00000000 --- a/docs/_config.yml +++ /dev/null @@ -1,2 +0,0 @@ -theme: jekyll-theme-tactile -show_downloads: "true" From 2376546c71acb64963bd7f02e7dc57dfe6d7a5a4 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 11:13:51 +0000 Subject: [PATCH 11/16] Delete README.md --- docs/README.md | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 docs/README.md diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index 43af7c5e..00000000 --- a/docs/README.md +++ /dev/null @@ -1,50 +0,0 @@ -![alt text](https://i.imgur.com/aUpMns5.jpg) - -## About - -An Application dashboard and launcher - -## Video -If you want to see a quick video of it in use, go to https://drive.google.com/file/d/1cijXgmjem_q2OfKMp36qVuXRiyOzvhWC/view - -## Web Server Configuration - -### Apache -A .htaccess file ships with the app, however, if it does not work with your Apache installation, try this alternative: - -``` -Options +FollowSymLinks -RewriteEngine On - -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME} !-f -RewriteRule ^ index.php [L] -``` - -### Nginx -If you are using Nginx, the following directive in your site configuration will direct all requests to the index.php front controller: - -``` -location / { - try_files $uri $uri/ /index.php?$query_string; -} -``` -Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from /web so their location was interferring with the /webfonts. - -Therefore, if your fonts aren't showing because you have a location for /web add the following -``` -location /webfonts { - try_files $uri $uri/; -} -``` -If there are any other locations which might interefere with any of the folders in the /public folder, you might have to do the same for those as well, but it's a super fringe case. - -## Credits -- PHP Framework - [Laravel](https://laravel.com/) -- Icons - [FonteAwesome 5](https://fontawesome.com/) -- Javascript - [jQuery](https://jquery.com/) -- Colour picker - [Huebee](http://huebee.buzz/) - -## License - -This app is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). From 82540d7b7c68e879094cd0de5b2633d0a77f7808 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 11:19:16 +0000 Subject: [PATCH 12/16] Update readme.md --- readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readme.md b/readme.md index 425ce62a..ade49899 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,12 @@ Why not use it as your browser start page? It even has the ability to include a ## Video If you want to see a quick video of it in use, go to https://drive.google.com/file/d/1cijXgmjem_q2OfKMp36qVuXRiyOzvhWC/view +## Installing + +Apart from the Laravel dependencies, namely PHP >= 7.0.0, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension and XML PHP Extension, the only other thing Heimdall needs is sqlite support. + +Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to it. For simple testing you could just go to the folder and type `php artisan serve` + ## Web Server Configuration ### Apache From a3a6b78a3244a5816784115a8d6a39c5246d2260 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 13:58:54 +0000 Subject: [PATCH 13/16] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..0f620f17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 Chris Hunt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 2e06f1c1534b4004f825bc6eb646ee80c3d056f9 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 21:28:56 +0000 Subject: [PATCH 14/16] try and remove reliance on .env --- config/database.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/database.php b/config/database.php index f2f0ab1d..8f7573f6 100644 --- a/config/database.php +++ b/config/database.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'sqlite'), /* |-------------------------------------------------------------------------- @@ -36,7 +36,7 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', //'database' => env('DB_DATABASE', database_path('database.sqlite')), - 'database' => database_path(env('DB_DATABASE')), + 'database' => database_path(env('DB_DATABASE', 'app.sqlite')), 'prefix' => '', ], From 3e4617e37d5d7d88b50cf3766e909522249f07cc Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 22:02:50 +0000 Subject: [PATCH 15/16] create .env if missing --- app/Providers/AppServiceProvider.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 254fdf24..fa04991c 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -18,16 +18,20 @@ class AppServiceProvider extends ServiceProvider { $alt_bg = ''; - if(!is_file(database_path(env('DB_DATABASE')))) { + if(!is_file(base_path('.env'))) { + touch(base_path('.env')); + Artisan::call('key:generate'); + } + if(!is_file(database_path('app.sqlite'))) { // first time setup - touch(database_path(env('DB_DATABASE'))); + touch(database_path('app.sqlite')); Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); Artisan::call('storage:link'); //Cache //Artisan::call('config:cache'); //Artisan::call('route:cache'); } - if(is_file(database_path(env('DB_DATABASE')))) { + if(is_file(database_path('app.sqlite'))) { if(Schema::hasTable('settings')) { if($bg_image = Setting::fetch('background_image')) { $alt_bg = ' style="background-image: url('.asset('storage/'.$bg_image).')"'; From 70bce9869a006b3f38fdbe9ce7eafc3e629b002e Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 6 Feb 2018 22:29:31 +0000 Subject: [PATCH 16/16] default key --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index d93e435a..105ad6f1 100644 --- a/config/app.php +++ b/config/app.php @@ -105,7 +105,7 @@ return [ | */ - 'key' => env('APP_KEY'), + 'key' => env('APP_KEY', 'base64:I206O8ibx+GQyRE7BeOxDobn04Mfmyyc5Ptzns/C0mY='), 'cipher' => 'AES-256-CBC',