Merge pull request #49 from Kovah/dev

v0.0.15

README.md

@@ -70,7 +70,8 @@ want to use for the application.
 
 #### 2. Modify the .env.docker file
 
-Now open the `.env.docker` file and follow the instructions inside the file. All needed variables you have to configure
+Rename the `.env.docker` file to `.env`.  
+Now open the `.env` file and follow the instructions inside the file. All needed variables you have to configure
 are marked accordingly.
 
 #### 3. Modify the nginx.conf file (optional)

app/Http/Controllers/App/UserSettingsController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\App;
 
 use App\Helper\LinkAce;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\UserAccountUpdateRequest;
 use App\Http\Requests\UserSettingsUpdateRequest;
 use App\Models\Setting;
 use Illuminate\Http\Request;
@@ -33,15 +34,15 @@ class UserSettingsController extends Controller
     }
 
     /**
-     * @param UserSettingsUpdateRequest $request
+     * @param UserAccountUpdateRequest $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function saveAccountSettings(UserSettingsUpdateRequest $request)
+    public function saveAccountSettings(UserAccountUpdateRequest $request)
     {
         $user = auth()->user();
 
         $user->update($request->only([
-            'username',
+            'name',
             'email',
         ]));
 
@@ -97,7 +98,7 @@ class UserSettingsController extends Controller
         $data = $request->all();
 
         // Validate the request by checking if the old password is currect
-        $data['old_password'] = Auth::attempt([$current_user->email, $data['old_password']]);
+        $data['old_password'] = Auth::attempt(['email' => $current_user->email, 'password' => $data['old_password']]);
 
         $validator = Validator::make($data, [
             'old_password' => 'accepted',

app/Http/Requests/UserAccountUpdateRequest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Request;
+
+class UserAccountUpdateRequest extends FormRequest
+{
+    /** @var bool */
+    private $validate_username = false;
+
+    /** @var bool */
+    private $validate_email = false;
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize(Request $request)
+    {
+        // Validate the username if it was changed
+        if ($request->get('username') !== auth()->user()->name) {
+            $this->validate_username = true;
+        }
+
+        // Validate the email address if it was changed
+        if ($request->get('email') !== auth()->user()->email) {
+            $this->validate_email = true;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        if ($this->validate_username) {
+            $rules['username'] = 'unique:users,name';
+        }
+
+        if ($this->validate_email) {
+            $rules['email'] = 'unique:users,email';
+        }
+
+        return $rules;
+    }
+}

app/Http/Requests/UserSettingsUpdateRequest.php

@@ -7,29 +7,14 @@ use Illuminate\Http\Request;
 
 class UserSettingsUpdateRequest extends FormRequest
 {
-    /** @var bool */
-    private $validate_username = false;
-
-    /** @var bool */
-    private $validate_email = false;
-
     /**
      * Determine if the user is authorized to make this request.
      *
+     * @param Request $request
      * @return bool
      */
     public function authorize(Request $request)
     {
-        // Validate the username if it was changed
-        if ($request->get('username') !== auth()->user()->name) {
-            $this->validate_username = true;
-        }
-
-        // Validate the email address if it was changed
-        if ($request->get('email') !== auth()->user()->email) {
-            $this->validate_email = true;
-        }
-
         return true;
     }
 
@@ -40,18 +25,8 @@ class UserSettingsUpdateRequest extends FormRequest
      */
     public function rules()
     {
-        $rules = [
+        return [
             'timezone' => 'required',
         ];
-
-        if ($this->validate_username) {
-            $rules['username'] = 'unique:users,name';
-        }
-
-        if ($this->validate_email) {
-            $rules['email'] = 'unique:users,email';
-        }
-
-        return $rules;
     }
 }

app/Models/Link.php

@@ -117,6 +117,20 @@ class Link extends Model
      | METHODS
      */
 
+    /**
+     * Display the short URL if it's longer than 60 characters
+     *
+     * @return string
+     */
+    public function shortUrl()
+    {
+        if (mb_strlen($this->url) > 60) {
+            return substr($this->url, 0, 60) . '...';
+        }
+
+        return $this->url;
+    }
+
     /**
      * @return null|string
      */

docker-compose.production.yml

@@ -14,7 +14,7 @@ services:
       - MARIADB_PASSWORD=${DB_PASSWORD}
       - MARIADB_DATABASE=${DB_DATABASE}
     env_file:
-      - ./.env.docker
+      - ./.env
     volumes:
       - db:/bitnami
 
@@ -25,7 +25,7 @@ services:
     restart: always
     volumes:
       - linkace_app:/app
-      - ./.env.docker:/app/.env:ro
+      - ./.env:/app/.env:ro
 
   # --- nginx
   nginx:
@@ -33,15 +33,15 @@ services:
     image: bitnami/nginx:latest
     restart: always
     ports:
-      - "127.0.0.1:80:8085"
-      #- "127.0.0.1:443:8085"
+      - "0.0.0.0:80:8085"
+      #- "0.0.0.0:443:8085"
     depends_on:
       - php
     env_file:
-      - ./.env.docker
+      - ./.env
     volumes:
       - linkace_app:/app
-      - nginx.conf:/opt/bitnami/nginx/conf/vhosts/site.conf:ro
+      - ./nginx.conf:/opt/bitnami/nginx/conf/vhosts/site.conf:ro
       #- /path/to/ssl/certificates:/bitnami/nginx/conf/bitnami/certs
 
   # --- Redis
@@ -50,7 +50,7 @@ services:
     image: bitnami/redis:latest
     restart: always
     env_file:
-      - ./.env.docker
+      - ./.env
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {

resources/docker/dockerfiles/release.Dockerfile

@@ -56,4 +56,7 @@ COPY --from=npm_builder /srv/public /app/public
 # Cleanup dev stuff from final image
 RUN rm -rf /app/node_modules
 
+# Set correct permissions for the storage directory
+RUN chmod 0777 -R /app/storage
+
 WORKDIR /app

resources/lang/en/linkace.php

@@ -39,4 +39,6 @@ return [
 
     'bookmarklet_close' => 'This bookmarklet window automatically closes in <span class="bm-timer">5</span> seconds.',
     'open_linkace' => 'Open LinkAce',
+
+    'demo_login_hint' => 'You can login right away. Please notice that this demo will be reset every 2 hours.',
 ];

resources/views/actions/settings/partials/account-settings.blade.php

@@ -11,12 +11,12 @@
                 <label for="username">
                     @lang('user.username')
                 </label>
-                <input type="text" name="username" id="username" required
-                    class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}"
-                    placeholder="@lang('user.username')" value="{{ old('username') ?: $user->name }}">
-                @if ($errors->has('username'))
+                <input type="text" name="name" id="name" required
+                    class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
+                    placeholder="@lang('user.username')" value="{{ old('name') ?: $user->name }}">
+                @if ($errors->has('name'))
                     <p class="invalid-feedback" role="alert">
-                        {{ $errors->first('username') }}
+                        {{ $errors->first('name') }}
                     </p>
                 @endif
             </div>
@@ -26,6 +26,7 @@
                     @lang('user.email')
                 </label>
                 <input type="text" name="email" id="email" required
+                    @if(env('APP_DEMO')) disabled @endif
                     class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}"
                     placeholder="@lang('user.email')" value="{{ old('email') ?: $user->email }}">
                 @if ($errors->has('email'))

resources/views/actions/settings/partials/change-pw.blade.php

@@ -1,44 +1,47 @@
-<div class="card mt-4">
-    <div class="card-header">
-        @lang('settings.change_password')
+@if(!env('APP_DEMO', false))
+    <div class="card mt-4">
+        <div class="card-header">
+            @lang('settings.change_password')
+        </div>
+        <div class="card-body">
+
+            <form action="{{ route('change-user-password') }}" method="POST">
+                @csrf
+
+                <div class="form-group">
+                    <label for="old_password">
+                        @lang('settings.old_password')
+                    </label>
+                    <input type="password" name="old_password" id="old_password" required
+                        class="form-control{{ $errors->has('old_password') ? ' is-invalid' : '' }}"
+                        placeholder="@lang('settings.old_password')">
+                </div>
+
+                <div class="form-group">
+                    <label for="new_password">
+                        @lang('settings.new_password')
+                    </label>
+                    <input type="password" name="new_password" id="new_password" required
+                        class="form-control{{ $errors->has('new_password') ? ' is-invalid' : '' }}"
+                        placeholder="@lang('settings.new_password')">
+                </div>
+
+                <div class="form-group">
+                    <label for="new_password_confirmation">
+                        @lang('settings.new_password2')
+                    </label>
+                    <input type="password" name="new_password_confirmation" id="new_password_confirmation" required
+                        class="form-control{{ $errors->has('new_password_confirmation') ? ' is-invalid' : '' }}"
+                        placeholder="@lang('settings.new_password2')">
+                </div>
+
+                <button type="submit" class="btn btn-primary">
+                    <i class="fa fa-key fa-mr"></i> @lang('settings.change_password')
+                </button>
+
+            </form>
+
+        </div>
     </div>
-    <div class="card-body">
+@endif
 
-        <form action="{{ route('change-user-password') }}" method="POST">
-            @csrf
-
-            <div class="form-group">
-                <label for="old_password">
-                    @lang('settings.old_password')
-                </label>
-                <input type="text" name="old_password" id="old_password" required
-                    class="form-control{{ $errors->has('old_password') ? ' is-invalid' : '' }}"
-                    placeholder="@lang('settings.old_password')">
-            </div>
-
-            <div class="form-group">
-                <label for="new_password">
-                    @lang('settings.new_password')
-                </label>
-                <input type="text" name="new_password" id="new_password" required
-                    class="form-control{{ $errors->has('new_password') ? ' is-invalid' : '' }}"
-                    placeholder="@lang('settings.new_password')">
-            </div>
-
-            <div class="form-group">
-                <label for="new_password_confirmation">
-                    @lang('settings.new_password2')
-                </label>
-                <input type="text" name="new_password_confirmation" id="new_password_confirmation" required
-                    class="form-control{{ $errors->has('new_password_confirmation') ? ' is-invalid' : '' }}"
-                    placeholder="@lang('settings.new_password2')">
-            </div>
-
-            <button type="submit" class="btn btn-primary">
-                <i class="fa fa-key fa-mr"></i> @lang('settings.change_password')
-            </button>
-
-        </form>
-
-    </div>
-</div>

resources/views/auth/login.blade.php

@@ -5,6 +5,10 @@
     <div class="row justify-content-center">
         <div class="col-12 col-md-8">
 
+            @if(env('APP_DEMO', false))
+                <div class="alert alert-info small">@lang('linkace.demo_login_hint')</div>
+            @endif
+
             <div class="card">
                 <div class="card-header">
                     @lang('linkace.login')
@@ -21,7 +25,7 @@
                                     </div>
                                 </div>
                                 <input type="email" name="email" id="email" class="form-control"
-                                    value="{{ old('email') }}"
+                                    value="{{ env('APP_DEMO', false) ? 'linkace@example.com' : old('email') }}"
                                     placeholder="@lang('linkace.email')" aria-label="@lang('linkace.email')" required
                                     autofocus>
                             </div>
@@ -41,7 +45,8 @@
                                     </div>
                                 </div>
                                 <input type="password" name="password" id="password" class="form-control"
-                                    placeholder="@lang('linkace.password')" aria-label="@lang('linkace.password')">
+                                    @if(env('APP_DEMO', false)) value="demopassword" @endif
+                                placeholder="@lang('linkace.password')" aria-label="@lang('linkace.password')">
                             </div>
                             @if ($errors->has('password'))
                                 <p class="invalid-feedback" role="alert">

resources/views/models/links/edit.blade.php

@@ -65,17 +65,22 @@
                                 class="{{ $errors->has('category_id') ? ' is-invalid' : '' }}">
                                 <option value="0">@lang('category.select_category')</option>
                                 @foreach($categories as $category)
-                                    <option value="{{ $category->id }}"
-                                        @if($link->category_id === $category->id) selected @endif>
-                                        {{ $category->name }}
-                                    </option>
-                                    @if($category->childCategories)
-                                        @foreach($category->childCategories as $child_category)
-                                            <option value="{{ $child_category->id }}"
-                                                @if($link->category_id === $child_category->id) selected @endif>
-                                                &rightarrow; {{ $child_category->name }}
+                                    @if($category->childCategories->count() > 0)
+                                        <optgroup label="{{ $category->name }}">
+                                            <option value="{{ $category->id }}">
+                                                {{ $category->name }}
                                             </option>
-                                        @endforeach
+
+                                            @foreach($category->childCategories as $child_category)
+                                                <option value="{{ $child_category->id }}">
+                                                    &rightarrow; {{ $child_category->name }}
+                                                </option>
+                                            @endforeach
+                                        </optgroup>
+                                    @else
+                                        <option value="{{ $category->id }}">
+                                            {{ $category->name }}
+                                        </option>
                                     @endif
                                 @endforeach
                             </select>

resources/views/models/links/partials/single-table.blade.php

@@ -9,7 +9,7 @@
     </td>
     <td>
         <a href="{{ $link->url }}" target="_blank">
-            {{ $link->url }}
+            {{ $link->shortUrl() }}
         </a>
     </td>
     <td class="text-muted">

resources/views/models/links/partials/single.blade.php

@@ -8,7 +8,7 @@
                 @endif
                 {!! $link->getIcon('mr-1') !!}
                 <a href="{{ $link->url }}">{{ $link->title }}</a>
-                <small>({{ $link->url }})</small>
+                <small>({{ $link->shortUrl() }})</small>
             </div>
             <div class="ml-auto text-right">
                 <button type="button" class="btn btn-xs btn-outline-primary" title="@lang('sharing.share_link')"