Merge branch 'dev' into dev-vj

app/Http/Controllers/AppSessionController.php

@@ -29,7 +29,7 @@ class AppSessionController extends Controller
 
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080') . '/api/session/confirmSmsAuthToken';
+            $url = config('stag.backendUrl') . '/api/session/confirmSmsAuthToken';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -63,7 +63,7 @@ class AppSessionController extends Controller
     public function resendSmsAuthToken(Request $request) {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080/api') . '/session/resendSmsAuthToken';
+            $url = config('stag.backendUrl') . '/api/session/resendSmsAuthToken';
 
             $data = [];
 
@@ -94,7 +94,7 @@ class AppSessionController extends Controller
     public function postSetPassword(Request $request) {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080') . '/api/pro/selfPutPassword';
+            $url = config('stag.backendUrl') . '/api/pro/selfPutPassword';
 
             $data = [
                 'newPassword' => $request->input('newPassword'),
@@ -128,7 +128,7 @@ class AppSessionController extends Controller
 
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080') . '/api/pro/selfPutSecurityQuestions';
+            $url = config('stag.backendUrl') . '/api/pro/selfPutSecurityQuestions';
 
             $data = [
                 'securityQuestion1' => $request->input('securityQuestion1'),
@@ -171,7 +171,7 @@ class AppSessionController extends Controller
     {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080') . '/api/pro/requestPasswordReset';
+            $url = config('stag.backendUrl') . '/api/pro/requestPasswordReset';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -214,7 +214,7 @@ class AppSessionController extends Controller
     {
         try {
 
-            $url = env('BACKEND_URL', 'http://localhost:8080') . '/api/pro/selfResetPassword';
+            $url = config('stag.backendUrl') . '/api/pro/selfResetPassword';
 
             $data = [
                 'cellNumber' => $request->input('cellNumber'),
@@ -257,7 +257,7 @@ class AppSessionController extends Controller
     }
 
     public function processProLogOut(Request $request){
-        $logOutUrl = env('BACKEND_URL', 'http://localhost:8080/api') . '/session/logOut';
+        $logOutUrl = config('stag.backendUrl') . '/api/session/logOut';
         $response = Http::asForm()->withHeaders(['sessionKey'=>$request->cookie('sessionKey')])->get($logOutUrl)->json();
         if(!$response['success']){
             return back()->with("message", $response['message']);
@@ -270,7 +270,7 @@ class AppSessionController extends Controller
     {
         $api = new Backend();
         try {
-            $apiResponse = $api->post('session/proLogInWithPassword', [
+            $apiResponse = $api->post('/api/session/proLogInWithPassword', [
                 'cellNumber' => $request->post('cellNumber'),
                 'password' => $request->post('password')
             ]);
@@ -288,14 +288,14 @@ class AppSessionController extends Controller
     }
 
     public function loginWithSessionKey($sessionKey, Request $request){
-        $url = "session/pro_log_in_with_session_key/${sessionKey}";
+        $url = "/api/session/pro_log_in_with_session_key/${sessionKey}";
         $api = new Backend();
         try {
             $apiResponse = $api->post($url, []);
             $data = json_decode($apiResponse->getContents());
 
             if (!property_exists($data, 'success') || !$data->success) {
-                return redirect('/mc');
+                return redirect('/');
             }
 
 
@@ -326,7 +326,7 @@ class AppSessionController extends Controller
             $data['uid'] = $fields['_uid'];
         }
 
-        $url = env('BACKEND_URL', 'http://localhost:8080') . $request->input('_api');
+        $url = config('stag.backendUrl') . $request->input('_api');
 
         $file = $request->file('file');
         if($file) {
@@ -380,7 +380,7 @@ class AppSessionController extends Controller
             $data['uid'] = $fields['_uid'];
         }
 
-        $url = env('BACKEND_URL', 'http://localhost:8080') . $request->input('_api');
+        $url = config('stag.backendUrl') . $request->input('_api');
         // dd($url);
 
         $response = Http::asForm()

app/Http/Controllers/GuestController.php

@@ -23,7 +23,7 @@ class GuestController extends Controller
 
         try {
 
-            $apiResponse = $api->post('client/createAsGuest', [
+            $apiResponse = $api->post('/apiclient/createAsGuest', [
                 'nameFirst' => $request->post('nameFirst'),
                 'nameLast' => $request->post('nameLast'),
                 'dob' => $request->post('dob'),
@@ -59,7 +59,7 @@ class GuestController extends Controller
 
         try {
 
-            $apiResponse = $api->post('session/clientCheckInTokenLogIn', [
+            $apiResponse = $api->post('/api/session/clientCheckInTokenLogIn', [
                 'checkInToken' => $request->post('checkInToken'),
                 'dob' => $request->post('dob'),
             ]);

app/Http/Controllers/NoteController.php

@@ -107,7 +107,7 @@ class NoteController extends Controller
     }
 
     private function callJava($request, $endPoint, $data){
-        $url = env('BACKEND_URL', 'http://localhost:8080') . $endPoint;
+        $url = config('stag.backendUrl') . $endPoint;
         $response = Http::asForm()
         ->withHeaders(['sessionKey'=>$request->cookie('sessionKey')])
         ->post($url, $data)

app/Http/Controllers/stag_app_pro_access_Controller.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class stag_app_pro_access_Controller extends Controller
+{
+    public $selfName = 'stag_app_pro_access_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /stag_app_pro_access
+	public function index(Request $request) {
+		$records = DB::table('stag_app_pro_access')->get();
+		return response()->view('admin/stag_app_pro_access/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /stag_app_pro_access/view/{uid}
+	public function view(Request $request, $uid) {
+		return redirect("/stag_app_pro_access/view/$uid/SUB_dashboard");
+	}
+}

app/Http/Controllers/stag_app_pro_access_SINGLE_Controller.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class stag_app_pro_access_SINGLE_Controller extends Controller
+{
+    public $selfName = 'stag_app_pro_access_SINGLE_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /stag_app_pro_access/view/{uid}/ACTION_deactivate
+	public function ACTION_deactivate(Request $request, $uid) {
+		$record = DB::table('stag_app_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('stag_app_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/stag_app_pro_access/view/' . $record->uid . '/ACTION_deactivate');
+		}
+		return response()->view('admin/stag_app_pro_access_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /stag_app_pro_access/view/{uid}/ACTION_reactivate
+	public function ACTION_reactivate(Request $request, $uid) {
+		$record = DB::table('stag_app_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('stag_app_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/stag_app_pro_access/view/' . $record->uid . '/ACTION_reactivate');
+		}
+		return response()->view('admin/stag_app_pro_access_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /stag_app_pro_access/view/{uid}/ACTION_updateMemo
+	public function ACTION_updateMemo(Request $request, $uid) {
+		$record = DB::table('stag_app_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('stag_app_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/stag_app_pro_access/view/' . $record->uid . '/ACTION_updateMemo');
+		}
+		return response()->view('admin/stag_app_pro_access_SINGLE/ACTION_updateMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /stag_app_pro_access/view/{uid}/SUB_dashboard
+	public function SUB_dashboard(Request $request, $uid) {
+		$record = DB::table('stag_app_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('stag_app_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/stag_app_pro_access/view/' . $record->uid . '/SUB_dashboard');
+		}
+		return response()->view('admin/stag_app_pro_access_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

app/Http/Middleware/ProAuthenticated.php

@@ -22,7 +22,7 @@ class ProAuthenticated
         $currentRouteName = $request->route()->getName();
 
         if (!$authenticated) {
-            return redirect(env('AUTH_URL'));
+            return redirect(config('stag.authUrl'));
         }
 
         return $next($request);

app/Lib/Backend.php

@@ -20,7 +20,7 @@ class Backend
 
     public function __construct()
     {
-        $this->url = env('BACKEND_URL', "http://localhost:8080/api");
+        $this->url = config('stag.backendUrl');
     }
 
 
@@ -34,7 +34,6 @@ class Backend
         return $this->sendRequest($url, 'GET', $data);
     }
 
-
     /**
      * @param string $url
      * @param string $method HTTP request method eg POST, GET.

config/stag.php

@@ -0,0 +1,8 @@
+<?php 
+
+return [
+    'backendUrl' => env('BACKEND_URL','http://localhost:8080'),
+    'authUrl' => env('AUTH_URL', 'https://scholar.securecpu.com'),
+    'hcpPortalUrl' =>env('HCP_PORTAL_URL', 'https://scholar.securecpu.com'),
+    'tokboxApiKey' =>env('TOKBOX_API_KEY', '46678902')
+];

generatecv/tree.txt

@@ -1124,7 +1124,7 @@ ADMIN
                     customMemo
             sessions
             app_access
-                id=stag_app_pro_access.pro_id
+                id=stag_app_pro_access.pro_id=>/stag_app_pro_access/view/UID/SUB_dashboard
                 !inc:stag_app
                 !qry:stag_apps:select id, name from stag_app
                 !col:stag_app:StagApp:~stag_apps:name:id,=,$$stag_app_id:all
@@ -1322,5 +1322,16 @@ ADMIN
                 name=name
                 url=url
                 description=description
+        SUB
+            dashboard
+    stag_app_pro_access|stag_app_pro_access|view|icon:tablet-alt
+    stag_app_pro_access/view/{uid}
+        ACTIONS
+            deactivate
+                memo
+            reactivate
+                memo
+            updateMemo
+                memo=memo
         SUB
             dashboard

resources/views/admin/pros_SINGLE/SUB_app_access.blade.php

@@ -21,7 +21,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href=""><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/stag_app_pro_access/view/{{ $subRecord->uid }}/SUB_dashboard"><i class="fas fa-share-square"></i></a></td>
 <td><?= value_from_rs($result_stag_apps, 'name', [['id', '=', $subRecord->stag_app_id], ], 'all'); ?></td>
                     </tr>
                 @endforeach

resources/views/admin/stag_app_pro_access/actions.blade.php

@@ -0,0 +1,3 @@
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/stag_app_pro_access/view/<?= $record->uid ?>/ACTION_deactivate?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Deactivate</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/stag_app_pro_access/view/<?= $record->uid ?>/ACTION_reactivate?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/stag_app_pro_access/view/<?= $record->uid ?>/ACTION_updateMemo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Memo</a>

resources/views/admin/stag_app_pro_access/index.blade.php

@@ -0,0 +1,54 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Stag App Pro Access: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Pro Id</th>
+<th>Stag App Id</th>
+<th>Memo</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/stag_app_pro_access/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->pro_id ?></td>
+<td><?= $record->stag_app_id ?></td>
+<td><?= $record->memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

resources/views/admin/stag_app_pro_access/info.blade.php

@@ -0,0 +1,3 @@
+<h4 class="d-flex my-3 px-3 stag-heading stag-heading-info">
+    <div>Stag App Pro Access: Single [<?= $record->uid ?>]</div>
+</h4>

resources/views/admin/stag_app_pro_access/subs.blade.php

@@ -0,0 +1 @@
+<a href='/stag_app_pro_access/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_dashboard' ? 'bg-secondary text-white font-weight-bold' : '' }}{{ strpos(request()->route()->getActionMethod(), 'ACTION_') === 0 ? 'bg-secondary text-white font-weight-bold' : '' }}'>Dashboard</a>

resources/views/admin/stag_app_pro_access/view.blade.php

@@ -0,0 +1,20 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/stag_app_pro_access/info')</div>
+        <div class="d-flex align-items-stretch">
+            <div class="inner-side-nav">
+                <div class="border-right h-100">
+                    @include('admin/stag_app_pro_access/subs')
+                </div>
+            </div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
+                <div>
+                    @yield('content-inner')
+                </div>
+            </div>
+        </div>
+    </div>
+
+@endsection

resources/views/admin/stag_app_pro_access_SINGLE/ACTION_deactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.stag_app_pro_access.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Deactivate</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/stagAppProAccess/deactivate">
+        <input type="hidden" name="_success" value="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('stag_app_pro_access_SINGLE-ACTION_deactivate', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo </label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : '' }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/admin/stag_app_pro_access_SINGLE/ACTION_reactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.stag_app_pro_access.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Reactivate</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/stagAppProAccess/reactivate">
+        <input type="hidden" name="_success" value="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('stag_app_pro_access_SINGLE-ACTION_reactivate', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo </label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : '' }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/admin/stag_app_pro_access_SINGLE/ACTION_updateMemo.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.stag_app_pro_access.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Update Memo</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/stagAppProAccess/updateMemo">
+        <input type="hidden" name="_success" value="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('stag_app_pro_access_SINGLE-ACTION_updateMemo', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo </label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : $record->memo }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('stag_app_pro_access-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/admin/stag_app_pro_access_SINGLE/SUB_dashboard.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.stag_app_pro_access.view')
+@section('content-inner')
+
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm stag-table border-top">
+            <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+                <thead>
+                <tr>
+                    <th colspan="2" class="px-2">Record Details</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
+                    <tr>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/stag_app_pro_access/actions')
+        </div>
+    </div>
+</div>
+
+
+@endsection

resources/views/client-dashboard.blade.php

@@ -141,7 +141,7 @@
 
                     var self = this;
 
-                    var apiKey = '<?= env('TOKBOX_API_KEY', '46678902') ?>';
+                    var apiKey = '<?= config('stag.tokboxApiKey') ?>';
                     var sessionId = this.otSessionId;
                     var token = this.selfToken;
 

resources/views/layouts/generated-links.blade.php

@@ -186,3 +186,10 @@
 		<p>Stag Apps</p>
 	</a>
 </li>
+
+<li class='nav-item'>
+	<a href='/stag_app_pro_access' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'stag_app_pro_access') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-tablet-alt'></i>
+		<p>Stag App Pro Access</p>
+	</a>
+</li>

resources/views/layouts/pro-logged-in.blade.php

@@ -80,7 +80,7 @@
                 </li>
 
                 <li class="nav-item">
-                    <a class="nav-link small d-flex align-items-center" href="{{env('HCP_PORTAL_URL', 'https://scholar.securecpu.com')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
+                    <a class="nav-link small d-flex align-items-center" href="{{config('stag.hcpPortalUrl')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
                         Go to HCP portal
                     </a>
                 </li>
@@ -100,7 +100,7 @@
 
             <ul class="navbar-nav ml-2 ml-2">
                 <li class="nav-item">
-                    <a class="nav-link px-2" href="{{ env('AUTH_URL') }}/logout" target="_top" role="button">
+                    <a class="nav-link px-2" href="{{ config('stag.authUrl') }}/logout" target="_top" role="button">
                         <i class="fas fa-sign-out-alt"></i>
                     </a>
                 </li>

resources/views/meet.blade.php

@@ -236,7 +236,7 @@
 
                     var self = this;
 
-                    var apiKey = '<?= env('TOKBOX_API_KEY', '46678902') ?>';
+                    var apiKey = '<?=  config('stag.tokboxApiKey') ?>';
                     var sessionId = this.otSessionId;
                     var token = this.selfToken;
 

resources/views/pro-call.blade.php

@@ -176,7 +176,7 @@
 
                     var self = this;
 
-                    var apiKey = '<?= env('TOKBOX_API_KEY', '46678902') ?>';
+                    var apiKey = '<?=  config('stag.tokboxApiKey') ?>';
                     var sessionId = this.otSessionId;
                     var token = this.selfToken;
 

routes/generated.php

@@ -539,6 +539,13 @@ Route::prefix('/bdt_measurements')->group(function () {
 	Route::get('add_new', 'bdt_measurements_Controller@add_new')->name('bdt_measurements-add_new');
 });
 
+// --- admin: stag_apps --- //
+Route::prefix('/stag_apps')->group(function () {
+	Route::get('', 'stag_apps_Controller@index')->name('stag_apps-index');
+	Route::get('add_new', 'stag_apps_Controller@add_new')->name('stag_apps-add_new');
+	Route::get('view/{uid}', 'stag_apps_Controller@view')->name('stag_apps-view');
+});
+
 // --- admin: stag_apps_SINGLE --- //
 Route::prefix('/stag_apps/view/{uid}')->group(function () {
 	Route::get('ACTION_deactivate', 'stag_apps_SINGLE_Controller@ACTION_deactivate')->name('stag_apps_SINGLE-ACTION_deactivate');
@@ -547,9 +554,16 @@ Route::prefix('/stag_apps/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'stag_apps_SINGLE_Controller@SUB_dashboard')->name('stag_apps_SINGLE-SUB_dashboard');
 });
 
-// --- admin: stag_apps --- //
-Route::prefix('/stag_apps')->group(function () {
-	Route::get('', 'stag_apps_Controller@index')->name('stag_apps-index');
-	Route::get('add_new', 'stag_apps_Controller@add_new')->name('stag_apps-add_new');
-	Route::get('view/{uid}', 'stag_apps_Controller@view')->name('stag_apps-view');
+// --- admin: stag_app_pro_access_SINGLE --- //
+Route::prefix('/stag_app_pro_access/view/{uid}')->group(function () {
+	Route::get('ACTION_deactivate', 'stag_app_pro_access_SINGLE_Controller@ACTION_deactivate')->name('stag_app_pro_access_SINGLE-ACTION_deactivate');
+	Route::get('ACTION_reactivate', 'stag_app_pro_access_SINGLE_Controller@ACTION_reactivate')->name('stag_app_pro_access_SINGLE-ACTION_reactivate');
+	Route::get('ACTION_updateMemo', 'stag_app_pro_access_SINGLE_Controller@ACTION_updateMemo')->name('stag_app_pro_access_SINGLE-ACTION_updateMemo');
+	Route::get('SUB_dashboard', 'stag_app_pro_access_SINGLE_Controller@SUB_dashboard')->name('stag_app_pro_access_SINGLE-SUB_dashboard');
+});
+
+// --- admin: stag_app_pro_access --- //
+Route::prefix('/stag_app_pro_access')->group(function () {
+	Route::get('', 'stag_app_pro_access_Controller@index')->name('stag_app_pro_access-index');
+	Route::get('view/{uid}', 'stag_app_pro_access_Controller@view')->name('stag_app_pro_access-view');
 });

routes/web.php

@@ -69,7 +69,7 @@ Route::middleware('pro.auth')->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::post("/process_form_submit", 'NoteController@processFormSubmit')->name('process_form_submit');
-if (env('APP_ENV') === 'production') {
+if (config('app.env') === 'production') {
     URL::forceScheme('https');
 }
 // =============================================================================================