Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@taeguscromis
taeguscromis committed Apr 23, 2023
1 parent d827ea2 commit 6da4dfd
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 78 deletions.
55 changes: 52 additions & 3 deletions labs/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,58 @@
</div>
<div class="row mb-5" id="labsProjects">
<div class="col-lg-12 mt-12 pl-lg-12" data-aos="fade-up" data-aos-delay="200">
<p>
Coming soon to a browser near you!
</p>
<h2 class="text-uppercase text-primary d-block mb-3" data-aos="fade-left" data-aos-delay="300">
Conceal-Assistant
</h2>
<p>
Conceal-Assistant is an application made to help you oversee and manage your CCX-Box Node and Miner operations. It simply checks the status of the associated services and also allows you to easily deactivate or activate those services from any device.
</p>
<p>
The CCX-Box is a small form-factor PC that will run a Conceal Network Full-Node and Miner out of the box. Utilizing the Conceal-Assistant, this small dedicated Node can be managed remotely and will earn $CCX over time.
</p>
<p>
<a href="https://github.com/Acktarius/conceal-assistant">
You can go the the github page for more info and for downloads by clicking on this url.
<i class="fab fa-github"></i>
</a>
</p>
<p>
<a href="data/conceal-assistant_info.pdf">
You can find more information about the product in this PDF.
<i class="fa-solid fa-file-pdf"></i>
</a>
</p>
<h3 class="text-uppercase text-primary d-block mb-3" data-aos="fade-left" data-aos-delay="300">
How it looks...
</h3>
<div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="carousel-item active">
<img src="images/ccxassistant/assistant_01.png" class="d-block w-80" alt="Assistant_01" />
</div>
<div class="carousel-item">
<img src="images/ccxassistant/assistant_02.png" class="d-block w-80" alt="Assistant_02" />
</div>
<div class="carousel-item">
<img src="images/ccxassistant/assistant_03.png" class="d-block w-80" alt="Assistant_03" />
</div>
<div class="carousel-item">
<img src="images/ccxassistant/assistant_04.png" class="d-block w-80" alt="Assistant_04" />
</div>
<div class="carousel-item">
<img src="images/ccxassistant/assistant_05.png" class="d-block w-80" alt="Assistant_05" />
</div>
</div>
<a class="carousel-control-prev" href="#carouselExampleControls" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleControls" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>

</div>
</div>
</div><!-- .cointainer -->
Expand Down
15 changes: 12 additions & 3 deletions landing/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@ body,
a {
-webkit-transition: .3s all ease;
-o-transition: .3s all ease;
transition: .3s all ease; }
a:hover {
text-decoration: none; }
transition: .3s all ease;
text-decoration: underline;
color: orange;
}
a:hover {
text-decoration: none;
text-decoration: underline;
}

h1, h2, h3, h4, h5,
.h1, .h2, .h3, .h4, .h5 {
Expand Down Expand Up @@ -1438,3 +1443,7 @@ body {
width: 90%;
font-size: 0.8em;
}

.carousel-inner img {
margin: auto;
}
42 changes: 21 additions & 21 deletions roadmap/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>Q2 2022, Conceal App - Version 3</h6> — Third release with Bridges and ID modules.
<h6>Web wallet improvements</h6> — Improving speed and making optimizations
</span>
<div class="t-square"></div>
</div>
Expand All @@ -338,7 +338,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>Q3 2022, New Bridges</h6> — Bridges to Ergo and AVAX.
<h6>Web wallet encrypted messages</h6> — Bringing encrypted messages to client side web wallet
</span>
<div class="t-square"></div>
</div>
Expand All @@ -348,7 +348,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>Q4 2022, Conceal App - Version 4</h6> — Fourth release with Explorer module.
<h6>Web wallet deposits</h6> — Bringing deposits to client side web wallet
</span>
<div class="t-square"></div>
</div>
Expand All @@ -358,7 +358,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>Q4 2023, Conceal App - Version 5</h6> — Fifth release with Conceal Live module.
<h6>Multi-signature</h6> — Support for Multi-signature Wallets. Together with Colored coins it will allow for “Privacy Protected Assets” on CCX.
</span>
<div class="t-square"></div>
</div>
Expand All @@ -368,37 +368,37 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2023/2024, Colored Coins</h6> — Support for Coloured Coins on CCX, this is a step towards “Privacy Protected Assets”.
<h6>Colored Coins</h6> — Support for Coloured Coins on CCX, this is a step towards “Privacy Protected Assets”.
</span>
<div class="t-square"></div>
</div>
</div>

<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2023/2024, Multi-signature Wallets</h6> — Support for Multi-signature Wallets. Together with Colored coins it will allow for “Privacy Protected Assets” on CCX.
<h6>Privacy Protected Assets</h6> — Allow users to create “Privacy Protected Assets” on CCX chain.
</span>
<div class="t-square"></div>
</div>
</div>
<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2025/2026, Privacy Protected Assets</h6> — Allow users to create “Privacy Protected Assets” on CCX chain.
<h6>Conceal App</h6> — Further development of Conceal App, to unite all features inside a single application
</span>
<div class="t-square"></div>
</div>
</div>

<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2024/2025, Privacy-Preserving Stable Coin</h6> — On-chain Privacy-Preserving stable coin pegged to other digital stablecoins using cross-chain bridges.
<h6>Avax Bridge</h6>
</span>
<div class="t-square"></div>
</div>
Expand All @@ -408,7 +408,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2026/2027, Canceling Deposits</h6> — Option to cancel currently locked deposits but with penalties.
<h6>Ergo Bridge</h6>
</span>
<div class="t-square"></div>
</div>
Expand All @@ -418,7 +418,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>2027/2028, Stable Deposits</h6> — Deposits pegged to a stable asset, giving you peace of mind, while gaining interest.
<h6>SSL support for daemon</h6>
</span>
<div class="t-square"></div>
</div>
Expand All @@ -428,7 +428,7 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>TBA, Conceal Vault</h6>
<h6>Conceal Vault</h6>
</span>
<div class="t-square"></div>
</div>
Expand All @@ -438,17 +438,17 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>TBA, Hardware Wallet Support</h6>
<h6>C-Live update</h6>
</span>
<div class="t-square"></div>
</div>
</div>

<div class="single-timeline d-flex-2" data-aos="fade-down" data-aos-delay="200">
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>TBA, Distributed API Layer</h6>
<h6> Hardware Wallet Support</h6>
</span>
<div class="t-square"></div>
</div>
Expand All @@ -458,12 +458,12 @@
<div class="timeline-blank"></div>
<div class="timeline-text d-flex-2 inprog">
<span>
<h6>TBA, Conceal Card</h6>
<h6>TBA, Distributed API Layer</h6>
</span>
<div class="t-square"></div>
</div>
</div>

</div>
</div>
</div>
Expand Down
54 changes: 3 additions & 51 deletions team/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,21 +144,7 @@
</div>
</div>
</div>

<div class="column pb-5" data-aos="fade-up" data-aos-delay="400">
<div class="team card h-100">
<div class="team-img">
<img src="../images/teampage/ZeMaNel.png" alt="">
</div>
<h3 class="team-name">ZeMaNel</h3>
<span class="role">Cloud Operations</span>
<ul class="socials">
<li><a href="https://github.com/cryptomanel" class="fab fa-github" target="_blank" rel="noopener noreferrer"></a></li>
</ul>
<div class="tdesc"><p class="desc">I'm one of the early developers overviewing Conceal's infrastructure around all cloud operations. I've been in the IT industry since early 00's working closely with security and performance workloads of mission critical software.</p></div>
</div>
</div>


<div class="column pb-5" data-aos="fade-up" data-aos-delay="400">
<div class="team card h-100">
<div class="team-img">
Expand Down Expand Up @@ -197,7 +183,7 @@
<img src="../images/teampage/AxVultis.png" alt="">
</div>
<h3 class="team-name">AxVultis</h3>
<span class="role">Developer</span>
<span class="role">Lead Developer</span>
<ul class="socials">
<li><a href="https://github.com/AxVultis" class="fab fa-github" target="_blank" rel="noopener noreferrer"></a></li>
<li><a href="https://twitter.com/AxVultis" class="fab fa-twitter" target="_blank" rel="noopener noreferrer"></a></li>
Expand Down Expand Up @@ -240,41 +226,7 @@
<div class="tdesc"><p class="desc">I began my crypto journey in mid-2017 and discovered Conceal in late 2020. In September 2021, I was promoted to join the core team to help our project grow. I've learned a lot over the years, and I'm still on a journey of learning and being the best I can be.</p></div>
</div>
</div>

<div class="column pb-5" data-aos="fade-up" data-aos-delay="400">
<div class="team card h-100">
<div class="team-img">
<img src="../images/teampage/CrypTader.jpg" alt="">
</div>
<h3 class="team-name">CrypTader</h3>
<span class="role">Marketing</span>
<ul class="socials">
<li><a href="https://twitter.com/Cryp_Tader" class="fab fa-twitter" target="_blank" rel="noopener noreferrer"></a></li>
</ul>
<div class="tdesc">
<p class="desc">My constant hunger for the truth and my curiosity to understand how the global financial system works due to my decade long experience in corporate finance led me to discover crypto in 2017. After years of reading and learning in the crypto-space I discovered Conceal Network in early 2021 and I instantly fell in love due to its strict adherence to fundamentally sound principles of cryptocurrencies.</p>
</div>
</div>
</div>

<div class="column pb-5" data-aos="fade-up" data-aos-delay="400">
<div class="team card h-100">
<div class="team-img">
<img src="../images/teampage/Overdrive.jpg" alt="">
</div>
<h3 class="team-name">Overdrive</h3>
<span class="role">Developer</span>
<ul class="socials">
<li><a href="https://github.com/Overdrive-on" class="fab fa-github" target="_blank" rel="noopener noreferrer"></a></li>
</ul>
<div class="tdesc">
<p class="desc">
I was interested in the conceal project ever since I first knew about it and one day I got an opportunity to work with the team. Conceal represents the very definition of privacy.I am a strong believer in privacy rights and I sincerely hope one day we can create a world where privacy is an undenied right.
</p>
</div>
</div>
</div>


</div>
<div class="row mb-5 aboutSection">
<div class="col-lg-4" data-aos="fade-up" data-aos-delay="100">
Expand Down

0 comments on commit 6da4dfd

Please sign in to comment.