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

UI: replace Obscuro logos with Ten #1649

Merged
merged 2 commits into from
Nov 16, 2023
Merged

UI: replace Obscuro logos with Ten #1649

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c6343f
UI: replace Obscuro logos with Ten
Jennievon Nov 16, 2023
49a7468
update favicons
Jennievon Nov 16, 2023
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
18 changes: 0 additions & 18 deletions tools/obscuroscan_v2/frontend/src/assets/imgs/obscuro.svg
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions tools/obscuroscan_v2/frontend/src/assets/imgs/ten.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 59 additions & 47 deletions tools/obscuroscan_v2/frontend/src/views/NavbarView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,65 @@
<header>
<el-container class="align-vertical">
<el-main>
<el-row justify="space-around">
<el-col :span="2" >
<img src="@/assets/imgs/obscuro.svg" alt="obscu.ro" class="header-image" style="max-height: 5vh;"/>
</el-col>
<el-col :span="10" :offset="7">
<nav class="nav-bar">
<el-radio-group size="default">
<RouterLink to="/"> <el-button link class="paddedTop"> Home</el-button></RouterLink>
<RouterLink to="/personal"> <el-button link class="paddedTop">Personal</el-button></RouterLink>
<el-button link class="paddedTop">
<el-dropdown>
<span class="el-dropdown-link">
Blockchain
</span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/transactions"> <el-dropdown-item>Transactions</el-dropdown-item></RouterLink>
<RouterLink to="/batches"> <el-dropdown-item>Batches</el-dropdown-item></RouterLink>
<RouterLink to="/blocks"> <el-dropdown-item>Blocks</el-dropdown-item></RouterLink>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
<el-button link class="paddedTop" style="margin: 0px">
<el-dropdown>
<span class="el-dropdown-link">
Resources
</span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/decrypt"> <el-dropdown-item>Decrypt</el-dropdown-item></RouterLink>
<RouterLink to="/verified"> <el-dropdown-item>Verified Data</el-dropdown-item></RouterLink>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
</el-radio-group>
</nav>
</el-col>
<el-col :span="5" >
<meta-mask-connect-button />
</el-col>
<!-- <el-col :span="4" >-->
<!-- <search-bar-item />-->
<!-- </el-col>-->
</el-row>
<el-row justify="space-around">
<el-col :span="2">
<img
src="@/assets/imgs/ten.svg"
alt="obscu.ro"
class="header-image"
style="max-height: 5vh"
/>
</el-col>
<el-col :span="10" :offset="7">
<nav class="nav-bar">
<el-radio-group size="default">
<RouterLink to="/"> <el-button link class="paddedTop"> Home</el-button></RouterLink>
<RouterLink to="/personal">
<el-button link class="paddedTop">Personal</el-button></RouterLink
>
<el-button link class="paddedTop">
<el-dropdown>
<span class="el-dropdown-link"> Blockchain </span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/transactions">
<el-dropdown-item>Transactions</el-dropdown-item></RouterLink
>
<RouterLink to="/batches">
<el-dropdown-item>Batches</el-dropdown-item></RouterLink
>
<RouterLink to="/blocks">
<el-dropdown-item>Blocks</el-dropdown-item></RouterLink
>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
<el-button link class="paddedTop" style="margin: 0px">
<el-dropdown>
<span class="el-dropdown-link"> Resources </span>
<template #dropdown>
<el-dropdown-menu>
<RouterLink to="/decrypt">
<el-dropdown-item>Decrypt</el-dropdown-item></RouterLink
>
<RouterLink to="/verified">
<el-dropdown-item>Verified Data</el-dropdown-item></RouterLink
>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-button>
</el-radio-group>
</nav>
</el-col>
<el-col :span="5">
<meta-mask-connect-button />
</el-col>
<!-- <el-col :span="4" >-->
<!-- <search-bar-item />-->
<!-- </el-col>-->
</el-row>
</el-main>
</el-container>
</header>
Comment on lines 2 to 66
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The restructuring of the HTML template and the replacement of the logo image source from "obscuro.svg" to "ten.svg" align with the rebranding requirements. The use of RouterLink for navigation is a Vue.js best practice for SPA routing, which should provide better performance and user experience by avoiding full page reloads. The inline styles, such as style="max-height: 5vh" on the logo image and style="margin: 0px" on the el-button, could be moved to the scoped CSS for better maintainability and to keep the template cleaner.

Expand Down Expand Up @@ -76,5 +89,4 @@ export default {
.paddedTop {
padding: 10px;
}
Comment on lines 89 to 91
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The .paddedTop class has been updated to include padding, which should ensure consistent spacing for elements with this class. However, the class name .paddedTop suggests that it only adds padding to the top, but the CSS rule applies padding to all sides. Consider renaming the class to reflect its purpose more accurately, such as .padded or .padded-all, to avoid confusion.


</style>
2 changes: 1 addition & 1 deletion tools/walletextension/api/staticOG/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<body>
<div class="container-fluid">
<img src="obscuro.svg" alt="Obscuro logo" class="logo" />
<img src="ten.svg" alt="Ten logo" class="logo" />
</div>

<div class="spinner" id="spinner"></div>
Expand Down
18 changes: 0 additions & 18 deletions tools/walletextension/api/staticOG/obscuro.svg
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tools/walletextension/api/staticOG/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ ol li {
}

.logo {
width: 100px;
height: 100px;
object-fit: contain;
padding: 10px;
}

.begin-box {
Expand Down
6 changes: 6 additions & 0 deletions tools/walletextension/api/staticOG/ten.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading