Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/dash-website-300x300.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/img/dashscan-300x300.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/app/layout.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import dynamic from 'next/dynamic'
// import dynamic from 'next/dynamic'
import './globals.css'
import 'react-toastify/dist/ReactToastify.css'

const ClientProviders = dynamic(() => import('@/components/ClientProviders'))
// const ClientProviders = dynamic(() => import('@/components/ClientProviders'))

export const metadata = {
title: 'pshenmic.Dev',
Expand All @@ -13,9 +13,9 @@ export default function RootLayout({ children }) {
return (
<html lang={'en'}>
<body>
<ClientProviders>
{/*<ClientProviders>*/}
{children}
</ClientProviders>
{/*</ClientProviders>*/}
</body>
</html>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useState, useEffect } from 'react'

const GetZeroClient = dynamic(() => import('@/components/GetZeroClient/GetZeroClient'), { ssr: false });

const defaultContent = 'projects'
const defaultContent = 'team'

export default function App() {
const [content, setContent] = useState(defaultContent)
Expand Down
2 changes: 1 addition & 1 deletion src/assets/styles/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ $width-tablet: 940px;
font-size: 16px;
color: #fff;
margin-bottom: 16px;
word-break: break-all;
word-break: normal;
overflow-wrap: break-word;
white-space: normal;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ContentBlock/ContentBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function ContentBlock () {
</m.div>
}
/>
<Route key={'projectsRoute'} path={'/'}
<Route key={'projectsRoute'} path={'/projects'}
element={
<m.div key={'projects'}
initial={{ y: 30, opacity: 0 }}
Expand All @@ -41,7 +41,7 @@ function ContentBlock () {
</m.div>
}
/>
<Route key={'teamRoute'} path={'/team'}
<Route key={'teamRoute'} path={'/'}
element={
<m.div key={'team'}>
<Team/>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Menu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ const menuItems = [
// title: 'Updates',
// id: 'updates'
// },
{
href: '/',
title: 'Team',
id: 'team'
},
{
href: '/services',
title: 'Services',
id: 'services'
},
{
href: '/',
href: '/projects',
title: 'Projects',
id: 'projects'
},
{
href: '/team',
title: 'Team',
id: 'team'
}
]

Expand Down
37 changes: 36 additions & 1 deletion src/components/Projects/ProjectsList.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,49 @@ const documents = [
description: 'A browser extension wallet for interacting with Dash Platform blockchain\n' +
'The Dash Platform Extension is a powerful Web3 wallet specifically designed for the Dash Platform ecosystem. Whether you\'re a crypto enthusiast managing digital assets or a developer building the next generation of decentralized applications, this extension provides all the tools you need in one secure, user-friendly package.',
url: 'https://chromewebstore.google.com/detail/dash-platform-extension/odmphbcnlldggfhcpdjgnlhbehoicdnf',
image: '/assets/img/dash-300x300.jpg'
image: '/assets/img/dash-platform-extension-300x300.jpg'
},
{
id: 'dash-platform-sdk',
name: 'Dash Platform Sdk',
description: 'A lightweight Javascript Dash Platform SDK',
url: 'https://github.com/pshenmic/dash-platform-sdk',
image: '/assets/img/dash-300x300.jpg'
},
{
id: 'dash-website',
name: 'Dash Website',
description: 'Dash.org website',
url: 'https://github.com/pshenmic/dash-website',
image: '/assets/img/dash-website-300x300.jpg'
},
{
id: 'dashscan',
name: 'Dash Scan',
description: 'Dash Blockchain explorer',
url: 'https://github.com/pshenmic/dashscan',
image: '/assets/img/dashscan-300x300.jpg'
},
{
id: 'dash-torrent-tracker',
name: 'Dash Torrent Tracker',
description: 'Decentralized Dash Torrent Tracker that stores magnet links on a Dash Platform blockchain',
url: 'https://github.com/pshenmic/dash-torrent-tracker',
image: '/assets/img/dash-torrent-tracker-300x300.jpg'
},
{
id: 'dash-platform-wallet-desktop',
name: 'Dash Platform Wallet Desktop',
description: 'Desktop wallet application for Dash Platform',
url: 'https://github.com/pshenmic/dash-platform-wallet-desktop',
image: '/assets/img/dash-platform-wallet-desctop-300x300.jpg'
},
{
id: 'dash-platform-wallet-mobile',
name: 'Dash Platform Wallet Mobile',
description: 'Mobile wallet application for Dash Platform',
url: 'https://github.com/pshenmic/dash-platform-wallet-mobile',
image: '/assets/img/dash-platform-wallet-mobile-300x300.jpg'
}
];

Expand Down
2 changes: 2 additions & 0 deletions src/components/Team/Team.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
align-items: center;

&__TeammateList {
width: 100%;

@mixin columnsView {
display: flex;
flex-wrap: wrap;
Expand Down
14 changes: 14 additions & 0 deletions src/components/Team/TeamInfo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import './TeamInfo.scss'

function TeamInfo () {
return (
<div className={'TeamInfo'}>
<h2 className={'TeamInfo__Title'}>About the Team</h2>
<p className={'TeamInfo__Description'}>
pshenmic.dev is a development team creating projects for the Dash ecosystem, funded by Dash Central.
</p>
</div>
)
}

export default TeamInfo
32 changes: 32 additions & 0 deletions src/components/Team/TeamInfo.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@import '../../assets/styles/mixins.scss';

.TeamInfo {
display: flex;
flex-direction: column;
gap: 10px;
width: 100%;
padding: 20px;
background: #1a212a;

&__Title {
font-size: 22px;
font-weight: 600;
color: #fff;
margin: 0;
}

&__Description {
font-size: 14px;
color: #A7A7A7;
margin: 0;
line-height: 1.6;
}

@media screen and (max-width: 580px) {
padding: 16px;

&__Title {
font-size: 18px;
}
}
}
4 changes: 4 additions & 0 deletions src/components/Team/Teammate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@
width: 100%;
height: auto;
}

&__ContentContainer {
padding: 0;
}
}

@media screen and ( min-width: 940px ) and ( max-width: 1200px ) {
Expand Down
33 changes: 23 additions & 10 deletions src/components/Team/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { motion as m } from 'framer-motion'
import { useCallback } from 'react'
import Teammate from './Teammate'
import TeamInfo from './TeamInfo'
import ActionButtons from '../UI/Button/ActionButtons/ActionButtons'
import useGlobalStore from '@/store/store'
import './Team.scss'
Expand Down Expand Up @@ -49,16 +50,6 @@ const data = [
twitter: '',
discord: 'https://discordapp.com/users/397767531462393857'
},
{
name: 't1mee',
username: 't1mee',
role: 'Frontend dev',
gpg: null,
photoSrc: 'https://avatars.githubusercontent.com/u/21291546?v=4',
github: 'https://github.com/t1mee',
twitter: '',
discord: 'https://discordapp.com/users/262229997324992512'
},
{
name: 'Alexey Yakushin',
username: 'LexxXell',
Expand All @@ -78,6 +69,26 @@ const data = [
github: 'https://github.com/denkravchu',
twitter: '',
discord: 'https://discordapp.com/users/926201806487437352'
},
{
name: 'Litvinov Y.',
username: 'litury',
role: 'Frontend dev',
gpg: null,
photoSrc: 'https://avatars.githubusercontent.com/u/60976781?v=4',
github: 'https://github.com/litury',
twitter: 'https://x.com/divatoz',
discord: 'https://discordapp.com/users/709134781895540826'
},
{
name: 'Roman',
username: 'r0man1337',
role: 'Frontend dev',
gpg: null,
photoSrc: 'https://avatars.githubusercontent.com/u/4090500?v=4',
github: 'https://github.com/r0man1337',
twitter: '',
discord: 'https://discordapp.com/users/234166134536929281'
}
]

Expand All @@ -91,6 +102,8 @@ function Team () {

return (
<m.div className={'Team'}>
<TeamInfo />

<div className={'Team__TeammateList'}>
{data.map((_, idx) => (
<Teammate
Expand Down