Skip to content

Commit

Permalink
Ln/deso (#451)
Browse files Browse the repository at this point in the history
* add new deso assets

* DeSo (diamond-app#3)

* (bit)clout -> deso

* fix LICENSE
  • Loading branch information
lazynina authored Sep 21, 2021
1 parent f676ddb commit cc00a91
Show file tree
Hide file tree
Showing 176 changed files with 1,609 additions and 1,575 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# For now, tag everyone who wants to participate
* @bitclout/reviewers
* @deso-protocol/reviewers
3 changes: 3 additions & 0 deletions Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ header @html Content-Security-Policy "
https://ka-f.fontawesome.com;
frame-src 'self'
localhost:*
identity.deso.org
identity.deso.blue
identity.deso.green
identity.bitclout.com
identity.bitclout.blue
identity.bitclout.green
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 bitclout
Copyright (c) 2021 DeSo Community Developers

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
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
![BitClout Logo](https://bitclout.com/assets/img/camelcase_logo.svg)
![DeSo Logo](src/assets/img/camelcase_logo.svg)

# About BitClout
BitClout is a blockchain built from the ground up to support a fully-featured
# About DeSo
DeSo is a blockchain built from the ground up to support a fully-featured
social network. Its architecture is similar to Bitcoin, only it supports complex
social network data like profiles, posts, follows, creator coin transactions, and
more.

[Read about the vision](https://docs.bitclout.com/the-vision)
[Read about the vision](https://docs.deso.org/the-vision)

# About This Repo
Documentation for this repo lives on docs.bitclout.com. Specifically, the following
Documentation for this repo lives on docs.deso.org. Specifically, the following
docs should give you everything you need to get started:
* [BitClout Code Walkthrough](https://docs.bitclout.com/code/walkthrough)
* [Setting Up Your Dev Environment](https://docs.bitclout.com/code/dev-setup)
* [Making Your First Changes](https://docs.bitclout.com/code/making-your-first-changes)
* [DeSo Code Walkthrough](https://docs.deso.org/code/walkthrough)
* [Setting Up Your Dev Environment](https://docs.deso.org/code/dev-setup)
* [Making Your First Changes](https://docs.deso.org/code/making-your-first-changes)
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Security Policy

BitClout encourages responsible vulnerability disclosure for security issues.
DeSo encourages responsible vulnerability disclosure for security issues.

Read the [Bug Bounty documentation](https://docs.bitclout.com/devs/bug-bounty) for more information.
Read the [Bug Bounty documentation](https://docs.deso.org/devs/bug-bounty) for more information.
19 changes: 11 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"cli": {
"analytics": false
},
"version": 1,
"newProjectRoot": "projects",
"projects": {
"bitclout-frontend": {
"deso-frontend": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
Expand Down Expand Up @@ -70,18 +73,18 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "bitclout-frontend:build"
"browserTarget": "deso-frontend:build"
},
"configurations": {
"production": {
"browserTarget": "bitclout-frontend:build:production"
"browserTarget": "deso-frontend:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "bitclout-frontend:build"
"browserTarget": "deso-frontend:build"
}
},
"test": {
Expand Down Expand Up @@ -114,7 +117,7 @@
}
}
},
"bitclout-frontend-e2e": {
"deso-frontend-e2e": {
"root": "e2e/",
"projectType": "application",
"prefix": "",
Expand All @@ -123,11 +126,11 @@
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "bitclout-frontend:serve"
"devServerTarget": "deso-frontend:serve"
},
"configurations": {
"production": {
"devServerTarget": "bitclout-frontend:serve:production"
"devServerTarget": "deso-frontend:serve:production"
}
}
},
Expand All @@ -143,5 +146,5 @@
}
}
},
"defaultProject": "bitclout-frontend"
"defaultProject": "deso-frontend"
}
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "bitclout-frontend",
"name": "deso-frontend",
"version": "0.0.0",
"scripts": {
"ng": "ng",
Expand Down Expand Up @@ -31,7 +31,7 @@
"bs58": "^4.0.1",
"canvas-confetti": "^1.3.0",
"cipher-base": "^1.0.4",
"confetti-js": "github:bitclout/confetti-js",
"confetti-js": "github:deso-protocol/confetti-js",
"core-js": "^2.5.4",
"currency-symbol-map": "^5.0.1",
"fs": "0.0.1-security",
Expand Down
10 changes: 5 additions & 5 deletions src/app/admin/admin-jumio/admin-jumio.component.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<div>
<div class="fs-15px font-weight-bold mt-15px mb-15px px-15px">
Set Jumio Starter $CLOUT amount (in nanos):
Set Jumio Starter $DESO amount (in nanos):
<div class="d-flex mt-5px">
<input
[(ngModel)]="jumioBitCloutNanos"
(keydown.enter)="updateJumioBitCloutNanos()"
[(ngModel)]="jumioDeSoNanos"
(keydown.enter)="updateJumioDeSoNanos()"
class="form-control w-100 fs-15px lh-15px"
placeholder="Enter an amount"
type="number"
/>
<button *ngIf="!updatingJumioBitCloutNanos" (click)="updateJumioBitCloutNanos()" class="btn btn-outline-primary fs-15px ml-5px">
<button *ngIf="!updatingJumioDeSoNanos" (click)="updateJumioDeSoNanos()" class="btn btn-outline-primary fs-15px ml-5px">
Update
</button>
<button *ngIf="updatingJumioBitCloutNanos" class="btn btn-primary fs-15px ml-5px" disabled>
<button *ngIf="updatingJumioDeSoNanos" class="btn btn-primary fs-15px ml-5px" disabled>
Working...
</button>
</div>
Expand Down
22 changes: 11 additions & 11 deletions src/app/admin/admin-jumio/admin-jumio.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ export class AdminJumioComponent {
resettingJumio = false;
executingJumioCallback = false;

jumioBitCloutNanos: number = 0;
updatingJumioBitCloutNanos = false;
jumioDeSoNanos: number = 0;
updatingJumioDeSoNanos = false;

constructor(
private globalVars: GlobalVarsService,
private router: Router,
private route: ActivatedRoute,
private backendApi: BackendApiService
) {
this.jumioBitCloutNanos = globalVars.jumioBitCloutNanos;
this.jumioDeSoNanos = globalVars.jumioDeSoNanos;
}

_resetJumio(): void {
Expand Down Expand Up @@ -81,12 +81,12 @@ export class AdminJumioComponent {
.add(() => (this.executingJumioCallback = false));
}

updateJumioBitCloutNanos(): void {
updateJumioDeSoNanos(): void {
SwalHelper.fire({
target: this.globalVars.getTargetComponentSelector(),
title: "Are you ready?",
html: `You are about to update the amount of $CLOUT sent for verifying with Jumio to ${this.globalVars.nanosToBitClout(
this.jumioBitCloutNanos
html: `You are about to update the amount of $DESO sent for verifying with Jumio to ${this.globalVars.nanosToDeSo(
this.jumioDeSoNanos
)}.`,
showConfirmButton: true,
showCancelButton: true,
Expand All @@ -99,22 +99,22 @@ export class AdminJumioComponent {
cancelButtonText: "Cancel",
}).then((res) => {
if (res.isConfirmed) {
this.updatingJumioBitCloutNanos = true;
this.updatingJumioDeSoNanos = true;
this.backendApi
.AdminUpdateJumioBitClout(
.AdminUpdateJumioDeSo(
this.globalVars.localNode,
this.globalVars.loggedInUser.PublicKeyBase58Check,
this.jumioBitCloutNanos
this.jumioDeSoNanos
)
.subscribe(
(res) => {
this.globalVars.jumioBitCloutNanos = res.BitCloutNanos;
this.globalVars.jumioDeSoNanos = res.DeSoNanos;
},
(err) => {
console.error(err);
}
)
.add(() => (this.updatingJumioBitCloutNanos = false));
.add(() => (this.updatingJumioDeSoNanos = false));
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/admin/admin-wyre/admin-wyre.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
Destination amount: {{ order.LatestWyreTrackWalletOrderResponse.destAmount }}
{{ order.LatestWyreTrackWalletOrderResponse.destCurrency }}
</li>
<li *ngIf="order.BitCloutPurchasedNanos">BitClout Nanos Purchased: {{ order.BitCloutPurchasedNanos }}</li>
<li *ngIf="order.DeSoPurchasedNanos">DeSo Nanos Purchased: {{ order.DeSoPurchasedNanos }}</li>
<li style="word-break: break-word" *ngIf="order.BasicTransferTxnHash">
BitClout Basic Transfer Hash: {{ order.BasicTransferTxnHash }}
DeSo Basic Transfer Hash: {{ order.BasicTransferTxnHash }}
</li>
</ul>
</div>
Expand Down
44 changes: 22 additions & 22 deletions src/app/admin/admin.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
(tabClick)="_postTabClicked($event)"
></tab-selector>
<div
*ngIf="activePostTab == POSTS_BY_CLOUT_TAB"
*ngIf="activePostTab == POSTS_BY_DESO_TAB"
class="w-100 px-15px py-5px fs-15px border-bottom border-color-grey d-flex"
style="justify-content: flex-start; align-items: center;"
>
Expand All @@ -65,14 +65,14 @@
<a
class="btn btn-primary"
style="vertical-align: middle; float: right; text-align: center;"
(click)="_searchPostsByClout()"
(click)="_searchPostsByDESO()"
>
Search
</a>
</div>

</div>
<simple-center-loader *ngIf="searchingForPostsByClout; else showPosts"></simple-center-loader>
<simple-center-loader *ngIf="searchingForPostsByDESO; else showPosts"></simple-center-loader>
<ng-template #showPosts>
<div *ngFor="let post of activePosts; let ii = index">
<div *ngIf="post.ProfileEntryResponse" class="border-bottom border-color-grey">
Expand Down Expand Up @@ -464,7 +464,7 @@
<div
class="w-100 d-flex justify-content-start py-10px pl-15px fs-15px fc-muted border-bottom border-color-grey light-grey-divider"
>
See the state of your bitclout node below.
See the state of your deso node below.
</div>
<network-info class="w-100"></network-info>
</div>
Expand Down Expand Up @@ -710,7 +710,7 @@
</div>

<div class="fs-15px font-weight-bold mt-15px mb-5px px-15px">
Create Profile Fee In BitClout
Create Profile Fee In DeSo
<div class="d-flex align-items-center justify-content-between font-weight-normal mt-5px">
<input
[(ngModel)]="updateGlobalParamsValues.CreateProfileFeeNanos"
Expand Down Expand Up @@ -803,7 +803,7 @@
</div>

<div class="fs-15px font-weight-bold mt-15px mb-5px px-15px">
Create NFT Fee in BitClout
Create NFT Fee in DeSo
<div class="d-flex align-items-center justify-content-between font-weight-normal mt-5px">
<input
[(ngModel)]="updateGlobalParamsValues.CreateNFTFeeNanos"
Expand Down Expand Up @@ -911,47 +911,47 @@
</ul>
</ul>

<!-- USD Cents Per BitClout Reserve Price -->
<!-- USD Cents Per DeSo Reserve Price -->
<div class="fs-15px font-weight-bold mt-15px mb-15px px-15px">
Update USD to BitClout Reserve Price ($)
Update USD to DeSo Reserve Price ($)
<div class="d-flex mt-5px">
<input
[(ngModel)]="usdToBitCloutReserveExchangeRate"
(keydown.enter)="updateUSDToBitCloutReserveExchangeRate()"
[(ngModel)]="usdToDeSoReserveExchangeRate"
(keydown.enter)="updateUSDToDeSoReserveExchangeRate()"
class="form-control w-100 fs-15px lh-15px"
placeholder="Enter the new USD to BitClout Reserve Exchange Rate"
placeholder="Enter the new USD to DeSo Reserve Exchange Rate"
type="number"
/>
<button
*ngIf="!submittingUSDToBitCloutReserveExchangeRateUpdate"
(click)="updateUSDToBitCloutReserveExchangeRate()"
*ngIf="!submittingUSDToDeSoReserveExchangeRateUpdate"
(click)="updateUSDToDeSoReserveExchangeRate()"
class="btn btn-outline-primary fs-15px ml-5px"
>
Update
</button>
<button *ngIf="submittingUSDToBitCloutReserveExchangeRateUpdate" class="btn btn-primary fs-15px ml-5px" disabled>Working...</button>
<button *ngIf="submittingUSDToDeSoReserveExchangeRateUpdate" class="btn btn-primary fs-15px ml-5px" disabled>Working...</button>
</div>
</div>

<!-- Buy BitClout Fee Rate-->
<!-- Buy DeSo Fee Rate-->
<div class="fs-15px font-weight-bold mt-15px mb-15px px-15px">
Update Buy BitClout Fee Rate (%)
Update Buy DeSo Fee Rate (%)
<div class="d-flex mt-5px">
<input
[(ngModel)]="buyBitCloutFeeRate"
(keydown.enter)="updateBuyBitCloutFeeRate()"
[(ngModel)]="buyDeSoFeeRate"
(keydown.enter)="updateBuyDeSoFeeRate()"
class="form-control w-100 fs-15px lh-15px"
placeholder="Enter Buy BitClout Fee Rate"
placeholder="Enter Buy DeSo Fee Rate"
type="number"
/>
<button
*ngIf="!submittingBuyBitCloutFeeRate"
(click)="updateBuyBitCloutFeeRate()"
*ngIf="!submittingBuyDeSoFeeRate"
(click)="updateBuyDeSoFeeRate()"
class="btn btn-outline-primary fs-15px ml-5px"
>
Update
</button>
<button *ngIf="submittingBuyBitCloutFeeRate" class="btn btn-primary fs-15px ml-5px" disabled>Working...</button>
<button *ngIf="submittingBuyDeSoFeeRate" class="btn btn-primary fs-15px ml-5px" disabled>Working...</button>
</div>
</div>

Expand Down
Loading

0 comments on commit cc00a91

Please sign in to comment.