Fix Composer Json that I changed for Dev Work

Author: Ubuntu

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "writingink/wink/wink",
+    "name": "writingink/wink",
     "description": "Wink Publishing Framework.",
     "keywords": ["framework", "laravel", "blog"],
     "license": "MIT",

public/app.js

@@ -1,6 +1,12 @@
 {
+<<<<<<< HEAD
     "/app.js": "/app.js?id=fdfd3afa70eeeac74e81",
     "/light.css": "/light.css?id=bcb03dbf596bfa351064",
     "/dark.css": "/dark.css?id=c655f9129824b8d032db",
+=======
+    "/app.js": "/app.js?id=a1763873e1bd0b22663f",
+    "/light.css": "/light.css?id=00726a847dc6b2cb132a",
+    "/dark.css": "/dark.css?id=aa5f40a240d2b1df06e2",
+>>>>>>> upstream/master
     "/favicon.png": "/favicon.png?id=b0b34b4095fcdbb8942d"
 }

public/dark.css

@@ -10,19 +10,19 @@ Wink runs on any Laravel application, it uses a separate database connection and
 
 To install Wink, require it via Composer:
 
-```
+```sh
 composer require writingink/wink
 ```
 
 Once Composer is done, run the following command:
 
-```
+```sh
 php artisan wink:install
 ```
 
 Check `config/wink.php` and **configure the database connection** wink is going to be using. Then instead of running `php artisan migrate`, run:
 
-```
+```sh
 php artisan wink:migrate
 ```
 
@@ -40,13 +40,13 @@ Head to `yourproject.test/wink` and use the provided email and password to log i
 
 Add this command in your deployment script so that wink runs new migrations if any:
 
-```
+```sh
 php artisan wink:migrate
 ```
 
 You may also want to run this command to re-publish the assets:
 
-```
+```sh
 php artisan vendor:publish --tag=wink-assets --force
 ```
 
@@ -97,7 +97,7 @@ Here's the plan for what's coming:
 - [x] Add text search inside listings.
 - [x] Filter posts by status, scheduling, tags, and authors
 - [x] Dark mode.
-- [ ] Enhance publishing date picker. (Make it use browser time & show text feedback)
+- [ ] Enhance publishing date picker.
 - [ ] Create an initial theme that people can use right away. @themsaid
 - [ ] Optimize image uploads and allow cropping.
 - [ ] Adding image galleries to posts and pages. @themsaid
@@ -106,7 +106,6 @@ Here's the plan for what's coming:
 And here are some ideas I'm still not sure about:
 
 - [ ] Email Subscription & auto send emails on new content.
-- [ ] Built-in comments system.
 - [ ] Configure roles (Contributor / Admin)
 - [ ] Localization
 - [ ] Multi-lingual content

public/light.css

@@ -68,7 +68,7 @@
                     },
                     theme: 'bubble',
                     scrollingContainer: 'html, body',
-                    placeholder: "Write to the world..."
+                    placeholder: "Starting writing now..."
                 });
             },
 

public/mix-manifest.json

@@ -28,7 +28,7 @@
 
                 errors: [],
 
-                formWatcher: null,
+                postBodyWatcher: null,
 
                 form: {
                     id: '',
@@ -66,12 +66,12 @@
             },
 
             'form.published'(val) {
-                if (this.formWatcher) {
-                    this.formWatcher();
+                if (this.postBodyWatcher) {
+                    this.postBodyWatcher();
                 }
 
                 if (!val) {
-                    this.watchChangesAndSave();
+                    this.watchBodyChangesAndSave();
                 }
             },
 
@@ -130,6 +130,7 @@
             fillForm(data) {
                 this.form.id = data.id;
                 this.form.publish_date = data.publish_date;
+                this.form.slug = 'draft-' + this.form.id;
 
                 if (this.id != 'new') {
                     this.form.title = data.title;
@@ -155,17 +156,17 @@
                 }
 
                 if (!this.form.published) {
-                    this.watchChangesAndSave();
+                    this.watchBodyChangesAndSave();
                 }
             },
 
 
             /**
              * Watch changes and save the post.
              */
-            watchChangesAndSave() {
+            watchBodyChangesAndSave() {
                 setTimeout(() => {
-                    this.formWatcher = this.$watch('form', _.debounce(() => this.save(), 1000), {deep: true});
+                    this.postBodyWatcher = this.$watch('form.body', _.debounce(() => this.save(), 1000), {deep: true});
                 }, 1000);
             },
 
@@ -182,7 +183,7 @@
                     this.authors = response.data.data;
 
                     if (!this.form.author_id && this.authors) {
-                        this.form.author_id = _.first(this.authors).id;
+                        this.form.author_id = this.Wink.author.id;
                     }
                 });
             },
@@ -300,11 +301,14 @@
              * Save the post.
              */
             save() {
+                if (this.status) return;
+
                 this.errors = [];
                 this.status = 'Saving...';
 
-                this.form.slug = this.form.slug || 'draft-' + this.form.id;
-                this.form.title = this.form.title || 'Draft';
+                if (this.form.title != 'Draft' && (!this.form.slug || this.form.slug.startsWith('draft-'))) {
+                    this.form.slug = this.slugify(this.form.title);
+                }
 
                 this.http().post('/api/posts/' + this.id, this.form).then(response => {
                     this.status = '';
@@ -313,6 +317,8 @@
                         this.$router.push({name: 'post-edit', params: {id: this.form.id}})
                     }
                 }).catch(error => {
+                    this.status = '';
+                    
                     this.errors = error.response.data.errors;
 
                     this.settingsModalShown = true;

readme.md

@@ -8,13 +8,14 @@
   background: rgba(17, 59, 92, 0.83);
 }
 
-.ql-editor.ql-blank::before{
+.ql-container hr {
   color: config('colors.light');
 }
 
 .ql-bubble .ql-editor pre.ql-syntax {
-  overflow-x: auto;
-  padding: 0.5em;
+  background: #000d18;
+  color: #fff;
+  border: solid 2px rgba(0, 0, 0, 0.05);
 }
 
 .ql-bubble .ql-editor code{

resources/js/components/Editor.vue

@@ -81,9 +81,10 @@
 
 .ql-container hr {
   border: none;
-  color: #111;
+  color: config('colors.text-color');
   letter-spacing: 1em;
   text-align: center;
+  @apply mb-20;
 }
 
 .ql-container hr:before {
@@ -138,6 +139,7 @@
 }
 
 .ql-editor.ql-blank::before {
+  color: config('colors.light');
   left: 0;
   font-style: normal;
 }

resources/js/screens/posts/edit.vue

@@ -48,6 +48,7 @@ public function sendResetLinkEmail()
     /**
      * Show the new password to the user.
      *
+     * @param  string  $token
      * @return \Illuminate\Http\Response
      */
     public function showNewPassword($token)

resources/sass/dark.scss

@@ -15,7 +15,7 @@ public function upload()
     {
         $path = request()->image->store(config('wink.storage_path'), [
                 'disk' => config('wink.storage_disk'),
-                'visibility' => 'public'
+                'visibility' => 'public',
             ]
         );
 

resources/sass/editor.scss

@@ -24,7 +24,7 @@ public function showLoginForm()
     /**
      * Log the user out of the application.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function logout(Request $request)

src/Http/Controllers/ForgotPasswordController.php

@@ -12,7 +12,7 @@ class PagesController
     /**
      * Return pages.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -28,7 +28,7 @@ public function index()
     /**
      * Return a single page.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
@@ -49,7 +49,7 @@ public function show($id = null)
     /**
      * Store a single page.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -80,8 +80,8 @@ public function store($id)
     /**
      * Delete a single page.
      *
-     * @param  string $id
-     * @return null
+     * @param  string  $id
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/ImageUploadsController.php

@@ -13,7 +13,7 @@ class PostsController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -38,14 +38,14 @@ public function index()
     /**
      * Return a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
     {
         if ($id === 'new') {
             return response()->json([
-                'entry' => WinkPost::make(['id' => Str::uuid(), 'publish_date' => now()->toDateTimeString()]),
+                'entry' => WinkPost::make(['id' => Str::uuid(), 'publish_date' => now()->format('Y-m-d H:i:00')]),
             ]);
         }
 
@@ -59,7 +59,7 @@ public function show($id = null)
     /**
      * Store a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -102,7 +102,7 @@ public function store($id)
     /**
      * Tags incoming from the request.
      *
-     * @param  array $incomingTags
+     * @param  array  $incomingTags
      * @return array
      */
     private function collectTags($incomingTags)
@@ -127,8 +127,8 @@ private function collectTags($incomingTags)
     /**
      * Return a single post.
      *
-     * @param  string $id
-     * @return null
+     * @param  string  $id
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/LoginController.php

@@ -12,7 +12,7 @@ class TagsController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -83,7 +83,7 @@ public function store($id)
      * Return a single tag.
      *
      * @param  string  $id
-     * @return null
+     * @return void
      */
     public function delete($id)
     {

src/Http/Controllers/PagesController.php

@@ -13,7 +13,7 @@ class TeamController
     /**
      * Return posts.
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection|\Illuminate\Http\JsonResponse
      */
     public function index()
     {
@@ -30,7 +30,7 @@ public function index()
     /**
      * Return a single post.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function show($id = null)
@@ -53,7 +53,7 @@ public function show($id = null)
     /**
      * Store a single category.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($id)
@@ -98,7 +98,7 @@ public function store($id)
     /**
      * Return a single author.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return \Illuminate\Http\JsonResponse|null
      */
     public function delete($id)

src/Http/Controllers/PostsController.php

@@ -9,7 +9,7 @@ class PagesResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Illuminate\Http\Request  $request
      * @return array
      */
     public function toArray($request)