assets/coffee/slepe.coffee

@@ -1,41 +1,12 @@
 $(document).ready ->
-  $('.ticket-queue').on('click', (e) ->
-    handleQueueClick(e)
-  )
-  $('.ticket-severity').on('click', (e) ->
-    handleAttributeClick(e, 'severity')
-  )
-  $('.ticket-status').on('click', (e) ->
-    handleAttributeClick(e, 'status')
-  )
+  console.log('Hello, world!')
+
+  $('.ticket-severity').on('click', handleAttributeClick('severity'))
+  $('.ticket-status').on('click', handleAttributeClick('status'))
 
 validOptions =
-  'severity': ['low', 'medium', 'high'],
-  'status': ['open', 'closed', 'parked']
-
-handleQueueClick = (e, fail = false) ->
-  newQueueId = prompt('Set queue ID:', $('.ticket-queue').data('id'))
-  
-  if (newQueueId != null) and (newQueueId != '')
-    if (true)
-      console.log('Setting queue ID to ' + newQueueId)
-      editLink = $('#ticketEditLink').attr('href') + '/queue_id'
-      console.log('Sending data to ' + editLink)
-      $.ajax({
-        type: "POST",
-        url: editLink,
-        data:
-          'queue_id': newQueueId,
-        dataType: 'json',
-        success: (result) ->
-          $('.ticket-queue').data('id', newQueueId)
-          $('.ticket-queue > span').text(result.queue_name)
-          updateTicketModified(result.updated_at)
-          console.log('Ticket updated successfully.')
-      })
-    else
-      console.log('Invalid queue ID entered')
-      handleQueueClick(e, 'Invalid queue ID entered; you must enter a number.')
+  'severity' = ['low', 'medium', 'high'],
+  'status' = ['open', 'closed', 'parked']
 
 handleAttributeClick = (e, attr, fail = false) ->
   newValue = prompt('Set ticket ' + attr + ':', $('.ticket-' + attr + ' > span').text())
@@ -45,13 +16,12 @@ handleAttributeClick = (e, attr, fail = false) ->
     if (newValue in validOptions[attr])
       console.log('Setting ' + attr + ' to ' + newValue)
       editLink = $('#ticketEditLink').attr('href') + '/' + attr
-      postData = {}
-      postData[attr] = newValue
       console.log('Sending data to ' + editLink)
       $.ajax({
         type: "POST",
         url: editLink,
-        data: postData,
+        data:
+          attr: newValue,
         dataType: 'json',
         success: (result) ->
           newValue = newValue.charAt(0).toUpperCase() + newValue.slice(1)

assets/sass/darkmeyer.sass

@@ -81,16 +81,12 @@ input[type="submit"].button-primary
     height: 250px
     min-height: 100px
 
-#queue-header,
 #ticket-header
   margin-bottom: 15px
 
-  .queue-title,
   .ticket-title
     margin-bottom: 5px
 
-  .queue-created,
-  .queue-updated,
   .ticket-created,
   .ticket-updated
     margin-bottom: 3px
@@ -98,7 +94,6 @@ input[type="submit"].button-primary
     font-size: 1.5rem
     font-style: italic
 
-#queue-description,
 #ticket-body
   p:last-child
     margin-bottom: 5px
@@ -146,7 +141,6 @@ input[type="submit"].button-primary
           margin-right: 5px
           font-size: 2rem
 
-  .ticket-queue,
   .ticket-severity,
   .ticket-status
     transition: all 230ms ease-in-out

db/migrations/20221204223428_add_queue_table.php

@@ -1,35 +0,0 @@
-<?php
-declare(strict_types=1);
-
-use Phinx\Migration\AbstractMigration;
-
-final class AddQueueTable extends AbstractMigration
-{
-    /**
-     * Change Method.
-     *
-     * Write your reversible migrations using this method.
-     *
-     * More information on writing migrations is available here:
-     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
-     *
-     * Remember to call "create()" or "update()" and NOT "save()" when working
-     * with the Table class.
-     */
-    public function change()
-    {
-        // Create table for Queue objects
-        $table = $this->table('queues');
-        $table->addColumn('title', 'string', ['null' => false])
-            ->addColumn('description', 'text', ['null' => false])
-            ->addTimestamps()
-            ->addIndex(['title'])
-            ->create();
-
-        // Update tickets table to have a Queue ID field
-        $tickets = $this->table('tickets')
-            ->addColumn('queue_id', 'integer', ['null' => false])
-            ->addForeignKey('queue_id', 'queues', 'id', ['delete' => 'CASCADE', 'update' => 'CASCADE'])
-            ->update();
-    }
-}

src/Controllers/QueueController.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace BitGoblin\Goliath\Controllers;
-
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Routing\RouteContext;
-use Slim\Views\Twig;
-use BitGoblin\Goliath\Models\Queue;
-
-class QueueController extends Controller {
-
-  public function getView(Request $request, Response $response, array $args): Response {
-    $queue = Queue::where('id', $args['queue_id'])->first();
-
-    $view = Twig::fromRequest($request);
-    return $view->render($response, 'queue/view.twig', [
-      'queue' => $queue,
-    ]);
-  }
-
-  public function getCreate(Request $request, Response $response): Response {
-    $view = Twig::fromRequest($request);
-    return $view->render($response, 'queue/create.twig');
-  }
-
-  public function postCreate(Request $request, Response $response): Response {
-    $params = (array)$request->getParsedBody();
-
-    $queue = new Queue;
-    $queue->title = $params['queue_title'];
-    $queue->description = $params['queue_description'];
-
-    $queue->save();
-
-    // redirect the user back to the home page
-    $routeContext = RouteContext::fromRequest($request);
-    $routeParser = $routeContext->getRouteParser();
-    return $response
-      ->withHeader('Location', $routeParser->urlFor('queue.view', ['queue_id' => $queue->id]))
-      ->withStatus(302);
-  }
-
-}

src/Controllers/TicketController.php

@@ -6,7 +6,6 @@ use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\Routing\RouteContext;
 use Slim\Views\Twig;
-use BitGoblin\Goliath\Models\Queue;
 use BitGoblin\Goliath\Models\Ticket;
 
 class TicketController extends Controller {
@@ -21,12 +20,8 @@ class TicketController extends Controller {
   }
 
   public function getCreate(Request $request, Response $response): Response {
-    $queues = Queue::all();
-
     $view = Twig::fromRequest($request);
-    return $view->render($response, 'ticket/create.twig', [
-      'queues' => $queues,
-    ]);
+    return $view->render($response, 'ticket/create.twig');
   }
 
   public function postCreate(Request $request, Response $response): Response {
@@ -36,7 +31,6 @@ class TicketController extends Controller {
     $ticket->title = $params['ticket_title'];
     $ticket->body = $params['ticket_body'];
     $ticket->severity = $params['ticket_severity'];
-    $ticket->queue_id = $params['ticket_queue'];
     $ticket->due_at = $params['ticket_due'];
 
     $ticket->save();
@@ -87,17 +81,11 @@ class TicketController extends Controller {
     // save updated ticket
     $ticket->save();
 
-    // build JSON response
-    $jsonResponse = [
+    // return a response
+    $response->getBody()->write(json_encode([
       'result' => 'success',
       'updated_at' => $ticket->formatUpdatedAt(),
-    ];
-    if ($attr == 'queue_id') {
-      $jsonResponse['queue_name'] = $ticket->queue->title;
-    }
-
-    // return a response
-    $response->getBody()->write(json_encode($jsonResponse));
+    ]));
     return $response;
   }
 

src/Models/Queue.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace BitGoblin\Goliath\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use League\CommonMark\CommonMarkConverter;
-
-class Queue extends Model {
-
-  protected $fillable = [
-    'title',
-    'description',
-  ];
-
-  public function tickets() {
-    return $this->hasMany(Ticket::class);
-  }
-
-  public function render(): string {
-    $converter = new CommonMarkConverter([
-      'html_input' => 'strip',
-      'allow_unsafe_links' => false,
-    ]);
-
-    return $converter->convert($this->description);
-  }
-
-  public function formatCreatedAt(): string {
-    return date_format(date_create($this->created_at), "F jS\\, Y \\a\\t g:i:s a");
-  }
-
-  public function formatUpdatedAt(): string {
-    return date_format(date_create($this->updated_at), "F jS\\, Y \\a\\t g:i:s a");
-  }
-
-}

src/Models/Ticket.php

@@ -14,14 +14,6 @@ class Ticket extends Model {
     'due_at',
   ];
 
-  public function queue() {
-    return $this->belongsTo(Queue::class);
-  }
-
-  public function comments() {
-    return $this->hasMany(Comment::class);
-  }
-
   public function render(): string {
     $converter = new CommonMarkConverter([
       'html_input' => 'strip',
@@ -31,6 +23,10 @@ class Ticket extends Model {
     return $converter->convert($this->body);
   }
 
+  public function comments() {
+    return $this->hasMany(Comment::class);
+  }
+
   public function formatCreatedAt(): string {
     return date_format(date_create($this->created_at), "F jS\\, Y \\a\\t g:i:s a");
   }

src/routes.php

@@ -7,13 +7,6 @@ use Slim\Views\Twig;
 // index GET route - this page should welcome the user and direct them to the available actions
 $app->get('/', '\\BitGoblin\\Goliath\\Controllers\\HomeController:getIndex')->setName('index');
 
-// /queue/create routes - allows a user to fill out a form to create a new queue
-$app->get('/queue/create', '\\BitGoblin\\Goliath\\Controllers\\QueueController:getCreate')->setName('queue.create');
-$app->post('/queue/create', '\\BitGoblin\\Goliath\\Controllers\\QueueController:postCreate');
-
-// /queue/id route - displays queue info to user
-$app->get('/queue/{queue_id}', '\\BitGoblin\\Goliath\\Controllers\QueueController:getView')->setName('queue.view');
-
 // /ticket/create routes - allows a user to fill out a form to create a ticket
 $app->get('/ticket/create', '\\BitGoblin\\Goliath\\Controllers\\TicketController:getCreate')->setName('ticket.create');
 $app->post('/ticket/create', '\\BitGoblin\\Goliath\\Controllers\\TicketController:postCreate');

views/layout.twig

@@ -16,8 +16,7 @@
       <ul class="nav-menu">
         <li>Goliath</li>
         <li class="nav-link"><a href="{{ url_for('index') }}">Home</a></li>
-        <li class="nav-link"><a href="{{ url_for('queue.create') }}">New Queue</a></li>
-        <li class="nav-link"><a href="{{ url_for('ticket.create') }}">New Ticket</a></li>
+        <li class="nav-link"><a href="{{ url_for('ticket.create') }}">Create</a></li>
         <li class="nav-link"><a href="/search">Search</a></li>
       </ul>
     </div>

views/queue/create.twig

@@ -1,29 +0,0 @@
-{% extends 'layout.twig' %}
-
-{% block title %}Create New Queue{% endblock %}
-
-{% block content %}
-  <div class="row">
-    <div class="columns twelve">
-      <h1>Create new queue</h1>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="columns twelve">
-      <form id="queue-form" action="/queue/create" method="POST" class="u-full-width">
-        <div class="row">
-          <div class="twelve columns">
-            <label for="queue_title">Title</label>
-            <input id="queue_title" class="u-full-width" type="text" placeholder="My new queue" name="queue_title">
-          </div>
-        </div>
-
-        <label for="queue_description">Description</label>
-        <textarea id="queue_description" class="u-full-width" placeholder="Explain what this queue is about..." name="queue_description"></textarea>
-
-        <input class="button-primary u-full-width" type="submit" value="Submit">
-      </form>
-    </div>
-  </div>
-{% endblock %}

views/queue/view.twig

@@ -1,44 +0,0 @@
-{% extends 'layout.twig' %}
-
-{% block title %}Ticket Queue: {{ queue.title }}{% endblock %}
-
-{% block content %}
-  <!-- queue content -->
-  <div class="row">
-    <div class="twelve columns">
-      <div id="queue-header" class="row">
-        <div class="columns twelve">
-          <h1 class="queue-title">{{ queue.title }}</h1>
-          <h4 class="queue-created">Created at: <span>{{ queue.formatCreatedAt() }}</span></h4>
-          <h4 class="queue-updated">Last updated at:  <span>{{ queue.formatUpdatedAt() }}</span></h4>
-        </div>
-      </div>
-
-      <div id="queue-description" class="row">
-        <div class="columns twelve">
-          {{ queue.render() | raw }}
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <hr>
-
-  <!-- queue tickets -->
-  <div class="row">
-    <div class="twelve columns">
-      <ul id="queue-list" class="row">
-        <h3>Tickets in this queue:</h3>
-        {% if queue.tickets | length > 0 %}
-          {% for ticket in queue.tickets %}
-            <li>
-              <a href="{{ url_for('ticket.view', { ticket_id: ticket.id }) }}">{{ ticket.title }}</a>
-            </li>
-          {% endfor %}
-        {% else %}
-          <p>There are no tickets in this queue.</p>
-        {% endif %}
-      </ul>
-    </div>
-  </div>
-{% endblock %}

views/ticket/create.twig

@@ -17,19 +17,11 @@
             <label for="ticket_title">Title</label>
             <input id="ticket_title" class="u-full-width" type="text" placeholder="My new ticket" name="ticket_title">
           </div>
-          <div class="two columns">
-            <label for="ticket_queue">Queue</label>
-            <select name="ticket_queue" id="ticket_queue" class="u-full-width">
-              {% for q in queues %}
-                <option value="{{ q.id }}">{{ q.title }}</option>
-              {% endfor %}
-            </select>
-          </div>
-          <div class="two columns">
+          <div class="columns three">
             <label for="ticket_due">Due at</label>
             <input id="ticket_due" class="u-full-width" type="datetime-local" name="ticket_due">
           </div>
-          <div class="two columns">
+          <div class="three columns">
             <label for="ticket_severity">Severity level</label>
             <select id="ticket_severity" class="u-full-width" name="ticket_severity">
               <option value="low">Low</option>

views/ticket/view.twig

@@ -29,9 +29,6 @@
             <li><a id="ticketEditLink" href="{{ url_for('ticket.edit', {ticket_id: ticket.id}) }}"><i class="fa-solid fa-pen-to-square"></i>Edit</a></li><li><a href="{{ url_for('ticket.delete', {ticket_id: ticket.id}) }}"><i class="fa-solid fa-trash"></i>Delete</a></li>
           </ul>
         </li>
-        <li class="ticket-queue" data-id="{{ ticket.queue.id }}">
-          Queue: <span>{{ ticket.queue.title }}</span>
-        </li>
         <li class="ticket-severity">
           Severity: <span>{{ ticket.severity | capitalize }}</span>
         </li>