Merge pull request #74 from scify/project_lp_cta

Fixed navbar
scify · Oct 4, 2024 · ca7fd46 · ca7fd46
2 parents 7f2b8fd + a74cce2
commit ca7fd46
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 26 deletions.
diff --git a/.env.example b/.env.example
@@ -4,7 +4,7 @@ APP_KEY=
 APP_DEBUG=true
 DEBUGBAR_ENABLED=false
 APP_LOG_LEVEL=debug
-APP_URL=http://localhost
+APP_URL=http://localhost:8000
 APP_VERSION=v5.0
 GOOGLE_MAPS_KEY=
 

diff --git a/config/app.php b/config/app.php
@@ -59,7 +59,6 @@
     */
 
     'url' => env('APP_URL', 'http://localhost'),
-    'mix_url' => env('VITE_ASSET_URL', null),
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

diff --git a/resources/assets/sass/common.scss b/resources/assets/sass/common.scss
@@ -507,3 +507,10 @@ a.link {
 		cursor: pointer;
 	}
 }
+
+.nav-item {
+	.user-image {
+		height: 35px;
+		margin-right: 5px;
+	}
+}
diff --git a/resources/views/crowdsourcing-project/partials/navbar.blade.php b/resources/views/crowdsourcing-project/partials/navbar.blade.php
@@ -17,18 +17,15 @@
             <span class="navbar-toggler-icon"></span>
         </button>
 
-        @if(isset($viewModel->project))
-            <div class="collapse navbar-collapse pull-right" id="top-menu-content">
-                <ul class="nav navbar"
-                <div class=" collapse navbar-collapse pull-right
-                " id="top-menu-content">
-                    <ul class="nav navbar-nav ml-auto">
-                        @if(!isset($onErrorPage))
-                            @include("partials.login-menu-options")
-                        @endif
-                        @include('partials.content-languages', ['languages' => $viewModel->project->languages])
-                    </ul>
-                </div>
-        @endif
+        <div class="collapse navbar-collapse pull-right" id="top-menu-content">
+            <ul class="nav navbar-nav ml-auto">
+                @if(!isset($onErrorPage))
+                    @include("partials.login-menu-options")
+                @endif
+                @if(isset($viewModel->project))
+                    @include('partials.content-languages', ['languages' => $viewModel->project->languages])
+                @endif
+            </ul>
+        </div>
     </nav>
 </div>
diff --git a/resources/views/loggedin-environment/partials/header-controls.blade.php b/resources/views/loggedin-environment/partials/header-controls.blade.php
@@ -18,7 +18,7 @@
             </li>
         @endif
         <li class="nav-item dropdown user user-menu">
-            <a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <a class="nav-link py-0" href="#" class="dropdown-toggle" data-toggle="dropdown">
                 @if (Auth::user()->avatar)
                     <img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image">
                 @endif

diff --git a/resources/views/partials/login-menu-options.blade.php b/resources/views/partials/login-menu-options.blade.php
@@ -4,9 +4,9 @@
     </li>
 
     <li class="nav-item dropdown user user-menu">
-        <a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown">
+        <a class="nav-link py-0" href="#" class="dropdown-toggle" data-toggle="dropdown">
             @if (Auth::user()->avatar)
-                <img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image">
+                <img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image" alt="User Image">
             @endif
             <span class="hidden-xs">{{Auth::user()->nickname}}</span>
             <i class="fas fa-caret-down"></i>

diff --git a/vite.config.mjs b/vite.config.mjs
@@ -4,14 +4,6 @@ import vue from "@vitejs/plugin-vue";
 import path from "path";
 
 export default defineConfig({
-	// declaring the base path for the project
-	server: {
-		port: 3000,
-		hmr: {
-			host: "localhost",
-			protocol: "ws",
-		},
-	},
 	plugins: [
 		laravel({
 			input: [