Skip to content

Information messages confirming actions are now represented as in-place animations #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Sep 10, 2015
Merged

Information messages confirming actions are now represented as in-place animations #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fdc00c8
initial refactoring
Sep 9, 2015
49036e6
refactor controllers and routes
Sep 9, 2015
590ea65
template clean up
Sep 9, 2015
f8fa9ec
Refactoring app
Sep 9, 2015
5272764
fixing update version command to work with new app.constants file
Sep 9, 2015
4c17770
more refactoring, added message directive
Sep 9, 2015
9e86465
Upgraded Angular, working through issue
Sep 9, 2015
e603bb1
disable tabs
Sep 9, 2015
5f2c326
ready to animate
Sep 10, 2015
53a7fd3
Fixed Signalr version issue, ready to merge with develop
Sep 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ServicePulse.Host/Commands/UpdateVersionCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ static void ExtractApp(string directoryPath)
{
var assembly = Assembly.GetExecutingAssembly();

using (var resourceStream = assembly.GetManifestResourceStream(@"app\js\app.js"))
using (var resourceStream = assembly.GetManifestResourceStream(@"app\js\app.constants.js"))
{
var destinationPath = Path.Combine(directoryPath, "js/app.js");
var destinationPath = Path.Combine(directoryPath, "js/app.constants.js");

Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));

Expand All @@ -40,7 +40,7 @@ static void ExtractApp(string directoryPath)

static void UpdateVersion(string directoryPath)
{
var appJsPath = Path.Combine(directoryPath, "js/app.js");
var appJsPath = Path.Combine(directoryPath, "js/app.constants.js");
var appJsCode = File.ReadAllText(appJsPath);

var updatedContent = Regex.Replace(appJsCode, @"(constant\('version', ')([\w:/.-]*)(')", "${1}" + GetFileVersion() + "$3");
Expand Down
77 changes: 58 additions & 19 deletions src/ServicePulse.Host/ServicePulse.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,15 @@
</ItemGroup>
<ItemGroup>
<Content Include="app\config.js" />
<Content Include="app\css\animate-css\animate.css" />
<Content Include="app\css\animate-css\animate.min.css" />
<Content Include="app\css\bootstrap-responsive.css" />
<Content Include="app\css\bootstrap-responsive.min.css" />
<Content Include="app\css\bootstrap.css" />
<Content Include="app\css\bootstrap.min.css" />
<Content Include="app\css\font-awesome.css" />
<Content Include="app\css\font-awesome.min.css" />
<Content Include="app\css\font-awesome\css\font-awesome.css" />
<Content Include="app\css\font-awesome\css\font-awesome.min.css" />
<Content Include="app\css\font-awesome\fonts\fontawesome-webfont.svg" />
<Content Include="app\css\select2.css" />
<Content Include="app\css\style-ie.css" />
<Content Include="app\css\style-responsive.css" />
Expand Down Expand Up @@ -149,51 +152,76 @@
<Content Include="app\img\ui-icons_cd0a0a_256x240.png" />
<Content Include="app\img\uploadify-cancel.png" />
<Content Include="app\index.html" />
<Content Include="app\js\configuration\configuration.js" />
<Content Include="app\js\configuration\configuration.tpl.html" />
<Content Include="app\js\app.constants.js" />
<Content Include="app\js\app.controller.js" />
<Content Include="app\js\app.route.js" />
<Content Include="app\js\configuration\configuration.controller.js" />
<Content Include="app\js\configuration\configuration.module.js" />
<Content Include="app\js\configuration\configuration.route.js" />
<Content Include="app\js\configuration\configuration.html" />
<Content Include="app\js\custom_checks\customChecks.controller.js" />
<Content Include="app\js\custom_checks\customChecks.module.js" />
<Content Include="app\js\custom_checks\customChecks.route.js" />
<Content Include="app\js\dashboard\dashboard.module.js" />
<Content Include="app\js\dashboard\dashboard.route.js" />
<Content Include="app\js\directives\eat.click.js" />
<Content Include="app\js\directives\ngClip.js" />
<Content Include="app\js\directives\productVersion.js" />
<Content Include="app\js\directives\productVersion.tpl.html" />
<Content Include="app\js\directives\ui.particular.confirmclick.js" />
<Content Include="app\js\directives\ui.particular.js" />
<Content Include="app\js\directives\ui.particular.tab.js" />
<Content Include="app\js\directives\ui.particular.tabset.js" />
<Content Include="app\js\directives\ui.particular.tabset.tpl.html" />
<Content Include="app\js\endpoints\endpoints.controller.js" />
<Content Include="app\js\endpoints\endpoints.route.js" />
<Content Include="app\js\event_log_items\eventLogItems.tpl.html" />
<Content Include="app\js\custom_checks\customChecks.js" />
<Content Include="app\js\custom_checks\customChecks.tpl.html" />
<Content Include="app\js\dashboard\dashboard.js" />
<Content Include="app\js\custom_checks\customChecks.html" />
<Content Include="app\js\directives\hud.js" />
<Content Include="app\js\directives\hud.tpl.html" />
<Content Include="app\js\directives\ui-bootstrap-custom-0.6.0.js" />
<Content Include="app\js\directives\ui-bootstrap-custom-0.6.0.min.js" />
<Content Include="app\js\directives\ui-bootstrap-custom-tpls-0.6.0.js" />
<Content Include="app\js\directives\ui-bootstrap-custom-tpls-0.6.0.min.js" />
<Content Include="app\js\failed_messages\failedMessages.js" />
<Content Include="app\js\endpoints\endpoints.js" />
<Content Include="app\js\endpoints\endpoints.module.js" />
<Content Include="app\js\failed_messages\failedMessages.html" />
<Content Include="app\js\failed_messages\failedMessages.controller.js" />
<Content Include="app\js\failed_messages\failedMessages.module.js" />
<Content Include="app\js\failed_messages\failedMessages.route.js" />
<Content Include="app\js\failed_messages\failedMessages.service.js" />
<Content Include="app\js\services\platformUpdateService.js" />
<Content Include="app\js\services\semverService.js" />
<Content Include="app\layout\topbar.html" />
<Content Include="app\layout\sidebar.html" />
<Content Include="app\lib\angular\angular-animate.js" />
<Content Include="app\lib\angular\angular-animate.min.js" />
<Content Include="app\lib\angular\angular-breadcrumb.js" />
<Content Include="app\lib\angular\angular-breadcrumb.min.js" />
<Content Include="app\lib\angular\angular-route.js" />
<Content Include="app\lib\angular\angular-route.min.js" />
<Content Include="app\lib\angular\angular-sanitize.js" />
<Content Include="app\lib\angular\angular-sanitize.min.js" />
<Content Include="app\lib\jquery-1.10.2.min.js" />
<Content Include="app\lib\jquery.signalR-1.1.3.min.js" />
<Content Include="app\lib\jQuery\jquery.js" />
<Content Include="app\lib\jQuery\jquery.min.js" />
<Content Include="app\lib\jQuery\jquery.signalR-1.1.3.min.js" />
<Content Include="app\lib\jQuery\jquery.signalr-2.2.0.js" />
<Content Include="app\lib\jQuery\jquery.signalr-2.2.0.min.js" />
<Content Include="app\lib\ng-infinite-scroll.min.js" />
<Content Include="app\lib\page-width-functions.js" />
<Content Include="app\js\failed_messages\failedMessages.tpl.html" />
<EmbeddedResource Include="Hosting\Help.txt" />
<Content Include="app\fonts\fontawesome-webfont.eot" />
<Content Include="app\fonts\fontawesome-webfont.ttf" />
<Content Include="app\fonts\fontawesome-webfont.woff" />
<Content Include="app\lib\jquery-1.10.2.min.map" />
<Content Include="app\css\app.css" />
<Content Include="app\js\app.js" />
<Content Include="app\js\event_log_items\eventLogItems.js" />
<Content Include="app\js\directives\moment.js" />
<Content Include="app\lib\ZeroClipboard.min.js" />
<Content Include="app\lib\ZeroClipboard.swf" />
<Content Include="app\notifications.tpl.html" />
<Content Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.Core.js" />
<Content Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.Core.min.js" />
<Content Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.js" />
<Content Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.min.js" />
<Content Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.swf" />
<Content Include="app\layout\notifications.html" />
<Content Include="app\js\services\breadcrumbs.js" />
<Content Include="app\js\services\exceptionHandler.js" />
<Content Include="app\js\services\notifications.js" />
Expand All @@ -205,14 +233,13 @@
<Content Include="app\lib\bootstrap.min.js" />
<Content Include="app\lib\moment.min.js" />
<Content Include="app\NoIE.html" />
<Content Include="app\js\dashboard\dashboard.tpl.html" />
<Content Include="app\js\endpoints\endpoints.tpl.html" />
<Content Include="app\js\dashboard\dashboard.html" />
<Content Include="app\js\endpoints\endpoints.html" />
<Content Include="app\fonts\FontAwesome.otf" />
<Content Include="app\lib\angular\angular-animate.min.js.map" />
<Content Include="app\lib\angular\angular-route.min.js.map" />
<Content Include="app\lib\angular\angular-sanitize.min.js.map" />
<Content Include="app\lib\angular\angular.min.js.map" />
<Content Include="app\lib\ZeroClipboard.min.map" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="app\**\*.*">
Expand All @@ -221,10 +248,22 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="app\js\dashboard\dashboard.controller.js" />
<None Include="app\css\font-awesome\css\font-awesome.css.map" />
<None Include="app\css\font-awesome\fonts\fontawesome-webfont.eot" />
<None Include="app\css\font-awesome\fonts\fontawesome-webfont.ttf" />
<None Include="app\css\font-awesome\fonts\fontawesome-webfont.woff" />
<None Include="app\css\font-awesome\fonts\fontawesome-webfont.woff2" />
<None Include="app\css\font-awesome\fonts\FontAwesome.otf" />
<None Include="app\lib\jQuery\jquery.min.map" />
<None Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.Core.min.map" />
<None Include="app\lib\zeroclipboard-2.2.0\ZeroClipboard.min.map" />
<None Include="bundleconfig.json" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand Down
Loading