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.

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

Removed components not required for 1522 delpoyment #94

Open
wants to merge 1 commit into
base: explorer/master
Choose a base branch
from
Open

Removed components not required for 1522 delpoyment #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions app/constants/Notification.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ object Notification {
}


val VALIDATOR_CREATED = new Notification(notificationType = "VALIDATOR_CREATED", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_EDITED = new Notification(notificationType = "VALIDATOR_EDITED", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_UNJAILED = new Notification(notificationType = "VALIDATOR_UNJAILED", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_MISSING_SIGNATURE_SLASHING = new Notification(notificationType = "VALIDATOR_MISSING_SIGNATURE_SLASHING", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_DOUBLE_SIGNING_SLASHING = new Notification(notificationType = "VALIDATOR_DOUBLE_SIGNING_SLASHING", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_MISSED_BLOCKS = new Notification(notificationType = "VALIDATOR_MISSED_BLOCKS", sendEmail = false, sendPushNotification = false, sendSMS = false, route = Option(routes.javascript.ComponentViewController.validator))
val VALIDATOR_CREATED = new Notification(notificationType = "VALIDATOR_CREATED", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)
val VALIDATOR_EDITED = new Notification(notificationType = "VALIDATOR_EDITED", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)
val VALIDATOR_UNJAILED = new Notification(notificationType = "VALIDATOR_UNJAILED", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)
val VALIDATOR_MISSING_SIGNATURE_SLASHING = new Notification(notificationType = "VALIDATOR_MISSING_SIGNATURE_SLASHING", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)
val VALIDATOR_DOUBLE_SIGNING_SLASHING = new Notification(notificationType = "VALIDATOR_DOUBLE_SIGNING_SLASHING", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)
val VALIDATOR_MISSED_BLOCKS = new Notification(notificationType = "VALIDATOR_MISSED_BLOCKS", sendEmail = false, sendPushNotification = false, sendSMS = false /*route = Option(routes.javascript.ComponentViewController.validator)*/)


val SUCCESS = new Notification(notificationType = "SUCCESS", sendEmail = false, sendPushNotification = true, sendSMS = false)
Expand Down
548 changes: 274 additions & 274 deletions app/controllers/ComponentViewController.scala
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/controllers/IndexController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class IndexController @Inject()(messagesControllerComponents: MessagesController
withoutLoginActionAsync { implicit loginState =>
implicit request =>
if (query == "") Future(Unauthorized(views.html.index(failures = Seq(constants.Response.EMPTY_QUERY))))
else if (query.matches(constants.Blockchain.AccountRegexString)) Future(Redirect(routes.ComponentViewController.wallet(query)))
else if (query.matches(constants.Blockchain.ValidatorRegexString) || utilities.Validator.isHexAddress(query)) Future(Redirect(routes.ComponentViewController.validator(query)))
// else if (query.matches(constants.Blockchain.AccountRegexString)) Future(Redirect(routes.ComponentViewController.wallet(query)))
// else if (query.matches(constants.Blockchain.ValidatorRegexString) || utilities.Validator.isHexAddress(query)) Future(Redirect(routes.ComponentViewController.validator(query)))
else if (query.matches(constants.RegularExpression.TRANSACTION_HASH.regex)) Future(Redirect(routes.ComponentViewController.transaction(query)))
else if (Try(query.toInt).isSuccess) Future(Redirect(routes.ComponentViewController.block(query.toInt)))
else Future(Redirect(routes.ComponentViewController.document(query)))
Expand Down
54 changes: 27 additions & 27 deletions app/controllers/JavaScriptRoutesController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ class JavaScriptRoutesController @Inject()(messagesControllerComponents: Message
routes.javascript.ComponentViewController.dashboard,
routes.javascript.ComponentViewController.block,
routes.javascript.ComponentViewController.transaction,
routes.javascript.ComponentViewController.validator,
routes.javascript.ComponentViewController.wallet,
routes.javascript.ComponentViewController.proposal,
// routes.javascript.ComponentViewController.validator,
// routes.javascript.ComponentViewController.wallet,
// routes.javascript.ComponentViewController.proposal,
routes.javascript.ComponentViewController.document,

routes.javascript.ComponentViewController.recentActivities,

routes.javascript.ComponentViewController.latestBlockHeight,
routes.javascript.ComponentViewController.tokensStatistics,
routes.javascript.ComponentViewController.votingPowers,
// routes.javascript.ComponentViewController.tokensStatistics,
// routes.javascript.ComponentViewController.votingPowers,

routes.javascript.ComponentViewController.assetMantleStatistics,

routes.javascript.ComponentViewController.tokensPrices,
// routes.javascript.ComponentViewController.tokensPricesDelete,
routes.javascript.ComponentViewController.transactionStatistics,
routes.javascript.ComponentViewController.transactionMessagesStatistics,

Expand All @@ -56,37 +56,37 @@ class JavaScriptRoutesController @Inject()(messagesControllerComponents: Message
routes.javascript.ComponentViewController.transactionMessages,
routes.javascript.ComponentViewController.withdrawRewardAmount,

routes.javascript.ComponentViewController.proposalList,
routes.javascript.ComponentViewController.proposalDetails,
routes.javascript.ComponentViewController.proposalDeposits,
routes.javascript.ComponentViewController.proposalVotes,

routes.javascript.ComponentViewController.validatorList,
routes.javascript.ComponentViewController.activeValidatorList,
routes.javascript.ComponentViewController.inactiveValidatorList,
routes.javascript.ComponentViewController.validatorDetails,
routes.javascript.ComponentViewController.validatorUptime,
routes.javascript.ComponentViewController.validatorDelegations,
routes.javascript.ComponentViewController.validatorTransactions,
routes.javascript.ComponentViewController.validatorTransactionsPerPage,

routes.javascript.ComponentViewController.parameters,
// routes.javascript.ComponentViewController.proposalList,
// routes.javascript.ComponentViewController.proposalDetails,
// routes.javascript.ComponentViewController.proposalDeposits,
// routes.javascript.ComponentViewController.proposalVotes,
//
// routes.javascript.ComponentViewController.validatorListDelete,
// routes.javascript.ComponentViewController.activeValidatorList,
// routes.javascript.ComponentViewController.inactiveValidatorList,
// routes.javascript.ComponentViewController.validatorDetails,
// routes.javascript.ComponentViewController.validatorUptime,
// routes.javascript.ComponentViewController.validatorDelegations,
// routes.javascript.ComponentViewController.validatorTransactions,
// routes.javascript.ComponentViewController.validatorTransactionsPerPage,
//
// routes.javascript.ComponentViewController.parameters,

routes.javascript.IndexController.search,

routes.javascript.NotificationController.recentActivityMessages,

routes.javascript.ViewController.block,
routes.javascript.ViewController.validator,
// routes.javascript.ViewController.validator,
routes.javascript.ViewController.transaction,
routes.javascript.ViewController.proposal,
// routes.javascript.ViewController.proposal,
routes.javascript.ViewController.blocks,
routes.javascript.ViewController.transactions,
routes.javascript.ViewController.validators,
routes.javascript.ViewController.proposals,
routes.javascript.ViewController.wallet,
// routes.javascript.ViewController.validators,
// routes.javascript.ViewController.proposals,
// routes.javascript.ViewController.wallet,
routes.javascript.ViewController.document,
routes.javascript.ViewController.parameters,
// routes.javascript.ViewController.parameters,

)
).as("text/javascript")
Expand Down
78 changes: 39 additions & 39 deletions app/controllers/ViewController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ class ViewController @Inject()(

private implicit val module: String = constants.Module.CONTROLLERS_VIEW

def validators(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.validators(None))
}
}

def validator(address: String): EssentialAction = cached.apply(req => req.path + "/" + address, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.validators(Option(address)))
}
}
// def validators(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.validators(None))
// }
// }

// def validator(address: String): EssentialAction = cached.apply(req => req.path + "/" + address, constants.AppConfig.CacheDuration) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.validators(Option(address)))
// }
// }

def blocks(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
Expand All @@ -50,12 +50,12 @@ class ViewController @Inject()(
}
}

def parameters: EssentialAction = cached.apply(req => req.path, 3600) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.parameters())
}
}
// def parameters: EssentialAction = cached.apply(req => req.path, 3600) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.parameters())
// }
// }

def transactions(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
Expand All @@ -71,26 +71,26 @@ class ViewController @Inject()(
}
}

def proposals(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.proposals(None))
}
}

def proposal(proposalID: Int): EssentialAction = cached.apply(req => req.path + "/" + proposalID.toString, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.proposals(Option(proposalID)))
}
}

def wallet(address: String): EssentialAction = cached.apply(req => req.path + "/" + address, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
implicit request =>
Ok(views.html.explorer.wallet(address))
}
}
// def proposals(): EssentialAction = cached.apply(req => req.path, constants.AppConfig.CacheDuration) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.proposals(None))
// }
// }
//
// def proposal(proposalID: Int): EssentialAction = cached.apply(req => req.path + "/" + proposalID.toString, constants.AppConfig.CacheDuration) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.proposals(Option(proposalID)))
// }
// }
//
// def wallet(address: String): EssentialAction = cached.apply(req => req.path + "/" + address, constants.AppConfig.CacheDuration) {
// withoutLoginAction { implicit loginState =>
// implicit request =>
// Ok(views.html.explorer.wallet(address))
// }
// }

def document(id: String): EssentialAction = cached.apply(req => req.path + "/" + id, constants.AppConfig.CacheDuration) {
withoutLoginAction { implicit loginState =>
Expand Down
62 changes: 31 additions & 31 deletions app/views/base/common.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
<nav class="cmuk-navbar-container" cmuk-navbar="mode: click">
<div class="mobileNavigationHeader cmuk-hidden@@m">
<a class="cmuk-navbar-item cmuk-logo" href="@controllers.routes.IndexController.index">
<img src="@routes.Assets.versioned("images/logo.svg")" class="navigationBarLogo">
<img src="@routes.Assets.versioned("images/1522logo.png")" class="navigationBarLogo">
</a>
<a class="cmuk-navbar-toggle cmuk-margin-auto-left" onclick="mobileNavigation()" cmuk-navbar-toggle-icon></a>
</div>
<div id="mobileNavigation" class="mobileNavigation">
<div class="cmuk-navbar-left">
<a class="cmuk-navbar-item cmuk-logo cmuk-visible@@m" href="@controllers.routes.IndexController.index">
<img src="@routes.Assets.versioned("images/logo.svg")" class="navigationBarLogo">
<img src="@routes.Assets.versioned("images/1522logo.png")" class="navigationBarLogo">
</a>
<ul class="cmuk-navbar-nav" onclick="setActiveLink(event)">
<li><a id="dashBoard" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.dashboard())" class="navItemRippleEffect"><span class="dashboardIcon">
Expand All @@ -97,35 +97,35 @@
@Messages(constants.View.TRANSACTIONS)
</a>
</li>
<li><a id="validators" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validatorList())" class="navItemRippleEffect"><span class="validatorsIcon">
@commonIcon("validatorsIcon")
</span>
@Messages(constants.View.VALIDATORS)
</a>
</li>
<li><a id="proposals" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.proposalList())" class="navItemRippleEffect"><span class="proposalsIcon">
@commonIcon("proposalsIcon")
</span>
@Messages(constants.View.PROPOSALS)
</a>
</li>
<li><a id="parameters" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.parameters())" class="navItemRippleEffect"><span class="proposalsIcon">
@commonIcon("parametersIcon")
</span>
@Messages(constants.View.PARAMETERS)
</a>
</li>
<li>
<a id="wallet" href="https://wallet.assetmantle.one" class="navItemRippleEffect" target="_blank">
<span class="walletIcon">
@commonIcon("walletIcon")
</span>
@Messages(constants.View.WALLET)
<span class="walletLinkIcon">
@commonIcon("walletLinkIcon")
</span>
</a>
</li>
@* <li><a id="validators" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.validatorListDelete())" class="navItemRippleEffect"><span class="validatorsIcon">*@
@* @commonIcon("validatorsIcon")*@
@* </span>*@
@* @Messages(constants.View.VALIDATORS)*@
@* </a>*@
@* </li>*@
@* <li><a id="proposals" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.proposalList())" class="navItemRippleEffect"><span class="proposalsIcon">*@
@* @commonIcon("proposalsIcon")*@
@* </span>*@
@* @Messages(constants.View.PROPOSALS)*@
@* </a>*@
@* </li>*@
@* <li><a id="parameters" onclick="componentResource('explorerContent', jsRoutes.controllers.ComponentViewController.parameters())" class="navItemRippleEffect"><span class="proposalsIcon">*@
@* @commonIcon("parametersIcon")*@
@* </span>*@
@* @Messages(constants.View.PARAMETERS)*@
@* </a>*@
@* </li>*@
@* <li>*@
@* <a id="wallet" href="https://wallet.assetmantle.one" class="navItemRippleEffect" target="_blank">*@
@* <span class="walletIcon">*@
@* @commonIcon("walletIcon")*@
@* </span>*@
@* @Messages(constants.View.WALLET)*@
@* <span class="walletLinkIcon">*@
@* @commonIcon("walletLinkIcon")*@
@* </span>*@
@* </a>*@
@* </li>*@
</ul>
</div>
<div class="cmuk-navbar-right">
Expand Down
Loading