Merge pull request #24 from MayMeow/dev/add-vite

Added Vite
MayMeow · Jan 8, 2023 · 0de518f · 0de518f
2 parents 862a33e + c3cf444
commit 0de518f
Show file tree

Hide file tree

Showing 20 changed files with 754 additions and 12 deletions.
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+19.4.0
diff --git a/README.md b/README.md
@@ -29,3 +29,35 @@ docker compose -f docker-compose.dev.yml up -d
 ## More information
 
 - [Roadmap](https://github.com/users/MayMeow/projects/4)
+
+## Development
+
+Requirements
+
+- Docker or Docker Desktop
+- Lando
+- PHP 8.1 and up
+- Node
+- Yarn
+
+### For backend
+
+```bash
+lando start
+lando composer install
+lando php bin/cake.php migrations migrate
+```
+
+### For frontend
+
+```bash
+fnm install # to install node - optionally
+yarn install
+yarn build
+```
+
+Source codes for frontend are stored in `webroot_src`, currently only styles which is slightly modified picocss.
+
+‼️ After successfull build you need to change css path in `templates/layout/default.php`. (not ideal but for now it is like it is).
+
+Application build is located in `webroot/app`.
diff --git a/package.json b/package.json
@@ -1,8 +1,22 @@
 {
   "name": "meowblog",
   "version": "1.0.0",
-  "main": "index.js",
+  "type": "module",
   "repository": "https://github.com/MayMeow/meowblog",
   "author": "May <may@maymeow.com>",
-  "license": "MIT"
+  "license": "MIT",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3.2.45"
+  },
+  "devDependencies": {
+    "@picocss/pico": "^1.5.6",
+    "@vitejs/plugin-vue": "^4.0.0",
+    "sass": "^1.57.1",
+    "vite": "^4.0.0"
+  }
 }
diff --git a/templates/Articles/view.php b/templates/Articles/view.php
@@ -4,11 +4,11 @@
  * @var \MeowBlog\Model\Entity\Article $article
  */
 ?>
+<div class="headings">
+    <h2><?= $article->title ?></h2>
+    <h3>at <?= $article->created ?> by <?= $article->user->email ?></h3>
+</div>
 <div id="article">
-    <h1><?= $article->title ?></h1>
-    <div id="article-info">
-        at <?= $article->created ?> by <?= $article->user->email ?>
-    </div>
     <div>
         <?= $this->Markdown->parse($article->body); ?>
     </div>

diff --git a/templates/Home/index.php b/templates/Home/index.php
@@ -16,10 +16,17 @@
         ]); ?>
         </li>
         <li>
-        <?= $this->Html->link('Logout', [
-            'action' => 'Logout',
-            'controller' => 'Users',
-            'prefix' => false
+        <?= $this->Html->link('Tags', [
+            'action' => 'Index',
+            'controller' => 'Articles',
+            'prefix' => 'Admin'
+        ]); ?>
+        </li>
+        <li>
+        <?= $this->Html->link('Users', [
+            'action' => 'Index',
+            'controller' => 'Articles',
+            'prefix' => 'Admin'
         ]); ?>
         </li>
     </ul>

diff --git a/templates/layout/default.php b/templates/layout/default.php
@@ -27,7 +27,7 @@
     </title>
     <?= $this->Html->meta('icon') ?>
 
-    <?= $this->Html->css(['pico.min']) ?>
+    <?= $this->Html->css(['/app/assets/index-4dfde9ce']) ?>
 
     <?= $this->fetch('meta') ?>
     <?= $this->fetch('css') ?>
@@ -42,7 +42,8 @@
                         <li>
                             <strong>
                                 <?= $this->Html->link('Meowblog.app', url:'/') ?>
-                            </strong>
+                            </strong> <br />
+                            <small>Simple blogging app made with PHP</small>
                         </li>
                     </ul>
                     <ul>

diff --git a/vite.config.js b/vite.config.js
@@ -0,0 +1,13 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue()],
+  base: '/',
+  root: 'webroot_src',
+  build: {
+    outDir: '../webroot/app',
+    emptyOutDir: true,
+  }
+})
diff --git a/webroot/app/assets/index-4dfde9ce.css b/webroot/app/assets/index-4dfde9ce.css
diff --git a/webroot/app/assets/index-96cfb7ee.js b/webroot/app/assets/index-96cfb7ee.js
diff --git a/webroot/app/index.html b/webroot/app/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Vue</title>
+    <script type="module" crossorigin src="/assets/index-96cfb7ee.js"></script>
+    <link rel="stylesheet" href="/assets/index-4dfde9ce.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>
diff --git a/webroot/app/vite.svg b/webroot/app/vite.svg
diff --git a/webroot_src/App.vue b/webroot_src/App.vue
@@ -0,0 +1,21 @@
+<script setup>
+import HelloWorld from './components/HelloWorld.vue'
+</script>
+
+<template>
+  <HelloWorld msg="MeowBlog" />
+</template>
+
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
+</style>
diff --git a/webroot_src/assets/scss/_theme.scss b/webroot_src/assets/scss/_theme.scss
@@ -0,0 +1,6 @@
+/* Custom Purple version */
+
+// Override default variables
+$primary-500: #9c27b0;
+$primary-600: #8e24aa;
+$primary-700: #7b1fa2;
diff --git a/webroot_src/assets/scss/main.scss b/webroot_src/assets/scss/main.scss
@@ -0,0 +1,2 @@
+@import "theme";
+@import "@picocss/pico/scss/pico.scss";
diff --git a/webroot_src/components/HelloWorld.vue b/webroot_src/components/HelloWorld.vue
@@ -0,0 +1,40 @@
+<script setup>
+import { ref } from 'vue'
+
+defineProps({
+  msg: String,
+})
+
+const count = ref(0)
+</script>
+
+<template>
+  <h1>{{ msg }}</h1>
+
+  <div class="card">
+    <button type="button" @click="count++">count is {{ count }}</button>
+    <p>
+      Edit
+      <code>components/HelloWorld.vue</code> to test HMR
+    </p>
+  </div>
+
+  <p>
+    Check out
+    <a href="https://vuejs.org/guide/quick-start.html#local" target="_blank"
+      >create-vue</a
+    >, the official Vue + Vite starter
+  </p>
+  <p>
+    Install
+    <a href="https://github.com/johnsoncodehk/volar" target="_blank">Volar</a>
+    in your IDE for a better DX
+  </p>
+  <p class="read-the-docs">Click on the Vite and Vue logos to learn more</p>
+</template>
+
+<style scoped>
+.read-the-docs {
+  color: #888;
+}
+</style>
diff --git a/webroot_src/index.html b/webroot_src/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + Vue</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/webroot_src/main.js b/webroot_src/main.js
@@ -0,0 +1,5 @@
+import { createApp } from 'vue'
+import './assets/scss/main.scss'
+import App from './App.vue'
+
+createApp(App).mount('#app')
diff --git a/webroot_src/public/vite.svg b/webroot_src/public/vite.svg
diff --git a/webroot_src/style.css b/webroot_src/style.css
@@ -0,0 +1,90 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@import "theme";
		@import "@picocss/pico/scss/pico.scss";