Deleted errors leftovers
This commit is contained in:
parent
164d252caa
commit
ab91982c42
5 changed files with 11 additions and 24 deletions
15
app/app.php
15
app/app.php
|
@ -275,22 +275,9 @@ $utopia->error(function($error /* @var $error Exception */) use ($request, $resp
|
||||||
|
|
||||||
$_SERVER = []; // Reset before reporting to error log to avoid keys being compromised
|
$_SERVER = []; // Reset before reporting to error log to avoid keys being compromised
|
||||||
|
|
||||||
$errorID = (App::ENV_TYPE_PRODUCTION == $env) ? $sentry->captureException($error) : null;
|
$output = ((App::ENV_TYPE_DEVELOPMENT == $env)) ? [
|
||||||
|
|
||||||
if (extension_loaded('newrelic') && (App::ENV_TYPE_PRODUCTION == $env)) { // Ensure PHP agent is available
|
|
||||||
newrelic_notice_error($error->getMessage(), $error);
|
|
||||||
}
|
|
||||||
|
|
||||||
$whiteUsers = [
|
|
||||||
'eldad.fux@gmail.com',
|
|
||||||
'eldad@appwrite.io',
|
|
||||||
'eldad@careerpage.io',
|
|
||||||
];
|
|
||||||
|
|
||||||
$output = ((App::ENV_TYPE_DEVELOPMENT == $env) || (in_array($user->getAttribute('email'), $whiteUsers))) ? [
|
|
||||||
'message' => $error->getMessage(),
|
'message' => $error->getMessage(),
|
||||||
'code' => $error->getCode(),
|
'code' => $error->getCode(),
|
||||||
'errorID' => $errorID,
|
|
||||||
'file' => $error->getFile(),
|
'file' => $error->getFile(),
|
||||||
'line' => $error->getLine(),
|
'line' => $error->getLine(),
|
||||||
'trace' => $error->getTrace(),
|
'trace' => $error->getTrace(),
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
$providers = $this->getParam('providers', []);
|
$providers = $this->getParam('providers', []);
|
||||||
|
$limit = 25;
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="cover">
|
<div class="cover">
|
||||||
|
@ -14,14 +15,14 @@ $providers = $this->getParam('providers', []);
|
||||||
|
|
||||||
<h2 style="display: none;">Users</h2>
|
<h2 style="display: none;">Users</h2>
|
||||||
|
|
||||||
<form class="box padding-small margin-bottom"
|
<form class="box padding-small margin-bottom-large"
|
||||||
data-service="users.listUsers"
|
data-service="users.listUsers"
|
||||||
data-event="submit"
|
data-event="submit"
|
||||||
data-scope="sdk"
|
data-scope="sdk"
|
||||||
data-name="project-users">
|
data-name="project-users">
|
||||||
<input type="hidden" name="orderType" value="ASC">
|
<input type="hidden" name="orderType" value="ASC">
|
||||||
<input type="hidden" name="offset" value="0">
|
<input type="hidden" name="offset" value="0">
|
||||||
<input type="hidden" name="limit" value="25">
|
<input type="hidden" name="limit" value="<?php echo $limit; ?>">
|
||||||
<div class="row responsive">
|
<div class="row responsive">
|
||||||
<div class="col span-10">
|
<div class="col span-10">
|
||||||
<input name="search" id="searchUsers" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no">
|
<input name="search" id="searchUsers" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no">
|
||||||
|
@ -32,13 +33,11 @@ $providers = $this->getParam('providers', []);
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<hr class="margin-bottom" />
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
data-service="users.listUsers"
|
data-service="users.listUsers"
|
||||||
data-event="load,user-create,user-update,user-delete"
|
data-event="load,user-create,user-update,user-delete"
|
||||||
data-param-search=""
|
data-param-search=""
|
||||||
data-param-limit="25"
|
data-param-limit="<?php echo $limit; ?>"
|
||||||
data-param-offset="0"
|
data-param-offset="0"
|
||||||
data-param-order-type="ASC"
|
data-param-order-type="ASC"
|
||||||
data-scope="sdk"
|
data-scope="sdk"
|
||||||
|
@ -59,13 +58,13 @@ $providers = $this->getParam('providers', []);
|
||||||
<th width="180">Name</th>
|
<th width="180">Name</th>
|
||||||
<th width="200">Email</th>
|
<th width="200">Email</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th width="100">Created</th>
|
<th width="100">Joined</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody data-ls-loop="project-users.users" data-ls-as="user">
|
<tbody data-ls-loop="project-users.users" data-ls-as="user">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<img src="" data-ls-attrs="src={{user.email|gravatar}}" alt="User Avatar" class="avatar pull-start" />
|
<img src="" data-ls-attrs="src={{user|gravatar}}" alt="User Avatar" class="avatar pull-start" />
|
||||||
</td>
|
</td>
|
||||||
<td data-title="Name: ">
|
<td data-title="Name: ">
|
||||||
<a data-ls-attrs="href=/console/users/view?id={{user.$uid}}&project={{router.params.project}}" data-ls-bind="{{user.name}}"></a>
|
<a data-ls-attrs="href=/console/users/view?id={{user.$uid}}&project={{router.params.project}}" data-ls-bind="{{user.name}}"></a>
|
||||||
|
@ -112,6 +111,7 @@ $providers = $this->getParam('providers', []);
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li data-state="/console/users/teams?project={{router.params.project}}">
|
<li data-state="/console/users/teams?project={{router.params.project}}">
|
||||||
<h2>Teams</h2>
|
<h2>Teams</h2>
|
||||||
|
|
||||||
|
@ -237,6 +237,7 @@ $providers = $this->getParam('providers', []);
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li data-state="/console/users/providers?project={{router.params.project}}">
|
<li data-state="/console/users/providers?project={{router.params.project}}">
|
||||||
<h2>Providers</h2>
|
<h2>Providers</h2>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ services:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
environment:
|
environment:
|
||||||
- _APP_ENV=development
|
- _APP_ENV=production
|
||||||
- _APP_OPENSSL_KEY_V1=
|
- _APP_OPENSSL_KEY_V1=
|
||||||
- _APP_REDIS_HOST=redis
|
- _APP_REDIS_HOST=redis
|
||||||
- _APP_REDIS_PORT=6379
|
- _APP_REDIS_PORT=6379
|
||||||
|
|
2
public/dist/styles/default-ltr.css
vendored
2
public/dist/styles/default-ltr.css
vendored
File diff suppressed because one or more lines are too long
|
@ -160,7 +160,6 @@ a.box:hover {
|
||||||
.func-padding-end(25px) !important;
|
.func-padding-end(25px) !important;
|
||||||
.func-padding-start(70px);
|
.func-padding-start(70px);
|
||||||
.func-end(0);
|
.func-end(0);
|
||||||
box-shadow: 0 0 6px rgba(0, 0, 0, .05);
|
|
||||||
background: #f9f9f9;
|
background: #f9f9f9;
|
||||||
border-radius: 0 10px 10px 0;
|
border-radius: 0 10px 10px 0;
|
||||||
height: ~"calc(100% - 30px)";
|
height: ~"calc(100% - 30px)";
|
||||||
|
|
Loading…
Reference in a new issue