uni los archivos de resources para menos transferencias

public/css/app.css

@@ -1483,10 +1483,167 @@ striping:
 .pure-table-horizontal tbody > tr:last-child > td {
     border-bottom-width: 0;
 }
+/**
+ * atom-dark theme for `prism.js`
+ * Based on Atom's `atom-dark` theme: https://github.com/atom/atom-dark-syntax
+ * @author Joe Gibson (@gibsjose)
+ */
+
+code[class*="language-"],
+pre[class*="language-"] {
+	color: #c5c8c6;
+	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
+	font-family: Inconsolata, Monaco, Consolas, 'Courier New', Courier, monospace;
+	direction: ltr;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	line-height: 1.5;
+
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+
+	-webkit-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;
+	border-radius: 0.3em;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+	background: #1d1f21;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+	padding: .1em;
+	border-radius: .3em;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+	color: #7C7C7C;
+}
+
+.token.punctuation {
+	color: #c5c8c6;
+}
+
+.namespace {
+	opacity: .7;
+}
+
+.token.property,
+.token.keyword,
+.token.tag {
+	color: #96CBFE;
+}
+
+.token.class-name {
+	color: #FFFFB6;
+	text-decoration: underline;
+}
+
+.token.boolean,
+.token.constant {
+	color: #99CC99;
+}
+
+.token.symbol,
+.token.deleted {
+	color: #f92672;
+}
+
+.token.number {
+	color: #FF73FD;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+	color: #A8FF60;
+}
+
+.token.variable {
+	color: #C6C5FE;
+}
+
+.token.operator {
+	color: #EDEDED;
+}
+
+.token.entity {
+	color: #FFFFB6;
+	/* text-decoration: underline; */
+}
+
+.token.url {
+	color: #96CBFE;
+}
+
+.language-css .token.string,
+.style .token.string {
+	color: #87C38A;
+}
+
+.token.atrule,
+.token.attr-value {
+	color: #F9EE98;
+}
+
+.token.function {
+	color: #DAD085;
+}
+
+.token.regex {
+	color: #E9C062;
+}
+
+.token.important {
+	color: #fd971f;
+}
+
+.token.important,
+.token.bold {
+	font-weight: bold;
+}
+.token.italic {
+	font-style: italic;
+}
+
+.token.entity {
+	cursor: help;
+}
 /******************************************************************************
     => Color definitions
 *******************************************************************************/
 
+pre[class*=language-] {
+  border-radius: 5px;
+  border: none;
+}
+
+code[class*=language-],
+pre[class*=language-] {
+  font-family: monospace;
+  font-size: 1.1em;
+  line-height: 1.2em;
+}
+
 /******************************************************************************
     => General
 *******************************************************************************/

public/js/prism.js

@@ -1478,7 +1478,6 @@ __webpack_require__(/*! prismjs/components/prism-php-extras.js */ "./node_module
 
 __webpack_require__(/*! prismjs/components/prism-markup-templating.js */ "./node_modules/prismjs/components/prism-markup-templating.js");
 
-console.log(prismjs);
 prismjs.highlightAll();
 
 /***/ }),

public/mix-manifest.json

@@ -2,6 +2,5 @@
     "/js/admin.js": "/js/admin.js",
     "/js/app.js": "/js/app.js",
     "/css/app.css": "/css/app.css",
-    "/js/prism.js": "/js/prism.js",
     "/css/prism.css": "/css/prism.css"
 }

resources/js/admin.js

@@ -1,3 +1,5 @@
+require("./app.js")
+
 function is_admin_post_route() {
     const posts_edit_regexp = new RegExp("/admin/posts/\\d+/edit");
     return (
@@ -34,7 +36,7 @@ function is_admin_setups_route() {
     );
 }
 
-function admin_highlight() {
+function admin_highlight_route() {
     if(is_admin_post_route()){
         document.getElementById("posts-link").classList.add("menu-highlight");
     }
@@ -49,7 +51,7 @@ function admin_highlight() {
     }
 }
 
-function preview() {
+function preview_md() {
     const previewButton = document.getElementById("preview");
     const mainButton = document.getElementById("main");
 
@@ -68,9 +70,6 @@ function preview() {
     });
 }
 
-function main() {
-    admin_highlight();
-    preview();
-}
 
-window.onload = main;
+admin_highlight_route();
+preview_md();

resources/js/app.js

@@ -1,15 +1,44 @@
-// Highlight links if in his page
-if(window.location.pathname == "/blog" || window.location.pathname == "/blog.archive")
-    document.getElementById("blog-link").classList.add("menu-highlight");
-else if(window.location.pathname == "/now")
-    document.getElementById("now-link").classList.add("menu-highlight");
-else if(window.location.pathname == "/projects")
-    document.getElementById("projects-link").classList.add("menu-highlight");
-else if(window.location.pathname == "/setups")
-    document.getElementById("setup-link").classList.add("menu-highlight");
+require("./prism.js")
 
-// Makes all images clickeable
-var images = document.getElementsByTagName("img");
-for(i = 0; i < images.length; i++) {
-    images[i].onclick = (e) => { window.open(e.target.src, '_blank') }
+function is_blog_route() {
+    const blog_regexp= new RegExp("/blog/\\d+");
+    return (
+        window.location.pathname == "/blog" || 
+        window.location.pathname == "/blog/archive" ||
+        window.location.pathname.match(blog_regexp)
+    );
 }
+
+function is_now_route() {
+    return window.location.pathname == "/now";
+}
+
+function is_projects_route() {
+    return window.location.pathname == "/projects";
+}
+
+function is_setups_route() {
+    return window.location.pathname == "/setups";
+}
+
+function highlight_route() {
+    if(is_blog_route()){
+        document.getElementById("blog-link").classList.add("menu-highlight");
+    }else if(is_now_route()){
+        document.getElementById("now-link").classList.add("menu-highlight");
+    }else if(is_projects_route()){
+        document.getElementById("projects-link").classList.add("menu-highlight");
+    }else if(is_projects_route()){
+        document.getElementById("setup-link").classList.add("menu-highlight");
+    }
+}
+
+function make_images_clickeable() {
+    var images = document.getElementsByTagName("img");
+    for(i = 0; i < images.length; i++) {
+        images[i].onclick = (e) => { window.open(e.target.src, '_blank') }
+    }
+}
+
+highlight_route();
+make_images_clickeable();

resources/js/prism.js

@@ -1,8 +1,8 @@
 const prismjs = require("prismjs")
+
 require("prismjs/components/prism-java.js");
 require("prismjs/components/prism-php.js");
 require("prismjs/components/prism-php-extras.js");
 require("prismjs/components/prism-markup-templating.js");
 
-console.log(prismjs);
 prismjs.highlightAll();

resources/sass/app.scss

@@ -1,5 +1,6 @@
 @import "~purecss/build/pure.css";
-@import "colors.scss";
+@import "./colors.scss";
+@import "./prism-theme.scss";
 
 
 /******************************************************************************

resources/views/admin/base.blade.php

@@ -5,7 +5,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Daniel Cortés</title>
         <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-        <link href="{{ asset('css/prism.css') }}" rel="stylesheet">
     </head>
     <body>
         <nav class="menu">
@@ -33,8 +32,6 @@
             @yield('content')
         </div>
 
-        <script src="{{ asset('js/app.js') }}"></script>
         <script src="{{ asset('js/admin.js') }}"></script>
-        <script src="{{ asset('js/prism.js') }}"></script>
     </body>
 </html>

resources/views/base.blade.php

@@ -7,7 +7,6 @@
             <title>Daniel Cortés</title>
         @show
         <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-        <link href="{{ asset('css/prism.css') }}" rel="stylesheet">
     </head>
     <body>
         <nav class="menu">
@@ -41,6 +40,5 @@
         </div>
 
         <script src="{{ asset('js/app.js') }}"></script>
-        <script src="{{ asset('js/prism.js') }}"></script>
     </body>
 </html>

webpack.mix.js

@@ -14,7 +14,6 @@ const mix = require('laravel-mix');
 mix.disableNotifications();
 mix.js('resources/js/app.js', 'public/js')
     .js('resources/js/admin.js', 'public/js')
-    .js('resources/js/prism.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css')
     .sass('resources/sass/prism-theme.scss', 'public/css/prism.css')
     .copyDirectory('resources/fonts', 'public/fonts');