diff --git a/next.config.js b/next.config.js
index 3aefd7b3..50025100 100755
--- a/next.config.js
+++ b/next.config.js
@@ -78,6 +78,9 @@ const nextConfig = {
{ source: '/hack_camp/', destination: '/camp/', permanent: true },
{ source: '/branding/', destination: '/brand/', permanent: true },
{ source: '/ama/', destination: '/amas/', permanent: false },
+ { source: '/geohot', destination: '/amas/geohot/', permanent: false },
+ { source: '/sal', destination: '/amas/sal/', permanent: false },
+ { source: '/vitalik', destination: '/amas/vitalik/', permanent: false },
{
source: '/open-source/',
destination: '/opensource/',
diff --git a/pages/geohot.js b/pages/amas/geohot.js
similarity index 92%
rename from pages/geohot.js
rename to pages/amas/geohot.js
index f3aa036a..5ab240e4 100644
--- a/pages/geohot.js
+++ b/pages/amas/geohot.js
@@ -3,20 +3,19 @@ import Head from 'next/head'
import Meta from '@hackclub/meta'
import React, { useEffect, useState } from 'react'
import tt from 'tinytime'
-import Particle from '../components/particles'
-import { thousands } from '../lib/members'
+import { thousands } from '../../lib/members'
export default function Geohot() {
let minutes = 1
let milliseconds = minutes * 60000
if (typeof window !== 'undefined') {
- setTimeout(function(){
- window.location.reload();
+ setTimeout(function () {
+ window.location.reload()
console.log('hi')
- }, milliseconds);
+ }, milliseconds)
}
-
+
const calculateTimeLeft = () => {
const difference = +new Date(`2022-11-11T23:00:00.000Z`) - +new Date()
@@ -150,7 +149,7 @@ export default function Geohot() {
bg: '#0f0f0f',
position: 'relative',
zIndex: '0',
- overflow: 'hidden',
+ overflow: 'hidden'
}}
>
@@ -257,8 +256,8 @@ export default function Geohot() {
fontWeight: 'bold'
})}
>
- The AMA has ended. Thank you to George Hotz and everyone for joining
- us!
+ The AMA has ended. Thank you to George Hotz and everyone for
+ joining us!
) : (
@@ -330,9 +329,9 @@ export default function Geohot() {
Hack Club
{' '}
is a global community of high school makers & student-led coding
- clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+ teenagers
- learning to code & building amazing projects, & you’ll fit right
- in.
+ clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+
+ teenagers learning to code & building amazing projects, & you’ll
+ fit right in.
)}
@@ -344,10 +343,9 @@ export default function Geohot() {
right: '0',
marginRight: ['-100px', '-50px', '-50px'],
width: ['100vw', '70vw', '40vw'],
- zIndex: '-30',
+ zIndex: '-30'
}}
>
-
{timer.length ? (
<>
+ src={`/ama/geohotBg.svg`}
+ alt="Grid pattern"
+ width={1500}
+ height={750}
+ sx={{
+ position: 'absolute',
+ bottom: '5vw',
+ left: ['10vw', '20vw'],
+ zIndex: '-2000'
+ }}
+ />
>
)
diff --git a/pages/amas.js b/pages/amas/index.js
similarity index 92%
rename from pages/amas.js
rename to pages/amas/index.js
index 2cf43da5..03320452 100644
--- a/pages/amas.js
+++ b/pages/amas/index.js
@@ -1,27 +1,14 @@
-import {
- Avatar,
- Box,
- Button,
- Card,
- Container,
- Flex,
- Grid,
- Heading,
- Link,
- Text
-} from 'theme-ui'
+import { Box, Button, Card, Flex, Grid, Heading, Link, Text } from 'theme-ui'
import Meta from '@hackclub/meta'
import Head from 'next/head'
-import ForceTheme from '../components/force-theme'
-import BGImg from '../components/background-image'
+import ForceTheme from '../../components/force-theme'
+import BGImg from '../../components/background-image'
import NextLink from 'next/link'
import Image from 'next/image'
-import Nav from '../components/nav'
-import SlideDown from '../components/slide-down'
-import FadeIn from '../components/fade-in'
-import Icon from '../components/icon'
-import Footer from '../components/footer'
-import { dt } from '../lib/dates'
+import Nav from '../../components/nav'
+import SlideDown from '../../components/slide-down'
+import Footer from '../../components/footer'
+import { dt } from '../../lib/dates'
const Page = ({ upcoming, past }) => (
<>
diff --git a/pages/sal.js b/pages/amas/sal.js
similarity index 84%
rename from pages/sal.js
rename to pages/amas/sal.js
index b8a540d4..1cd34ba0 100644
--- a/pages/sal.js
+++ b/pages/amas/sal.js
@@ -3,19 +3,19 @@ import Head from 'next/head'
import Meta from '@hackclub/meta'
import React, { useEffect, useState } from 'react'
import tt from 'tinytime'
-import { thousands } from '../lib/members'
+import { thousands } from '../../lib/members'
export default function Sal() {
let minutes = 1
let milliseconds = minutes * 60000
if (typeof window !== 'undefined') {
- setTimeout(function(){
- window.location.reload();
+ setTimeout(function () {
+ window.location.reload()
console.log('hi')
- }, milliseconds);
+ }, milliseconds)
}
-
+
const calculateTimeLeft = () => {
const difference = +new Date(`2022-10-28T23:00:00.000Z`) - +new Date()
@@ -146,7 +146,8 @@ export default function Sal() {
sx={{
minHeight: '100vh',
width: '100vw',
- backgroundImage: 'url(https://cloud-72izs50b1-hack-club-bot.vercel.app/0sal_ama__4_.png)',
+ backgroundImage:
+ 'url(https://cloud-72izs50b1-hack-club-bot.vercel.app/0sal_ama__4_.png)',
position: 'relative',
zIndex: '0',
overflow: 'hidden',
@@ -156,7 +157,9 @@ export default function Sal() {
>
)}
-
-
- Teenager? New here? Welcome!{' '}
-
- Hack Club
- {' '}
- is a global community of high school makers & student-led coding
- clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+ teenagers
- learning to code & building amazing projects, & you’ll fit right
- in.
-
-
+
+
+ Teenager? New here? Welcome!{' '}
+
+ Hack Club
+ {' '}
+ is a global community of high school makers & student-led coding
+ clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+ teenagers
+ learning to code & building amazing projects, & you’ll fit right
+ in.
+
+
{timer.length ? (
@@ -321,7 +319,7 @@ export default function Sal() {
src={`https://cloud-oik8els6y-hack-club-bot.vercel.app/0frame_54__1_.png`}
alt="Image of Sal Khan"
fill="object-positon"
- sx={{position: 'absolute', bottom: 0}}
+ sx={{ position: 'absolute', bottom: 0 }}
/>
>
) : (
diff --git a/pages/vitalik.js b/pages/amas/vitalik.js
similarity index 96%
rename from pages/vitalik.js
rename to pages/amas/vitalik.js
index 2a0145f4..325e83c3 100644
--- a/pages/vitalik.js
+++ b/pages/amas/vitalik.js
@@ -3,8 +3,8 @@ import Head from 'next/head'
import Meta from '@hackclub/meta'
import React, { useEffect, useState } from 'react'
import tt from 'tinytime'
-import Particle from '../components/particles'
-import { thousands } from '../lib/members'
+import Particle from '../../components/particles'
+import { thousands } from '../../lib/members'
export default function Vitalik() {
const calculateTimeLeft = () => {
@@ -292,9 +292,9 @@ export default function Vitalik() {
Hack Club
{' '}
is a global community of high school makers & student-led coding
- clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+ teenagers
- learning to code & building amazing projects, & you’ll fit right
- in.
+ clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+
+ teenagers learning to code & building amazing projects, & you’ll
+ fit right in.
) : (
@@ -321,9 +321,9 @@ export default function Vitalik() {
Hack Club
{' '}
is a global community of high school makers & student-led coding
- clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+ teenagers
- learning to code & building amazing projects, & you’ll fit right
- in.
+ clubs. We’ve got a 24/7 Slack chatroom of {thousands}k+
+ teenagers learning to code & building amazing projects, & you’ll
+ fit right in.
)}