From ca7177f676ca830187cc371d321faa9773e2f4cb Mon Sep 17 00:00:00 2001
From: Romulus21 <romain@delanoe.me>
Date: Sun, 26 Apr 2020 11:50:06 +0200
Subject: [PATCH] add Tailwing & CssPurge

---
 package.json                          |   4 +-
 resources/js/components/App.vue       |   4 +-
 resources/js/components/Avatar.vue    |   4 +-
 resources/js/components/Nav.vue       |  30 ++--
 resources/js/components/TopBar.vue    |  14 +-
 resources/js/views/Memo/MemoIndex.vue |  18 +-
 resources/sass/app.scss               |  55 +++---
 resources/sass/components/_btn.scss   | 125 ++++++++------
 resources/sass/components/nav.scss    | 237 +++++++++++++++++---------
 tailwind.config.js                    |  11 ++
 webpack.mix.js                        |   9 +-
 11 files changed, 317 insertions(+), 194 deletions(-)
 create mode 100644 tailwind.config.js

diff --git a/package.json b/package.json
index d06d4b6..879612a 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
         "eslint-plugin-vue": "^6.2.2",
         "laravel-mix": "^5.0.1",
         "laravel-mix-eslint": "^0.1.3",
+        "laravel-mix-purgecss": "^5.0.0-rc.2",
         "lodash": "^4.17.13",
         "resolve-url-loader": "^2.3.1",
         "sass": "^1.20.1",
@@ -32,6 +33,7 @@
         "dropzone": "^5.7.0",
         "laravel-mix-svg-vue": "^0.2.6",
         "markdown-it": "^10.0.0",
-        "markdown-it-checkbox": "^1.1.0"
+        "markdown-it-checkbox": "^1.1.0",
+        "tailwindcss": "^1.3.5"
     }
 }
diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
index 41ee1f7..64b82c7 100644
--- a/resources/js/components/App.vue
+++ b/resources/js/components/App.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="flex">
         <Nav />
-        <div v-if="authUser" class="w-100">
+        <div v-if="authUser" class="w-full">
             <TopBar />
-            <main>
+            <main class="bg-orange-200">
                 <router-view :key="$route.fullPath" class="main"></router-view>
             </main>
         </div>
diff --git a/resources/js/components/Avatar.vue b/resources/js/components/Avatar.vue
index 43a8a42..759a057 100644
--- a/resources/js/components/Avatar.vue
+++ b/resources/js/components/Avatar.vue
@@ -1,7 +1,7 @@
 <template>
-    <div>
+    <div class="flex justify-center items-center">
         <img v-if="avatar" src="avatar" alt="alt" class="avatar" v-bind:class="'avatar' + size">
-        <span v-else class="avatar" v-bind:class="'avatar-' + size">{{ alt[0] }}</span>
+        <span v-else class="text-2xl font-bold"  v-bind:class="'avatar-' + size">{{ alt[0] }}</span>
     </div>
 
 </template>
diff --git a/resources/js/components/Nav.vue b/resources/js/components/Nav.vue
index b795fa0..2f3afe9 100644
--- a/resources/js/components/Nav.vue
+++ b/resources/js/components/Nav.vue
@@ -1,18 +1,20 @@
 <template>
-    <nav v-bind:class="{ small: !toggleNav }">
-        <router-link to="/" class="site-logo-main" v-bind:class="{ small: !toggleNav }">
-            <svg-vue icon="logo" />
-        </router-link>
-        <hr>
-        <router-link to="/memos" class="nav-item">
-            <svg-vue icon="memos" />
-            <span v-bind:class="{ navhidden: !toggleNav }">Memos</span>
-        </router-link>
-        <router-link to="/jeux" class="nav-item">
-            <svg-vue icon="games" />
-            <span v-bind:class="{ navhidden: !toggleNav }">Jeux</span>
-        </router-link>
-        <div @click="toggleNavBar"  class="nav-toggle mt-5">
+    <nav v-bind:class="{ small: !toggleNav }" class="h-screen bg-orange-400 flex flex-col justify-between">
+        <div class="">
+            <router-link to="/" class="logo" v-bind:class="{ small: !toggleNav }">
+                <svg-vue icon="logo" />
+            </router-link>
+            <hr>
+            <router-link to="/memos" class="nav-item p-2">
+                <svg-vue icon="memos" />
+                <span v-bind:class="{ navhidden: !toggleNav }">Memos</span>
+            </router-link>
+            <router-link to="/jeux" class="nav-item p-2">
+                <svg-vue icon="games" />
+                <span v-bind:class="{ navhidden: !toggleNav }">Jeux</span>
+            </router-link>
+        </div>
+        <div @click="toggleNavBar"  class="nav-toggle flex ml-2">
             <svg-vue icon="arrow" v-bind:class="{ small: !toggleNav }" />
         </div>
     </nav>
diff --git a/resources/js/components/TopBar.vue b/resources/js/components/TopBar.vue
index 807e8b6..26059bd 100644
--- a/resources/js/components/TopBar.vue
+++ b/resources/js/components/TopBar.vue
@@ -1,17 +1,17 @@
 <template>
-    <div class="flex-between flex-middle py-1 px-2 topbar">
-        <router-link v-if="authUser" :to="'/profile'" class="flex-middle avatar-box">
-            <Avatar :avatar="authUser.data.attributes.avatar" size="small" :alt="authUser.data.attributes.name" class="mr-1"/>
-            {{ authUser.data.attributes.name }}
+    <div class="top-bar flex justify-between bg-orange-300">
+        <router-link v-if="authUser" :to="'/profile'" class="flex items-center m-2">
+            <Avatar :avatar="authUser.data.attributes.avatar" size="small" :alt="authUser.data.attributes.name" class="bg-orange-600 hover:bg-orange-800 w-10 h-10 rounded-full"/>
+            <span class="ml-2 hover:text-orange-900">{{ authUser.data.attributes.name }}</span>
         </router-link>
-        <form v-if="authUser && search" class="search-box">
+        <form v-if="authUser && search" class="m-2">
             <input type="search" name="search" placeholder="Search">
             <button type="submit" value="S">
                 <svg-vue icon="search" />
             </button>
         </form>
-        <router-link to="/dashboard" v-if="authUser" class="mr-1">
-            <svg-vue icon="params" />
+        <router-link to="/dashboard" v-if="authUser" class="text-orange-600 hover:text-orange-800">
+            <svg-vue icon="params" class="w-10 m-2 fill-current" />
         </router-link>
         <router-link v-else to="/login">
             Se connecter
diff --git a/resources/js/views/Memo/MemoIndex.vue b/resources/js/views/Memo/MemoIndex.vue
index 473d2b3..14f9df0 100755
--- a/resources/js/views/Memo/MemoIndex.vue
+++ b/resources/js/views/Memo/MemoIndex.vue
@@ -1,20 +1,22 @@
 <template>
-    <div class="p-2">
-        <div class="flex-between flex-center mb-1">
+    <div class="p-4">
+        <div class="flex justify-between flex-center mb-4">
             <a href="#" class="btn" @click="$router.back()">< Back</a>
             <router-link :to="'/memos/create'" class="btn-primary">Add New Memo</router-link>
         </div>
         <Loader v-if="loading" />
-        <div v-else class="container-cards-list">
+        <div v-else class="flex flex-wrap mb-4">
             <div v-if="memos.lenght === 0">
                 <p>No memos yet. <router-link to="/memos/create">Get Started ></router-link></p>
             </div>
-            <router-link v-for="memo in memos" :key="memo.data.memo_id" :to="'/memos/' + memo.data.memo_id" class="card">
-                <div>
-                    <img :src="memo.data.attributes.cover_image.data.attributes.path" alt="" class="cover">
-                    <h1 class="p-1">{{ memo.data.name }}</h1>
+            <router-link v-for="memo in memos" :key="memo.data.memo_id" :to="'/memos/' + memo.data.memo_id" class="lg:w-1/4 p-2 max-w-lg rounded overflow-hidden shadow-lg bg-white">
+                <img :src="memo.data.attributes.cover_image.data.attributes.path" alt="" class="w-full">
+                <div class="px-6 py-4">
+                    <h1 class="text-gray-700 text-">{{ memo.data.name }}</h1>
+                </div>
+                <div class="px-6 py-4">
+                    <span class="inline-block bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2">{{ memo.data.last_updated }}</span>
                 </div>
-                <div class="memo-date p-1">{{ memo.data.last_updated }}</div>
             </router-link>
         </div>
     </div>
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 2932ade..6da9a1a 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -1,30 +1,37 @@
 
-@import "setup/reset";
-@import "setup/colors";
-@import "setup/fonts";
-@import "setup/positions";
-@import "setup/containers";
-@import "setup/effects";
+@tailwind base;
+@tailwind components;
 
-@import "components/transitions";
+
+//@import "setup/reset";
+//@import "setup/colors";
+//@import "setup/fonts";
+//@import "setup/positions";
+//@import "setup/containers";
+//@import "setup/effects";
+//
+//@import "components/transitions";
 @import "components/btn";
-@import "components/elements";
-@import "components/loader";
-@import "components/events";
-@import "components/main";
+//@import "components/elements";
+//@import "components/loader";
+//@import "components/events";
+//@import "components/main";
 @import "components/nav";
-@import "components/topbar";
-@import "components/modal";
-@import "components/images";
-@import "components/avatar";
-@import "components/alert_box";
-@import "components/search_box";
-@import "components/owfont-regular";
+//@import "components/topbar";
+//@import "components/modal";
+//@import "components/images";
+//@import "components/avatar";
+//@import "components/alert_box";
+//@import "components/search_box";
+//@import "components/owfont-regular";
+//
+//@import "pages/auth";
+//@import "pages/users";
+//@import "pages/memos";
+//@import "pages/meteo";
+//@import "pages/games";
+//
+//@import "pages/games/hangman";
 
-@import "pages/auth";
-@import "pages/users";
-@import "pages/memos";
-@import "pages/meteo";
-@import "pages/games";
 
-@import "pages/games/hangman";
+@tailwind utilities;
diff --git a/resources/sass/components/_btn.scss b/resources/sass/components/_btn.scss
index d5414f7..4ef7eef 100644
--- a/resources/sass/components/_btn.scss
+++ b/resources/sass/components/_btn.scss
@@ -1,68 +1,85 @@
 // Button
 
+//.btn {
+//    font-size: 1.6rem;
+//    border: 1px solid transparent;
+//    padding: 0.5rem 1rem;
+//    border-radius: 0.5rem;
+//    cursor: pointer;
+//    box-shadow: 1px 1px 2px $grey;
+//    text-decoration: none;
+//    transition: background-color 0.2s, color 0.2s;
+//
+//    &:hover {
+//        transition: background-color 0.2s, color 0.2s;
+//        background-color: $mediumDark;
+//        color: $white;
+//    }
+//}
+//
+//.btn-primary {
+//    @extend .btn;
+//    background-color: $medium;
+//    border-color: $medium;
+//    color: $white;
+//
+//    &:visited,
+//    &:focus {
+//        color: $white;
+//    }
+//}
+//
+//.btn-secondary {
+//    @extend .btn;
+//    background-color: $mediumLight;
+//    border-color: $mediumLight;
+//    color: $dark;
+//}
+//
+//.btn-alert {
+//    @extend .btn;
+//    background-color: $error;
+//    border-color: $error;
+//    color: $white;
+//
+//    &:hover {
+//        background-color: $dark;
+//    }
+//}
+//
+//.btn-icon {
+//    @extend .btn;
+//    display: flex;
+//    align-items: center;
+//    height: 4rem;
+//
+//    &:hover svg {
+//        fill: $white;
+//    }
+//
+//    svg {
+//        height: 3rem;
+//        margin-right: 1rem;
+//
+//        &:hover {
+//            fill: $white;
+//        }
+//    }
+//}
+
 .btn {
-    font-size: 1.6rem;
-    border: 1px solid transparent;
-    padding: 0.5rem 1rem;
-    border-radius: 0.5rem;
-    cursor: pointer;
-    box-shadow: 1px 1px 2px $grey;
-    text-decoration: none;
-    transition: background-color 0.2s, color 0.2s;
+    @apply border bg-orange-400 py-2 px-4 shadow-sm rounded-md;
 
     &:hover {
-        transition: background-color 0.2s, color 0.2s;
-        background-color: $mediumDark;
-        color: $white;
+        @apply text-white bg-orange-600 transition-all duration-300;
     }
 }
 
 .btn-primary {
     @extend .btn;
-    background-color: $medium;
-    border-color: $medium;
-    color: $white;
-
-    &:visited,
-    &:focus {
-        color: $white;
-    }
-}
-
-.btn-secondary {
-    @extend .btn;
-    background-color: $mediumLight;
-    border-color: $mediumLight;
-    color: $dark;
-}
-
-.btn-alert {
-    @extend .btn;
-    background-color: $error;
-    border-color: $error;
-    color: $white;
+    @apply bg-orange-600;
 
     &:hover {
-        background-color: $dark;
-    }
-}
-
-.btn-icon {
-    @extend .btn;
-    display: flex;
-    align-items: center;
-    height: 4rem;
-
-    &:hover svg {
-        fill: $white;
-    }
-
-    svg {
-        height: 3rem;
-        margin-right: 1rem;
-
-        &:hover {
-            fill: $white;
-        }
+        @apply bg-orange-800;
     }
 }
diff --git a/resources/sass/components/nav.scss b/resources/sass/components/nav.scss
index e606665..54b8c8d 100644
--- a/resources/sass/components/nav.scss
+++ b/resources/sass/components/nav.scss
@@ -1,103 +1,178 @@
 
+//nav {
+//    background-color: $mediumDark;
+//    height: 100vh;
+//    width: 15rem;
+//    flex-shrink: 0;
+//    display: flex;
+//    flex-direction: column;
+//    box-shadow: inset -3px -2px 3px rgba(0,0,0,0.2);
+//    transition: width $transition-delay;
+//
+//    &.small {
+//        width: 5.5rem;
+//    }
+//
+//    hr {
+//        width: 90%;
+//        border-radius: 1px;
+//        border: 1px solid $dark;
+//    }
+//
+//    .nav-item {
+//        display: flex;
+//        align-items: center;
+//        text-decoration: none;
+//        color: $light;
+//        padding-top: 1rem;
+//        padding-bottom: 1rem;
+//
+//        span {
+//            overflow: hidden;
+//        }
+//
+//        svg {
+//            margin: 0 1rem;
+//            width: 3rem;
+//            transition: fill 0.2s;
+//            fill: $light;
+//        }
+//
+//        &:hover {
+//            color: $dark;
+//            background-color: $light;
+//            transition: color 0.2s, background-color 0.2s;
+//
+//            svg {
+//                fill: $dark;
+//                transition: fill 0.2s;
+//            }
+//        }
+//
+//        //&:visited {
+//        //    color: $dark;
+//        //}
+//    }
+//}
+//
+//.site-logo {
+//    width: 3rem;
+//    fill: $light;
+//    transition: fill 0.2s;
+//
+//    &:hover {
+//        fill: $dark;
+//        transition: fill 0.2s;
+//    }
+//}
+//
+//.navhidden {
+//    width: 0;
+//}
+//
+//
+//.site-logo-main {
+//    @extend .site-logo;
+//    display: block;
+//    margin: 1rem;
+//    width: 13rem;
+//    transition: width $transition-delay;
+//
+//    svg {
+//
+//        width: 100%;
+//    }
+//
+//    &.small {
+//        //padding-bottom: 10rem;
+//        width: 3.5rem;
+//    }
+//}
+//
+//.nav-toggle {
+//    @extend .site-logo;
+//    align-self: center;
+//
+//    svg {
+//        transition: transform $transition-delay;
+//    }
+//
+//    svg.small {
+//            transform: rotate(-180deg);
+//    }
+//}
+
 nav {
-    background-color: $mediumDark;
-    height: 100vh;
-    width: 15rem;
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    box-shadow: inset -3px -2px 3px rgba(0,0,0,0.2);
-    transition: width $transition-delay;
+    @apply w-48;
+    transition: width 0.3s;
 
-    &.small {
-        width: 5.5rem;
+    svg {
+        @apply fill-current text-orange-600 w-12 p-2;
+        transition: color 0.3s;
+
+        &:hover {
+            @apply text-orange-800;
+        }
     }
 
-    hr {
-        width: 90%;
-        border-radius: 1px;
-        border: 1px solid $dark;
+    .logo {
+        @apply block;
+
+        svg {
+            @apply w-40 m-2;
+            transition: width 0.3s, color 0.3s;
+        }
     }
 
     .nav-item {
-        display: flex;
-        align-items: center;
-        text-decoration: none;
-        color: $light;
-        padding-top: 1rem;
-        padding-bottom: 1rem;
+        @apply flex items-center;
+
 
         span {
-            overflow: hidden;
-        }
+            @apply font-bold text-xl ml-2 overflow-hidden;
+            transition: width 0.3s;
 
-        svg {
-            margin: 0 1rem;
-            width: 3rem;
-            transition: fill 0.2s;
-            fill: $light;
-        }
-
-        &:hover {
-            color: $dark;
-            background-color: $light;
-            transition: color 0.2s, background-color 0.2s;
-
-            svg {
-                fill: $dark;
-                transition: fill 0.2s;
+            &:hover {
+                @apply text-orange-800;
             }
         }
 
-        //&:visited {
-        //    color: $dark;
-        //}
+        &:hover {
+            @apply bg-orange-500;
+
+            span,
+            svg {
+                @apply text-orange-800;
+            }
+        }
+    }
+
+    .nav-toggle svg {
+        transition: transform 0.3s;
     }
 }
 
-.site-logo {
-    width: 3rem;
-    fill: $light;
-    transition: fill 0.2s;
+nav.small {
+    @apply w-16;
 
-    &:hover {
-        fill: $dark;
-        transition: fill 0.2s;
+    .logo {
+        @apply w-16 p-0;
+
+        svg {
+            @apply w-16 m-0;
+        }
+    }
+
+    .nav-item span {
+        @apply w-0;
+    }
+
+    .nav-toggle svg {
+        transform: rotate(-180deg);
     }
 }
 
-.navhidden {
-    width: 0;
-}
-
-
-.site-logo-main {
-    @extend .site-logo;
-    display: block;
-    margin: 1rem;
-    width: 13rem;
-    transition: width $transition-delay;
-
-    svg {
-
-        width: 100%;
-    }
-
-    &.small {
-        //padding-bottom: 10rem;
-        width: 3.5rem;
-    }
-}
-
-.nav-toggle {
-    @extend .site-logo;
-    align-self: center;
-
-    svg {
-        transition: transform $transition-delay;
-    }
-
-    svg.small {
-            transform: rotate(-180deg);
-    }
+.app {
+    //min-width: 100%;
+    width: initial;
 }
diff --git a/tailwind.config.js b/tailwind.config.js
new file mode 100644
index 0000000..bf31657
--- /dev/null
+++ b/tailwind.config.js
@@ -0,0 +1,11 @@
+module.exports = {
+  theme: {
+    extend: {
+        width: {
+            '96': '24rem'
+        }
+    },
+  },
+  variants: {},
+  plugins: [],
+}
diff --git a/webpack.mix.js b/webpack.mix.js
index afa1b25..6cab0aa 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,6 +1,13 @@
 const mix = require('laravel-mix');
+const tailwindcss = require('tailwindcss')
+require('laravel-mix-purgecss');
 require('laravel-mix-svg-vue');
 
 mix.js('resources/js/app.js', 'public/js')
     .svgVue()
-   .sass('resources/sass/app.scss', 'public/css');
+    .sass('resources/sass/app.scss', 'public/css')
+    .options({
+        processCssUrls: false,
+        postCss: [ tailwindcss('./tailwind.config.js') ],
+    })
+    .purgeCss();