1
0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-08 22:36:41 +02:00

fix registry

This commit is contained in:
Lee Brown
2019-08-06 12:10:47 -08:00
parent a916aa5f46
commit 9418241408
5 changed files with 10 additions and 31 deletions

View File

@ -119,7 +119,6 @@
} }
if (filter_column && filter_value ) { if (filter_column && filter_value ) {
$( "#dataTable_wrapper thead th" ).each(function( index ) { $( "#dataTable_wrapper thead th" ).each(function( index ) {
//console.log( index + ": " + $( this ).text() );
column_text = $( this ).text().toLowerCase(); column_text = $( this ).text().toLowerCase();
column_text = column_text.replace(" ", "_"); column_text = column_text.replace(" ", "_");
if (column_text ==filter_column) { if (column_text ==filter_column) {
@ -127,11 +126,7 @@
} }
}); });
if (filer_column_num ) { if (filer_column_num ) {
//console.log(filer_column_num);
dtbl.column(filer_column_num).search(filter_value).draw(); dtbl.column(filer_column_num).search(filter_value).draw();
//filer_column_num = filer_column_num +1 ;
//console.log($(".dataTables_scrollFootInner tfoot th:nth-child("+filer_column_num+") ").text());
//$(".dataTables_scrollFootInner tfoot th:nth-child("+filer_column_num+") select ").val(filter_value);
} }
} }
} }

View File

@ -1,16 +1,12 @@
{{ define "partials/site-footer" }} {{ define "partials/site-footer" }}
<footer class="bg-white mt-5 pt-5"> <footer class="bg-white mt-5 pt-5">
<div class="container mt-5 pt-5"> <div class="container mt-5 pt-5">
<div class="row"> <div class="row">
<div class="col-sm-9 col-lg-6 mb-7"> <div class="col-sm-9 col-lg-6 mb-7">
<a class="d-inline-flex align-items-center mb-3" href="/" aria-label="Starter Kit for Software-as-a-Service"> <a class="d-inline-flex align-items-center mb-3" href="/" aria-label="Starter Kit for Software-as-a-Service">
<img src="{{ SiteAssetUrl "/images/saas-stater-kit-icon-200x200.png" }}" height="50" alt="Starter Kit for Software-as-a-Service"></a> <img src="{{ SiteAssetUrl "/images/saas-stater-kit-icon-200x200.png" }}" height="50" alt="Starter Kit for Software-as-a-Service"></a>
<p class="small text-white-70">Our software-as-a-service digitizes your businesses processes to increase performance and efficiency.</p> <p class="small text-white-70">Our software-as-a-service digitizes your businesses processes to increase performance and efficiency.</p>
</div> </div>
<div class="col-6 col-sm-6 col-lg-3 ml-lg-auto mb-4"> <div class="col-6 col-sm-6 col-lg-3 ml-lg-auto mb-4">
<h3 class="h6">SaaS</h3> <h3 class="h6">SaaS</h3>
<ul class="list-unstyled"> <ul class="list-unstyled">
@ -41,16 +37,11 @@
<p class="small text-white-70 mb-0">&copy; Copyright 2019 Geeks Accelerator.</p> <p class="small text-white-70 mb-0">&copy; Copyright 2019 Geeks Accelerator.</p>
</div> </div>
</div> </div>
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-sm-6 mb-5"> <div class="col-sm-6 mb-5">
{{ template "partials/buildinfo" . }} {{ template "partials/buildinfo" . }}
</div> </div>
</div> </div>
</div> </div>
</footer> </footer>
{{end}} {{end}}

View File

@ -1,14 +1,9 @@
{{ define "partials/site-topbar" }} {{ define "partials/site-topbar" }}
<!-- Topbar --> <!-- Topbar -->
<nav class="navbar navbar-dark bg-primary topbar navbar-fixed-top shadow" style="position: fixed; right: 0; left: 0; z-index: 1030;"> <nav class="navbar navbar-dark bg-primary topbar navbar-fixed-top shadow" style="position: fixed; right: 0; left: 0; z-index: 1030;">
<a class="my-0 mr-md-auto navbar-brand" href="/"> <a class="my-0 mr-md-auto navbar-brand" href="/">
<img src="{{ SiteAssetUrl "/images/saas-stater-kit-logo-350x100.png"}}" height="30" alt="SaaS Starter Kit"> <img src="{{ SiteAssetUrl "/images/saas-stater-kit-logo-350x100.png"}}" height="30" alt="SaaS Starter Kit">
</a> </a>
<nav class="my-2 my-md-0 mr-md-3"> <nav class="my-2 my-md-0 mr-md-3">
<a class="p-2 text-white" href="/">Home</a> <a class="p-2 text-white" href="/">Home</a>
<a class="p-2 text-white" href="/pricing">Pricing</a> <a class="p-2 text-white" href="/pricing">Pricing</a>
@ -17,12 +12,6 @@
<a class="p-2 text-white" href="/user/login"><i class="far fa-user"></i> Login</a> <a class="p-2 text-white" href="/user/login"><i class="far fa-user"></i> Login</a>
</nav> </nav>
<a class="btn btn-purple" href="/signup">Sign up</a> <a class="btn btn-purple" href="/signup">Sign up</a>
</nav> </nav>
<!-- End of Topbar --> <!-- End of Topbar -->
{{ end }} {{ end }}

View File

@ -6,10 +6,10 @@ twins@geeksaccelerator.com
## Description ## Description
_Devops_ handles creating AWS resources and deploying your services with minimal _Devops_ handles creating AWS resources and deploying your services with minimal additional configuration. You can
additional configuration. You can customizing any of the configuration in the code. While AWS is already a core part of customizing any of the configuration in the code. While AWS is already a core part of the saas-starter-kit, keeping
the saas-starter-kit, keeping the deployment in GoLang limits the scope of additional technologies required to get your the deployment in GoLang limits the scope of additional technologies required to get your project successfully up and
project successfully up and running. If you understand Golang, then you will be a master at devops with this tool. running. If you understand Golang, then you will be a master at devops with this tool.
The project includes a Postgres database which adds an additional resource dependency when deploying the The project includes a Postgres database which adds an additional resource dependency when deploying the
project. It is important to know that the tasks running schema migration for the Postgres database can not run as shared project. It is important to know that the tasks running schema migration for the Postgres database can not run as shared

View File

@ -273,7 +273,11 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
if !req.NoCache && buildBaseImageTag != "" { if !req.NoCache && buildBaseImageTag != "" {
var pushTargetImg bool var pushTargetImg bool
if ciReg := os.Getenv("CI_REGISTRY"); ciReg != "" { if ciReg := os.Getenv("CI_REGISTRY"); ciReg != "" {
cmds = append(cmds, []string{"docker", "login", "-u", "gitlab-ci-token", "-p", os.Getenv("CI_JOB_TOKEN"), ciReg}) cmds = append(cmds, []string{
"docker", "login",
"-u", os.Getenv("CI_REGISTRY_USER"),
"-p", os.Getenv("CI_REGISTRY_PASSWORD"),
ciReg})
buildBaseImage = ciReg + "/" + buildBaseImageTag buildBaseImage = ciReg + "/" + buildBaseImageTag
pushTargetImg = true pushTargetImg = true
@ -297,7 +301,7 @@ func ServiceBuild(log *log.Logger, req *serviceBuildRequest) error {
cmds = append(cmds, []string{"docker", "push", buildBaseImageTag}) cmds = append(cmds, []string{"docker", "push", buildBaseImageTag})
} }
} }
// The initial build command slice. // The initial build command slice.
buildCmd := []string{ buildCmd := []string{
"docker", "build", "docker", "build",