rollback some changes

app/Http/Controllers/AppSessionController.php

@@ -48,30 +48,6 @@ class AppSessionController extends Controller
         return redirect(route('pro-request-sms-login-token'))->withCookie($cookie);
     }
 
-    public function clientLogIn(){
-        return view('public.client-log-in');
-    }
-
-    public function processClientLogIn(Request $request){
-        $loginUrl = env('BACKEND_URL', 'http://localhost:8080') . '/api/session/proLogIn';
-
-        $response = Http::asForm()->post($loginUrl, [
-            'cellNumber' => $request->get('cellNumber'),
-            'token' => $request->get('token'),
-        ])->json();
-
-        if(!$response['success']){
-            return back()->with("message", $response['message']);
-        }
-
-        $sessionKey = $response['data']["sessionKey"];
-        $request->session()->put("authID", $response['data']["proId"]);
-
-        $cookie = cookie()->forever('sessionKey', $sessionKey, '/');
-
-        return redirect("/mc/dashboard")->withCookie($cookie);
-    }
-
     public function postToAPI(Request $request) {
 
         session()->remove('message');

app/Http/Controllers/ClientController.php

@@ -16,38 +16,6 @@ class ClientController extends Controller
 {
 
     // GET /care_months
-    public function entranceNormal(Request $request) {
-        /* $sessionKey = Cookie::get('sessionKey');
-
-        if(!$sessionKey){
-            $loginUrl = env('BACKEND_URL', 'http://localhost:8080') . '/api/session/createStrangerSession';
-
-            $httpResponse = Http::asForm()->post($loginUrl)->json();
-
-            if(!$httpResponse['success']){
-                return back()->with("message", $httpResponse['message']);
-            }
-
-            $sessionKey = $httpResponse['data'];
-
-            // $cookie = cookie()->forever('sessionKey', $sessionKey, '/');
-
-            cookie()->queue('sessionKey', $sessionKey, 1440, '/');
-
-            // $response = new \Illuminate\Http\Response(view('client/index'));
-            // $response->withCookie($cookie);
-            // return $response;
-        }
-
-        $session = AppSession::where("session_key",$sessionKey)->first();
-
-        $meeting = null;
-        if ($session->meetingParticipant && $session->meetingParticipant->meeting->lobby_id === $lobby->id) {
-            $meeting = new MeetingModel($session->meetingParticipant->meeting);
-        }
-        return view('client/index',compact('lobbyModel','meeting','sessionKey')); */
-        return view('client/index');
-	}
 
 	public function entranceLobby(Request $request, Lobby $lobby) {
         if (!$lobby->id) {

resources/js/components/partials/Settings.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="d-flex flex-column">
-        <v-switch v-model="newSettings.newMeetingNotificationExpanded" @change="updateSettings('newMeetingNotificationExpanded')" :label="'Always expand new meeting notification'"></v-switch>
+        <v-switch class="mt-0" v-model="newSettings.newMeetingNotificationExpanded" @change="updateSettings(newSettings.newMeetingNotificationExpanded)" label="Always expand new meeting notification"></v-switch>
+        <p class="mb-0 pb-2 pt-3"><b>ADMIN SETTINGS</b></p>
+        <v-switch class="mt-0" v-model="newSettings.admin.showAllLobbiesMettings" @change="updateSettings(newSettings.admin.showAllLobbiesMettings)" label="Show All Lobbies / Meetings"></v-switch>
     </div>
 </template>
 
@@ -10,7 +12,12 @@ import { mapState } from "vuex";
 export default {
     data() {
         return {
-            newSettings: null
+            newSettings: {
+                newMeetingNotificationExpanded: null,
+                admin: {
+                    showAllLobbiesMettings: null
+                }
+            }
         }
     },
     computed: {

resources/js/components/vuex/index.js

@@ -29,7 +29,10 @@ export default () => new Vuex.Store({
         },
         lobbies: [],
         settings: {
-            newMeetingNotificationExpanded: localStorage.getItem('newMeetingNotificationExpanded') == 'true' ? true : false
+            newMeetingNotificationExpanded: localStorage.getItem('newMeetingNotificationExpanded') == 'true' ? true : false,
+            admin: {
+                showAllLobbiesMettings: localStorage.getItem('showAllLobbiesMettings') == 'true' ? true : false
+            }
         }
     },
     mutations: {

routes/web.php

@@ -35,8 +35,6 @@ Route::middleware('ensureNoValidSession')->group(function(){
     Route::get('/', 'AppSessionController@proRequestSmsLogInToken')->name('pro-request-sms-login-token');
     Route::get('/pro/login', 'AppSessionController@proLogIn')->name('pro-login');
     Route::post('/pro/login', 'AppSessionController@processProLogIn')->name('process-pro-login');
-    Route::get('/client/login', 'AppSessionController@clientLogIn')->name('client-login');
-    Route::get('/client/login', 'AppSessionController@clientLogIn')->name('process-client-login');
 });
 
 Route::middleware('ensureValidSession')->group(function(){
@@ -62,11 +60,10 @@ Route::middleware('ensureValidSession')->group(function(){
 Route::post('/post-to-api', 'AppSessionController@postToAPI')->name('post-to-api');
 Route::post('/post-to-api-ajax', 'AppSessionController@postToAPIAjax')->name('post-to-api-ajax');
 
-Route::get('/client', 'ClientController@entranceNormal')->name('client-entrance');
-Route::get('/client/{url_slug}', 'ClientController@entranceLobby')->name('client-lobby');
+Route::get('/client/{slug}', 'ClientController@entranceLobby')->name('client-lobby');
 Route::get('/client/meeting/{meeting_uid}', 'ClientController@entranceLobby')->name('join-meeting');
 
-Route::bind('url_slug', function($value, $route)
+Route::bind('slug', function($value, $route)
 {
-    return Lobby::where('url_slug', $value)->first();
+    return Lobby::where('slug', $value)->first();
 });