Updated UI on setup, fixed logo upload with add copany, better wording during setup

This commit is contained in:
johnny@pittpc.com
2021-02-05 14:17:18 -05:00
parent 6d23b87f7c
commit 71d5ce1c10
4 changed files with 53 additions and 55 deletions

View File

@@ -146,6 +146,8 @@
<input type="file" class="form-control-file" name="file"> <input type="file" class="form-control-file" name="file">
</div> </div>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-fw fa-plus"></i></button>
</div> </div>
<div class="modal-footer bg-white"> <div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>

View File

@@ -188,5 +188,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</div> </div>
<?php include("add_expense_modal.php"); ?> <?php include("add_expense_modal.php"); ?>
<?php include("add_category_modal.php"); ?>
<?php include("footer.php"); <?php include("footer.php");

View File

@@ -1115,7 +1115,7 @@ if(isset($_POST['add_category'])){
$_SESSION['alert_message'] = "Category added"; $_SESSION['alert_message'] = "Category added";
header("Location: categories.php"); header("Location: " . $_SERVER["HTTP_REFERER"]);
} }

103
setup.php
View File

@@ -286,13 +286,11 @@ if(isset($_POST['add_company_settings'])){
<!-- /.navbar --> <!-- /.navbar -->
<!-- Main Sidebar Container --> <!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none"> <aside class="main-sidebar sidebar-dark-primary elevation-4">
<!-- Brand Logo --> <!-- Brand Logo -->
<a href="index3.html" class="brand-link"> <a href="https://itflow.org" class="brand-link">
<img src="dist/img/AdminLTELogo.png" alt="Logo" class="brand-image img-circle elevation-3" <span class="brand-text font-weight-light">ITFlow</span>
style="opacity: .8">
<span class="brand-text font-weight-light">Setup</span>
</a> </a>
<!-- Sidebar --> <!-- Sidebar -->
@@ -365,70 +363,70 @@ if(isset($_POST['add_company_settings'])){
<?php if(isset($_GET['database'])){ ?> <?php if(isset($_GET['database'])){ ?>
<div class="card mb-3"> <div class="card card-dark">
<div class="card-header"> <div class="card-header">
<h6 class="mt-1"><i class="fa fa-fw fa-database"></i> Setup Database</h6> <h3 class="card-title"><i class="fa fa-fw fa-database"></i> Connect your Database</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<form class="p-3" method="post" autocomplete="off"> <form method="post" autocomplete="off">
<div class="form-group"> <div class="form-group">
<label>Database</label> <label>Database User <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-database"></i></span>
</div>
<input type="text" class="form-control" name="database" placeholder="Name of the database" autofocus required>
</div>
</div>
<div class="form-group">
<label>Username</label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div> </div>
<input type="text" class="form-control" name="username" placeholder="Username to access the database" required> <input type="text" class="form-control" name="username" placeholder="Username to access the database" autofocus required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Password</label> <label>Database Password <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
</div> </div>
<input type="password" class="form-control" name="password" placeholder="Enter the password" required> <input type="password" class="form-control" name="password" placeholder="Enter the Datbase password" required>
</div> </div>
</div> </div>
<div class="form-group mb-5"> <div class="form-group">
<label>Host</label> <label>Database Name <strong class="text-danger">*</strong></label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-database"></i></span>
</div>
<input type="text" class="form-control" name="database" placeholder="Name of the database" required>
</div>
</div>
<div class="form-group">
<label>Database Host <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-server"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
</div> </div>
<input type="text" class="form-control" name="host" value="localhost" placeholder="Hostname of the server" required> <input type="text" class="form-control" name="host" value="localhost" placeholder="Database Host" required>
</div> </div>
</div> </div>
<hr> <hr>
<button type="submit" name="add_database" class="btn btn-primary">Save</button> <button type="submit" name="add_database" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
</form> </form>
</div> </div>
</div> </div>
<?php }elseif(isset($_GET['user'])){ ?> <?php }elseif(isset($_GET['user'])){ ?>
<div class="card mb-3"> <div class="card card-dark">
<div class="card-header"> <div class="card-header">
<h6 class="mt-1"><i class="fa fa-fw fa-user"></i> Create your first user</h6> <h3 class="card-title"><i class="fa fa-fw fa-user"></i> Create your first user</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<form class="p-3" method="post" enctype="multipart/form-data" autocomplete="off"> <form method="post" enctype="multipart/form-data" autocomplete="off">
<div class="form-group"> <div class="form-group">
<label>Name</label> <label>Name <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
@@ -438,7 +436,7 @@ if(isset($_POST['add_company_settings'])){
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Email</label> <label>Email <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
@@ -448,7 +446,7 @@ if(isset($_POST['add_company_settings'])){
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Password</label> <label>Password <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
@@ -456,27 +454,30 @@ if(isset($_POST['add_company_settings'])){
<input type="password" class="form-control" name="password" placeholder="Enter a Password" required> <input type="password" class="form-control" name="password" placeholder="Enter a Password" required>
</div> </div>
</div> </div>
<div class="form-group mb-5">
<div class="form-group">
<label>Avatar</label> <label>Avatar</label>
<input type="file" class="form-control-file" accept="image/*;capture=camera" name="file"> <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
</div> </div>
<hr> <hr>
<button type="submit" name="add_user" class="btn btn-primary">Save</button>
<button type="submit" name="add_user" class="btn btn-primary">Next <i class="fa fa-fw fa-arrow-circle-right"></i></button>
</form> </form>
</div> </div>
</div> </div>
<?php }elseif(isset($_GET['company'])){ ?> <?php }elseif(isset($_GET['company'])){ ?>
<div class="card mb-3"> <div class="card card-dark">
<div class="card-header"> <div class="card-header">
<h6 class="mt-1"><i class="fa fa-fw fa-building"></i> Company Settings</h6> <h3 class="card-title"><i class="fa fa-fw fa-building"></i> Company Details</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<form class="p-3" method="post" autocomplete="off"> <form method="post" enctype="multipart/form-data" autocomplete="off">
<div class="form-group"> <div class="form-group">
<label>Company Name</label> <label>Company Name <strong class="text-danger">*</strong></label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-building"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
@@ -575,14 +576,14 @@ if(isset($_POST['add_company_settings'])){
</div> </div>
</div> </div>
<div class="form-group mb-5"> <div class="form-group">
<label>Logo</label> <label>Logo</label>
<input type="file" class="form-control-file" name="file"> <input type="file" class="form-control-file" name="file">
</div> </div>
<hr> <hr>
<button type="submit" name="add_company_settings" class="btn btn-primary">Save</button> <button type="submit" name="add_company_settings" class="btn btn-primary">Finish and Login <i class="fa fa-fw fa-checkmark"></i></button>
</form> </form>
</div> </div>
@@ -590,29 +591,23 @@ if(isset($_POST['add_company_settings'])){
<?php }else{ ?> <?php }else{ ?>
<div class="card mb-3"> <div class="card card-dark">
<div class="card-header"> <div class="card-header">
<h6 class="mt-1"><i class="fa fa-fw fa-download"></i> Start Install <?php echo $database; ?></h6> <h3 class="card-title"><i class="fa fa-fw fa-box"></i> Welcome to ITFlow Setup</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<p>Click on the install button to start the install process, you must create a database before proceeding</p> <p>Click on the install button to start the install process, you must create a database before proceeding</p>
<p>This process will accomplish the following</p> <hr>
<ul class="mb-4"> <p>After install add cron.php to your cron and set it to run once everyday at 11:00PM. This is for tasks such as sending out recurring invoices, late payment reminders, alerts, etc</p>
<li>Create a config.php</li> <hr>
<li>Creates the following expense cataegories (Office Supplies, Advertising, Travel)</li> <p>An API is present to allow integration with other third pary apps. An API Key will be auto generated and can be changed in settings after install. The API will give you the following capabilities</p>
<li>Creates the following payment methods (Cash, Check)</li>
<li>Creates an account named Cash</li>
<li>Creates an income category</li>
</ul>
<p>After install add cron.php to your cron and set it to run once everyday at 11:00PM. This is so recurring invoices will automatically be sent out and created. This will also trigger late payment reminders, along with alerts such as domains expiration, etc.</p>
<p>An API is present to allow integration with other third pary apps. An API Key will be auto generated, and can be changed in settings after install. The API will give you the following capabilities</p>
<ul class="mb-4"> <ul class="mb-4">
<li>Address book XML for VOIP Phones</li> <li>Address book XML for VOIP Phones</li>
<li>Caller ID Lookup</li> <li>Caller ID Lookup</li>
<li>Get List of Emails in CSV to export to a mailing list</li> <li>Get List of Emails in CSV to export to a mailing list</li>
<li>Get Balance, can be useful for customer's to get balances by phone</li> <li>Acquire balance can be useful for customer's to get their balance by phone</li>
</ul> </ul>
<center><a href="?database" class="btn btn-lg btn-primary mb-5">Install</a></center> <center><a href="?database" class="btn btn-lg btn-primary p-5 mb-5"><i class="fa fa-fw fa-checkmark"></i><br><br>Install</a></center>
</div> </div>
</div> </div>