diff --git a/.circleci/config.yml b/.circleci/config.yml index 09bfd9e3..b2fe707b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,10 +149,10 @@ jobs: if [ -z "${prerelease}" ]; then echo "No pre-release in version, creating release" - ghr -u vibrato ${version} output + ghr -u servian ${version} output else echo "Found pre-release in version, creating pre-release" - ghr -u vibrato -prerelease ${version} output + ghr -u servian -prerelease ${version} output fi fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 84765828..f76f2816 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ### Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@vibrato.com.au. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thomas.winsnes@servian.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/LICENSE b/LICENSE index 617d51bf..91eb3421 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright © 2018 Servian +Copyright © 2020 Servian Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/assets/images/VIBRATO_Logo_dark-cropped-200.png b/assets/images/VIBRATO_Logo_dark-cropped-200.png deleted file mode 100644 index 62ca02c6..00000000 Binary files a/assets/images/VIBRATO_Logo_dark-cropped-200.png and /dev/null differ diff --git a/assets/images/servian_logo.png b/assets/images/servian_logo.png new file mode 100644 index 00000000..96de1e32 Binary files /dev/null and b/assets/images/servian_logo.png differ diff --git a/cmd/root.go b/cmd/root.go index 7f93bcd8..e5bb7b07 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -21,12 +21,12 @@ package cmd import ( - "fmt" - "os" + "fmt" + "os" - "github.com/servian/TechTestApp/config" - "github.com/servian/TechTestApp/daemon" - "github.com/spf13/cobra" + "github.com/servian/TechTestApp/config" + "github.com/servian/TechTestApp/daemon" + "github.com/spf13/cobra" ) var cfgFile string @@ -34,53 +34,53 @@ var cfg *daemon.Config // rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ - Use: "TechTestApp", - Short: "Application used to test potential candidates at Servian", - Long: ` -.:ooooool, .:odddddl;. .;ooooc. .l, ;c. ::. 'coddddoc' ,looooooc. + Use: "TechTestApp", + Short: "Application used to test potential candidates at Servian", + Long: ` + .:ooooool, .:odddddl;. .;ooooc. .l, ;c. ::. 'coddddoc' ,looooooc. 'kk;....';, .lOx:'...,cxkc. .dOc.... .xO' ,0d. .kk. ,xko;....;okx, .xkl,....;dOl. :Xl .xO, :0d. ;Kl ,0o .dO' .kk. :0d. .d0: .xO' lK: .oOxc,. lKl...........oK: :Kc l0; :Kc .kk. .Ok. .kO. '0d '0d .;ldddo;. oXkdddddddddddxx, :Kc .kk. .Ox. .kk. '0d d0' '0d '0d - .cOk. lKc :Kc :0l o0; .kk. .Ok. .k0' '0d '0d - cXc .xO; .. :Kc .d0' ;0o .kk. :0d. .dN0' '0d '0d + .cOk. lKc :Kc :0l o0; .kk. .Ok. .k0' '0d '0d + cXc .xO; .. :Kc .d0' ;0o .kk. :0d. .dN0' '0d '0d ,c,....'cOx. .lOxc,...':dkc. :Kc 'Ox',kk. .kk. ,xko;'..';okk00, '0d '0d ';;;;;;;;;;,. 'looooool;. .;ldddddo:. 'l' .lool. :: 'coddddoc'.;l. .l; .c; .cxxxxxxxxxxo. This application is used as part of testing potential candiates at Sevian. Please visit http://Servian.com for more details`, - Version: "0.5.0", + Version: "0.6.0", } // Execute adds all child commands to the root command and sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() { - if err := rootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } + if err := rootCmd.Execute(); err != nil { + fmt.Println(err) + os.Exit(1) + } } func init() { - cobra.OnInitialize(initConfig) + cobra.OnInitialize(initConfig) } // initConfig reads in config file and ENV variables if set. func initConfig() { - conf, err := config.LoadConfig() + conf, err := config.LoadConfig() - if err != nil { - fmt.Print(err) - os.Exit(1) - } + if err != nil { + fmt.Print(err) + os.Exit(1) + } - cfg = &daemon.Config{} - cfg.UI.DB.DbName = conf.DbName - cfg.UI.DB.DbPassword = conf.DbPassword - cfg.UI.DB.DbUser = conf.DbUser - cfg.UI.DB.DbHost = conf.DbHost - cfg.UI.DB.DbPort = conf.DbPort - cfg.ListenSpec = conf.ListenHost + ":" + conf.ListenPort + cfg = &daemon.Config{} + cfg.UI.DB.DbName = conf.DbName + cfg.UI.DB.DbPassword = conf.DbPassword + cfg.UI.DB.DbUser = conf.DbUser + cfg.UI.DB.DbHost = conf.DbHost + cfg.UI.DB.DbPort = conf.DbPort + cfg.ListenSpec = conf.ListenHost + ":" + conf.ListenPort } diff --git a/cmd/serve.go b/cmd/serve.go index 2a67e2f1..b14965ea 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/cmd/updatedb.go b/cmd/updatedb.go index 7b735e7a..0596f6e2 100644 --- a/cmd/updatedb.go +++ b/cmd/updatedb.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/config/config.go b/config/config.go index f0cd7b6a..02c90445 100644 --- a/config/config.go +++ b/config/config.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/daemon/deamon.go b/daemon/deamon.go index 185778f0..013816bc 100644 --- a/daemon/deamon.go +++ b/daemon/deamon.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/db/db.go b/db/db.go index 5b6e38b6..af699173 100644 --- a/db/db.go +++ b/db/db.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright ©2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/main.go b/main.go index 59144703..2e529ef3 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -18,12 +18,12 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -// Vibrato Tech Test Application +// Servian Tech Test Application // -// This application is used as part of the Vibrato Technical Assessment. +// This application is used as part of the Servian Technical Assessment. // // Version: 1.0 -// Contact: Thomas Winsnes https://www.vibrato.com.au +// Contact: Thomas Winsnes https://www.servian.com // // swagger:meta package main diff --git a/model/task.go b/model/task.go index 15878ea0..a5b2fba1 100644 --- a/model/task.go +++ b/model/task.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright ©2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/ui/api.go b/ui/api.go index 3dfb0d60..7dc8a994 100644 --- a/ui/api.go +++ b/ui/api.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/ui/index.go b/ui/index.go index a0190049..1c96c77f 100644 --- a/ui/index.go +++ b/ui/index.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -47,11 +47,11 @@ const indexHTML = `
- +
- © Vibrato + © Servian
diff --git a/ui/ui.go b/ui/ui.go index 842cd394..874b26ae 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -1,4 +1,4 @@ -// Copyright © 2018 Servian +// Copyright © 2020 Servian // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal