Skip to content

Commit

Permalink
Merge pull request #46 from servian/Servianify
Browse files Browse the repository at this point in the history
Branding updated to servian, tested against Postgres 10.7 for AWS Aurora serverless support
  • Loading branch information
TWinsnes authored Apr 11, 2020
2 parents b86e85b + 0af0e6b commit c4aff45
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file removed assets/images/VIBRATO_Logo_dark-cropped-200.png
Binary file not shown.
Binary file added assets/images/servian_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 30 additions & 30 deletions cmd/root.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,66 +21,66 @@
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
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

}
2 changes: 1 addition & 1 deletion cmd/serve.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/updatedb.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion daemon/deamon.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion db/db.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<tom@vibrato.com.au> https://www.vibrato.com.au
// Contact: Thomas Winsnes<thomas.winsnes@servian.com> https://www.servian.com
//
// swagger:meta
package main
Expand Down
2 changes: 1 addition & 1 deletion model/task.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ui/api.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ui/index.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -47,11 +47,11 @@ const indexHTML = `
</head>
<body>
<header>
<img src="/images/VIBRATO_Logo_dark-cropped-200.png" width="100" height="85"/>
<img src="/images/servian_logo.png" width="197" height="30"/>
</header>
<div id='root'></div>
<footer>
&COPY; Vibrato
&COPY; Servian
</footer>
<script src="` + cdnReact + `"></script>
<script src="` + cdnReactDom + `"></script>
Expand Down
2 changes: 1 addition & 1 deletion ui/ui.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit c4aff45

Please sign in to comment.