Fixed typo in Gruntfile; added Make tasks to compile frontend assets; Modernized the gathering of benchmark result data for the test view

Adding license to project

Co-authored-by: Gregory Ballantine <gballantine@bitgoblin.tech>
Reviewed-on: #10

.gitignore

@@ -3,7 +3,6 @@ blt
 
 # Local data files
 data/
-tmp/
 
 # Compiled assets
 public/css/

.woodpecker.yml

@@ -1,32 +0,0 @@
-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

Gruntfile.js

@@ -60,8 +60,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-coffee');
 
   // CLI tasks.
-  grunt.registerTask('build', ['sass', 'coffee']);
+  grunt.registerTask('default', ['sass', 'coffee']);
-  grunt.registerTask('dev', ['watch']);
-  grunt.registerTask('default', ['build']);
 
 };

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.

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	gotemplate "html/template"
 	"log"
 	"net/http"
 
@@ -26,16 +25,7 @@ func main() {
 	f.Use(flamego.Renderer())
 
 	// initialize templating engine
-	f.Use(template.Templater(template.Options{
+	f.Use(template.Templater())
-			FuncMaps: []gotemplate.FuncMap{
-				{
-					"contains": web.Contains,
-				},
-			},
-			Directory: "templates",
-			Extensions: []string{".tmpl", ".html"},
-		},
-	))
 
 	// inject custom middleware
 	f.Use(middleware.CustomVars)

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,9 @@ type Benchmark struct {
   ScoringType string
   Description string
 
-  // one-to-many BenchmarkProfiles
+  // many-to-many test
-  BenchmarkProfiles []BenchmarkProfile
+  Tests       []Test    `gorm:"many2many:tests_benchmarks;"`
-}
 
-func (b *Benchmark) StringID() string {
+  // has many results
-  return strconv.Itoa(int(b.ID))
+  Results     []Result
 }

models/result.go

@@ -11,8 +11,8 @@ type Result struct {
   MaximumScore float32
 
   // belongs to Benchmark
-  BenchmarkProfileID  int
+  BenchmarkID  int
-  BenchmarkProfile    BenchmarkProfile
+  Benchmark    Benchmark
 
   // belongs to Test
   TestID       int

models/test.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-  "strconv"
-
   "gorm.io/gorm"
 )
 
@@ -15,30 +13,9 @@ type Test struct {
   HardwareID    int
   Hardware      Hardware
 
-  // many-to-many benchmark profiles
+  // many-to-many benchmarks
-  BenchmarkProfiles []Benchmark `gorm:"many2many:tests_benchmark_profiles;"`
+  Benchmarks    []Benchmark `gorm:"many2many:tests_benchmarks;"`
 
   // 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
-}

package.json

@@ -4,8 +4,7 @@
   "description": "Self-hosted PC hardware benchmark logging tool",
   "main": "index.js",
   "scripts": {
-    "grunt": "grunt",
+    "grunt": "grunt"
-    "nodemon": "nodemon"
   },
   "repository": {
     "type": "git",
@@ -28,8 +27,8 @@
   "devDependencies": {
     "grunt": "^1.5.3",
     "grunt-cli": "^1.4.3",
-    "grunt-contrib-coffee": "^2.1.0",
     "grunt-contrib-sass": "^2.0.0",
+    "grunt-contrib-coffee": "^2.1.0",
     "grunt-contrib-watch": "^1.1.0",
     "sass": "^1.55.0"
   }

runner.conf

@@ -1,14 +0,0 @@
-root:              .
-tmp_path:          ./tmp
-build_name:        runner-build
-build_log:         runner-build-errors.log
-valid_ext:         .go, .tpl, .tmpl, .html
-no_rebuild_ext:    .tpl, .tmpl, .html
-ignored:           assets, tmp, node_modules, data, vendor
-build_delay:       600
-colors:            1
-log_color_main:    cyan
-log_color_build:   yellow
-log_color_runner:  green
-log_color_watcher: magenta
-log_color_app:

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/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/view.tmpl

@@ -3,8 +3,6 @@
 <div class="row">
   <h2>{{ .hardware.Name }}</h2>
 
-  <span><a href="/hardware/{{ .hardware.ID }}/edit">Edit</a></span>
-
   <p>{{ .hardware.Type }}</p>
 
   <hr>

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/view.tmpl

@@ -3,15 +3,11 @@
 <div class="row">
   <h2>{{ .test.Name }}</h2>
 
-  <span><a href="/test/{{ .test.ID }}/edit">Edit</a></span>
+  <p>Hardware tested: <a href="/hardware/{{ .test.Hardware.ID }}">{{ .test.Hardware.Name }}</a></p>
 
   <p>{{ .test.Description }}</p>
 
-  <h4>Test Info:</h4>
+  <h4>Benchmarks used:</h4>
-
-  <p>Hardware tested: <a href="/hardware/{{ .test.Hardware.ID }}">{{ .test.Hardware.Name }}</a></p>
-
-  <p>Benchmarks used:</p>
 
   <ul>
     {{ range $bm := .test.Benchmarks }}

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

@@ -2,7 +2,7 @@ package forms
 
 type ResultForm struct {
   Test         int     `form:"result_test" validate:"required"`
-  BenchmarkProfile  int     `form:"result_benchmark" validate:"required"`
+  Benchmark    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"`
+  Benchmarks  []string  `form:"test_benchmarks" validate:"required"`
-}
-
-func (t *TestForm) IsBenchmarkSelected(checkID uint) bool {
-  for _, selectedID := range t.BenchmarkProfiles {
-    if checkID == selectedID {
-      return true
-    }
-  }
-
-  return false
 }

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/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,11 +51,7 @@ 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("/{test_id}", routes.TestGetView)
-      f.Get("", routes.TestGetView)
-      f.Get("/edit", routes.TestGetEdit)
-      f.Post("/edit", binding.Form(forms.TestForm{}), routes.TestPostEdit)
-    })
   })
 
   // result routes
@@ -81,10 +66,6 @@ func RegisterRoutes(f *flamego.Flame) {
         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)

web/routes/api_v1.go

@@ -23,18 +23,6 @@ func ApiV1BenchmarkDetails(c flamego.Context, r flamego.Render) {
   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
@@ -49,7 +37,7 @@ func ApiV1ResultAdd(c flamego.Context, form forms.ResultForm, errs binding.Error
 
   result := models.Result{
     TestID:       form.Test,
-    BenchmarkProfileID: form.BenchmarkProfile,
+    BenchmarkID:  form.Benchmark,
     AverageScore: form.AverageScore,
     MinimumScore: form.MinimumScore,
     MaximumScore: form.MaximumScore,
@@ -62,12 +50,12 @@ func ApiV1ResultAdd(c flamego.Context, form forms.ResultForm, errs binding.Error
 
 func ApiV1ResultList(c flamego.Context, r flamego.Render) {
   // find benchmark and test IDs from request
-  benchmarkProfileID := c.Query("benchmark_id")
+  benchmarkID := 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)
+  models.DB.Where("test_id = ? AND benchmark_id = ?", testID, benchmarkID).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

@@ -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/result.go

@@ -26,7 +26,7 @@ func ResultPostCreate(c flamego.Context, form forms.ResultForm, errs binding.Err
 
   result := models.Result{
     TestID:       form.Test,
-    BenchmarkProfileID:  form.BenchmarkProfile,
+    BenchmarkID:  form.Benchmark,
     AverageScore: form.AverageScore,
     MinimumScore: form.MinimumScore,
     MaximumScore: form.MaximumScore,

web/routes/test.go

@@ -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))
-}