diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index f4d3e31..5a5fb25 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -2,4 +2,5 @@ return [ 'mood' => 'What is your mood today?', 'year_in_history' => 'Your year in history', + 'please_login' => 'Please log in to start.', ]; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 3193ffa..53384c5 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,6 +1,3 @@ -// Fonts -@import url('https://fonts.googleapis.com/css?family=Nunito'); - // Variables @import 'variables'; diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 684bdca..f7e7b08 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,28 +1,22 @@ @extends('layouts.app') @section('content') -
-
-
-
-
- @lang('app.year_in_history') +
+
+ @lang('app.year_in_history') +
+ +
+ @if (session('status')) + - -
- @if (session('status')) - - @endif + @endif - @foreach($history as $record) - @lang('app.'.$record->mood->name) - @endforeach -
-
+ @foreach($history as $record) + @lang('app.'.$record->mood->name) + @endforeach
-
@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7bcfd31..7869e70 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -12,10 +12,6 @@ - - - - @@ -73,7 +69,13 @@
- @yield('content') +
+
+
+ @yield('content') +
+
+
diff --git a/resources/views/new_record.blade.php b/resources/views/new_record.blade.php index a1bba24..44cab00 100644 --- a/resources/views/new_record.blade.php +++ b/resources/views/new_record.blade.php @@ -1,31 +1,25 @@ @extends('layouts.app') @section('content') -
-
-
-
-
Dashboard
+
+
Dashboard
-
- @if (session('status')) - - @endif - -

@lang('app.mood')

- -

- @foreach ($moods as $mood) - - @lang('app.'.$mood->name) - - @endforeach -

+
+ @if (session('status')) + -
+ @endif + +

@lang('app.mood')

+ +

+ @foreach ($moods as $mood) + + @lang('app.'.$mood->name) + + @endforeach +

-
@endsection diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 3fb48cc..0b4c62a 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,100 +1,5 @@ - - - - - +@extends('layouts.app') - Laravel - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - -
-
- - +@section('content') +

@lang('app.please_login')

+@endsection