Skip to content

Commit

Permalink
Merge pull request #1 from pedrofeitosa98/develop
Browse files Browse the repository at this point in the history
feature: player verdadeiro
  • Loading branch information
pedrofeitosa98 authored Nov 20, 2023
2 parents 9ea465b + e3223d8 commit 463f6a6
Show file tree
Hide file tree
Showing 28 changed files with 814 additions and 832 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"editor.formatOnSave": false,
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"eslint": "^8.45.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import-helpers": "^1.3.1",
"eslint-plugin-prettier": "^5.0.0",
Expand Down
Binary file added public/images/autodj-avatar.png
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/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/pf-icon.fw.png
Binary file not shown.
Binary file removed public/images/repository-preview.png
Binary file not shown.
10 changes: 10 additions & 0 deletions public/images/wave-small.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/images/wave.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions src/components/GradientButton/index.tsx

This file was deleted.

84 changes: 0 additions & 84 deletions src/components/GradientButton/style.ts

This file was deleted.

12 changes: 0 additions & 12 deletions src/components/ProfileImage/index.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions src/components/ProfileImage/style.ts

This file was deleted.

11 changes: 11 additions & 0 deletions src/components/WaveAnimation/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { WaveAnimationContainer } from './style'

export default function WaveAnimation() {
return (
<WaveAnimationContainer>
<div className="ocean">
<div className="wave"></div>
</div>
</WaveAnimationContainer>
)
}
51 changes: 51 additions & 0 deletions src/components/WaveAnimation/style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import styled from 'styled-components'

export const WaveAnimationContainer = styled.div`
.ocean {
height: 5px;
width: 100%;
position: absolute;
bottom: 0;
left: 0;
background: #d1d1d1;
}
.wave {
background: url(/images/wave.svg) repeat-x;
position: absolute;
top: -122px;
width: 6400px;
height: 122px;
animation: wave 5s cubic-bezier(0.36, 0.45, 0.63, 0.53) infinite;
transform: translate3d(0, 0, 0);
}
.wave:nth-of-type(2) {
top: -175px;
animation:
wave 7s cubic-bezier(0.36, 0.45, 0.63, 0.53) -0.125s infinite,
swell 7s ease -1.25s infinite;
opacity: 1;
}
@keyframes wave {
0% {
margin-left: 0;
}
100% {
margin-left: -1600px;
}
}
@keyframes swell {
0%,
100% {
transform: translate3d(0, -25px, 0);
}
50% {
transform: translate3d(0, 5px, 0);
}
}
.endWave {
display: none;
}
`
4 changes: 2 additions & 2 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { AppProps } from 'next/app'
import { Source_Sans_3 } from 'next/font/google'
import { Nunito } from 'next/font/google'
import { StrictMode } from 'react'
import { ToastContainer } from 'react-toastify'
import { ThemeProvider } from 'styled-components'
Expand All @@ -11,7 +11,7 @@ import GlobalStyle from '../styles/global'
import theme from '../styles/theme'
import GlobalTypography from '../styles/typography'

const font = Source_Sans_3({ subsets: ['latin'] })
const font = Nunito({ subsets: ['latin'] })

export default function App({ Component, pageProps }: AppProps) {
return (
Expand Down
8 changes: 5 additions & 3 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
// import Image from 'next/image
import Head from '@/components/Head'
import WorkInProgress from '@/templates/WorkInProgress'
import Header from '@/patterns/Header'
import MaintanceContent from '@/templates/MaintanceContent'

function Home() {
return (
<>
<Head title="Pedro Feitosa - Portfólio" />
<WorkInProgress />
<Head title="Nappanautas - Início" />
<Header />
<MaintanceContent />
</>
)
}
Expand Down
13 changes: 13 additions & 0 deletions src/patterns/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import WaveAnimation from '@/components/WaveAnimation'
import { HeaderContainer } from './style'

export default function Header() {
return (
<HeaderContainer>
<div className="logo-container">
<img src="/images/logo.png" alt="Logo Nappanautas" />
</div>
<WaveAnimation />
</HeaderContainer>
)
}
19 changes: 19 additions & 0 deletions src/patterns/Header/style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import styled from 'styled-components'

export const HeaderContainer = styled.header`
width: 100%;
height: 150px;
position: relative;
.logo-container {
position: relative;
margin: 0 auto;
width: 114px;
height: 210px;
}
& img {
position: absolute;
z-index: 2;
}
`
18 changes: 0 additions & 18 deletions src/patterns/ProfileCard/index.tsx

This file was deleted.

12 changes: 0 additions & 12 deletions src/patterns/ProfileCard/style.ts

This file was deleted.

20 changes: 20 additions & 0 deletions src/services/radioAPI.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import axios from 'axios'

// Chamadas pelo lado server com SSR
const radioAPI = (ctx?: any) => {
// const { ['laravel_session']: token } = parseCookies(ctx)

const api = axios.create({
baseURL: 'https://sonic1.transmissaodigital.com',
timeout: 10000
})
// api.defaults.xsrfCookieName = 'laravel_session'
// api.defaults.withCredentials = true
// axios.defaults.headers.common = {
// Accept: 'application/json'
// }

return api
}

export default radioAPI
9 changes: 8 additions & 1 deletion src/styles/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,20 @@ const GlobalStyle = createGlobalStyle`
html {
scroll-behavior: smooth;
font-size: 100%;
color: ${(props) => props.theme.colors.main1};
color: ${(props) => props.theme.colors.white};
}
body, input, button, ::placeholder {
font-family: inherit;
}
main {
display: flex;
flex-direction: column;
align-items: center;
height: 100vh;
}
a {
display: inline-block;
background: none;
Expand Down
Loading

0 comments on commit 463f6a6

Please sign in to comment.