Skip to content
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.

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

A Brand New wasabiwallet.io ⭐️ #2043

Merged
merged 33 commits into from Aug 8, 2019
Merged
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4fed349
first draft of website, static, only for desktop
mayankchhabra Jul 27, 2019
8493068
responsiveness fixed, plus accordians
mayankchhabra Jul 27, 2019
c58f396
hero image flicker effect
mayankchhabra Jul 27, 2019
96e0882
image cleaning and compressions
mayankchhabra Jul 29, 2019
19031b2
Merge branch 'master' into website-2.0
mayankchhabra Jul 29, 2019
4bdf335
removed old index/css, added _variables for bootstrap 4 theming, pref…
mayankchhabra Aug 1, 2019
393a7ee
Merge branch 'master' into website-2.0
mayankchhabra Aug 1, 2019
8323c85
responsive fixes
mayankchhabra Aug 1, 2019
fda3e87
removed unnecessary images
mayankchhabra Aug 1, 2019
0c5fd21
Merge branch 'master' into pr/2043-a-brand-new-wasabiwallet-io
nopara73 Aug 1, 2019
15610bb
fixed broken link in footer
mayankchhabra Aug 1, 2019
be29d2e
docs
mayankchhabra Aug 1, 2019
3b47aa0
added cj txs
mayankchhabra Aug 1, 2019
b58c730
updated faq, and textual content
mayankchhabra Aug 1, 2019
2dc13e9
added twitter/fb social card (sharing preview) images
mayankchhabra Aug 1, 2019
f64344e
Merge branch 'master' into website-2.0
mayankchhabra Aug 1, 2019
a0b866f
Merge branch 'website-2.0' of https://github.com/weareblockspace/Wall…
mayankchhabra Aug 1, 2019
0f3e01d
nitpick on text
nopara73 Aug 2, 2019
097c7ec
added cj link
mayankchhabra Aug 4, 2019
1931b6a
responsiveness fix of hero section
mayankchhabra Aug 4, 2019
c2cacb1
features tabs are now links
mayankchhabra Aug 4, 2019
a258d06
guide links
mayankchhabra Aug 4, 2019
9057452
extended FAQs link
mayankchhabra Aug 4, 2019
1219b31
added learn more link in cj
mayankchhabra Aug 4, 2019
07ac645
Merge branch 'master' into pr/2043-a-brand-new-wasabiwallet-io
nopara73 Aug 5, 2019
7614ee9
nitpick
nopara73 Aug 5, 2019
9601598
Remove unversionedwebbuilder
nopara73 Aug 5, 2019
da50f5a
removed w3c validation errors from html
mayankchhabra Aug 5, 2019
378e749
Merge branch 'master' into website-2.0
mayankchhabra Aug 5, 2019
a58c4ed
docs link faq
mayankchhabra Aug 5, 2019
66304a7
links
mayankchhabra Aug 6, 2019
773b574
Merge branch 'master' into website-2.0
mayankchhabra Aug 6, 2019
067d16f
faq broken linnks
mayankchhabra Aug 7, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -16,15 +16,13 @@ namespace WalletWasabi.Backend
{
public class InitConfigStartupTask : IStartupTask
{
private static List<string> Last5CoinJoins { get; set; } = new List<string>();
private static object UpdateUnversionedLock { get; } = new object();
public UnversionedWebBuilder UnversionedWebBuilder { get; }
public WebsiteTorifier WebsiteTorifier { get; }
public Global Global { get; }

public InitConfigStartupTask(Global global, IHostingEnvironment hostingEnvironment)
{
Global = global;
UnversionedWebBuilder = new UnversionedWebBuilder(global, ((HostingEnvironment)hostingEnvironment).WebRootPath);
WebsiteTorifier = new WebsiteTorifier(((HostingEnvironment)hostingEnvironment).WebRootPath);
}

public async Task ExecuteAsync(CancellationToken cancellationToken)
@@ -54,18 +52,7 @@ public async Task ExecuteAsync(CancellationToken cancellationToken)

try
{
Directory.CreateDirectory(UnversionedWebBuilder.UnversionedFolder);
UnversionedWebBuilder.CreateDownloadTextWithVersionHtml();
UnversionedWebBuilder.CloneAndUpdateOnionIndexHtml();

if (File.Exists(Global.Coordinator.CoinJoinsFilePath))
{
string[] allLines = File.ReadAllLines(Global.Coordinator.CoinJoinsFilePath);
Last5CoinJoins = allLines.TakeLast(5).Reverse().ToList();
UnversionedWebBuilder.UpdateCoinJoinsHtml(Last5CoinJoins);
}

Global.Coordinator.CoinJoinBroadcasted += Coordinator_CoinJoinBroadcasted;
WebsiteTorifier.CloneAndUpdateOnionIndexHtml();
}
catch (Exception ex)
{
@@ -82,25 +69,5 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
{
Logger.LogWarning(e?.ExceptionObject as Exception, "UnhandledException");
}

private void Coordinator_CoinJoinBroadcasted(object sender, Transaction tx)
{
try
{
lock (UpdateUnversionedLock)
{
if (Last5CoinJoins.Count > 4)
{
Last5CoinJoins.RemoveLast();
}
Last5CoinJoins.Insert(0, tx.GetHash().ToString());
UnversionedWebBuilder.UpdateCoinJoinsHtml(Last5CoinJoins);
}
}
catch (Exception ex)
{
Logger.LogWarning(ex, nameof(Program));
}
}
}
}

This file was deleted.

@@ -37,10 +37,6 @@
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
</ItemGroup>

<ItemGroup>
<Folder Include="wwwroot\unversioned\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
@@ -0,0 +1,32 @@
using NBitcoin;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

namespace WalletWasabi.Backend
{
public class WebsiteTorifier
{
public string RootFolder { get; }
public string UnversionedFolder { get; }

public WebsiteTorifier(string rootFolder)
{
RootFolder = rootFolder;
UnversionedFolder = Path.GetFullPath(Path.Combine(RootFolder, "unversioned"));
}

public void CloneAndUpdateOnionIndexHtml()
{
var path = Path.Combine(RootFolder, "index.html");
var onionPath = Path.Combine(RootFolder, "onion-index.html");

var content = File.ReadAllText(path);

content = content.Replace("http://wasabiukrxmkdgve5kynjztuovbg43uxcbcxn6y2okcrsg7gb6jdmbad.onion", "https://wasabiwallet.io", StringComparison.Ordinal);

This comment has been minimized.

Copy link
@benthecarman

benthecarman Aug 6, 2019

Collaborator

The onion link might be able to be moved to a variable, it is also linked in the About view page.


File.WriteAllText(onionPath, content);
}
}
}
@@ -0,0 +1,23 @@
// Wasabi Wallet CSS Theme
// Compile Bootstrap 4.3+ with these variables

$green: #58A567;
$dark: #211B24;
$blue: #3B83F7;
$body-color: $dark;
$headings-font-family: 'Playfair Display', serif;;
$font-family-monospace: Inconsolata, monospace;
$font-family-base: $font-family-monospace;
$headings-font-weight: 600;
$border-radius: .2rem;
$h1-font-size: $font-size-base * 4;
$h2-font-size: $font-size-base * 4;
$font-weight-bold: 600;
$text-muted: #716686;
$spacer: 3rem;
$navbar-nav-link-padding-x: 2rem;
$navbar-dark-color: $white;
$list-group-bg: $dark;
$list-group-color: $white;
$list-group-border-color: rgba($white, .125);
$input-btn-padding-y: .5rem;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.