diff --git a/.DS_Store b/.DS_Store index 752c4fb..26103e4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/.DS_Store b/app/.DS_Store index 286caef..bf2a33c 100644 Binary files a/app/.DS_Store and b/app/.DS_Store differ diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 1e52ad5..a49921d 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class DashboardController extends Controller { diff --git a/database/.DS_Store b/database/.DS_Store index 6e6b303..9cf8d25 100644 Binary files a/database/.DS_Store and b/database/.DS_Store differ diff --git a/public/.DS_Store b/public/.DS_Store new file mode 100644 index 0000000..a091b6b Binary files /dev/null and b/public/.DS_Store differ diff --git a/public/favicon.ico b/public/favicon.ico index e69de29..2013dde 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/.DS_Store b/public/images/.DS_Store new file mode 100644 index 0000000..16e33ba Binary files /dev/null and b/public/images/.DS_Store differ diff --git a/public/images/logo.png b/public/images/logo.png new file mode 100644 index 0000000..b2aaf35 Binary files /dev/null and b/public/images/logo.png differ diff --git a/public/images/logo_white.png b/public/images/logo_white.png new file mode 100644 index 0000000..b60d8df Binary files /dev/null and b/public/images/logo_white.png differ diff --git a/resources/.DS_Store b/resources/.DS_Store index bab2017..bc2a90c 100644 Binary files a/resources/.DS_Store and b/resources/.DS_Store differ diff --git a/resources/js/.DS_Store b/resources/js/.DS_Store new file mode 100644 index 0000000..339591a Binary files /dev/null and b/resources/js/.DS_Store differ diff --git a/resources/js/app.js b/resources/js/app.js index 9fda533..9570e19 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -12,6 +12,5 @@ import './bootstrap'; * or customize the JavaScript scaffolding to fit your unique needs. */ -import './components/Example'; import './views/Dashboard'; import './views/Bookslist'; \ No newline at end of file diff --git a/resources/js/components/Example.jsx b/resources/js/components/Example.jsx deleted file mode 100644 index 379eb21..0000000 --- a/resources/js/components/Example.jsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react'; -import ReactDOM from 'react-dom/client'; - -function Example() { - return ( -
-
-
-
-
Example Component
- -
I'm an example component!
-
-
-
-
- ); -} - -export default Example; - -if (document.getElementById('example')) { - const Index = ReactDOM.createRoot(document.getElementById("example")); - - Index.render( - - - - ) -} diff --git a/resources/js/components/Sidebar.jsx b/resources/js/components/Sidebar.jsx new file mode 100644 index 0000000..57c9155 --- /dev/null +++ b/resources/js/components/Sidebar.jsx @@ -0,0 +1,14 @@ +import React from 'react'; + +function Sidebar() { + return ( +
+ +
+ ) +}; + +export default Sidebar; \ No newline at end of file diff --git a/resources/js/views/Bookslist.jsx b/resources/js/views/Bookslist.jsx index 34bcf90..8769f05 100644 --- a/resources/js/views/Bookslist.jsx +++ b/resources/js/views/Bookslist.jsx @@ -1,19 +1,24 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; +import Sidebar from '../components/Sidebar'; const Bookslist = () => { return ( -
-
-
-
-
NovelMetrix
+ + -
Bookslist
+
+
+
+
+
NovelMetrix
+ +
Bookslist
+
-
+ ); } diff --git a/resources/js/views/Dashboard.jsx b/resources/js/views/Dashboard.jsx index 3f410a0..58a306a 100644 --- a/resources/js/views/Dashboard.jsx +++ b/resources/js/views/Dashboard.jsx @@ -1,19 +1,39 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; +import Sidebar from '../components/Sidebar'; const Dashboard = () => { return ( -
-
-
-
-
NovelMetrix
+ + + +
+
+
+
+
+ Boeken per maand per genre +
+
-
Dashboard
+
+
+ Genres +
+
+
+
+ Ratings +
+ +
+ Talen +
+
-
+ ); } diff --git a/resources/sass/_login.scss b/resources/sass/_login.scss new file mode 100644 index 0000000..a57192a --- /dev/null +++ b/resources/sass/_login.scss @@ -0,0 +1,79 @@ +$color_1: #aaa; + +.login_overlay { + background: #eee; + position: absolute; + z-index: 2; + width: 100%; + height: 100%; + top: 0; +} + +.login { + width: 350px; + min-height: 300px; + position: absolute; + z-index: 3; + top: 50%; + left: 50%; + -ms-transform: translateX(-50%) translateY(-50%); + transform: translateX(-50%) translateY(-50%); + border-radius: 5px; + + form { + background: #ffffff; + box-shadow: 1px 1px 1px rgba(0,0,0,.05); + padding: 30px; + + input { + background: #f9f9f9; + border: none; + border-radius: 5px; + padding: 10px 15px; + font-size: 13px; + } + + .icon { + position: absolute; + right: 44px; + margin-top: 7px; + i { + color: $color_1; + font-size: 13px; + } + } + + button { + background: #364c67; + width: 100%; + border: none; + padding: 10px 15px; + font-size: 13px; + &:hover { + background: #122235; + } + } + } + + img { + display: block; + width: 200px; + margin: auto; + margin-bottom: 30px; + } + + .login_logo { + width: 120px; + margin: auto; + margin-top: -65px; + background: #ffffff; + border-radius: 50%; + img { + width: 100%; + } + } + + .register{ + width:450px; + } +} diff --git a/resources/sass/_sidebar.scss b/resources/sass/_sidebar.scss new file mode 100644 index 0000000..e297750 --- /dev/null +++ b/resources/sass/_sidebar.scss @@ -0,0 +1,74 @@ +$color_1: rgba(255,255,255,0.25); +$color_2: rgba(255,255,255,0.3); +$color_3: rgba(255,255,255,0.5); +$color_4: #ffffff; + +.sidebar { + background: #333333; + width: 70px; + height: 100vh; + position: fixed; + padding-top: 47px; + + span { + color: $color_1; + padding: 20px 20px 10px 20px; + display: block; + } + + h3 { + color: $color_2; + font-size: 12px; + padding-bottom: 5px; + } + + ul { + padding: 0; + margin: 0; + + li { + color: $color_3; + list-style-type: none; + font-weight: 300; + cursor: pointer; + font-size: 12px; + padding: 20px 0px; + text-align: center; + + i { + margin-right: 5px; + color: $color_3; + width: 15px; + font-size: 15px; + } + } + + .active { + li { + background: rgba(0,0,0,0.3); + color: $color_4; + background: rgba(0,0,0,0.3) !important; + + i { + color: $color_4; + } + } + } + + a { + text-decoration: none; + } + } + + button { + background: none; + border: none; + } + + .bottom-menu { + position: absolute; + bottom: 0; + width: 100%; + border-top: solid 1px rgba(255,255,255,0.2); + } +} \ No newline at end of file diff --git a/resources/sass/_topbar.scss b/resources/sass/_topbar.scss new file mode 100644 index 0000000..a4889ef --- /dev/null +++ b/resources/sass/_topbar.scss @@ -0,0 +1,71 @@ +$color_1: #ffffff; + +/* Topbar */ + +.navbar.topbar { + background: #405181 !important; + width: 100%; + min-height: 50px; + padding-left: 10px; + position: fixed; + z-index: 1; + + .logo { + width: 150px; + display: inline-block; + } +} + +.topbar_right { + float: right; + padding: 23px 0; + margin-right: 30px; + + ul { + margin: 0; + + li { + list-style-type: none; + display: inline-block; + margin: 0 10px; + cursor: pointer; + + i { + color: $color_1; + font-size: 14px; + } + + &:hover { + i { + color: $color_1; + } + } + } + } +} + +/* Choose Year */ + +.chooseYear { + padding: 15px 15px; + color: $color_1; + display: inline-block; + span { + display: inline-block; + color: $color_1; + } + i { + color: $color_1; + font-size: 13px; + } + select { + font-size: 13px; + background: none; + color: $color_1; + padding: 5px; + &:focus-visible { + border: none !important; + outline: none !important; + } + } +} diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 1026a0b..f14b999 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,8 +1,45 @@ // Fonts -@import url('https://fonts.bunny.net/css?family=Nunito'); +@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); // Variables -@import 'variables'; +@import 'login'; +@import 'topbar'; +@import 'sidebar'; // Bootstrap @import 'bootstrap/scss/bootstrap'; + +html, body{ + background:#fafdfb; + margin:0; + padding:0; + font-family: "Poppins", sans-serif; + letter-spacing: .3px; + font-weight: 400; + font-size: 14px; + color:#333; +} + +.content{ + padding: 80px 30px 30px 100px; +} + +.books-per-month, .genresPercent, .books-per-country, .book, .ratings, .readed{ + background: #ffffff; + padding: 20px; + box-shadow: 0 .15rem 1.75rem 0 rgba(58, 59, 69, .15); + margin-bottom: 20px; + border-radius: 10px; + padding:30px; + } + + span.block_name { + color: #777; + font-weight: 300; + border-bottom: solid 1px #f5f6fa; + width: 100%; + display: block; + padding-bottom: 10px; + margin-bottom: 10px; + font-size: 14px; +} diff --git a/resources/views/.DS_Store b/resources/views/.DS_Store new file mode 100644 index 0000000..cfff50d Binary files /dev/null and b/resources/views/.DS_Store differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index ea9ac94..460dd8d 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,73 +1,35 @@ @extends('layouts.app') @section('content') -
-
-
-
-
{{ __('Login') }}
+ + +
+ + + + + @error('password') + + {{ $message }} + + @enderror +
+ +
-
@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 66a1a9e..0beadf8 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,7 +7,7 @@ - {{ config('app.name', 'Laravel') }} + NovelMetrix @@ -19,10 +19,10 @@
-