- {children}
-
+ {children}
+
+
diff --git a/public/data/academy/2-git/readme.mdx b/public/data/academy/2-git/readme.mdx index afe9904..46875dd 100644 --- a/public/data/academy/2-git/readme.mdx +++ b/public/data/academy/2-git/readme.mdx @@ -28,7 +28,6 @@ summary: 'Módulo de git, donde aprenderemos a usar git en la terminal para vers Cuando una tarea está lista, su rama se puede fusionar con otra para juntar los cambios! -## Próximamente, jueves 8 de Julio ## 2. `git remote` ### ¿Cómo trabajar con un repositorio remoto? diff --git a/public/images/team/Lucas.jpg b/public/images/team/Lucas.jpg new file mode 100644 index 0000000..626f7e7 Binary files /dev/null and b/public/images/team/Lucas.jpg differ diff --git a/public/images/team/Meison.jpg b/public/images/team/Meison.jpg new file mode 100644 index 0000000..af2f470 Binary files /dev/null and b/public/images/team/Meison.jpg differ diff --git a/public/images/team/Pablo.jpg b/public/images/team/Pablo.jpg new file mode 100644 index 0000000..533cef4 Binary files /dev/null and b/public/images/team/Pablo.jpg differ diff --git a/public/images/team/Tomas.png b/public/images/team/Tomas.png new file mode 100644 index 0000000..605ca50 Binary files /dev/null and b/public/images/team/Tomas.png differ diff --git a/src/components/Auth/SignInForm.jsx b/src/components/Auth/SignInForm.jsx index 843b4dd..3795942 100644 --- a/src/components/Auth/SignInForm.jsx +++ b/src/components/Auth/SignInForm.jsx @@ -4,6 +4,7 @@ import { motion } from 'framer-motion' import { Dialog } from '@headlessui/react' import { yupResolver } from '@hookform/resolvers/yup' import * as yup from 'yup' +import Image from 'next/image' import { Input } from '@/components/Input' import { Button } from '@/components/Button' @@ -22,6 +23,8 @@ const schema = yup.object().shape({ export const SignIn = ({ onComplete, onRequestSignUp, unauthorizedMessage }) => { const [loading, setLoading] = useState(false) const [error, setError] = useState(null) + const [discordButtonLoading, setDiscordButtonLoading] = useState(false) + const [discordAuthError, setDiscordAuthError] = useState(null) const { register, handleSubmit, formState } = useForm({ resolver: yupResolver(schema), }) @@ -46,11 +49,36 @@ export const SignIn = ({ onComplete, onRequestSignUp, unauthorizedMessage }) => } } + const discordAuth = async () => { + setDiscordAuthError(null) + setDiscordButtonLoading(true) + try { + const { user, error } = await supabase.auth.signIn( + { + provider: 'discord', + }, + { + redirectTo: window.location.href, + } + ) + + if (error) { + throw error + } else { + onComplete(user) + } + } catch (error) { + setError(error.error_description || error.message) + } finally { + setDiscordButtonLoading(false) + } + } + return (
-
-
diff --git a/src/pages/academy/[module]/[lesson].jsx b/src/pages/academy/[module]/[lesson].jsx
index 88fef05..fb8daf2 100644
--- a/src/pages/academy/[module]/[lesson].jsx
+++ b/src/pages/academy/[module]/[lesson].jsx
@@ -1,5 +1,4 @@
-import { MDXRemote } from 'next-mdx-remote'
-
+import MDX from '@/components/MDX'
import useStore from '@/lib/store'
import { getFolderContent, getLesson, getLessons, getModuleTitle } from '@/lib/files'
import { LessonLayout } from '@/layouts/Lesson'
@@ -10,13 +9,7 @@ const LessonPage = ({ title, pdfURL, mdxSource, frontMatter, lessons }) => {
return (
<>
- ![]()
{children},
- }}
- />
+
)
diff --git a/src/pages/academy/[module]/index.jsx b/src/pages/academy/[module]/index.jsx
index 5793150..80574ac 100644
--- a/src/pages/academy/[module]/index.jsx
+++ b/src/pages/academy/[module]/index.jsx
@@ -1,5 +1,4 @@
-import { MDXRemote } from 'next-mdx-remote'
-
+import MDX from '@/components/MDX'
import useStore from '@/lib/store'
import { ModuleLayout } from '@/layouts/Module'
import {
@@ -16,13 +15,7 @@ const Module = ({ mdxSource, title, lessons, frontMatter }) => {
return (
<>
- ![]()
{children},
- }}
- />
+
)
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 6634c9e..d014258 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,13 +1,13 @@
-import { useState, useEffect } from 'react'
+// import { useState, useEffect } from 'react'
import { motion } from 'framer-motion'
-import { Bubbles } from '@/components/Bubbles'
+// import { Bubbles } from '@/components/Bubbles'
import { Container } from '@/components/Container'
-import { learningBubbles } from '@/data/learningBubbles'
-import { useAuth } from '@/hooks/useAuth'
-import { Account } from '@/components/Account'
+// import { learningBubbles } from '@/data/learningBubbles'
+// import { useAuth } from '@/hooks/useAuth'
+// import { Account } from '@/components/Account'
// import { Auth } from '@/components/Auth/_Signin'
-import { AuthModal } from '@/components/Auth'
-import { supabase } from '@/lib/supabaseClient'
+// import { AuthModal } from '@/components/Auth'
+// import { supabase } from '@/lib/supabaseClient'
const Home = ({ modules }) => {
return (
diff --git a/src/pages/profile.jsx b/src/pages/profile.jsx
index f68bfb1..34f24ef 100644
--- a/src/pages/profile.jsx
+++ b/src/pages/profile.jsx
@@ -11,12 +11,15 @@ const Profile = () => {
<>
{user &&
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..64c56b6
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,24 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "lib": ["dom", "dom.iterable", "esnext"],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": false,
+ "forceConsistentCasingInFileNames": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "baseUrl": ".",
+ "paths": {
+ "@/*": ["src/*"],
+ "@/data/*": ["public/data/*"]
+ }
+ },
+ "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+ "exclude": ["node_modules"]
+}
diff --git a/yarn.lock b/yarn.lock
index b9c2572..f1f5aec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2710,6 +2710,11 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.1.tgz#5e07e0cb2ff793aa7a1b41deae76221e6166049f"
integrity sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==
+"@types/node@^16.3.3":
+ version "16.3.3"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.3.3.tgz#0c30adff37bbbc7a50eb9b58fae2a504d0d88038"
+ integrity sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==
+
"@types/node@^8.5.7":
version "8.10.66"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
@@ -2756,6 +2761,15 @@
"@types/scheduler" "*"
csstype "^3.0.2"
+"@types/react@^17.0.14":
+ version "17.0.14"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f"
+ integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ==
+ dependencies:
+ "@types/prop-types" "*"
+ "@types/scheduler" "*"
+ csstype "^3.0.2"
+
"@types/readable-stream@^2.3.9":
version "2.3.10"
resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.10.tgz#0f1a512ca30bec5e53d3282133b9237a703e7562"
@@ -15496,6 +15510,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+typescript@^4.3.5:
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+ integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
+
unbox-primitive@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+
{
+export const Author: React.FC<{ author: string }> = ({ author }) => {
const src = team[author] || '/images/logos/logo.png'
return (
{
const mesh = useRef()
// Subscribe this to the render-loop, rotate the mesh every frame
useFrame((state, delta) =>
- mesh.current
- ? (mesh.current.rotation.y = mesh.current.rotation.x += 0.002)
- : null
+ mesh.current ? (mesh.current.rotation.y = mesh.current.rotation.x += 0.002) : null
)
// Return the view, these are regular Threejs elements expressed in JSX
return (
diff --git a/src/components/Head.jsx b/src/components/Head.jsx
index 0e0e4a1..8290f92 100644
--- a/src/components/Head.jsx
+++ b/src/components/Head.jsx
@@ -2,15 +2,10 @@ import NextHead from 'next/head'
const TITLE = 'Coderhood'
const URL = 'https://coderhood.dev/'
-const DESCRIPTION =
- 'La comunidad que impulsa el aprendizaje autodidacta y colaborativo'
+const DESCRIPTION = 'La comunidad que impulsa el aprendizaje autodidacta y colaborativo'
const author = 'Ema Lorenzo'
-export const Head = ({
- title = TITLE,
- url = URL,
- description = DESCRIPTION,
-}) => {
+export const Head = ({ title = TITLE, url = URL, description = DESCRIPTION }) => {
return (
<>
diff --git a/src/components/MDX.tsx b/src/components/MDX.tsx
new file mode 100644
index 0000000..5667984
--- /dev/null
+++ b/src/components/MDX.tsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import { MDXRemote, MDXRemoteSerializeResult } from 'next-mdx-remote'
+
+const MDX: React.FC<{ source: MDXRemoteSerializeResult> }> = ({
+ source,
+}) => {
+ return (
+ ![{alt}]()
,
+ }}
+ />
+ )
+}
+
+export default MDX
diff --git a/src/examples/canvas/test_shader.js b/src/examples/canvas/test_shader.js
index a2c51e4..6875452 100644
--- a/src/examples/canvas/test_shader.js
+++ b/src/examples/canvas/test_shader.js
@@ -43,8 +43,7 @@ const TestShader = (props) => {
mesh.current.rotation.x = mesh.current.rotation.y += 0.01
}
if (mesh.current.material) {
- mesh.current.material.uniforms.time.value +=
- Math.sin(delta / 2) * Math.cos(delta / 2)
+ mesh.current.material.uniforms.time.value += Math.sin(delta / 2) * Math.cos(delta / 2)
}
})
diff --git a/src/layouts/Lesson.jsx b/src/layouts/Lesson.jsx
index 1ab70c1..8fe52ba 100644
--- a/src/layouts/Lesson.jsx
+++ b/src/layouts/Lesson.jsx
@@ -26,9 +26,14 @@ export const LessonLayout = ({ title, frontMatter, pdfURL, lessons, children })
{/*
{pdfURL ? (
⚡️ Descarga el pdf de la clase
) : (
-
diff --git a/src/layouts/Module.jsx b/src/layouts/Module.jsx
index b9f6693..90862ae 100644
--- a/src/layouts/Module.jsx
+++ b/src/layouts/Module.jsx
@@ -12,9 +12,7 @@ export const ModuleLayout = ({ frontMatter, title, lessons, children }) => {
+
+
+
+
+ {getErrorMessage(discordAuthError)}
- {children}
{author}
*/} -- {publishedAt && format(parseISO(publishedAt), 'MMMM dd, yyyy')} -
+
+
+ {publishedAt && format(parseISO(publishedAt), 'MMMM dd, yyyy')} +
++ {author || null} +
+Próximamente
+Próximamente en PDF
)}- {children}
- {children}
{JSON.stringify(user, null, 2)}}
+ + Querés cambiar de cuenta cuenta o salir? +