Parcourir la source

made it pretty, fixed bugs (logout)

Алина il y a 4 ans
Parent
commit
2e3ad09b4f

+ 38 - 38
resources/views/home.blade.php

@@ -1,4 +1,5 @@
 @extends('layouts.app')
+
 @extends('page')
 @section('content')
 <div class="container">
@@ -15,59 +16,58 @@
                     </div>
                     @endif
 
-                    {{ __('You are logged in!') }}
-
-                    <a href="{{ url('/logout') }}"> <button>logout</button> </a>
+                    <p>{{ __('You are logged in!') }}</p>
                     
-                    <h3>post a message:</h3>@if ($errors->any())
-                    <div class="alert alert-danger">
-                        <ul>
-                            @foreach ($errors->all() as $error)
-                            <li>{{ $error }}</li>
-                            @endforeach
-                        </ul>
-                    </div>
-                    @endif
+                    <h6>post a message:</h6>
 
                     <form action="/create" method="post">
+                        <div class="form-group">
 
-                        <input type="text" name="title" placeholder="Title"> 
+                            <input type="text" name="title"  class="form-control" placeholder="Title">
+                        </div>
 
-                        <br>
-
-                        <input type="text" name="content" placeholder="content">
+                        <input type="text" name="content"  class="form-control" placeholder="content">
 
                         {{ csrf_field() }}
 
-                        <button type="submit">Submit</button>
-                        <input type="hidden" value="{{ Session::token() }}" name="_token">
+                        <div class="form-group">
+                            <input type="hidden" value="{{ Session::token() }}" name="_token">
+                        </div>
+                        <button class="btn btn-outline-primary" type="submit">twet</button>
+                    </form> 
 
-                    </form>
                     <br>
+
+                    @if ($errors->any())
+                    @foreach ($errors->all() as $error)
+                    <div class="alert alert-danger">
+                        {{ $error }}
+                    </div> 
+                    @endforeach
+                    @endif
+
+
                     @if(session()->has('message'))
                     <div class="alert alert-success">{{session()->get('message')}}</div>
                     @endif
-                    <h3>Recent Messages:</h3>
-
-                    <ul>
-                        @foreach($messages as $message)
-
-                        <li>
-                            {{ $message->title }}
-                            <br> 
-                            user: {{ $message -> user-> name}}
-                            <br>
-                            {{ $message -> content }}
-                            <br>
-                            {{ $message->created_at->diffForHumans() }} 
-                        </li>
-
-                        <a href="/message/{{ $message->id }}"> view tweet </a>
-                        <br>
+
+                    <h5>Recent Messages:</h5>
+
+                        <div style="width: 18rem;">  
+                        @foreach($messages->reverse()  as $message)
+                        <div class=" card card-body">
+                       
+                            <h5 class="card-title"> {{ $message->title }} </h5>
+                            <h6 class="card-subtitle mb-2 text-muted"> {{ $message -> user-> name}} </h6>
+                            <p class="card-text"> {{ $message -> content }} </p>
+                            <p class="card-text text-muted">  {{ $message->created_at->diffForHumans() }} </p>
+
+                        <a href="/message/{{ $message->id }}" class="card-link"> view tweet </a>
+                        </div>
                         <br>
                         @endforeach
-
-                    </ul>
+                        
+                       </div>
                 </div>
             </div>
         </div>

+ 32 - 19
resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ config('app.name', 'Laravel') }}</title>
+    <title>{{ config('app.name', 'Twittor') }}</title>
 
     <!-- Scripts -->
     <script src="{{ asset('js/app.js') }}" defer></script>
@@ -18,13 +18,19 @@
 
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+
+    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
+
 </head>
 <body>
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
             <div class="container">
                 <a class="navbar-brand" href="{{ url('/') }}">
-                    {{ config('app.name', 'Laravel') }}
+                    {{ config('app.name', 'Twittor') }}
                 </a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                     <span class="navbar-toggler-icon"></span>
@@ -49,23 +55,30 @@
                                 </li>
                             @endif
                         @else
-                            <li class="nav-item dropdown">
-                                <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
-                                    {{ Auth::user()->name }}
-                                </a>
-
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-                                    <a class="dropdown-item" href="{{ route('logout') }}"
-                                       onclick="event.preventDefault();
-                                                     document.getElementById('logout-form').submit();">
-                                        {{ __('Logout') }}
-                                    </a>
-
-                                    <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
-                                        @csrf
-                                    </form>
-                                </div>
-                            </li>
+                        <li class="nav-item dropdown">
+                            <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button"
+                            data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
+                            {{ Auth::user()->name }} <span class="caret"></span>
+                        </a>
+
+                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+                                   <a class="dropdown-item" href="{{ route('logout') }}"
+                                   onclick="
+                                   event.preventDefault();
+                                   document.getElementById('logout-form').submit();"
+                                   >{{ __('Logout') }}
+                               </a>
+
+
+                               <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                @csrf
+                            </form>
+                        </div>
+
+
+                    </li>
+
+
                         @endguest
                     </ul>
                 </div>

+ 26 - 10
resources/views/message.blade.php

@@ -1,14 +1,30 @@
-@extends('page')
-
- @section('title', $message->title) 
+@section('title', $message->title)
 
- @section('tweet') 
-{{ $message->title }}
-<p>{{ $message -> user ->name }}</p>
-<h4>{{ $message->content }}</h4>
-<p>{{ $message->created_at->diffForHumans() }}</p>
+@extends('page')
+@extends('layouts.app')
 
-<a  class="btn btn-primary" href="/">return home</a>
+@section('posts')
+<div class="container">
+	<div class="row justify-content-center">
+		<div class="col-md-8">
+			<div class="card">
+				<div class="card-header">
+					<h3>{{ $message->title }}</h3>
+				</div>
+				<div class="card-body">
+					<p></p>
+					<blockquote class="blockquote mb-0">
+						<p>{{ $message->content }}</p>
+						<footer class="blockquote-footer"> <cite title="Source Title">{{ $message -> user ->name }}</cite></footer>
+					</blockquote>
+					<p  class="font-weight-light text-muted text-right" >{{ $message->created_at->diffForHumans() }}</p>
+				</div>
+			</div>
+			<br>
+			<a  class="btn btn-primary float-right" href="/">return home</a>
+		</div>
 
-@endsection
+	</div>
 
+</div>
+@endsection

+ 0 - 1
routes/web.php

@@ -25,4 +25,3 @@ Route::get('/message/{id}', [ MessageController::class, 'view' ]);
 Auth::routes();
 
 Route::get('/', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
-Route::get('/logout', '\App\Http\Controllers\Auth\LoginController@logout');