Merge branch 'main' into pwa-notifications

devcon/.gitignore

@@ -48,3 +48,6 @@ yarn-error.log*
 
 # Sentry
 .sentryclirc
+
+node_modules
+.env

devcon/src/pages/supporters.tsx → devcon/archived-pages/supporters.tsx

@@ -17,7 +17,7 @@ import IconPeople from 'assets/icons/people.svg'
 import { Link } from 'components/common/link'
 import { AutoScroller } from 'components/domain/dips/overview/contribute/Contribute'
 import HorizontalLooper from 'components/common/horizontal-looper'
-import Image from "next/legacy/image"
+import Image from 'next/legacy/image'
 // impact
 import wat from 'assets/images/supporters-page/impact/wat.png'
 import l2beat from 'assets/images/supporters-page/impact/l2-beat.png'
@@ -71,6 +71,7 @@ import swarm from 'assets/images/supporters-page/supporters/swarm.png'
 import tenderly from 'assets/images/supporters-page/supporters/tenderly.png'
 import thesis from 'assets/images/supporters-page/supporters/thesis.png'
 import upshot from 'assets/images/supporters-page/supporters/upshot.png'
+import HeroBackground from 'assets/images/pages/hero-bgs/get-involved.jpg'
 
 /*
   Add links to everything
@@ -201,6 +202,7 @@ export default pageHOC(function SatelliteEvents(props: any) {
   return (
     <Page theme={themes['teal']}>
       <PageHero
+        heroBackground={HeroBackground}
         path={[{ text: <span className="bold">Get Involved</span> }, { text: props.page.header }]}
         title={pageContext?.current?.title}
         navigation={[

devcon/cms/pages/dips.mdx

@@ -0,0 +1,6 @@
+---
+section1:
+  about: "## **Contribute**\n\n#### Devcon Improvement Proposals (DIPs)\_provide a mechanism for collecting collaborative community input on what should be included at the upcoming Devcon.\n\nWhile we are excited to have a more formal process to hear ideas from the community (roughly inspired by the more decentralized PEP, BIP and EIP processes), this is an experiment, and it should be understood that approval of proposals ultimately lies solely with the Devcon team. DIPs focus on collaboration in the ecosystem between different projects.\n\nThe Devcon team also publishes\_Requests For Proposals (RFPs), which are specific ideas we'd love to see take place for the next Devcon edition. They are available on our forum.\n"
+_template: dips
+---
+

devcon/cms/pages/index.mdx

@@ -0,0 +1,84 @@
+---
+title: Test
+catchphrase: Connecting the builders of Ethereum
+subtext: "Devconnect is a week-long gathering of independent Ethereum events to learn, share, and\_**make progress together.**\n"
+button: Devconnect IST Photo Gallery
+section6:
+  button: View Full Archive →
+body: |+
+  aefaef
+
+  aefafea
+
+section1:
+  body: >
+    ## Discover Ethereum and its community at Devcon!
+
+
+    **Devcon is the Ethereum conference for developers, thinkers, and makers.
+    Join Devcon and empower yourself to use and build decentralized systems.**
+
+
+    Devcon is more than just a conference with talks and presentations. It’s a
+    unique place for inspiration, where passionate builders, engineers,
+    designers, researchers, community organizers, and artists come together to
+    share updates and ideas. It's a space for learning and teaching, where the
+    latest Ethereum technology is both showcased and demystified.
+
+
+    Whether you're a seasoned Ethereum expert or just starting, Devcon is for
+    you. It’s an intensive introduction for new Ethereum explorers, a global
+    family reunion for those already a part of our ecosystem, and a source of
+    energy and creativity for all.
+section2:
+  top: >
+    ## **Devcon 7 — Southeast Asia**
+
+
+    ## Devcon’s goal is to make Ethereum more accessible to communities around
+    the world and to contribute to the ongoing evolution of the global Ethereum
+    ecosystem.
+  left: >
+    The Ethereum community in Southeast Asia holds immense potential to play a
+    pivotal role in the global Ethereum landscape. You can see the evidence in
+    its rapidly growing crypto adoption: Vietnam, the Philippines, Indonesia and
+    Thailand are among the top 10 countries leading in the Global Crypto
+    Adoption Index.
+  right: >
+    Southeast Asia is a melting pot of diverse cultures, rich histories, and
+    communities. While Bangkok Thailand, with its unique blend of tradition and
+    modernity, serves as an ideal location to host Devcon in terms of both venue
+    suitability and global accessibility, our intention is to bring the Devcon
+    experience to the whole of Southeast Asia!
+  button: Devcon 7 Update →
+section3:
+  body: "## **Road to Devcon**\n\n## Are you based in SEA, driven by a community-oriented spirit, and passionate about Ethereum's potential to create a positive impact?\n\nCheck out the Road to Devcon grants round and apply. \LThis initiative was born from our commitment to support the rise of new Ethereum events, grassroots communities, and educational endeavors across Southeast Asia before Devcon 7.\n"
+  button: |
+    Apply for RTD Grants →
+section4:
+  body: >
+    ## **Devcon VI Bogotá**
+
+
+    ## Tracing our roots back to ÐΞVcon 0, a humble meetup in Berlin, Devcon has
+    grown into a global beacon for the Ethereum community, uniting voices,
+    ideas, and innovations from across the world.
+
+
+    At Devcon VI, we celebrated the power of community and turned our spotlight
+    to Latin America. The Road to Devcon VI was paved with passion and
+    collaboration, as the Latin American Ethereum community hosted approximately
+    14 events across the region.
+  button: Devcon VI Recap →
+section5:
+  body: >
+    Devcon is geared toward Ethereum's builders, creators, and thinkers who wish
+    to improve this world. Programming at Devcon takes a holistic approach and
+    aims to engage all attendees through talks, panels, workshops, lightning
+    talks, and freeform learning sessions.
+  title: |
+    ## **Devcon Archive**
+  button: View Full Archive →
+_template: index
+---
+

devcon/cms/pages/past_events.mdx

@@ -0,0 +1,79 @@
+---
+section1:
+  about: "## **Devcon Editions**\n\n## Everything began in Berlin Kreuzberg in 2014 when the co-founders and earliest builders of Ethereum came together for a meet-up they named Devcon 0. Since then, Devcon has rotated the world. The journey went from Berlin to London, Shanghai, Cancún, Prague, Osaka and Bogotá. Each location brings something unique to the developer conference.\n\nYou might want to check out some details about Devcon’s history. Read on below for summaries of past editions, or head to the\_**[Devcon Archive](https://archive.devcon.org/archive)** to watch round-up videos, talks, and presentations.\n"
+events:
+  - title: Devcon VI
+    description: >
+      After a three-year-long pause, we emerged from the pandemic stronger than
+      before and reunited in Bogotá for the largest and some would say, “best
+      Devcon yet.” One of its most powerful aspects was the impact on the
+      regional community and the involvement of the flourishing Latin American
+      Ethereum community, which had organized 14 community events around the
+      region leading up to Devcon.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/Bogota.png
+  - title: Devcon V
+    description: >
+      Devcon 5 brought the Ethereum ecosystem together in Japan in October of
+      2019 for an event that featured more content and attendees than ever
+      before. In addition to the conference talks, Devcon featured the event's
+      first community run outdoor stage and experiential Park area, a powerful
+      open from the City of Osaka, a celebrity appearance by the world’s most
+      well-known dog, Kabosu (the original “Doge”) and so much more.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?edition=5'
+    image: /cms-assets/past-events/Osaka.png
+  - title: Devcon iv
+    description: >
+      Devcon 4 brought Ethereum's ecosystem and family back to Europe with a
+      2018 event at the Prague Convention Center in the Czech Republic
+      (Czechia). With 3,000 strong in attendance, Devcon was filled with talks,
+      experiences, teams from a matured application ecosystem, and more
+      enterprise support than ever before.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/Prague.png
+  - title: devcon three
+    description: >
+      Devcon 3 was a celebration held around "Dio de Los Muertos" and Halloween
+      in Cancun, Mexico in November of 2017. It was the largest ever Ethereum
+      gathering at the time, with just under 2000 attending in a year of
+      unprecedented growth in terms of network use, adoption and progress.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/Cancun.png
+  - title: devcon two
+    description: >
+      Devcon 2 came alongside one of the most (in)famous moments in Ethereum's
+      early history, as a set of Denial of Service attacks were launched against
+      the network just hours before the event was set to begin. With many of the
+      most formidable builders in the ecosystem gathered together in Shanghai,
+      they helped to coordinate emergency upgrades backstage to restore full
+      functionality to the network, moments before stepping forward to speak to
+      the future of the network on stage.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/Shanghai.png
+  - title: DΞVCON 1
+    description: >
+      Only a few months after Ethereum came to life, DΞVCON 1 was held in London
+      in November of 2015. Presenters remained hard at work on each piece of the
+      original Ethereum roadmap, early dApp teams took the stage, and supporters
+      teased the early industry adoption that was to arrive soon.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/London.png
+  - title: DEV CON 0
+    description: >
+      It all began in Berlin. Long prior to the launch of Ethereum, the earliest
+      builders and co-founders gathered in the Kreuzberg neighborhood in late
+      November of 2014 to outline their work and designs for the future of
+      Ethereum at a meetup called "ÐΞVcon-0". A great resource to learn about
+      the historical context and the early ethos of the project.
+    button: Watch
+    button_link: 'https://archive.devcon.org/archive/watch/?order=desc&sort=eventId'
+    image: /cms-assets/past-events/Berlin.png
+_template: past_events
+---
+

devcon/next.config.js

@@ -18,6 +18,7 @@ const nextConfig = {
       'blog.ethereum.org',
       'img.youtube.com',
       'www.gravatar.com',
+      'assets.tina.io'
     ],
   },
   i18n: {
@@ -108,15 +109,15 @@ const nextConfig = {
   },
   async headers() {
     return [
-      {
-        source: '/(.*)',
-        headers: [
-          {
-            key: 'X-Frame-Options',
-            value: 'DENY',
-          },
-        ],
-      },
+      // {
+      //   source: '/(.*)',
+      //   headers: [
+      //     {
+      //       key: 'X-Frame-Options',
+      //       value: 'DENY',
+      //     },
+      //   ],
+      // },
     ]
   },
   async rewrites() {

devcon/package.json

@@ -9,8 +9,8 @@
     "prebuild": "yarn prebuild:cms",
     "prebuild:cms": "sed -i \"s|%BRANCH_PLACEHOLDER%|$BRANCH|g\" ./public/admin/config.yml && sed -i \"s|local_backend: true||g\" ./public/admin/config.yml",
     "dev:cms": "npx netlify-cms-proxy-server",
-    "dev": "next dev",
-    "build": "cd ../lib && yarn && cd ../devcon && next build",
+    "dev": "cross-env TINA_PUBLIC_IS_LOCAL=true tinacms dev -c \"next dev\"",
+    "build": "tinacms build && cd ../lib && yarn && cd ../devcon && next build",
     "start": "next start",
     "lint": "next lint",
     "scripts:db-cleanup": "ts-node src/scripts/db-cleanup",
@@ -22,10 +22,12 @@
     "@notionhq/client": "^0.4.11",
     "@octokit/rest": "^18.12.0",
     "@sentry/nextjs": "^7.13.0",
+    "@socialgouv/matomo-next": "^1.8.0",
     "@tippyjs/react": "^4.2.6",
     "@types/matter-js": "^0.18.2",
     "@walletconnect/web3-provider": "^1.8.0",
     "carousel": "^0.0.3",
+    "cross-env": "^7.0.3",
     "dotenv": "^15.0.0",
     "email-validator": "^2.0.4",
     "eth-sig-util": "^3.0.1",
@@ -69,32 +71,37 @@
     "swr": "^1.2.0",
     "three": "^0.119.1",
     "three-orbit-controls": "^82.1.0",
+    "tinacms": "^1.5.28",
     "unique-names-generator": "^4.7.1",
     "web3modal": "^1.9.5"
   },
   "devDependencies": {
     "@netlify/plugin-nextjs": "^4.36.1",
     "@octokit/types": "^6.34.0",
     "@svgr/webpack": "^6.2.1",
+    "@tinacms/cli": "^1.5.39",
     "@types/fuzzy-search": "^2.1.2",
     "@types/js-search": "^1.4.0",
     "@types/jsonp": "^0.2.1",
     "@types/mongoose": "^5.11.97",
-    "@types/node": "17.0.14",
+    "@types/node": "^20.10.5",
     "@types/nodemailer": "^6.4.4",
     "@types/qrcode.react": "^1.0.2",
     "@types/react": "18.2.29",
     "@types/react-dom": "18.2.14",
     "@types/react-slick": "^0.23.11",
     "@types/react-toggle": "^4.0.3",
+    "autoprefixer": "^10.4.16",
     "cross-fetch": "^3.1.5",
     "eslint": "8.8.0",
     "eslint-config-next": "12.0.10",
     "glslify-deps": "^1.3.2",
     "glslify-loader": "^2.0.0",
+    "postcss": "^8.4.32",
     "prettier": "^2.5.1",
     "raw-loader": "^4.0.2",
     "sass": "^1.49.4",
+    "tailwindcss": "^3.4.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   }

devcon/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

devcon/public/admin/.gitignore

@@ -0,0 +1,2 @@
+index.html
+assets/

devcon/public/admin/tina/.gitignore

@@ -0,0 +1,2 @@
+index.html
+assets/

devcon/src/assets/css/global/buttons.scss

@@ -1,7 +1,6 @@
 @use 'assets/css/partials/index' as *;
 
-.button,
-button {
+.button {
   // Sometimes the button element can be useful for semantic reasons, add "plain" class to remove default styles
   cursor: pointer;
   touch-action: manipulation;
@@ -22,6 +21,7 @@ button {
     display: inline-flex;
     align-items: center;
     position: relative;
+    border-radius: var(--border-radius);
 
     // Using pseudo element for borders so we can overlay an animating background without stripping the border away (which would also resize the button)
     &:before {
@@ -34,6 +34,8 @@ button {
       right: 0px;
       border-width: var(--border-width);
       border-color: var(--border-color);
+      border-radius: var(--border-radius);
+      background: var(--button-background);
       border-style: solid;
 
       &:hover {
@@ -57,6 +59,28 @@ button {
       cursor: auto;
     }
 
+    &.rounded-purple {
+      --border-color: transparent;
+      --border-width: 1px;
+      --border-radius: 77px;
+      background: #AEB6FF;
+      color: black;
+      --color-icon: black !important;
+    }
+
+    &.rounded-dark-purple {
+      // --border-color: #7958A5;
+      --border-width: 1px;
+      --border-radius: 67px;
+      background: #8B6BBB;
+      color: white;
+      --color-icon: white !important;
+
+      &:hover, &.hover {
+        background: #8746e9;
+      }
+    }
+
     &.squared {
       width: 48px;
       height: 48px;