Skip to content

Commit

Permalink
fixes, loose ends
Browse files Browse the repository at this point in the history
  • Loading branch information
@caseyWebb
caseyWebb committed Nov 15, 2018
1 parent b6a3806 commit 5fa118c
Show file tree
Hide file tree
Showing 15 changed files with 801 additions and 390 deletions.
21 changes: 12 additions & 9 deletions cmd/mailslurper/controllers/AdminController.go
View file
Expand Up @@ -42,9 +42,10 @@ func (c *AdminController) Admin(ctx echo.Context) error {
context := contexts.GetAdminContext(ctx)

data := mailslurper.Page{
Theme: c.Config.GetTheme(),
Title: "Admin",
User: context.User,
PublicWWWURL: c.Config.GetPublicWWWURL(),
Theme: c.Config.GetTheme(),
Title: "Admin",
User: context.User,
}

return context.Render(http.StatusOK, "mainLayout:admin", data)
Expand Down Expand Up @@ -86,9 +87,10 @@ func (c *AdminController) Index(ctx echo.Context) error {
context := contexts.GetAdminContext(ctx)

data := mailslurper.Page{
Theme: c.Config.GetTheme(),
Title: "Mail",
User: context.User,
PublicWWWURL: c.Config.GetPublicWWWURL(),
Theme: c.Config.GetTheme(),
Title: "Mail",
User: context.User,
}

return context.Render(http.StatusOK, "mainLayout:index", data)
Expand Down Expand Up @@ -118,9 +120,10 @@ func (c *AdminController) ManageSavedSearches(ctx echo.Context) error {
context := contexts.GetAdminContext(ctx)

data := mailslurper.Page{
Theme: c.Config.GetTheme(),
Title: "Manage Saved Searches",
User: context.User,
PublicWWWURL: c.Config.GetPublicWWWURL(),
Theme: c.Config.GetTheme(),
Title: "Manage Saved Searches",
User: context.User,
}

return context.Render(http.StatusOK, "mainLayout:manageSavedSearches", data)
Expand Down
6 changes: 4 additions & 2 deletions cmd/mailslurper/www/mailslurper/js/app.js
View file
Expand Up @@ -3,6 +3,8 @@
// that can be found in the LICENSE file.

$(document).ready(function () {
var appURL = window.SettingsService.getAppURL();

if (!window.SettingsService.serviceSettingsExistInLocalStore()) {
window.SettingsService.getServiceSettings()
.then(function (serviceSettings) {
Expand All @@ -12,7 +14,7 @@ $(document).ready(function () {
.then(function (serviceSettings) {
if (serviceSettings.authenticationScheme !== "") {
if (!window.AuthService.tokenExistsInStorage()) {
window.location = "/login";
window.location = appURL + "/login";
}
}
})
Expand All @@ -26,7 +28,7 @@ $(document).ready(function () {
$("#logOutLink").on("click", function () {
window.AuthService.logout(serviceURL)
.then(function () {
window.location = "/logout";
window.location = appURL + "/logout";
})
.catch(function (err) {
alert("There was an error logging out: " + err)
Expand Down
3 changes: 2 additions & 1 deletion cmd/mailslurper/www/mailslurper/js/controllers/AdminController.js
View file
Expand Up @@ -127,7 +127,8 @@
window.SettingsService.storeSettings(settings)
.then(function () {
if (settings.theme != currentTheme) {
window.location = "/admin";
var appURL = window.SettingsService.getAppURL();
window.location = appURL + "/admin";
return;
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/mailslurper/www/mailslurper/js/controllers/LoginController.js
View file
Expand Up @@ -55,7 +55,8 @@
$("#frmLogin").submit();
})
.catch(function (err) {
window.location = "/login?message=Invalid user name or password";
var appURL = window.SettingsService.getAppURL();
window.location = appURL + "/login?message=Invalid user name or password";
});
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/mailslurper/www/mailslurper/js/services/AuthService.js
View file
Expand Up @@ -74,6 +74,7 @@ window.AuthService = {
},

gotoLogin: function () {
window.location = "/login";
var appURL = window.SettingsService.getAppURL();
window.location = appURL + "/login";
}
};
7 changes: 7 additions & 0 deletions cmd/mailslurper/www/mailslurper/js/services/SettingsService.js
View file
Expand Up @@ -75,6 +75,13 @@ window.SettingsService = {
return serviceURL;
},

/**
* getWWURL return the fully formatted app URL
*/
getAppURL: function () {
return $('meta[name=app-url]').attr('content')
},

/**
* retrieveSavedSearches reads saved searches from local storage
*/
Expand Down
3 changes: 2 additions & 1 deletion cmd/mailslurper/www/mailslurper/js/services/TemplateService.js
View file
Expand Up @@ -7,7 +7,8 @@
window.TemplateService = {
load: function (name) {
return new Promise(function (resolve, reject) {
$.get("/www/mailslurper/templates/" + name + ".hbs").then(
var appURL = window.SettingsService.getAppURL();
$.get(appURL + "/www/mailslurper/templates/" + name + ".hbs").then(
function (result) {
return resolve(result);
},
Expand Down
3 changes: 2 additions & 1 deletion cmd/mailslurper/www/mailslurper/js/widgets/SavedSearchesWidget.js
View file
Expand Up @@ -30,7 +30,8 @@
label: "Manage",
cssClass: "btn-default",
action: function () {
window.location = "/savedsearches";
var appURL = window.SettingsService.getAppURL();
window.location = appURL + "/savedsearches";
}
},
{
Expand Down
42 changes: 22 additions & 20 deletions cmd/mailslurper/www/mailslurper/layouts/loginLayout.gohtml
View file
Expand Up @@ -13,17 +13,19 @@
<meta name="description" content="MailSlurper Server - Slurps mail into oblivion!" />
<meta name="author" content="Adam Presley <adam@adampresley.com>" />

<link rel="icon" href="{{PublicWWWURL}}/mailslurper/images/favicon.ico" />
<meta name="app-url" content="{{.PublicWWWURL}}" />

<link rel="icon" href="{{.PublicWWWURL}}/www/mailslurper/images/favicon.ico" />

<title>Login // MailSlurper</title>

<link href="{{PublicWWWURL}}/mailslurper/themes/{{.Theme}}/bootstrap.css" rel="stylesheet" id="themeBootstrapStylesheet" />
<link href="{{PublicWWWURL}}/fontawesome/css/font-awesome.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/lightbox2/css/lightbox.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/bootstrap-dialog/css/bootstrap-dialog.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/mailslurper/themes/{{.Theme}}/style.css" rel="stylesheet" id="themeStylesheet" />
<link href="{{PublicWWWURL}}/mailslurper/css/login.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/themes/{{.Theme}}/bootstrap.css" rel="stylesheet" id="themeBootstrapStylesheet" />
<link href="{{.PublicWWWURL}}/www/fontawesome/css/font-awesome.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/lightbox2/css/lightbox.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/bootstrap-dialog/css/bootstrap-dialog.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/themes/{{.Theme}}/style.css" rel="stylesheet" id="themeStylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/css/login.css" rel="stylesheet" />
</head>

<body>
Expand All @@ -33,18 +35,18 @@
<!-- /.container -->
</body>

<script src="{{PublicWWWURL}}/npo/npo.js"></script>
<script src="{{PublicWWWURL}}/moment/moment.js"></script>
<script src="{{PublicWWWURL}}/handlebars/handlebars.js"></script>
<script src="{{PublicWWWURL}}/jquery/jquery.js"></script>
<script src="{{PublicWWWURL}}/blockui/jquery.blockUI.js"></script>
<script src="{{PublicWWWURL}}/bootstrap/js/bootstrap.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-dialog/js/bootstrap-dialog.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-growl/jquery.bootstrap-growl.js"></script>
<script src="{{PublicWWWURL}}/lightbox2/js/lightbox.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/SettingsService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/AuthService.js"></script>
<script src="{{.PublicWWWURL}}/www/npo/npo.js"></script>
<script src="{{.PublicWWWURL}}/www/moment/moment.js"></script>
<script src="{{.PublicWWWURL}}/www/handlebars/handlebars.js"></script>
<script src="{{.PublicWWWURL}}/www/jquery/jquery.js"></script>
<script src="{{.PublicWWWURL}}/www/blockui/jquery.blockUI.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap/js/bootstrap.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-dialog/js/bootstrap-dialog.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-growl/jquery.bootstrap-growl.js"></script>
<script src="{{.PublicWWWURL}}/www/lightbox2/js/lightbox.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/SettingsService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/AuthService.js"></script>

{{template "js" .}}

Expand Down
80 changes: 41 additions & 39 deletions cmd/mailslurper/www/mailslurper/layouts/mainLayout.gohtml
View file
Expand Up @@ -13,17 +13,19 @@
<meta name="description" content="MailSlurper Server - Slurps mail into oblivion!" />
<meta name="author" content="Adam Presley <adam@adampresley.com>" />

<link rel="icon" href="{{PublicWWWURL}}/mailslurper/images/favicon.ico" />
<meta name="app-url" content="{{.PublicWWWURL}}" />

<link rel="icon" href="{{.PublicWWWURL}}/www/mailslurper/images/favicon.ico" />

<title>{{.Title}} // MailSlurper</title>

<link href="{{PublicWWWURL}}/mailslurper/themes/{{.Theme}}/bootstrap.css" rel="stylesheet" id="themeBootstrapStylesheet" />
<link href="{{PublicWWWURL}}/fontawesome/css/font-awesome.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/lightbox2/css/lightbox.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/bootstrap-dialog/css/bootstrap-dialog.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/mailslurper/css/style.css" rel="stylesheet" />
<link href="{{PublicWWWURL}}/mailslurper/themes/{{.Theme}}/style.css" rel="stylesheet" id="themeStylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/themes/{{.Theme}}/bootstrap.css" rel="stylesheet" id="themeBootstrapStylesheet" />
<link href="{{.PublicWWWURL}}/www/fontawesome/css/font-awesome.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/lightbox2/css/lightbox.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/bootstrap-dialog/css/bootstrap-dialog.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/css/style.css" rel="stylesheet" />
<link href="{{.PublicWWWURL}}/www/mailslurper/themes/{{.Theme}}/style.css" rel="stylesheet" id="themeStylesheet" />
{{template "css" .}}
</head>

Expand All @@ -38,23 +40,23 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand mailSlurperLogoLink" href="{{PublicWWWURL}}"><img src="{{PublicWWWURL}}/mailslurper/images/logo.png" alt="MailSlurper" class="mailSlurperLogo" /></a>
<a class="navbar-brand mailSlurperLogoLink" href="{{.PublicWWWURL}}"><img src="{{.PublicWWWURL}}/www/mailslurper/images/logo.png" alt="MailSlurper" class="mailSlurperLogo" /></a>
</div>

<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li>
<a href="{{PublicWWWURL}}">
<a href="{{.PublicWWWURL}}">
<i class="fa fa-home fa-lg"></i>
</a>
</li>
<li>
<a href="{{PublicWWWURL}}/savedsearches">
<a href="{{.PublicWWWURL}}/savedsearches">
<i class="fa fa-filter"></i>
</a>
</li>
<li>
<a href="{{PublicWWWURL}}/admin">
<a href="{{.PublicWWWURL}}/admin">
<i class="fa fa-cog"></i>
</a>
</li>
Expand All @@ -78,35 +80,35 @@
<!-- /.container -->
</body>

<script src="{{PublicWWWURL}}/npo/npo.js"></script>
<script src="{{PublicWWWURL}}/moment/moment.js"></script>
<script src="{{PublicWWWURL}}/handlebars/handlebars.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/attachmentURL.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/autoRefreshSelector.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/dateFormatSelector.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/formatDateTime.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/ifIsImageAttachment.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/themeSelector.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/pageSelector.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/templates/helpers/unescape.js"></script>
<script src="{{PublicWWWURL}}/jquery/jquery.js"></script>
<script src="{{PublicWWWURL}}/blockui/jquery.blockUI.js"></script>
<script src="{{PublicWWWURL}}/bootstrap/js/bootstrap.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-dialog/js/bootstrap-dialog.js"></script>
<script src="{{PublicWWWURL}}/bootstrap-growl/jquery.bootstrap-growl.js"></script>
<script src="{{PublicWWWURL}}/lightbox2/js/lightbox.js"></script>
<script src="{{.PublicWWWURL}}/www/npo/npo.js"></script>
<script src="{{.PublicWWWURL}}/www/moment/moment.js"></script>
<script src="{{.PublicWWWURL}}/www/handlebars/handlebars.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/attachmentURL.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/autoRefreshSelector.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/dateFormatSelector.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/formatDateTime.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/ifIsImageAttachment.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/themeSelector.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/pageSelector.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/templates/helpers/unescape.js"></script>
<script src="{{.PublicWWWURL}}/www/jquery/jquery.js"></script>
<script src="{{.PublicWWWURL}}/www/blockui/jquery.blockUI.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap/js/bootstrap.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-dialog/js/bootstrap-dialog.js"></script>
<script src="{{.PublicWWWURL}}/www/bootstrap-growl/jquery.bootstrap-growl.js"></script>
<script src="{{.PublicWWWURL}}/www/lightbox2/js/lightbox.js"></script>

<script src="{{PublicWWWURL}}/mailslurper/js/services/SettingsService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/AuthService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/AlertService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/MailService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/SeedService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/VersionService.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/services/TemplateService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/SettingsService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/AuthService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/AlertService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/MailService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/SeedService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/VersionService.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/services/TemplateService.js"></script>

<script src="{{PublicWWWURL}}/mailslurper/js/widgets/SavedSearchesWidget.js"></script>
<script src="{{PublicWWWURL}}/mailslurper/js/app.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/widgets/SavedSearchesWidget.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/app.js"></script>
{{template "js" .}}

</html>
2 changes: 1 addition & 1 deletion cmd/mailslurper/www/mailslurper/pages/admin.gohtml
View file
Expand Up @@ -14,5 +14,5 @@
{{end}}

{{define "js"}}
<script src="{{PublicWWWURL}}/mailslurper/js/controllers/AdminController.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/controllers/AdminController.js"></script>
{{end}}
2 changes: 1 addition & 1 deletion cmd/mailslurper/www/mailslurper/pages/index.gohtml
View file
Expand Up @@ -7,5 +7,5 @@
{{end}}

{{define "js"}}
<script src="{{PublicWWWURL}}/mailslurper/js/controllers/HomeController.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/controllers/HomeController.js"></script>
{{end}}
4 changes: 2 additions & 2 deletions cmd/mailslurper/www/mailslurper/pages/login.gohtml
View file
@@ -1,6 +1,6 @@
{{define "body"}}
<p class="logo-container">
<img src="{{PublicWWWURL}}/mailslurper/images/vertical.png" alt="MailSlurper Logo" />
<img src="{{.PublicWWWURL}}/www/mailslurper/images/vertical.png" alt="MailSlurper Logo" />
</p>

{{if .Error}}
Expand All @@ -25,5 +25,5 @@
{{end}}

{{define "js"}}
<script src="{{PublicWWWURL}}/mailslurper/js/controllers/LoginController.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/controllers/LoginController.js"></script>
{{end}}
2 changes: 1 addition & 1 deletion cmd/mailslurper/www/mailslurper/pages/manageSavedSearches.gohtml
View file
Expand Up @@ -6,5 +6,5 @@
{{end}}

{{define "js"}}
<script src="{{PublicWWWURL}}/mailslurper/js/controllers/ManageSavedSearchesController.js"></script>
<script src="{{.PublicWWWURL}}/www/mailslurper/js/controllers/ManageSavedSearchesController.js"></script>
{{end}}

0 comments on commit 5fa118c

Please sign in to comment.