Fixed associating benchmarks to test

.air.toml

@@ -1,21 +0,0 @@
-[build]
-  # Tell Air to use your Makefile build target directly!
-  cmd = "make build BUILD_DIR=/tmp"
-
-  # Tell Air where your compiled binary ends up
-  bin = "/tmp/blt"
-
-  # Watch these extensions and ignore these paths
-  include_ext = ["go", "tpl", "tmpl", "html"]
-  exclude_dir = ["assets", "tmp", "bin", "node_modules", "public"]
-
-  # Delay before rebuilding after a file save (ms)
-  delay = 500
-
-[log]
-  time = false
-
-[color]
-  main = "magenta"
-  build = "yellow"
-  runner = "green"

.gitignore

@@ -3,12 +3,4 @@ blt
 
 # Local data files
 data/
-tmp/
-
-# Compiled assets
-public/css/
-public/js/
-
-# Node modules
-node_modules/
 

.woodpecker.yml

@@ -1,35 +0,0 @@
-when:
-  event: push
-
-steps:
-  build:
-    image: golang:1.22
-    commands:
-      - go mod vendor
-      - GOOS=linux GOARCH=amd64 go build -o "dist/blt-linux-amd64-${CI_COMMIT_TAG}.bin"
-      - GOOS=windows GOARCH=amd64 go build -o "dist/blt-windows-amd64-${CI_COMMIT_TAG}.exe"
-
-  assets:
-    image: node:24
-    commands:
-      - npm install
-      - npm run grunt build
-
-  package:
-    image: alpine
-    commands:
-      - tar -cvzf "dist/blt-assets-${CI_COMMIT_TAG}.tar.gz" public/
-    when:
-      event: tag
-
-  gitea_release:
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: gitea_api_key
-      base_url: https://git.metaunix.net
-      title: "${CI_COMMIT_TAG}"
-      files:
-        - dist/blt-*
-    when:
-      event: tag

Dockerfile.dev

@@ -1,21 +0,0 @@
-FROM golang:1.26
-
-WORKDIR /app
-
-RUN apt install -y make gcc
-
-# Make sure /app is safe regardless of who owns it
-RUN git config --global --add safe.directory /app
-
-ENV CGO_ENABLED=1
-
-# Install Air for auto-reloading
-RUN go install github.com/air-verse/air@latest
-
-# Copy dependency definitions first (caching optimization)
-COPY go.mod go.sum ./
-RUN go mod download
-
-COPY . .
-
-RUN make build BUILD_DIR=/tmp

Dockerfile.grunt

@@ -1,11 +0,0 @@
-# Node.js runtime
-FROM node:24
-
-WORKDIR /var/www/html/
-
-COPY package.* /var/www/html/
-
-RUN npm install
-
-# Run the app
-CMD [ "npm", "run", "grunt" ]

Gruntfile.js

@@ -1,67 +0,0 @@
-module.exports = function(grunt) {
-
-  // Project configuration.
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-
-    sass: {
-      dist: {
-        options: {
-          style: 'compressed'
-        },
-        files: [{
-          expand: true,
-          cwd: 'assets/styles',
-          src: ['**/*.sass'],
-          dest: 'public/css',
-          ext: '.css'
-        }]
-      }
-    },
-
-    coffee: {
-      options: {
-        sourceMap: true,
-        style: 'compressed'
-      },
-      files: {
-        expand: true,
-        flatten: true,
-        cwd: 'assets/scripts',
-        src: ['*.coffee'],
-        dest: 'public/js',
-        ext: '.js'
-      }
-    },
-
-    watch: {
-      css: {
-        files: ['assets/styles/**/*.sass'],
-        tasks: ['sass'],
-        options: {
-          atBegin: true,
-          spawn: false
-        }
-      },
-      js: {
-        files: ['assets/scripts/**/*.coffee'],
-        tasks: ['coffee'],
-        options: {
-          atBegin: true,
-          spawn: false
-        }
-      }
-    }
-  });
-
-  // Load plugins.
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-sass');
-  grunt.loadNpmTasks('grunt-contrib-coffee');
-
-  // CLI tasks.
-  grunt.registerTask('build', ['sass', 'coffee']);
-  grunt.registerTask('dev', ['watch']);
-  grunt.registerTask('default', ['build']);
-
-};

LICENSE

@@ -1,9 +0,0 @@
-Copyright (c) 2023 Bit Goblin
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,28 +1,35 @@
 NAME=blt
 VERSION=`git describe --tags`
 
-# used for changing the output directory within docker containers
-BUILD_DIR ?= .
-
-dev-up:
-	docker compose -f docker-dev.yml up -d
-
-dev-down:
-	docker compose -f docker-dev.yml down
-
-dev-build:
-	docker compose -f docker-dev.yml build
-
+.PHONY: build
+## build: Compile the packages.
 build:
-	@echo "Building Go binary..."
-	@go build -o $(BUILD_DIR)/$(NAME) -ldflags "-X git.metaunix.net/bitgoblin/blt/app.AppVersion=$(VERSION)"
+	@go build -o $(NAME) -ldflags "-X git.metaunix.net/bitgoblin/blt/app.Version=$(VERSION)"
 
-run:
-	$(BUILD_DIR)/$(NAME)
+.PHONY: run
+## run: Build and Run in development mode.
+run: build
+	@./$(NAME) -e development
 
-watch:
-	@echo "Starting hot-reload watcher..."
-	@air
+.PHONY: run-prod
+## run-prod: Build and Run in production mode.
+run-prod: build
+	@./$(NAME) -e production
+
+.PHONY: clean
+## clean: Clean project and previous builds.
+clean:
+	@rm -f $(NAME)
+
+.PHONY: deps
+## deps: Download modules
+deps:
+	@go mod download
+
+.PHONY: test
+## test: Run tests with verbose mode
+test:
+	@go test -v ./tests/*
 
 .PHONY: help
 all: help

README.md

@@ -1,54 +0,0 @@
-# Benchmark Logging Tool (BLT)
-
-![Build badge](https://builds.metaunix.net/api/badges/87/status.svg)
-
-Web-based tool to store and organize PC hardware benchmarks.
-
-## Project Goals
-
-The goals of this project are to:
-
-* Record benchmarking results from multiple devices - e.g. log from a laptop or a phone.
-* Group results into tests to keep track of different testing configurations.
-* Encourage running tests multiple times - it's good practice to run a benchmark multiple times for accuracy.
-* Create comparisons of hardware tests to compare performance.
-* Generate graphs of hardware comparisons for usage in videos and articles.
-
-## Requirements
-
-BLT runs on Go. It uses the built-in `go mod` tool to manage dependencies, thus there is no external tooling to install to build/run BLT.
-
-Debian/Ubuntu: `apt install -y golang`
-RedHat and clones: `dnf install -y golang`
-
-## Production Deployment
-
-**TODO**
-
-## Development
-
-### Via Docker
-
-**TODO**
-
-### Local/Native Development
-
-BLT uses [fresh](https://github.com/gravityblast/fresh) to auto-reload the app. While this is not strictly necessary, it used to make development more convenient. If you wish to forego installing it, you may simply build and run the app with the standard `go run main.go`.
-
-1. Install dependencies:
-
-`go mod download`
-
-2. Install fresh to auto-reload the app:
-
-`go install github.com/gravityblast/fresh@latest`
-
-3. Run the app via air:
-
-`fresh`
-
-4. If everything is running successfully you can open your browser and go to http://localhost:2830.
-
-## License
-
-This project is available under the BSD 2-Clause license.

app/vars.go

@@ -1,15 +1,5 @@
 package app
 
-import (
-  "runtime"
-)
-
 var (
-  AppVersion string = "N/a"
-  RuntimeVersion string = runtimeVersion()
+  Version string = "N/a"
 )
-
-func runtimeVersion() string {
-  raw_string := runtime.Version()
-  return raw_string[2:]
-}

assets/scripts/kebos.coffee

@@ -1,7 +0,0 @@
-root = if typeof window isnt 'undefined' then window else global
-
-root.roundDecimal = (value) ->
-  return Math.round(value * 100) / 100
-
-$ ->
-  console.log('DOM is ready.')

assets/scripts/test.coffee

@@ -1,62 +0,0 @@
-testId = $('#results-table').data('test-id')
-
-$ ->
-	$('#result-form').on 'submit', (e) ->
-		e.preventDefault()
-
-		form = $(this)
-		formData = $(this).serialize()
-		benchmarkId = $(this).find('[name="result_benchmark"]').val()
-
-		$.post '/api/v1/result/add', formData, (response) ->
-			if response == 'success'
-				fetchTestBenchmarkResults(testId, benchmarkId)
-				form[0].reset()
-
-fetchTestBenchmarkResults = (testId, benchmarkId) ->
-	try
-		benchmarkSearchParams = new URLSearchParams
-			benchmark_id: benchmarkId
-		benchmarkRes = await fetch("/api/v1/benchmark/details?#{benchmarkSearchParams}")
-		benchmarkData = await benchmarkRes.json()
-
-		resultSearchParams = new URLSearchParams
-			test_id: testId
-			benchmark_id: benchmarkId
-		resultRes = await fetch("/api/v1/result/list?#{resultSearchParams}")
-		resultData = await resultRes.json()
-
-		avg_total = 0
-		min_total = 0
-		max_total = 0
-
-		for result in resultData
-			avg_total += result.AverageScore
-			min_total += result.MinimumScore if result.MinimumScore
-			max_total += result.MaximumScore if result.MaximumScore
-
-		tableRow = $("#results-table tr[data-benchmark-id=#{benchmarkId}]")
-		tableRow.empty()
-
-		tableRow.append('<td><a href="/benchmark/' + benchmarkData.ID + '">' + benchmarkData.Name + '</a></td>')
-		tableRow.append('<td>' + benchmarkData.ScoringType + '</td>')
-		tableRow.append('<td>' + resultData.length + '</td>')
-
-		if resultData.length != 0
-			tableRow.append('<td>' + roundDecimal(avg_total / resultData.length) + '</td>')
-		else
-			tableRow.append('<td>N/a</td>')
-
-		if min_total != 0
-			tableRow.append('<td>' + roundDecimal(min_total / resultData.length) + '</td>')
-			tableRow.append('<td>' + roundDecimal(max_total / resultData.length) + '</td>')
-		else
-			tableRow.append('<td>N/a</td>')
-			tableRow.append('<td>N/a</td>')
-	catch error
-		console.error 'An error occurred while fetching benchmark results.', error
-
-$('#results-table tbody tr').each (index, tr) ->
-	benchmarkId = $(tr).data('benchmark-id')
-	console.log("Fetching results for benchmark id: " + benchmarkId)
-	fetchTestBenchmarkResults(testId, benchmarkId)

assets/styles/kourend.sass

@@ -1,122 +0,0 @@
-$primary-color: #ff3300
-$primary-color-dark: darken($primary-color, 10%)
-
-@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap')
-html,
-body
-  width: 100%
-  height: 100%
-  margin: 0
-  padding: 0
-
-body
-  height: auto
-  min-height: 100%
-  box-sizing: border-box
-  padding-top: 80px
-  padding-bottom: 100px
-  background: #eee
-  font-family: "Roboto", sans-serif
-  font-optical-sizing: auto
-
-a
-  color: $primary-color
-  transition: color 180ms ease-in-out
-  &:hover
-    color: $primary-color-dark
-
-button.button-primary,
-input[type=button].button-primary,
-input[type=submit].button-primary
-  background: $primary-color
-  transition: background 180ms ease-in-out
-  &:hover
-    background: $primary-color-dark
-
-textarea
-  max-width: 100%
-  min-width: 100%
-  height: 100px
-
-
-form select[multiple]
-  min-height: 100px
-
-table
-  border: 1px solid #ddd
-  border-radius: 8px
-  border-spacing: 0
-  overflow: hidden
-
-table th,
-table td,
-table th:first-child,
-table td:first-child
-  border: none
-  padding: 7px 12px
-
-table thead tr
-  border-radius: 8px 8px 0 0
-  &:last-child
-    border-radius: 0 0 8px 8px
-
-table thead tr,
-table tr:nth-child(even)
-  background: #eee
-
-table tbody tr
-  transition: background 180ms ease-in-out
-  &:hover
-    background: #d8d8d8
-
-.container
-  max-width: 1200px
-
-#main-nav
-  position: fixed
-  top: 0
-  left: 0
-  width: 100%
-  height: 64px
-  background: $primary-color
-  color: white
-  z-index: 20
-
-  ul
-    list-style: none
-    display: inline-block
-
-    li
-      display: inline-block
-      margin-left: 15px
-
-  h4
-    display: inline-block
-    margin-left: 25px
-    line-height: 64px
-
-  a
-    color: white
-    text-decoration: none
-    font-size: 2.25rem
-    line-height: 64px
-    transition: all 200ms ease-in-out
-    &:hover
-      color: #eee
-
-#main-content
-  padding: 15px 25px
-  background: white
-  border-radius: 8px
-  z-index: 10
-
-#main-footer
-  position: fixed
-  bottom: 0
-  left: 0
-  width: 100%
-  height: 64px
-
-  p
-    margin-bottom: 5px
-    text-align: center

docker-dev.yml

@@ -1,32 +0,0 @@
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile.dev
-    command: make watch
-    ports:
-      - "2830:2830"
-    volumes:
-      - .:/app # Mounts local directory for hot-reloading/live edits
-      - go-modules:/go/pkg/mod # Caches Go modules on host
-      # Mount the compiled static assets generated by Grunt
-      - static-assets:/app/public
-    environment:
-      - APP_ENV=development
-  assets:
-    build:
-      context: .
-      dockerfile: Dockerfile.grunt
-    # Override CMD to run watch mode during local dev
-    command: npm run grunt watch
-    volumes:
-      # Mount host code so Grunt detects file changes in real time
-      - .:/var/www/html
-      # Preserve container node_modules from being overwritten by host
-      - /var/www/html/node_modules
-      # Output compiled assets into the shared volume
-      - static-assets:/var/www/html/public
-
-volumes:
-  go-modules:
-  static-assets:

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	gotemplate "html/template"
 	"log"
 	"net/http"
 
@@ -22,20 +21,8 @@ func main() {
 	// initialize database
 	models.Open()
 
-	// initialize base renderer
-	f.Use(flamego.Renderer())
-
 	// initialize templating engine
-	f.Use(template.Templater(template.Options{
-			FuncMaps: []gotemplate.FuncMap{
-				{
-					"contains": web.Contains,
-				},
-			},
-			Directory: "templates",
-			Extensions: []string{".tmpl", ".html"},
-		},
-	))
+	f.Use(template.Templater())
 
 	// inject custom middleware
 	f.Use(middleware.CustomVars)
@@ -44,6 +31,6 @@ func main() {
 	web.RegisterRoutes(f)
 
 	// alert the user and start the server
-	log.Println("Server is listening on 0.0.0.0:2830.")
+	log.Println("Server is running...")
 	log.Println(http.ListenAndServe("0.0.0.0:2830", f))
 }

models/Benchmark_profile.go

@@ -1,27 +0,0 @@
-package models
-
-import (
-  "strconv"
-
-  "gorm.io/gorm"
-)
-
-type BenchmarkProfile struct {
-  gorm.Model
-  Label       string
-  Settings    string
-
-  // belongs to Benchmark
-  BenchmarkID int
-  Benchmark   Benchmark
-
-  // many-to-many with tests
-  Tests       []Test    `gorm:"many2many:tests_benchmark_profiles;"`
-
-  // has many results
-  Results     []Result
-}
-
-func (b *BenchmarkProfile) StringID() string {
-  return strconv.Itoa(int(b.ID))
-}

models/benchmark.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-  "strconv"
-
   "gorm.io/gorm"
 )
 
@@ -12,10 +10,6 @@ type Benchmark struct {
   ScoringType string
   Description string
 
-  // one-to-many BenchmarkProfiles
-  BenchmarkProfiles []BenchmarkProfile
-}
-
-func (b *Benchmark) StringID() string {
-  return strconv.Itoa(int(b.ID))
+  // many-to-many test
+  Tests[]     Test    `gorm:"many2many:tests_benchmarks;"`
 }

models/init.go

@@ -21,6 +21,6 @@ func Open() {
   }
 
   // Migrate the schema
-  DB.AutoMigrate(&Test{}, &Hardware{}, &Benchmark{}, &Result{})
+  DB.AutoMigrate(&Test{}, &Hardware{}, &Benchmark{})
   log.Println("Database migrations complete.")
 }

models/result.go

@@ -1,20 +0,0 @@
-package models
-
-import (
-  "gorm.io/gorm"
-)
-
-type Result struct {
-  gorm.Model
-  AverageScore float32
-  MinimumScore float32
-  MaximumScore float32
-
-  // belongs to Benchmark
-  BenchmarkProfileID  int
-  BenchmarkProfile    BenchmarkProfile
-
-  // belongs to Test
-  TestID       int
-  Test         Test
-}

models/test.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-  "strconv"
-
   "gorm.io/gorm"
 )
 
@@ -15,30 +13,6 @@ type Test struct {
   HardwareID    int
   Hardware      Hardware
 
-  // many-to-many benchmark profiles
-  BenchmarkProfiles []Benchmark `gorm:"many2many:tests_benchmark_profiles;"`
-
-  // has many results
-  Results       []Result
-}
-
-func (t *Test) SelectedBenchmarks() []string {
-  benchmarks := t.BenchmarkProfiles
-  ids := make([]string, len(benchmarks))
-  for i, b := range benchmarks {
-    ids[i] = strconv.Itoa(int(b.ID))
-  }
-  return ids
-}
-
-func (t *Test) IsBenchmarkSelected(benchmarkID uint) bool {
-  benchmarkUint := uint(benchmarkID)
-
-  for _, b := range t.BenchmarkProfiles {
-    if b.ID == benchmarkUint {
-      return true
-    }
-  }
-
-  return false
+  // many-to-many benchmarks
+  Benchmarks[]  Benchmark `gorm:"many2many:tests_benchmarks;"`
 }

package.json

@@ -1,36 +0,0 @@
-{
-  "name": "blt",
-  "version": "0.1.0",
-  "description": "Self-hosted PC hardware benchmark logging tool",
-  "main": "index.js",
-  "scripts": {
-    "grunt": "grunt",
-    "nodemon": "nodemon"
-  },
-  "repository": {
-    "type": "git",
-    "url": "gitea@git.metaunix.net:BitGoblin/blt.git"
-  },
-  "keywords": [
-    "hardware",
-    "benchmark",
-    "testing",
-    "PC"
-  ],
-  "author": "Gregory Ballanine <gballantine@bitgoblin.tech>",
-  "uploaders": [
-    {
-      "name": "Gregory Ballantine",
-      "email": "gballantine@bitgoblin.tech"
-    }
-  ],
-  "license": "BSD-2-Clause",
-  "devDependencies": {
-    "grunt": "^1.5.3",
-    "grunt-cli": "^1.4.3",
-    "grunt-contrib-coffee": "^2.1.0",
-    "grunt-contrib-sass": "^2.0.0",
-    "grunt-contrib-watch": "^1.1.0",
-    "sass": "^1.55.0"
-  }
-}

public/css/kourend.css

@@ -0,0 +1,87 @@
+html,
+body{
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+
+body{
+  height: auto;
+  min-height: 100%;
+  box-sizing: border-box;
+  padding-top: 80px;
+  padding-bottom: 80px;
+  background: #eee;
+}
+
+textarea{
+  max-width: 100%;
+  min-width: 100%;
+  height: 100px;
+}
+
+form select[multiple]{
+  min-height: 100px;
+}
+
+.container{
+  max-width: 1024px;
+}
+
+#main-nav{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 64px;
+  background: teal;
+  color: white;
+  z-index: 20;
+}
+
+#main-nav ul{
+  list-style: none;
+  display: inline-block;
+}
+#main-nav h4{
+  display: inline-block;
+  margin-left: 25px;
+  line-height: 64px;
+}
+#main-nav ul li{
+  display: inline-block;
+  margin-left: 15px;
+}
+
+#main-nav a{
+  color: white;
+  font-size: 2.25rem;
+  line-height: 64px;
+  transition: all 200ms ease-in-out;
+}
+#main-nav a:hover{
+  color: #eee;
+  font-size: 2.5rem;
+}
+
+#main-content{
+  padding: 14px 20px;
+  background: white;
+  border-radius: 8px;
+  z-index: 10;
+}
+
+#main-footer{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 64px;
+
+}
+
+#main-footer p{
+  margin-bottom: 5px;
+  text-align: center;
+}

templates/benchmark/edit.tmpl

@@ -1,38 +0,0 @@
-{{ template "header" . }}
-
-<div class="row">
-  <h2>Editing Benchmark: {{ .benchmark.Name }}</h2>
-
-  <form class="twelve columns" action="/benchmark/{{ .benchmark.ID }}/edit" method="POST">
-    <div class="row">
-      <div class="nine columns">
-        <label for="benchmark_name">
-          Benchmark name:
-          <input id="benchmark_name" class="u-full-width" type="text" name="benchmark_name" placeholder="Unigine Heaven" value="{{ .benchmark.Name }}">
-        </label>
-      </div>
-
-      <div class="three columns">
-        <label for="benchmark_scoring">
-          Benchmark type:
-          <select id="benchmark_scoring" class="u-full-width" name="benchmark_scoring">
-            <option value="fps" {{ if eq .benchmark.ScoringType "fps" }}selected{{ end }}>Frames per second</option>
-            <option value="ms" {{ if eq .benchmark.ScoringType "ms" }}selected{{ end }}>Frame time</option>
-            <option value="pts" {{ if eq .benchmark.ScoringType "pts" }}selected{{ end }}>Total points</option>
-          </select>
-        </label>
-      </div>
-    </div>
-
-    <div class="row">
-      <label for="benchmark_description">
-        Benchmark description:
-        <textarea id="benchmark_description" class="twelve columns" cols="30" rows="10" name="benchmark_description">{{ .benchmark.Description }}</textarea>
-      </label>
-    </div>
-
-    <input class="button-primary u-full-width" type="submit" value="Submit">
-  </form>
-</div>
-
-{{ template "footer" . }}

templates/benchmark/list.tmpl

@@ -1,7 +1,7 @@
 {{ template "header" . }}
 
 <div class="row">
-  <h2>List of benchmarks</h2>
+  <h2>Benchmark</h2>
   <a href="/benchmark/create">Add new benchmark</a>
 
   <table class="twelve columns">
@@ -16,8 +16,8 @@
       {{ range $b := .benchmarks }}
         <tr>
           <td><a href="/benchmark/{{ $b.ID }}">{{ $b.Name }}</a></td>
-          <td>{{ $b.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-          <td>{{ $b.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
+          <td>{{ $b.CreatedAt.Format "01/02/2006 15:04am" }}</td>
+          <td>{{ $b.UpdatedAt.Format "01/02/2006 15:04am" }}</td>
         </tr>
       {{ end }}
     </tbody>

templates/benchmark/profile/add.tmpl

@@ -1,47 +0,0 @@
-{{ template "header" . }}
-
-<div class="row">
-  <h2>Add benchmark settings profile</h2>
-
-  <form class="twelve columns" action="/benchmark/profile/add" method="POST">
-    <div class="row">
-      <div class="six columns">
-        <label for="benchmark_profile_benchmark">
-          Benchmark:
-          {{ if .benchmark }}
-            <select id="benchmark_profile_benchmark" class="u-full-width" disabled>
-              <option value="{{ .benchmark.ID }}">{{ .benchmark.Name }}</option>
-            </select>
-            <input type="hidden" name="benchmark_profile_benchmark" value="{{ .benchmark.ID }}">
-          {{ end }}
-
-          {{ if .benchmarks }}
-            <select id="benchmark_profile_benchmark" class="u-full-width" name="benchmark_profile_benchmark">
-              {{ range $benchmark := .benchmarks }}
-                <option value="{{ $benchmark.ID }}">{{ $benchmark.Name }}</option>
-              {{ end }}
-            </select>
-          {{ end }}
-        </label>
-      </div>
-
-      <div class="six columns">
-        <label for="benchmark_profile_label">
-          Profile label:
-          <input id="benchmark_profile_label" class="u-full-width" type="text" name="benchmark_profile_label" placeholder="My benchmark settings profile">
-        </label>
-      </div>
-    </div>
-
-    <div class="row">
-      <label for="benchmark_description">
-        Benchmark description:
-        <textarea id="benchmark_description" class="twelve columns" cols="30" rows="10" name="benchmark_description"></textarea>
-      </label>
-    </div>
-
-    <input class="button-primary u-full-width" type="submit" value="Submit">
-  </form>
-</div>
-
-{{ template "footer" . }}

templates/benchmark/view.tmpl

@@ -3,30 +3,8 @@
 <div class="row">
   <h2>{{ .benchmark.Name }}</h2>
 
-  <span><a href="/benchmark/{{ .benchmark.ID }}/edit">Edit</a></span>
-
   <p>{{ .benchmark.ScoringType }}</p>
 
-  <p>{{ .benchmark.Description }}</p>
-
-  <hr>
-
-  <h4>Profiles for this Benchmark</h4>
-
-  <p><a href="/benchmark/profile/add?benchmark={{ .benchmark.ID }}">Add settings profile</a></p>
-
-  <ul class="benchmark-profiles">
-    {{ range $profile := .benchmark.BenchmarkProfiles }}
-      <li>
-        {{ $profile.Label }}
-        <span>
-          <a href="/benchmark/profile/{{ $profile.ID }}/edit">Edit</a>
-          <a href="/benchmark/profile/{{ $profile.ID }}/delete">Delete</a>
-        </span>
-      </li>
-    {{ end }}
-  </ul>
-
   <hr>
 
   <h4>Latest Benchmark Results:</h4>

templates/hardware/edit.tmpl

@@ -1,34 +0,0 @@
-{{ template "header" . }}
-
-<div class="row">
-  <h2>Add new hardware</h2>
-
-  <form class="twelve columns" action="/hardware/{{ .hardware.ID }}/edit" method="POST">
-    <div class="row">
-      <div class="nine columns">
-        <label for="hardware_name">
-          Hardware name:
-          <input id="hardware_name" class="u-full-width" type="text" name="hardware_name" placeholder="EVGA RTX 3080 Ti" value="{{ .hardware.Name }}">
-        </label>
-      </div>
-
-      <div class="three columns">
-        <label for="hardware_type">
-          Hardware type:
-          <select id="hardware_type" class="u-full-width" name="hardware_type">
-            <option value="cpu" {{ if eq .hardware.Type "cpu" }}selected{{ end }}>Processor</option>
-            <option value="mem" {{ if eq .hardware.Type "mem" }}selected{{ end }}>Memory</option>
-            <option value="gpu" {{ if eq .hardware.Type "gpu" }}selected{{ end }}>Graphics Card</option>
-            <option value="ssd" {{ if eq .hardware.Type "ssd" }}selected{{ end }}>Solid State Drive</option>
-            <option value="hdd" {{ if eq .hardware.Type "hdd" }}selected{{ end }}>Hard Drive</option>
-            <option value="nic" {{ if eq .hardware.Type "nic" }}selected{{ end }}>Network Card</option>
-          </select>
-        </label>
-      </div>
-    </div>
-
-    <input class="button-primary u-full-width" type="submit" value="Submit">
-  </form>
-</div>
-
-{{ template "footer" . }}

templates/hardware/list.tmpl

@@ -1,7 +1,7 @@
 {{ template "header" . }}
 
 <div class="row">
-  <h2>List of hardware</h2>
+  <h2>Hardware</h2>
   <a href="/hardware/create">Add new hardware</a>
 
   <table class="twelve columns">
@@ -16,8 +16,8 @@
       {{ range $h := .hardware }}
         <tr>
           <td><a href="/hardware/{{ $h.ID }}">{{ $h.Name }}</a></td>
-          <td>{{ $h.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-          <td>{{ $h.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
+          <td>{{ $h.CreatedAt.Format "01/02/2006 15:04am" }}</td>
+          <td>{{ $h.UpdatedAt.Format "01/02/2006 15:04am" }}</td>
         </tr>
       {{ end }}
     </tbody>

templates/hardware/view.tmpl

@@ -3,36 +3,13 @@
 <div class="row">
   <h2>{{ .hardware.Name }}</h2>
 
-  <span><a href="/hardware/{{ .hardware.ID }}/edit">Edit</a></span>
-
   <p>{{ .hardware.Type }}</p>
 
   <hr>
 
-  <h4>Tests Using This Component:</h4>
+  <h4>Latest Benchmark Results:</h4>
 
-  {{ $length := len .hardware.Tests }} {{ if eq $length 0 }}
-    <p>There are currently no tests using this hardware component.</p>
-  {{ else }}
-    <table class="u-full-width">
-      <thead>
-        <tr>
-          <th>Test</th>
-          <th># of Benchmarks</th>
-          <th>Last Updated</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{ range $test := .hardware.Tests }}
-          <tr>
-            <td><a href="/test/{{ $test.ID }}">{{ $test.Name }}</a></td>
-            <td>{{ len $test.Benchmarks }}</td>
-            <td>{{ $test.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-          </tr>
-        {{ end }}
-      </tbody>
-    </table>
-  {{ end }}
+  <p>There are currently no benchmarks recorded using this hardware component.</p>
 
   <hr>
 

templates/index/dashboard.tmpl

@@ -2,79 +2,4 @@
 
 <p>This is the BLT dashboard.</p>
 
-<section class="row">
-  <h3>Recently updated tests:</h3>
-
-  <table class="twelve columns">
-    <thead>
-      <tr>
-        <td>Title</td>
-        <td>Created at</td>
-        <td>Last updated</td>
-      </tr>
-    </thead>
-    <tbody>
-      {{ range $p := .tests }}
-        <tr>
-          <td><a href="/test/{{ $p.ID }}">{{ $p.Name }}</a></td>
-          <td>{{ $p.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-          <td>{{ $p.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
-        </tr>
-      {{ end }}
-    </tbody>
-  </table>
-
-	<p>Visit the <a href="/test/list">tests</a> page to for more information and actions.</p>
-</section>
-
-<hr>
-
-<section class="row">
-  <div class="six columns">
-    <h3>Recently updated hardware:</h3>
-
-    <table class="u-full-width">
-      <thead>
-        <tr>
-          <td>Name</td>
-          <td>Created at</td>
-          <td>Last updated</td>
-        </tr>
-      </thead>
-      <tbody>
-        {{ range $h := .hardware }}
-          <tr>
-            <td><a href="/hardware/{{ $h.ID }}">{{ $h.Name }}</a></td>
-            <td>{{ $h.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-            <td>{{ $h.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
-          </tr>
-        {{ end }}
-      </tbody>
-    </table>
-  </div>
-
-  <div class="six columns">
-    <h3>Recently updated benchmarks:</h3>
-
-    <table class="u-full-width">
-      <thead>
-        <tr>
-          <td>Name</td>
-          <td>Created at</td>
-          <td>Last updated</td>
-        </tr>
-      </thead>
-      <tbody>
-        {{ range $b := .benchmarks }}
-          <tr>
-            <td><a href="/benchmark/{{ $b.ID }}">{{ $b.Name }}</a></td>
-            <td>{{ $b.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-            <td>{{ $b.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
-          </tr>
-        {{ end }}
-      </tbody>
-    </table>
-  </div>
-</section>
-
 {{ template "footer" . }}

templates/layout/footer.tmpl

@@ -3,7 +3,7 @@
 
   <!-- footer -->
   <nav id="main-footer">
-    <p>BLT version {{ .app_version }} | Built with Go {{ .runtime_version }}</p>
+    <p>BLT version {{ .app_version }}</p>
   </nav>
 
 </body>

templates/layout/header.tmpl

@@ -9,7 +9,6 @@
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/skeleton/2.0.4/skeleton.min.css">
   <link rel="stylesheet" href="/css/kourend.css">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" charset="utf-8"></script>
-  <script src="/js/kebos.js" charset="utf-8"></script>
 </head>
 <body>
 

templates/test/edit.tmpl

@@ -1,53 +0,0 @@
-{{ template "header" . }}
-
-<div class="row">
-  <h2>{{ .title }}</h2>
-
-  <form class="twelve columns" action="/test/{{ .test.ID }}/edit" method="POST">
-    <div class="row">
-      <div class="columns four">
-        <label for="test_hardware">
-          Hardware Component:
-          <select id="test_hardware" class="u-full-width" name="test_hardware">
-            {{ $testHardwareID := .test.Hardware.ID }}
-            {{ range $hw := .hardware }}
-              <option value="{{ $hw.ID }}" {{ if eq $testHardwareID $hw.ID }}selected{{ end }}>{{ $hw.Name }}</option>
-            {{ end }}
-          </select>
-        </label>
-      </div>
-
-      <div class="columns eight">
-        <label for="test_name">
-          Test name:
-          <input id="test_name" class="u-full-width" type="text" name="test_name" placeholder="My hardware benchmarking test" value="{{ .test.Name }}">
-        </label>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns twelve">
-        <label for="test_benchmarks">
-          Benchmarks to Test:
-          <select id="test_benchmarks" class="u-full-width" name="test_benchmarks" multiple>
-            {{ $selectedBenchmarks := .selectedBenchmarks }}
-            {{ range $bm := .benchmarks }}
-              <option value="{{ $bm.ID }}" {{ if contains $selectedBenchmarks $bm.StringID }}selected{{ end }}>{{ $bm.Name }}</option>
-            {{ end }}
-          </select>
-        </label>
-      </div>
-    </div>
-
-    <div class="row">
-      <label for="test_description">
-        Test description:
-        <textarea id="test_description" class="twelve columns" cols="30" rows="10" name="test_description"></textarea>
-      </label>
-    </div>
-
-    <input class="button-primary u-full-width" type="submit" value="Submit">
-  </form>
-</div>
-
-{{ template "footer" . }}

templates/test/list.tmpl

@@ -1,7 +1,7 @@
 {{ template "header" . }}
 
 <div class="row">
-  <h2>List of tests</h2>
+  <h2>Tests</h2>
   <a href="/test/create">Create a new test</a>
 
   <table class="twelve columns">
@@ -16,8 +16,8 @@
       {{ range $p := .tests }}
         <tr>
           <td><a href="/test/{{ $p.ID }}">{{ $p.Name }}</a></td>
-          <td>{{ $p.CreatedAt.Format "01/02/2006 3:04pm" }}</td>
-          <td>{{ $p.UpdatedAt.Format "01/02/2006 3:04pm" }}</td>
+          <td>{{ $p.CreatedAt.Format "01/02/2006 15:04am" }}</td>
+          <td>{{ $p.UpdatedAt.Format "01/02/2006 15:04am" }}</td>
         </tr>
       {{ end }}
     </tbody>

templates/test/view.tmpl

@@ -3,15 +3,11 @@
 <div class="row">
   <h2>{{ .test.Name }}</h2>
 
-  <span><a href="/test/{{ .test.ID }}/edit">Edit</a></span>
+  <p><a href="/hardware/{{ .test.Hardware.ID }}">link to hardware tested.</a></p>
 
   <p>{{ .test.Description }}</p>
 
-  <h4>Test Info:</h4>
-
-  <p>Hardware tested: <a href="/hardware/{{ .test.Hardware.ID }}">{{ .test.Hardware.Name }}</a></p>
-
-  <p>Benchmarks used:</p>
+  <h4>Benchmarks used:</h4>
 
   <ul>
     {{ range $bm := .test.Benchmarks }}
@@ -21,81 +17,13 @@
 
   <hr>
 
-  <h4>Add new result:</h4>
+  <h4>Latest Benchmark Results:</h4>
 
-  <form id="result-form" class="u-full-width" action="/result/add" method="POST">
-    <div class="row">
-      <div class="columns four">
-        <label for="result_benchmark">
-          Benchmark:
-          <select id="result_benchmark" class="u-full-width" name="result_benchmark">
-            {{ range $bm := .test.Benchmarks }}
-              <option value="{{ $bm.ID }}">{{ $bm.Name }}</option>
-            {{ end }}
-          </select>
-        </label>
-      </div>
-
-      <div class="columns two">
-        <label for="result_avg">
-          Average score:
-          <input id="result_avg" class="u-full-width" type="number" name="result_avg" step="0.01" placeholder="0.00">
-        </label>
-      </div>
-
-      <div class="columns two">
-        <label for="result_min">
-          Minimum score:
-          <input id="result_min" class="u-full-width" type="number" name="result_min" step="0.01" placeholder="0.00">
-        </label>
-      </div>
-
-      <div class="columns two">
-        <label for="result_max">
-          Maximum score:
-          <input id="result_max" class="u-full-width" type="number" name="result_max" step="0.01" placeholder="0.00">
-        </label>
-      </div>
-
-      <div class="columns two">
-        <button class="button-primary u-full-width" type="submit" name="button">Submit</button>
-      </div>
-
-      <input type="hidden" name="result_test" value="{{ .test.ID }}">
-    </div>
-  </form>
-
-  <hr>
-
-  <h4>Benchmark Results:</h4>
-
-  {{ $length := len .test.Benchmarks }} {{ if eq $length 0 }}
   <p>There are currently no benchmarks recorded in this test.</p>
-  {{ else }}
-    <table id="results-table" class="u-full-width card-2" data-test-id="{{ .test.ID }}">
-      <thead>
-        <tr>
-          <th>Benchmark</th>
-          <th>Scoring Type</th>
-          <th># of Results</th>
-          <th>Average</th>
-          <th>Minimum</th>
-          <th>Maximum</th>
-        </tr>
-      </thead>
-      <tbody>
-        {{ range $benchmark := .test.Benchmarks }}
-          <tr data-benchmark-id="{{ $benchmark.ID }}"></tr>
-        {{ end }}
-      </tbody>
-    </table>
-  {{ end }}
 
   <hr>
 
   <p><a href="/test">Back</a></p>
 </div>
 
-<script src="/js/test.js"></script>
-
 {{ template "footer" . }}

web/forms/benchmark_profile.go

@@ -1,7 +0,0 @@
-package forms
-
-type BenchmarkProfileForm struct {
-  BenchmarkID int    `form:"benchmark_profile_benchmark" validate:"required"`
-  Label       string `form:"benchmark_profile_label" validate:"required"`
-  Settings    string `form:"benchmark_profile_settings" validate:"required"`
-}

web/forms/result.go

@@ -1,9 +0,0 @@
-package forms
-
-type ResultForm struct {
-  Test              int     `form:"result_test" validate:"required"`
-  BenchmarkProfile  int     `form:"result_benchmark" validate:"required"`
-  AverageScore      float32 `form:"result_avg" validate:"required"`
-  MinimumScore      float32 `form:"result_min"`
-  MaximumScore      float32 `form:"result_max"`
-}

web/forms/test.go

@@ -4,15 +4,5 @@ type TestForm struct {
   Name        string    `form:"test_name" validate:"required"`
   Description string    `form:"test_description"`
   Hardware    int       `form:"test_hardware" validate:"required"`
-  BenchmarkProfiles []uint  `form:"test_benchmarks" validate:"required"`
-}
-
-func (t *TestForm) IsBenchmarkSelected(checkID uint) bool {
-  for _, selectedID := range t.BenchmarkProfiles {
-    if checkID == selectedID {
-      return true
-    }
-  }
-
-  return false
+  Benchmarks  []string  `form:"test_benchmarks" validate:"required"`
 }

web/helpers.go

@@ -1,10 +0,0 @@
-package web
-
-func Contains(slice []string, val string) bool {
-	for _, v := range slice {
-		if v == val {
-			return true
-		}
-	}
-	return false
-}

web/middleware/vars.go

@@ -7,6 +7,5 @@ import (
 )
 
 func CustomVars(data template.Data) {
-  data["app_version"] = app.AppVersion
-  data["runtime_version"] = app.RuntimeVersion
+  data["app_version"] = app.Version
 }

web/routes.go

@@ -24,9 +24,6 @@ func RegisterRoutes(f *flamego.Flame) {
     f.Post("/create", binding.Form(forms.HardwareForm{}), routes.HardwarePostCreate)
 
     f.Get("/{hardware_id}", routes.HardwareGetView)
-
-    f.Get("/{hardware_id}/edit", routes.HardwareGetEdit)
-    f.Post("/{hardware_id}/edit", binding.Form(forms.HardwareForm{}), routes.HardwarePostEdit)
   })
 
   // benchmark routes
@@ -41,14 +38,6 @@ func RegisterRoutes(f *flamego.Flame) {
     f.Post("/create", binding.Form(forms.BenchmarkForm{}), routes.BenchmarkPostCreate)
 
     f.Get("/{benchmark_id}", routes.BenchmarkGetView)
-
-    f.Get("/{benchmark_id}/edit", routes.BenchmarkGetEdit)
-    f.Post("/{benchmark_id}/edit", binding.Form(forms.BenchmarkForm{}), routes.BenchmarkPostEdit)
-
-    f.Group("/profile", func() {
-      f.Get("/add", routes.BenchmarkGetProfileAdd)
-      f.Post("/add", binding.Form(forms.BenchmarkProfileForm{}), routes.BenchmarkPostProfileAdd)
-    })
   })
 
   // test routes
@@ -62,33 +51,6 @@ func RegisterRoutes(f *flamego.Flame) {
     f.Get("/create", routes.TestGetCreate)
     f.Post("/create", binding.Form(forms.TestForm{}), routes.TestPostCreate)
 
-    f.Group("/{test_id}", func() {
-      f.Get("", routes.TestGetView)
-      f.Get("/edit", routes.TestGetEdit)
-      f.Post("/edit", binding.Form(forms.TestForm{}), routes.TestPostEdit)
-    })
-  })
-
-  // result routes
-  f.Group("/result", func() {
-    f.Post("/add", binding.Form(forms.ResultForm{}), routes.ResultPostCreate)
-  })
-
-  // API v1 routes
-  f.Group("/api", func () {
-    f.Group("/v1", func() {
-      f.Group("/benchmark", func() {
-        f.Get("/details", routes.ApiV1BenchmarkDetails)
-      })
-
-      f.Group("/benchmark_profile", func() {
-        f.Get("/details", routes.ApiV1BenchmarkProfileDetails)
-      })
-
-      f.Group("/result", func() {
-        f.Post("/add", binding.Form(forms.ResultForm{}), routes.ApiV1ResultAdd)
-        f.Get("/list", routes.ApiV1ResultList)
-      })
-    })
+    f.Get("/{test_id}", routes.TestGetView)
   })
 }

web/routes/api_v1.go

@@ -1,74 +0,0 @@
-package routes
-
-import (
-  "log"
-
-  "github.com/flamego/binding"
-  "github.com/flamego/flamego"
-  "github.com/flamego/validator"
-
-  "git.metaunix.net/bitgoblin/blt/models"
-  "git.metaunix.net/bitgoblin/blt/web/forms"
-)
-
-func ApiV1BenchmarkDetails(c flamego.Context, r flamego.Render) {
-  // find benchmark ID from request
-  benchmarkID := c.Query("benchmark_id")
-
-  // find benchmark from DB
-  var benchmark models.Benchmark
-  models.DB.First(&benchmark, benchmarkID)
-
-  // return JSON response
-  r.JSON(200, benchmark)
-}
-
-func ApiV1BenchmarkProfileDetails(c flamego.Context, r flamego.Render) {
-  // find benchmark ID from request
-  benchmarkProfileID := c.Query("benchmark_profile_id")
-
-  // find benchmark from DB
-  var benchmarkProfile models.BenchmarkProfile
-  models.DB.Preload("BenchmarkProfiles").First(&benchmarkProfile, benchmarkProfileID)
-
-  // return JSON response
-  r.JSON(200, benchmarkProfile)
-}
-
-func ApiV1ResultAdd(c flamego.Context, form forms.ResultForm, errs binding.Errors, r flamego.Render) {
-  if len(errs) > 0 {
-    var err error
-    switch errs[0].Category {
-    case binding.ErrorCategoryValidation:
-      err = errs[0].Err.(validator.ValidationErrors)[0]
-    default:
-      err = errs[0].Err
-    }
-    log.Fatal(err)
-  }
-
-  result := models.Result{
-    TestID: form.Test,
-    BenchmarkProfileID: form.BenchmarkProfile,
-    AverageScore: form.AverageScore,
-    MinimumScore: form.MinimumScore,
-    MaximumScore: form.MaximumScore,
-  }
-
-  _ = models.DB.Create(&result)
-
-  r.JSON(200, "success")
-}
-
-func ApiV1ResultList(c flamego.Context, r flamego.Render) {
-  // find benchmark and test IDs from request
-  benchmarkProfileID := c.Query("benchmark_id")
-  testID := c.Query("test_id")
-
-  // find results from the DB that match the benchmark and test
-  var results []models.Result
-  models.DB.Where("test_id = ? AND benchmark_profile_id = ?", testID, benchmarkProfileID).Find(&results)
-
-  // return JSON response
-  r.JSON(200, results)
-}

web/routes/benchmark.go

@@ -30,7 +30,7 @@ func BenchmarkGetView(c flamego.Context, t template.Template, data template.Data
 
   // find benchmark from DB
   var benchmark models.Benchmark
-  models.DB.Preload("BenchmarkProfiles").First(&benchmark, benchmarkID)
+  models.DB.First(&benchmark, benchmarkID)
   data["benchmark"] = benchmark
 
   data["title"] = benchmark.Name
@@ -64,77 +64,3 @@ func BenchmarkPostCreate(c flamego.Context, form forms.BenchmarkForm, errs bindi
 
   c.Redirect(fmt.Sprintf("/benchmark/%d", benchmark.ID))
 }
-
-func BenchmarkGetEdit(c flamego.Context, t template.Template, data template.Data) {
-  // find benchmark ID from request
-  benchmarkID := c.Param("benchmark_id")
-
-  // find benchmark from DB
-  var benchmark models.Benchmark
-  models.DB.First(&benchmark, benchmarkID)
-  data["benchmark"] = benchmark
-
-  data["title"] = "Editing Benchmark"
-  t.HTML(http.StatusOK, "benchmark/edit")
-}
-
-func BenchmarkPostEdit(c flamego.Context, form forms.BenchmarkForm, errs binding.Errors) {
-  if len(errs) > 0 {
-    var err error
-    switch errs[0].Category {
-    case binding.ErrorCategoryValidation:
-      err = errs[0].Err.(validator.ValidationErrors)[0]
-    default:
-      err = errs[0].Err
-    }
-    log.Fatal(err)
-  }
-
-  // find benchmark ID from request
-  benchmarkID := c.Param("benchmark_id")
-
-  // find benchmark from DB
-  var benchmark models.Benchmark
-  models.DB.First(&benchmark, benchmarkID)
-
-  benchmark.Name = form.Name
-  benchmark.ScoringType = form.ScoringType
-  benchmark.Description = form.Description
-
-  models.DB.Save(&benchmark)
-
-  c.Redirect(fmt.Sprintf("/benchmark/%d", benchmark.ID))
-}
-
-func BenchmarkGetProfileAdd(c flamego.Context, t template.Template, data template.Data) {
-  // find benchmark ID from GET parameters
-  benchmarkID := c.Query("benchmark")
-
-  // check if the query parameter was used
-  if benchmarkID != "" {
-    // find benchmark from DB
-    var benchmark models.Benchmark
-    models.DB.First(&benchmark, benchmarkID)
-    data["benchmark"] = benchmark
-  } else {
-    // find all benchmarks from DB
-    var benchmarks []models.Benchmark
-    models.DB.Find(&benchmarks)
-    data["benchmarks"] = benchmarks
-  }
-
-  data["title"] = "Add new benchmark settings profile"
-  t.HTML(http.StatusOK, "benchmark/profile/add")
-}
-
-func BenchmarkPostProfileAdd(c flamego.Context, form forms.BenchmarkProfileForm, errs binding.Errors) {
-  benchmarkProfile := models.BenchmarkProfile{
-    BenchmarkID: form.BenchmarkID,
-    Label: form.Label,
-    Settings: form.Settings,
-  }
-
-  _ = models.DB.Create(&benchmarkProfile)
-
-  c.Redirect(fmt.Sprintf("/benchmark/%d", form.BenchmarkID))
-}

web/routes/hardware.go

@@ -30,7 +30,7 @@ func HardwareGetView(c flamego.Context, t template.Template, data template.Data)
 
   // find hardware from DB
   var hardware models.Hardware
-  models.DB.Preload("Tests.Benchmarks").First(&hardware, hardwareID)
+  models.DB.First(&hardware, hardwareID)
   data["hardware"] = hardware
 
   data["title"] = hardware.Name
@@ -63,43 +63,3 @@ func HardwarePostCreate(c flamego.Context, form forms.HardwareForm, errs binding
 
   c.Redirect(fmt.Sprintf("/hardware/%d", hardware.ID))
 }
-
-func HardwareGetEdit(c flamego.Context, t template.Template, data template.Data) {
-  // find hardware ID from request
-  hardwareID := c.Param("hardware_id")
-
-  // find hardware from DB
-  var hardware models.Hardware
-  models.DB.Preload("Tests.Benchmarks").First(&hardware, hardwareID)
-  data["hardware"] = hardware
-
-  data["title"] = "Edit Hardware"
-  t.HTML(http.StatusOK, "hardware/edit")
-}
-
-func HardwarePostEdit(c flamego.Context, form forms.HardwareForm, errs binding.Errors) {
-  if len(errs) > 0 {
-    var err error
-    switch errs[0].Category {
-    case binding.ErrorCategoryValidation:
-      err = errs[0].Err.(validator.ValidationErrors)[0]
-    default:
-      err = errs[0].Err
-    }
-    log.Fatal(err)
-  }
-
-  // find hardware ID from request
-  hardwareID := c.Param("hardware_id")
-
-  // find hardware from DB
-  var hardware models.Hardware
-  models.DB.Preload("Tests.Benchmarks").First(&hardware, hardwareID)
-
-  hardware.Name = form.Name
-  hardware.Type = form.Type
-
-  models.DB.Save(&hardware)
-
-  c.Redirect(fmt.Sprintf("/hardware/%d", hardware.ID))
-}

web/routes/index.go

@@ -4,25 +4,9 @@ import (
   "net/http"
 
   "github.com/flamego/template"
-
-  "git.metaunix.net/bitgoblin/blt/models"
 )
 
 func GetDashboard(t template.Template, data template.Data) {
-  // add tests to template; limited to 10 most recent
-  var tests []models.Test
-  models.DB.Order("updated_at desc").Limit(10).Find(&tests)
-  data["tests"] = tests
-
-  // add hardwares to template; limited to 5 most recent
-  var hardware []models.Hardware
-  models.DB.Order("updated_at desc").Limit(5).Find(&hardware)
-  data["hardware"] = hardware
-  // add benchmarks to template; limited to 5 most recent
-  var benchmarks []models.Benchmark
-  models.DB.Order("updated_at desc").Limit(5).Find(&benchmarks)
-  data["benchmarks"] = benchmarks
-
   data["title"] = "Dashboard"
   t.HTML(http.StatusOK, "index/dashboard")
 }

web/routes/result.go

@@ -1,38 +0,0 @@
-package routes
-
-import (
-  "fmt"
-  "log"
-
-  "github.com/flamego/binding"
-  "github.com/flamego/flamego"
-  "github.com/flamego/validator"
-
-  "git.metaunix.net/bitgoblin/blt/models"
-  "git.metaunix.net/bitgoblin/blt/web/forms"
-)
-
-func ResultPostCreate(c flamego.Context, form forms.ResultForm, errs binding.Errors) {
-  if len(errs) > 0 {
-    var err error
-    switch errs[0].Category {
-    case binding.ErrorCategoryValidation:
-      err = errs[0].Err.(validator.ValidationErrors)[0]
-    default:
-      err = errs[0].Err
-    }
-    log.Fatal(err)
-  }
-
-  result := models.Result{
-    TestID:       form.Test,
-    BenchmarkProfileID:  form.BenchmarkProfile,
-    AverageScore: form.AverageScore,
-    MinimumScore: form.MinimumScore,
-    MaximumScore: form.MaximumScore,
-  }
-
-  _ = models.DB.Create(&result)
-
-  c.Redirect(fmt.Sprintf("/test/%d", result.TestID))
-}

web/routes/test.go

@@ -30,7 +30,7 @@ func TestGetView(c flamego.Context, t template.Template, data template.Data) {
 
   // find hardware from DB
   var test models.Test
-  models.DB.Preload("Hardware").Preload("Benchmarks").Preload("Results.Benchmark").First(&test, testID)
+  models.DB.Preload("Hardware").Preload("Benchmarks").First(&test, testID)
   data["test"] = test
 
   data["title"] = test.Name
@@ -73,82 +73,11 @@ func TestPostCreate(c flamego.Context, form forms.TestForm, errs binding.Errors)
   _ = models.DB.Create(&test)
 
   // bind benchmarks to test
-  for _, v := range form.BenchmarkProfiles {
+  for _, v := range form.Benchmarks {
     var benchmark models.Benchmark
     models.DB.First(&benchmark, v) // find benchmark
-    models.DB.Model(&test).Association("BenchmarkProfiles").Append(&benchmark)
+    models.DB.Model(&test).Association("Benchmarks").Append(&benchmark)
   }
 
   c.Redirect(fmt.Sprintf("/test/%d", test.ID))
 }
-
-func TestGetEdit(c flamego.Context, t template.Template, data template.Data) {
-  // find test in DB
-  testID := c.Param("test_id")
-  var test models.Test
-  models.DB.Preload("Hardware").Preload("BenchmarkProfiles").First(&test, testID)
-  data["test"] = test
-
-  // add hardware components to template
-  var hardware []models.Hardware
-  models.DB.Find(&hardware)
-  data["hardware"] = hardware
-
-  // add benchmarks to template
-  var benchmarks []models.Benchmark
-  models.DB.Find(&benchmarks)
-  data["benchmarks"] = benchmarks
-
-  // determine which benchmarks are selected in a test
-  selectedBenchmarks := test.SelectedBenchmarks()
-  data["selectedBenchmarks"] = selectedBenchmarks
-
-  data["title"] = fmt.Sprintf("Editing Test: %s", test.Name)
-  t.HTML(http.StatusOK, "test/edit")
-}
-
-func TestPostEdit(c flamego.Context, form forms.TestForm, errs binding.Errors) {
-  if len(errs) > 0 {
-    var err error
-    switch errs[0].Category {
-    case binding.ErrorCategoryValidation:
-      err = errs[0].Err.(validator.ValidationErrors)[0]
-    default:
-      err = errs[0].Err
-    }
-    log.Fatal(err)
-  }
-
-  // find test ID from request
-  testID := c.Param("test_id")
-
-  // find hardware from DB
-  var test models.Test
-  models.DB.Preload("Hardware").Preload("BenchmarkProfiles").First(&test, testID)
-
-  test.Name = form.Name
-  test.Description = form.Description
-  test.HardwareID = form.Hardware
-
-  // bind benchmarks to test that aren't already associated
-  for _, b := range form.BenchmarkProfiles {
-    if ! test.IsBenchmarkSelected(b) {
-      var benchmark models.BenchmarkProfile
-      models.DB.First(&benchmark, b) // find benchmark
-      models.DB.Model(&test).Association("BenchmarkProfiles").Append(&benchmark)
-    }
-  }
-
-  // removed associated benchmarks that weren't in the form
-  for _, b := range test.BenchmarkProfiles {
-    if ! form.IsBenchmarkSelected(b.ID) {
-      var benchmark models.BenchmarkProfile
-      models.DB.First(&benchmark, b) // find benchmark
-      models.DB.Model(&test).Association("BenchmarkProfiles").Delete(&benchmark)
-    }
-  }
-
-  models.DB.Save(&test)
-
-  c.Redirect(fmt.Sprintf("/test/%d", test.ID))
-}