diff --git a/config/services.php b/config/services.php index 0ace530..8407709 100644 --- a/config/services.php +++ b/config/services.php @@ -14,21 +14,8 @@ | */ - 'mailgun' => [ - 'domain' => env('MAILGUN_DOMAIN'), - 'secret' => env('MAILGUN_SECRET'), - 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), - 'scheme' => 'https', - ], - - 'postmark' => [ - 'token' => env('POSTMARK_TOKEN'), - ], - - 'ses' => [ - 'key' => env('AWS_ACCESS_KEY_ID'), - 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), - ], - + 'lastfm' => [ + 'key' => env('LASTFM_KEY'), + 'user' => env('LASTFM_USER') + ] ]; diff --git a/public/css/dark.css b/public/css/dark.css new file mode 100644 index 0000000..1eeaf43 --- /dev/null +++ b/public/css/dark.css @@ -0,0 +1,77 @@ +/* +This stylesheet contains only colors which are +different depending on theme. All other styles have +been moved to global.css and imported below. +*/ +@import url('global.css'); + +html { + color-scheme: dark; +} + +div.project pre { + border: 1px solid #666666 +} + +body { + color: #ddd; + background-color: #333; +} + +h1 { + color: #fff; +} + + +h2 { + color: #fff; +} + +h3 { + color: #fff; +} + +div.preview pre, div.project pre { + background-color: #222; + color: #ccc; +} + +a { + color: #99f; + text-decoration: none +} +.header { + color: #fff; +} + + +.header .pagetree { + color: #fff; +} + +.header .pagetree .title { + color: #fff +} + +/*table td { + border: 1px solid black +}*/ + + +/*table.skami { + border-color: #eeeeee +}*/ +table.skami .semiused { + color: #ccc; + background-color: #444; + border-color: #FFF; +} + +table.skami .unused { + color: #bbb; + background-color: #555 +} + +table { + border-color: #fff +} diff --git a/public/css/global.css b/public/css/global.css new file mode 100644 index 0000000..693452b --- /dev/null +++ b/public/css/global.css @@ -0,0 +1,311 @@ +/* +This stylesheet contains all styles which are +the same across both themes. +*/ +ul { + list-style-type: square; +} + +table.banner { + margin-left: auto; + margin-right: auto; + border: 2px solid #E04A38; + background-color: #E6897E; + width: 95%; + /* Passes both WCAG AA and WCAG AAA contrast tests */ + color: #0F0F0F; +} + +td.banner { + padding: 5px; +} + +a.bannerlink { + color: #0F0F0F; +} + +a.bannerlink:hover { + text-decoration: underline; +} + +div.page { + min-width: 700px; + max-width: 1024px; + /*margin-left: 0.5em; + margin-right: 0.5em;*/ + padding-left: 0.5em; + padding-right: 0.5em; + margin: auto +} + +h1.inline { + font-family: sans-serif; + font-weight: normal; + margin-top: 0em; + clear: none; + font-size: 100%; + display: inline +} + +h1.inline:before { + content: "" +} + +h1:before { + content: "> " +} + +h2:before { + content: ">> " +} + +h3:before { + content: ">>> " +} + +.toplinks span:after { + content: " >" +} + +h1, h2, h3 { + font-family: Monospace; + font-weight: normal; + margin-top: 1em; + clear: left +} + +img { + border: none; + max-width: 100%; +} + +img.right { + float: right; + margin-left: 0.5em +} + +table.form, td.form { + border: none; +} + +div.preview { + display: inline-block; + width: 30em; + max-width: 100%; + text-align: center; + vertical-align: top; + margin-bottom: 2em +} + +div.project { + display: inline-block; + width: 40em; + max-width: 100%; + text-align: center; + vertical-align: top; + margin-bottom: 2em +} + +div.preview .heading .name, div.project .heading .name { + font-size: 120% +} + +div.preview img, div.project img { + width: auto; + max-width: 90%; + max-height: 15em +} + +div.preview pre.small, div.project pre.small { + font-size: 75%; + overflow: hidden +} + +pre { + display: inline; + max-width: 95%; + overflow: auto +} + +.header a { + text-decoration: none +} + +nav { + margin-bottom: 0.3em +} + +div.ddate { + text-align: center +} + +div.note { + font-style: italic +} + +table { + border-collapse: collapse +} + +table.noborder td { + border: none +} + +table.skami a { + text-decoration: none +} + +table.weather th { + font-weight: normal +} + +table.weather td { + font-weight: bold; + text-align: right +} + +.project .name { + font-weight: bold +} + +.toplinks a { + margin-right: 0.5em; + text-decoration: none +} + +div.inlinepage { + margin-top: 2em; + border: 0; + padding: 0 +} + +div.pheader { + font-size: 120% +} + +div.pheader span.date { + margin-right: 1em; + font-weight: normal +} + +div.pheader a { + font-weight: bold; + text-decoration: none +} + +div.rss { + position: absolute; + top: 1em; + right: 1em +} + +div.archived { + margin-top: 0.5em +} + +div.archived span.date { + font-style: italic; + margin-right: 0.2em +} + +video { + max-width: 100% +} + +.toplinks span { + display: block; + text-align: right; + float: left; + width: 8em; + margin-right: 0.5em +} + +.deprecated { + line-height: 140%; + width: 100%; + color: #aa0000; + text-align: center; + padding-bottom: 0.5em; + border-bottom: 2px dashed #aa0000 +} + +.project .attributes { + font-style: italic +} + +.project .attribbracket { + margin-left: 0.5em +} + +.toplinks { + line-height: 140%; + width: 100%; + padding-top: 0.5em; + padding-bottom: 0.5em; + border-bottom: 1px solid #cccccc +} + +table td { + border: 1px solid white +} + +td { + padding: 3px; + vertical-align: top; +} + +table.skami { + border-color: #eeeeee !important +} + +.header .pagetree { + font-size: 80%; + display: block; + text-align: center; + width: 100%; + padding-top: 0.1em; + padding-bottom: 0.1em; + border-top: 1px solid #cccccc +} + +.header { + font-size: 100%; + font-weight: normal; + padding-bottom: 0em; + border-bottom: 1px solid #cccccc; + text-align: center +} + +div.preview pre, div.project pre { + display: inline-block; + text-align: left; + padding: 0.2em; + max-width: 90% +} + +h1 { + font-size: 150% +} + + +h2 { + font-size: 130% +} + +h3 { + font-size: 115% +} + +body { + font-family: sans-serif; + margin: 0px; +} + +table.computers { + width: 100%; +} + +td.computer { + width: 50%; + border: 0px; +} diff --git a/public/images/buttons/browser.gif b/public/images/buttons/browser.gif new file mode 100644 index 0000000..28a63e3 Binary files /dev/null and b/public/images/buttons/browser.gif differ diff --git a/public/images/buttons/linuxnow.gif b/public/images/buttons/linuxnow.gif new file mode 100644 index 0000000..9851014 Binary files /dev/null and b/public/images/buttons/linuxnow.gif differ diff --git a/public/images/buttons/valid-html401-blue.png b/public/images/buttons/valid-html401-blue.png new file mode 100644 index 0000000..dd20e49 Binary files /dev/null and b/public/images/buttons/valid-html401-blue.png differ diff --git a/public/images/buttons/vcss-blue.gif b/public/images/buttons/vcss-blue.gif new file mode 100644 index 0000000..c373b2a Binary files /dev/null and b/public/images/buttons/vcss-blue.gif differ diff --git a/public/images/buttons/vim.gif b/public/images/buttons/vim.gif new file mode 100644 index 0000000..01f09f1 Binary files /dev/null and b/public/images/buttons/vim.gif differ diff --git a/public/images/icons/fav/ico/calc.ico b/public/images/icons/fav/ico/calc.ico new file mode 100755 index 0000000..b304c47 Binary files /dev/null and b/public/images/icons/fav/ico/calc.ico differ diff --git a/public/images/icons/fav/ico/computer.ico b/public/images/icons/fav/ico/computer.ico new file mode 100644 index 0000000..01f4a74 Binary files /dev/null and b/public/images/icons/fav/ico/computer.ico differ diff --git a/public/images/icons/fav/ico/favicon.ico b/public/images/icons/fav/ico/favicon.ico new file mode 100755 index 0000000..848cc6f Binary files /dev/null and b/public/images/icons/fav/ico/favicon.ico differ diff --git a/public/images/icons/fav/ico/globe.ico b/public/images/icons/fav/ico/globe.ico new file mode 100644 index 0000000..55ae5a3 Binary files /dev/null and b/public/images/icons/fav/ico/globe.ico differ diff --git a/public/images/icons/fav/ico/help-book.ico b/public/images/icons/fav/ico/help-book.ico new file mode 100644 index 0000000..a156820 Binary files /dev/null and b/public/images/icons/fav/ico/help-book.ico differ diff --git a/public/images/icons/fav/png/calc.png b/public/images/icons/fav/png/calc.png new file mode 100755 index 0000000..bdc9e06 Binary files /dev/null and b/public/images/icons/fav/png/calc.png differ diff --git a/public/images/icons/fav/png/computer.png b/public/images/icons/fav/png/computer.png new file mode 100644 index 0000000..d53eb99 Binary files /dev/null and b/public/images/icons/fav/png/computer.png differ diff --git a/public/images/icons/fav/png/globe.png b/public/images/icons/fav/png/globe.png new file mode 100644 index 0000000..21b4b17 Binary files /dev/null and b/public/images/icons/fav/png/globe.png differ diff --git a/public/images/icons/fav/png/help-book.png b/public/images/icons/fav/png/help-book.png new file mode 100644 index 0000000..845863a Binary files /dev/null and b/public/images/icons/fav/png/help-book.png differ diff --git a/public/images/icons/nav/bookmarks.png b/public/images/icons/nav/bookmarks.png new file mode 100644 index 0000000..e135cf8 Binary files /dev/null and b/public/images/icons/nav/bookmarks.png differ diff --git a/public/images/icons/nav/deskbar.png b/public/images/icons/nav/deskbar.png new file mode 100644 index 0000000..203daa0 Binary files /dev/null and b/public/images/icons/nav/deskbar.png differ diff --git a/public/images/icons/nav/gl.png b/public/images/icons/nav/gl.png new file mode 100644 index 0000000..90ec35c Binary files /dev/null and b/public/images/icons/nav/gl.png differ diff --git a/public/images/icons/nav/haiku.png b/public/images/icons/nav/haiku.png new file mode 100644 index 0000000..af92ace Binary files /dev/null and b/public/images/icons/nav/haiku.png differ diff --git a/public/images/icons/nav/screenshot.png b/public/images/icons/nav/screenshot.png new file mode 100644 index 0000000..8fba644 Binary files /dev/null and b/public/images/icons/nav/screenshot.png differ diff --git a/public/images/icons/nav/writing.png b/public/images/icons/nav/writing.png new file mode 100644 index 0000000..82089ba Binary files /dev/null and b/public/images/icons/nav/writing.png differ diff --git a/resources/css/app.css b/resources/css/app.css deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/components/lastfm.blade.php b/resources/views/components/lastfm.blade.php new file mode 100644 index 0000000..78c5f81 --- /dev/null +++ b/resources/views/components/lastfm.blade.php @@ -0,0 +1,67 @@ +get('services')['lastfm']; + +$curl_current = curl_init(); + +curl_setopt_array($curl_current, [ + CURLOPT_URL => "https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=".$cfg['user']."&nowplaying=true&format=json&api_key=".$cfg['key'], + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 30, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "GET", +]); + +$current_response = curl_exec($curl_current); +$err = curl_error($curl_current); + +curl_close($curl_current); + +if ($err) { + die("cURL Error #:" . $err); +} +$current_response = json_decode($current_response, true); +$nowplaying = $current_response['recenttracks']['track'][0]; + + +$tracks_to_show = 10; + +$curl = curl_init(); +curl_setopt_array($curl, [ + CURLOPT_URL => "https://ws.audioscrobbler.com/2.0/?method=user.gettoptracks&user=".$cfg['user']."&format=json&period=7day&api_key=".$cfg['key'], + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 30, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "GET", +]); + +$toptracks = curl_exec($curl); +$err = curl_error($curl); +curl_close($curl); +if ($err) { + die("cURL Error #:" . $err); +} + +$toptracks = json_decode($toptracks, true); +$tracks = $toptracks['toptracks']['track']; +$count = 0; +?> + +

Last.fm (Profile)

+ Last/Current Track: {{ $nowplaying['name'] }} • {{ $nowplaying['artist']['#text'] }} +

Top {{ $tracks_to_show }} Tracks (Last 7 days)

+
    +@foreach ($tracks as $track) + @if ($count >= $tracks_to_show) +
+ @break + @endif +
  • + {{ $track['name'] }} • {{ $track['artist']['name'] }} + ({{$track['playcount']}} plays) +
  • + +@endforeach diff --git a/resources/views/components/weatherdata.blade.php b/resources/views/components/weatherdata.blade.php new file mode 100644 index 0000000..28e163d --- /dev/null +++ b/resources/views/components/weatherdata.blade.php @@ -0,0 +1,68 @@ + "http://weather.diskfloppy.me/data/weatherData.json", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 300, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "GET", +]); + +$current_response = curl_exec($curl_current); +$err = curl_error($curl_current); + +curl_close($curl_current); + +$curl_current = curl_init(); + +curl_setopt_array($curl_current, [ + CURLOPT_URL => "http://weather.diskfloppy.me/data/got.txt", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => "", + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 300, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => "GET", +]); + +$last_update = curl_exec($curl_current); +$err = curl_error($curl_current); + +curl_close($curl_current); + +if ($err) { + die("cURL Error: " . $err); +} +$current_response = json_decode($current_response, true); +$weather_data = $current_response['data']['conditions'][0]; +$windDirDeg = $weather_data['wind_dir_last']; +$windDir = ""; +// W I N D +if (349 <= $windDirDeg || $windDirDeg <= 11) { $windDir = "N"; } +else if (12 <= $windDirDeg && $windDirDeg <= 33) { $windDir = "NNE"; } +else if (34 <= $windDirDeg && $windDirDeg <= 56) { $windDir = "NE"; } +else if (57 <= $windDirDeg && $windDirDeg <= 78) { $windDir = "ENE"; } +else if (79 <= $windDirDeg && $windDirDeg <= 101) { $windDir = "E"; } +else if (102 <= $windDirDeg && $windDirDeg <= 123) { $windDir = "ESE"; } +else if (124 <= $windDirDeg && $windDirDeg <= 146) { $windDir = "SE"; } +else if (147 <= $windDirDeg && $windDirDeg <= 168) { $windDir = "SSE"; } +else if (169 <= $windDirDeg && $windDirDeg <= 191) { $windDir = "S"; } +else if (192 <= $windDirDeg && $windDirDeg <= 213) { $windDir = "SSW"; } +else if (214 <= $windDirDeg && $windDirDeg <= 236) { $windDir = "SW"; } +else if (237 <= $windDirDeg && $windDirDeg <= 258) { $windDir = "WSW"; } +else if (259 <= $windDirDeg && $windDirDeg <= 281) { $windDir = "W"; } +else if (282 <= $windDirDeg && $windDirDeg <= 303) { $windDir = "WNE"; } +else if (304 <= $windDirDeg && $windDirDeg <= 326) { $windDir = "NW"; } +else if (327 <= $windDirDeg && $windDirDeg <= 348) { $windDir = "WNW"; } + +?> +

    Local Weather (Last Update: {{ gmdate('H:i Y-m-d', intval(rtrim($last_update))) }})

    + Wind Speed: {{ $weather_data['wind_speed_last'] }} mph
    + Wind Direction: {{ $weather_data['wind_dir_last']}}°, {{ $windDir }}
    + Temperature: {{ round(($weather_data['temp']-32)*(5/9), 1) }}°C
    + Rain Rate: {{ round($weather_data['rain_rate_last']*0.2, 2) }} mm/hr
    + Humidity: {{ round($weather_data['hum']) }}%
    diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php new file mode 100644 index 0000000..09dcf38 --- /dev/null +++ b/resources/views/includes/footer.blade.php @@ -0,0 +1,8 @@ +
    +
    + Any Damn Browser  + Linux NOW!  + vim  + Valid CSS!  + Valid HTML 4.01!
    +
    diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php new file mode 100644 index 0000000..ed4f29e --- /dev/null +++ b/resources/views/includes/head.blade.php @@ -0,0 +1,13 @@ + + + + + + + + + ~floppydisk / @yield('title') + + + + diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php new file mode 100644 index 0000000..37dccbe --- /dev/null +++ b/resources/views/includes/header.blade.php @@ -0,0 +1,11 @@ + diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php new file mode 100644 index 0000000..77c3f76 --- /dev/null +++ b/resources/views/layouts/default.blade.php @@ -0,0 +1,27 @@ + + + + + + + + @include('includes.head') + + + +
    +
    + @include('includes.header') +
    + +
    +
    + @yield('content') +
    + +
    +
    + + diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php new file mode 100644 index 0000000..f21528f --- /dev/null +++ b/resources/views/pages/home.blade.php @@ -0,0 +1,25 @@ +@extends('layouts.default') +@section('title', 'test') +@section('description', 'This is the personal homepage of floppydisk.') +@section('content') +

    Hi!

    +

    This is the personal homepage of floppydisk.

    + + + @include('components.lastfm') + + + @include('components.weatherdata') + +

    Contact

    +

    Mail: contact@diskfloppy.me
    + IRC: floppydisk @ r-type
    +

    + +

    Elsewhere

    +

    Mastodon: @floppydisk_@mastodon.sdf.org
    + Twitter: @floppydisk__
    + GitHub: floppydisk05
    + SDF: ~floppydisk +

    +@stop diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index 638ec96..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - Laravel - - - - - - - - - -
    - @if (Route::has('login')) -
    - @auth - Home - @else - Log in - - @if (Route::has('register')) - Register - @endif - @endauth -
    - @endif - -
    -
    - - - -
    - - - -
    - - -
    - Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) -
    -
    -
    -
    - - diff --git a/routes/web.php b/routes/web.php index d259f33..6af7650 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,5 +14,5 @@ */ Route::get('/', function () { - return view('welcome'); + return View::make('pages.home'); });