diff --git a/devcon/.gitignore b/devcon/.gitignore index bb9686a40..15432c1ec 100644 --- a/devcon/.gitignore +++ b/devcon/.gitignore @@ -48,3 +48,6 @@ yarn-error.log* # Sentry .sentryclirc + +node_modules +.env \ No newline at end of file diff --git a/devcon/src/components/domain/app/Layout.tsx b/devcon/archived-pages/app/Layout.tsx similarity index 100% rename from devcon/src/components/domain/app/Layout.tsx rename to devcon/archived-pages/app/Layout.tsx diff --git a/devcon/src/components/domain/app/account/AccountFooter.tsx b/devcon/archived-pages/app/account/AccountFooter.tsx similarity index 100% rename from devcon/src/components/domain/app/account/AccountFooter.tsx rename to devcon/archived-pages/app/account/AccountFooter.tsx diff --git a/devcon/src/components/domain/app/account/Login.tsx b/devcon/archived-pages/app/account/Login.tsx similarity index 100% rename from devcon/src/components/domain/app/account/Login.tsx rename to devcon/archived-pages/app/account/Login.tsx diff --git a/devcon/src/components/domain/app/account/Settings.tsx b/devcon/archived-pages/app/account/Settings.tsx similarity index 100% rename from devcon/src/components/domain/app/account/Settings.tsx rename to devcon/archived-pages/app/account/Settings.tsx diff --git a/devcon/src/components/domain/app/account/footer-road.png b/devcon/archived-pages/app/account/footer-road.png similarity index 100% rename from devcon/src/components/domain/app/account/footer-road.png rename to devcon/archived-pages/app/account/footer-road.png diff --git a/devcon/src/components/domain/app/account/login.module.scss b/devcon/archived-pages/app/account/login.module.scss similarity index 100% rename from devcon/src/components/domain/app/account/login.module.scss rename to devcon/archived-pages/app/account/login.module.scss diff --git a/devcon/src/components/domain/app/account/private.module.scss b/devcon/archived-pages/app/account/private.module.scss similarity index 100% rename from devcon/src/components/domain/app/account/private.module.scss rename to devcon/archived-pages/app/account/private.module.scss diff --git a/devcon/src/components/domain/app/account/pwa-icon.png b/devcon/archived-pages/app/account/pwa-icon.png similarity index 100% rename from devcon/src/components/domain/app/account/pwa-icon.png rename to devcon/archived-pages/app/account/pwa-icon.png diff --git a/devcon/src/components/domain/app/account/settings/Email.tsx b/devcon/archived-pages/app/account/settings/Email.tsx similarity index 100% rename from devcon/src/components/domain/app/account/settings/Email.tsx rename to devcon/archived-pages/app/account/settings/Email.tsx diff --git a/devcon/src/components/domain/app/account/settings/NotFound.tsx b/devcon/archived-pages/app/account/settings/NotFound.tsx similarity index 100% rename from devcon/src/components/domain/app/account/settings/NotFound.tsx rename to devcon/archived-pages/app/account/settings/NotFound.tsx diff --git a/devcon/src/components/domain/app/account/settings/Username.tsx b/devcon/archived-pages/app/account/settings/Username.tsx similarity index 100% rename from devcon/src/components/domain/app/account/settings/Username.tsx rename to devcon/archived-pages/app/account/settings/Username.tsx diff --git a/devcon/src/components/domain/app/account/settings/Wallet.tsx b/devcon/archived-pages/app/account/settings/Wallet.tsx similarity index 100% rename from devcon/src/components/domain/app/account/settings/Wallet.tsx rename to devcon/archived-pages/app/account/settings/Wallet.tsx diff --git a/devcon/src/components/domain/app/account/settings/notfound.module.scss b/devcon/archived-pages/app/account/settings/notfound.module.scss similarity index 100% rename from devcon/src/components/domain/app/account/settings/notfound.module.scss rename to devcon/archived-pages/app/account/settings/notfound.module.scss diff --git a/devcon/src/components/domain/app/account/settings/settings.module.scss b/devcon/archived-pages/app/account/settings/settings.module.scss similarity index 100% rename from devcon/src/components/domain/app/account/settings/settings.module.scss rename to devcon/archived-pages/app/account/settings/settings.module.scss diff --git a/devcon/src/components/domain/app/app-filter.module.scss b/devcon/archived-pages/app/app-filter.module.scss similarity index 100% rename from devcon/src/components/domain/app/app-filter.module.scss rename to devcon/archived-pages/app/app-filter.module.scss diff --git a/devcon/src/components/domain/app/app-search/AppSearch.tsx b/devcon/archived-pages/app/app-search/AppSearch.tsx similarity index 100% rename from devcon/src/components/domain/app/app-search/AppSearch.tsx rename to devcon/archived-pages/app/app-search/AppSearch.tsx diff --git a/devcon/src/components/domain/app/app-search/app-search.module.scss b/devcon/archived-pages/app/app-search/app-search.module.scss similarity index 100% rename from devcon/src/components/domain/app/app-search/app-search.module.scss rename to devcon/archived-pages/app/app-search/app-search.module.scss diff --git a/devcon/src/components/domain/app/app-search/index.ts b/devcon/archived-pages/app/app-search/index.ts similarity index 100% rename from devcon/src/components/domain/app/app-search/index.ts rename to devcon/archived-pages/app/app-search/index.ts diff --git a/devcon/src/components/domain/app/app-tabs-section/AppTabsSection.tsx b/devcon/archived-pages/app/app-tabs-section/AppTabsSection.tsx similarity index 100% rename from devcon/src/components/domain/app/app-tabs-section/AppTabsSection.tsx rename to devcon/archived-pages/app/app-tabs-section/AppTabsSection.tsx diff --git a/devcon/src/components/domain/app/app-tabs-section/app-tabs-section.module.scss b/devcon/archived-pages/app/app-tabs-section/app-tabs-section.module.scss similarity index 100% rename from devcon/src/components/domain/app/app-tabs-section/app-tabs-section.module.scss rename to devcon/archived-pages/app/app-tabs-section/app-tabs-section.module.scss diff --git a/devcon/src/components/domain/app/app-tabs-section/index.ts b/devcon/archived-pages/app/app-tabs-section/index.ts similarity index 100% rename from devcon/src/components/domain/app/app-tabs-section/index.ts rename to devcon/archived-pages/app/app-tabs-section/index.ts diff --git a/devcon/src/components/domain/app/app.module.scss b/devcon/archived-pages/app/app.module.scss similarity index 100% rename from devcon/src/components/domain/app/app.module.scss rename to devcon/archived-pages/app/app.module.scss diff --git a/devcon/src/components/domain/app/button-overlay/ButtonOverlay.tsx b/devcon/archived-pages/app/button-overlay/ButtonOverlay.tsx similarity index 100% rename from devcon/src/components/domain/app/button-overlay/ButtonOverlay.tsx rename to devcon/archived-pages/app/button-overlay/ButtonOverlay.tsx diff --git a/devcon/src/components/domain/app/button-overlay/button-overlay.module.scss b/devcon/archived-pages/app/button-overlay/button-overlay.module.scss similarity index 100% rename from devcon/src/components/domain/app/button-overlay/button-overlay.module.scss rename to devcon/archived-pages/app/button-overlay/button-overlay.module.scss diff --git a/devcon/src/components/domain/app/button-overlay/index.tsx b/devcon/archived-pages/app/button-overlay/index.tsx similarity index 100% rename from devcon/src/components/domain/app/button-overlay/index.tsx rename to devcon/archived-pages/app/button-overlay/index.tsx diff --git a/devcon/src/components/domain/app/dashboard/Dashboard.tsx b/devcon/archived-pages/app/dashboard/Dashboard.tsx similarity index 100% rename from devcon/src/components/domain/app/dashboard/Dashboard.tsx rename to devcon/archived-pages/app/dashboard/Dashboard.tsx diff --git a/devcon/src/components/domain/app/dashboard/dashboard.module.scss b/devcon/archived-pages/app/dashboard/dashboard.module.scss similarity index 100% rename from devcon/src/components/domain/app/dashboard/dashboard.module.scss rename to devcon/archived-pages/app/dashboard/dashboard.module.scss diff --git a/devcon/src/components/domain/app/dashboard/index.ts b/devcon/archived-pages/app/dashboard/index.ts similarity index 100% rename from devcon/src/components/domain/app/dashboard/index.ts rename to devcon/archived-pages/app/dashboard/index.ts diff --git a/devcon/src/components/domain/app/history-tracker/HistoryTracker.tsx b/devcon/archived-pages/app/history-tracker/HistoryTracker.tsx similarity index 100% rename from devcon/src/components/domain/app/history-tracker/HistoryTracker.tsx rename to devcon/archived-pages/app/history-tracker/HistoryTracker.tsx diff --git a/devcon/src/components/domain/app/history-tracker/index.tsx b/devcon/archived-pages/app/history-tracker/index.tsx similarity index 100% rename from devcon/src/components/domain/app/history-tracker/index.tsx rename to devcon/archived-pages/app/history-tracker/index.tsx diff --git a/devcon/src/components/domain/app/home/Home.tsx b/devcon/archived-pages/app/home/Home.tsx similarity index 100% rename from devcon/src/components/domain/app/home/Home.tsx rename to devcon/archived-pages/app/home/Home.tsx diff --git a/devcon/src/components/domain/app/home/home.module.scss b/devcon/archived-pages/app/home/home.module.scss similarity index 100% rename from devcon/src/components/domain/app/home/home.module.scss rename to devcon/archived-pages/app/home/home.module.scss diff --git a/devcon/src/components/domain/app/home/index.ts b/devcon/archived-pages/app/home/index.ts similarity index 100% rename from devcon/src/components/domain/app/home/index.ts rename to devcon/archived-pages/app/home/index.ts diff --git a/devcon/src/assets/images/thumbnail-placeholder.png b/devcon/archived-pages/app/home/thumbnail-placeholder.png similarity index 100% rename from devcon/src/assets/images/thumbnail-placeholder.png rename to devcon/archived-pages/app/home/thumbnail-placeholder.png diff --git a/devcon/src/components/domain/app/home/ticket.png b/devcon/archived-pages/app/home/ticket.png similarity index 100% rename from devcon/src/components/domain/app/home/ticket.png rename to devcon/archived-pages/app/home/ticket.png diff --git a/devcon/src/components/domain/app/info/Info.tsx b/devcon/archived-pages/app/info/Info.tsx similarity index 100% rename from devcon/src/components/domain/app/info/Info.tsx rename to devcon/archived-pages/app/info/Info.tsx diff --git a/devcon/src/components/domain/app/info/index.ts b/devcon/archived-pages/app/info/index.ts similarity index 100% rename from devcon/src/components/domain/app/info/index.ts rename to devcon/archived-pages/app/info/index.ts diff --git a/devcon/src/components/domain/app/info/info.module.scss b/devcon/archived-pages/app/info/info.module.scss similarity index 100% rename from devcon/src/components/domain/app/info/info.module.scss rename to devcon/archived-pages/app/info/info.module.scss diff --git a/devcon/src/components/domain/app/navigation/AppNav.tsx b/devcon/archived-pages/app/navigation/AppNav.tsx similarity index 100% rename from devcon/src/components/domain/app/navigation/AppNav.tsx rename to devcon/archived-pages/app/navigation/AppNav.tsx diff --git a/devcon/src/components/domain/app/navigation/BottomNav.tsx b/devcon/archived-pages/app/navigation/BottomNav.tsx similarity index 100% rename from devcon/src/components/domain/app/navigation/BottomNav.tsx rename to devcon/archived-pages/app/navigation/BottomNav.tsx diff --git a/devcon/src/components/domain/app/navigation/app-nav.module.scss b/devcon/archived-pages/app/navigation/app-nav.module.scss similarity index 100% rename from devcon/src/components/domain/app/navigation/app-nav.module.scss rename to devcon/archived-pages/app/navigation/app-nav.module.scss diff --git a/devcon/src/components/domain/app/navigation/bottom-nav.module.scss b/devcon/archived-pages/app/navigation/bottom-nav.module.scss similarity index 100% rename from devcon/src/components/domain/app/navigation/bottom-nav.module.scss rename to devcon/archived-pages/app/navigation/bottom-nav.module.scss diff --git a/devcon/src/components/domain/app/navigation/index.tsx b/devcon/archived-pages/app/navigation/index.tsx similarity index 100% rename from devcon/src/components/domain/app/navigation/index.tsx rename to devcon/archived-pages/app/navigation/index.tsx diff --git a/devcon/src/components/domain/app/notifications/Notifications.tsx b/devcon/archived-pages/app/notifications/Notifications.tsx similarity index 100% rename from devcon/src/components/domain/app/notifications/Notifications.tsx rename to devcon/archived-pages/app/notifications/Notifications.tsx diff --git a/devcon/src/components/domain/app/notifications/index.tsx b/devcon/archived-pages/app/notifications/index.tsx similarity index 100% rename from devcon/src/components/domain/app/notifications/index.tsx rename to devcon/archived-pages/app/notifications/index.tsx diff --git a/devcon/src/components/domain/app/notifications/notifications.module.scss b/devcon/archived-pages/app/notifications/notifications.module.scss similarity index 100% rename from devcon/src/components/domain/app/notifications/notifications.module.scss rename to devcon/archived-pages/app/notifications/notifications.module.scss diff --git a/devcon/src/components/domain/app/pwa-prompt/PWAPrompt.tsx b/devcon/archived-pages/app/pwa-prompt/PWAPrompt.tsx similarity index 100% rename from devcon/src/components/domain/app/pwa-prompt/PWAPrompt.tsx rename to devcon/archived-pages/app/pwa-prompt/PWAPrompt.tsx diff --git a/devcon/src/components/domain/app/pwa-prompt/index.ts b/devcon/archived-pages/app/pwa-prompt/index.ts similarity index 100% rename from devcon/src/components/domain/app/pwa-prompt/index.ts rename to devcon/archived-pages/app/pwa-prompt/index.ts diff --git a/devcon/src/components/domain/app/pwa-prompt/pwa-utilities.ts b/devcon/archived-pages/app/pwa-prompt/pwa-utilities.ts similarity index 100% rename from devcon/src/components/domain/app/pwa-prompt/pwa-utilities.ts rename to devcon/archived-pages/app/pwa-prompt/pwa-utilities.ts diff --git a/devcon/src/components/domain/app/pwa-prompt/pwa.module.scss b/devcon/archived-pages/app/pwa-prompt/pwa.module.scss similarity index 100% rename from devcon/src/components/domain/app/pwa-prompt/pwa.module.scss rename to devcon/archived-pages/app/pwa-prompt/pwa.module.scss diff --git a/devcon/src/components/domain/app/pwa-prompt/usefulsnippets.txt b/devcon/archived-pages/app/pwa-prompt/usefulsnippets.txt similarity index 100% rename from devcon/src/components/domain/app/pwa-prompt/usefulsnippets.txt rename to devcon/archived-pages/app/pwa-prompt/usefulsnippets.txt diff --git a/devcon/src/components/domain/app/schedule/Schedule.tsx b/devcon/archived-pages/app/schedule/Schedule.tsx similarity index 100% rename from devcon/src/components/domain/app/schedule/Schedule.tsx rename to devcon/archived-pages/app/schedule/Schedule.tsx diff --git a/devcon/src/components/domain/app/schedule/ShareScheduleModal.tsx b/devcon/archived-pages/app/schedule/ShareScheduleModal.tsx similarity index 100% rename from devcon/src/components/domain/app/schedule/ShareScheduleModal.tsx rename to devcon/archived-pages/app/schedule/ShareScheduleModal.tsx diff --git a/devcon/src/components/domain/app/schedule/index.tsx b/devcon/archived-pages/app/schedule/index.tsx similarity index 100% rename from devcon/src/components/domain/app/schedule/index.tsx rename to devcon/archived-pages/app/schedule/index.tsx diff --git a/devcon/src/components/domain/app/schedule/schedule.module.scss b/devcon/archived-pages/app/schedule/schedule.module.scss similarity index 100% rename from devcon/src/components/domain/app/schedule/schedule.module.scss rename to devcon/archived-pages/app/schedule/schedule.module.scss diff --git a/devcon/src/components/domain/app/schedule/share.module.scss b/devcon/archived-pages/app/schedule/share.module.scss similarity index 100% rename from devcon/src/components/domain/app/schedule/share.module.scss rename to devcon/archived-pages/app/schedule/share.module.scss diff --git a/devcon/src/components/domain/app/schedule/views/List.tsx b/devcon/archived-pages/app/schedule/views/List.tsx similarity index 100% rename from devcon/src/components/domain/app/schedule/views/List.tsx rename to devcon/archived-pages/app/schedule/views/List.tsx diff --git a/devcon/src/components/domain/app/schedule/views/list.module.scss b/devcon/archived-pages/app/schedule/views/list.module.scss similarity index 100% rename from devcon/src/components/domain/app/schedule/views/list.module.scss rename to devcon/archived-pages/app/schedule/views/list.module.scss diff --git a/devcon/src/components/domain/app/session/LivestreamCard.tsx b/devcon/archived-pages/app/session/LivestreamCard.tsx similarity index 100% rename from devcon/src/components/domain/app/session/LivestreamCard.tsx rename to devcon/archived-pages/app/session/LivestreamCard.tsx diff --git a/devcon/src/components/domain/app/session/Session.tsx b/devcon/archived-pages/app/session/Session.tsx similarity index 100% rename from devcon/src/components/domain/app/session/Session.tsx rename to devcon/archived-pages/app/session/Session.tsx diff --git a/devcon/src/components/domain/app/session/SessionCard.tsx b/devcon/archived-pages/app/session/SessionCard.tsx similarity index 100% rename from devcon/src/components/domain/app/session/SessionCard.tsx rename to devcon/archived-pages/app/session/SessionCard.tsx diff --git a/devcon/src/components/domain/app/session/index.ts b/devcon/archived-pages/app/session/index.ts similarity index 100% rename from devcon/src/components/domain/app/session/index.ts rename to devcon/archived-pages/app/session/index.ts diff --git a/devcon/src/components/domain/app/session/livestream-icon.png b/devcon/archived-pages/app/session/livestream-icon.png similarity index 100% rename from devcon/src/components/domain/app/session/livestream-icon.png rename to devcon/archived-pages/app/session/livestream-icon.png diff --git a/devcon/src/components/domain/app/session/livestream.module.scss b/devcon/archived-pages/app/session/livestream.module.scss similarity index 100% rename from devcon/src/components/domain/app/session/livestream.module.scss rename to devcon/archived-pages/app/session/livestream.module.scss diff --git a/devcon/src/components/domain/app/session/session-card.module.scss b/devcon/archived-pages/app/session/session-card.module.scss similarity index 100% rename from devcon/src/components/domain/app/session/session-card.module.scss rename to devcon/archived-pages/app/session/session-card.module.scss diff --git a/devcon/src/components/domain/app/session/session.module.scss b/devcon/archived-pages/app/session/session.module.scss similarity index 100% rename from devcon/src/components/domain/app/session/session.module.scss rename to devcon/archived-pages/app/session/session.module.scss diff --git a/devcon/src/components/domain/app/session/track-icon.png b/devcon/archived-pages/app/session/track-icon.png similarity index 100% rename from devcon/src/components/domain/app/session/track-icon.png rename to devcon/archived-pages/app/session/track-icon.png diff --git a/devcon/src/components/domain/app/side-events/SideEventCard.tsx b/devcon/archived-pages/app/side-events/SideEventCard.tsx similarity index 100% rename from devcon/src/components/domain/app/side-events/SideEventCard.tsx rename to devcon/archived-pages/app/side-events/SideEventCard.tsx diff --git a/devcon/src/components/domain/app/side-events/SideEvents.tsx b/devcon/archived-pages/app/side-events/SideEvents.tsx similarity index 100% rename from devcon/src/components/domain/app/side-events/SideEvents.tsx rename to devcon/archived-pages/app/side-events/SideEvents.tsx diff --git a/devcon/src/components/domain/app/side-events/index.ts b/devcon/archived-pages/app/side-events/index.ts similarity index 100% rename from devcon/src/components/domain/app/side-events/index.ts rename to devcon/archived-pages/app/side-events/index.ts diff --git a/devcon/src/components/domain/app/side-events/side-event.module.scss b/devcon/archived-pages/app/side-events/side-event.module.scss similarity index 100% rename from devcon/src/components/domain/app/side-events/side-event.module.scss rename to devcon/archived-pages/app/side-events/side-event.module.scss diff --git a/devcon/src/components/domain/app/side-events/side-events.module.scss b/devcon/archived-pages/app/side-events/side-events.module.scss similarity index 100% rename from devcon/src/components/domain/app/side-events/side-events.module.scss rename to devcon/archived-pages/app/side-events/side-events.module.scss diff --git a/devcon/src/components/domain/app/speakers/SpeakerDetails.tsx b/devcon/archived-pages/app/speakers/SpeakerDetails.tsx similarity index 100% rename from devcon/src/components/domain/app/speakers/SpeakerDetails.tsx rename to devcon/archived-pages/app/speakers/SpeakerDetails.tsx diff --git a/devcon/src/components/domain/app/speakers/Speakers.tsx b/devcon/archived-pages/app/speakers/Speakers.tsx similarity index 100% rename from devcon/src/components/domain/app/speakers/Speakers.tsx rename to devcon/archived-pages/app/speakers/Speakers.tsx diff --git a/devcon/src/components/domain/app/speakers/index.tsx b/devcon/archived-pages/app/speakers/index.tsx similarity index 100% rename from devcon/src/components/domain/app/speakers/index.tsx rename to devcon/archived-pages/app/speakers/index.tsx diff --git a/devcon/src/components/domain/app/speakers/speaker-details.module.scss b/devcon/archived-pages/app/speakers/speaker-details.module.scss similarity index 100% rename from devcon/src/components/domain/app/speakers/speaker-details.module.scss rename to devcon/archived-pages/app/speakers/speaker-details.module.scss diff --git a/devcon/src/components/domain/app/speakers/speakers.module.scss b/devcon/archived-pages/app/speakers/speakers.module.scss similarity index 100% rename from devcon/src/components/domain/app/speakers/speakers.module.scss rename to devcon/archived-pages/app/speakers/speakers.module.scss diff --git a/devcon/src/components/domain/app/venue/Room.tsx b/devcon/archived-pages/app/venue/Room.tsx similarity index 100% rename from devcon/src/components/domain/app/venue/Room.tsx rename to devcon/archived-pages/app/venue/Room.tsx diff --git a/devcon/src/components/domain/app/venue/Venue.tsx b/devcon/archived-pages/app/venue/Venue.tsx similarity index 100% rename from devcon/src/components/domain/app/venue/Venue.tsx rename to devcon/archived-pages/app/venue/Venue.tsx diff --git a/devcon/src/components/domain/app/venue/css-3d.module.scss b/devcon/archived-pages/app/venue/css-3d.module.scss similarity index 100% rename from devcon/src/components/domain/app/venue/css-3d.module.scss rename to devcon/archived-pages/app/venue/css-3d.module.scss diff --git a/devcon/src/components/domain/app/venue/css-3d.tsx b/devcon/archived-pages/app/venue/css-3d.tsx similarity index 100% rename from devcon/src/components/domain/app/venue/css-3d.tsx rename to devcon/archived-pages/app/venue/css-3d.tsx diff --git a/devcon/src/components/domain/app/venue/index.tsx b/devcon/archived-pages/app/venue/index.tsx similarity index 100% rename from devcon/src/components/domain/app/venue/index.tsx rename to devcon/archived-pages/app/venue/index.tsx diff --git a/devcon/src/components/domain/app/venue/mall-floor-plan.png b/devcon/archived-pages/app/venue/mall-floor-plan.png similarity index 100% rename from devcon/src/components/domain/app/venue/mall-floor-plan.png rename to devcon/archived-pages/app/venue/mall-floor-plan.png diff --git a/devcon/src/components/domain/app/venue/room.module.scss b/devcon/archived-pages/app/venue/room.module.scss similarity index 100% rename from devcon/src/components/domain/app/venue/room.module.scss rename to devcon/archived-pages/app/venue/room.module.scss diff --git a/devcon/src/components/domain/app/venue/venue.module.scss b/devcon/archived-pages/app/venue/venue.module.scss similarity index 100% rename from devcon/src/components/domain/app/venue/venue.module.scss rename to devcon/archived-pages/app/venue/venue.module.scss diff --git a/devcon/src/pages/applications.module.scss b/devcon/archived-pages/applications.module.scss similarity index 100% rename from devcon/src/pages/applications.module.scss rename to devcon/archived-pages/applications.module.scss diff --git a/devcon/src/pages/applications.tsx b/devcon/archived-pages/applications.tsx similarity index 100% rename from devcon/src/pages/applications.tsx rename to devcon/archived-pages/applications.tsx diff --git a/devcon/src/pages/archived-devcon-week.module.scss b/devcon/archived-pages/archived-devcon-week.module.scss similarity index 100% rename from devcon/src/pages/archived-devcon-week.module.scss rename to devcon/archived-pages/archived-devcon-week.module.scss diff --git a/devcon/src/pages/archived-devcon-week.tsx b/devcon/archived-pages/archived-devcon-week.tsx similarity index 100% rename from devcon/src/pages/archived-devcon-week.tsx rename to devcon/archived-pages/archived-devcon-week.tsx diff --git a/devcon/src/pages/bogota.tsx b/devcon/archived-pages/bogota.tsx similarity index 100% rename from devcon/src/pages/bogota.tsx rename to devcon/archived-pages/bogota.tsx diff --git a/devcon/src/pages/continuous-devcon.module.scss b/devcon/archived-pages/continuous-devcon.module.scss similarity index 100% rename from devcon/src/pages/continuous-devcon.module.scss rename to devcon/archived-pages/continuous-devcon.module.scss diff --git a/devcon/src/pages/continuous-devcon.tsx b/devcon/archived-pages/continuous-devcon.tsx similarity index 100% rename from devcon/src/pages/continuous-devcon.tsx rename to devcon/archived-pages/continuous-devcon.tsx diff --git a/devcon/src/pages/faq.tsx b/devcon/archived-pages/faq.tsx similarity index 100% rename from devcon/src/pages/faq.tsx rename to devcon/archived-pages/faq.tsx diff --git a/devcon/src/pages/program.module.scss b/devcon/archived-pages/program.module.scss similarity index 100% rename from devcon/src/pages/program.module.scss rename to devcon/archived-pages/program.module.scss diff --git a/devcon/src/pages/program.tsx b/devcon/archived-pages/program.tsx similarity index 100% rename from devcon/src/pages/program.tsx rename to devcon/archived-pages/program.tsx diff --git a/devcon/src/pages/satellites.module.scss b/devcon/archived-pages/satellites.module.scss similarity index 100% rename from devcon/src/pages/satellites.module.scss rename to devcon/archived-pages/satellites.module.scss diff --git a/devcon/src/pages/satellites.tsx b/devcon/archived-pages/satellites.tsx similarity index 100% rename from devcon/src/pages/satellites.tsx rename to devcon/archived-pages/satellites.tsx diff --git a/devcon/src/pages/supporters.module.scss b/devcon/archived-pages/supporters.module.scss similarity index 100% rename from devcon/src/pages/supporters.module.scss rename to devcon/archived-pages/supporters.module.scss diff --git a/devcon/src/pages/supporters.tsx b/devcon/archived-pages/supporters.tsx similarity index 99% rename from devcon/src/pages/supporters.tsx rename to devcon/archived-pages/supporters.tsx index b78e44167..90b3539a5 100644 --- a/devcon/src/pages/supporters.tsx +++ b/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 ( Get Involved }, { text: props.page.header }]} title={pageContext?.current?.title} navigation={[ diff --git a/devcon/src/pages/surveypoap.tsx b/devcon/archived-pages/surveypoap.tsx similarity index 100% rename from devcon/src/pages/surveypoap.tsx rename to devcon/archived-pages/surveypoap.tsx diff --git a/devcon/cms/pages/dips.mdx b/devcon/cms/pages/dips.mdx new file mode 100644 index 000000000..d77e1aaed --- /dev/null +++ b/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 +--- + diff --git a/devcon/cms/pages/index.mdx b/devcon/cms/pages/index.mdx new file mode 100644 index 000000000..d87cac595 --- /dev/null +++ b/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 +--- + diff --git a/devcon/cms/pages/past_events.mdx b/devcon/cms/pages/past_events.mdx new file mode 100644 index 000000000..a3272360d --- /dev/null +++ b/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 +--- + diff --git a/devcon/next.config.js b/devcon/next.config.js index 7f83c0675..22c0e8bc1 100644 --- a/devcon/next.config.js +++ b/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() { diff --git a/devcon/package.json b/devcon/package.json index 80c4f3da3..42689662e 100644 --- a/devcon/package.json +++ b/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,6 +71,7 @@ "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" }, @@ -76,25 +79,29 @@ "@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" } diff --git a/devcon/postcss.config.js b/devcon/postcss.config.js new file mode 100644 index 000000000..33ad091d2 --- /dev/null +++ b/devcon/postcss.config.js @@ -0,0 +1,6 @@ +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +} diff --git a/devcon/public/admin/.gitignore b/devcon/public/admin/.gitignore new file mode 100644 index 000000000..c6a8f8ff6 --- /dev/null +++ b/devcon/public/admin/.gitignore @@ -0,0 +1,2 @@ +index.html +assets/ \ No newline at end of file diff --git a/devcon/public/admin/tina/.gitignore b/devcon/public/admin/tina/.gitignore new file mode 100644 index 000000000..c6a8f8ff6 --- /dev/null +++ b/devcon/public/admin/tina/.gitignore @@ -0,0 +1,2 @@ +index.html +assets/ \ No newline at end of file diff --git a/devcon/public/assets/images/dc7-og.png b/devcon/public/assets/images/dc7-og.png new file mode 100644 index 000000000..c0202a16a Binary files /dev/null and b/devcon/public/assets/images/dc7-og.png differ diff --git a/devcon/src/assets/images/editions/Berlin.png b/devcon/public/cms-assets/past-events/Berlin.png similarity index 100% rename from devcon/src/assets/images/editions/Berlin.png rename to devcon/public/cms-assets/past-events/Berlin.png diff --git a/devcon/src/assets/images/editions/Bogota.png b/devcon/public/cms-assets/past-events/Bogota.png similarity index 100% rename from devcon/src/assets/images/editions/Bogota.png rename to devcon/public/cms-assets/past-events/Bogota.png diff --git a/devcon/src/assets/images/editions/Cancun.png b/devcon/public/cms-assets/past-events/Cancun.png similarity index 100% rename from devcon/src/assets/images/editions/Cancun.png rename to devcon/public/cms-assets/past-events/Cancun.png diff --git a/devcon/src/assets/images/editions/London.png b/devcon/public/cms-assets/past-events/London.png similarity index 100% rename from devcon/src/assets/images/editions/London.png rename to devcon/public/cms-assets/past-events/London.png diff --git a/devcon/src/assets/images/editions/Osaka.png b/devcon/public/cms-assets/past-events/Osaka.png similarity index 100% rename from devcon/src/assets/images/editions/Osaka.png rename to devcon/public/cms-assets/past-events/Osaka.png diff --git a/devcon/src/assets/images/editions/Prague.png b/devcon/public/cms-assets/past-events/Prague.png similarity index 100% rename from devcon/src/assets/images/editions/Prague.png rename to devcon/public/cms-assets/past-events/Prague.png diff --git a/devcon/src/assets/images/editions/Shanghai.png b/devcon/public/cms-assets/past-events/Shanghai.png similarity index 100% rename from devcon/src/assets/images/editions/Shanghai.png rename to devcon/public/cms-assets/past-events/Shanghai.png diff --git a/devcon/src/assets/css/global/buttons.scss b/devcon/src/assets/css/global/buttons.scss index 224f0b5c5..28a526cc5 100644 --- a/devcon/src/assets/css/global/buttons.scss +++ b/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; diff --git a/devcon/src/assets/css/global/cms.scss b/devcon/src/assets/css/global/cms.scss new file mode 100644 index 000000000..b536fae9e --- /dev/null +++ b/devcon/src/assets/css/global/cms.scss @@ -0,0 +1,44 @@ +b, strong { + font-weight: 600; +} + +.rich-text { + h1, h2, h3, h4, h5, h6 { + // font-family: inherit !important; + font-weight: normal !important; + } + + // h1 { + // font-size: 1.6rem !important; + // } + + // h2 { + // font-size: 1.5rem; + // } + + // h3 { + // font-size: 1.4rem; + // } + + // h4 { + // font-size: 1.3rem; + // } + + // h5 { + // font-size: 1.2rem; + // } + + // h6 { + // font-size: 1.1rem; + // } + + ul { + display: block; + } + + p, h1, h2, h3, h4, h5, h6 { + &:not(&:last-child) { + margin-bottom: 1rem; + } + } +} \ No newline at end of file diff --git a/devcon/src/assets/css/global/fonts.scss b/devcon/src/assets/css/global/fonts.scss index 76480cb20..b711ad522 100644 --- a/devcon/src/assets/css/global/fonts.scss +++ b/devcon/src/assets/css/global/fonts.scss @@ -8,10 +8,14 @@ @include fonts-secondary; } +[data-cms-header] { + @include fonts-secondary; +} + // Headers h1, .h1 { - @include fonts-secondary; + // @include fonts-secondary; @include fonts-bold; font-size: $sizes-size-16 + $sizes-size-16; line-height: 125%; @@ -24,6 +28,7 @@ h1, h2, .h2, .title { + @include fonts-secondary; @include fonts-bold; font-size: 24px; line-height: 120%; diff --git a/devcon/src/assets/css/global/tailwind.scss b/devcon/src/assets/css/global/tailwind.scss new file mode 100644 index 000000000..d047a6f2f --- /dev/null +++ b/devcon/src/assets/css/global/tailwind.scss @@ -0,0 +1,15 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer utilities { + /* Hide scrollbar for Chrome, Safari and Opera */ + .no-scrollbar::-webkit-scrollbar { + display: none; + } + /* Hide scrollbar for IE, Edge and Firefox */ + .no-scrollbar { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + } +} \ No newline at end of file diff --git a/devcon/src/assets/css/index.scss b/devcon/src/assets/css/index.scss index 5797019d1..3cd13b987 100644 --- a/devcon/src/assets/css/index.scss +++ b/devcon/src/assets/css/index.scss @@ -1,4 +1,6 @@ +@use 'global/tailwind.scss'; @use 'assets/css/partials/index' as *; +@use 'global/cms'; @use 'global/general'; @use 'global/buttons'; @use 'global/list'; @@ -36,9 +38,9 @@ html { font-size: 14px; } - @media (max-width: $breakpoints-md) { - font-size: 12px; - } + // @media (max-width: $breakpoints-md) { + // font-size: 12px; + // } } body { diff --git a/devcon/src/assets/css/partials/_fonts.scss b/devcon/src/assets/css/partials/_fonts.scss index 53f40fc90..ce84bf69b 100644 --- a/devcon/src/assets/css/partials/_fonts.scss +++ b/devcon/src/assets/css/partials/_fonts.scss @@ -4,8 +4,8 @@ @use 'colors'; // Fonts -$primary: 'Roboto', serif; -$secondary: 'Space Mono', monospace; +$primary: 'Inter', sans-serif; +$secondary: 'Poppins', sans-serif; // Relative to root (rem) sizes @mixin xxs { diff --git a/devcon/src/assets/images/archive/archive-logo.png b/devcon/src/assets/images/archive/archive-logo.png new file mode 100644 index 000000000..a71d3d14c Binary files /dev/null and b/devcon/src/assets/images/archive/archive-logo.png differ diff --git a/devcon/src/assets/images/ask-deva.png b/devcon/src/assets/images/ask-deva.png deleted file mode 100644 index 804d1a327..000000000 Binary files a/devcon/src/assets/images/ask-deva.png and /dev/null differ diff --git a/devcon/src/assets/images/ask_background.png b/devcon/src/assets/images/ask_background.png deleted file mode 100644 index 5aa52103a..000000000 Binary files a/devcon/src/assets/images/ask_background.png and /dev/null differ diff --git a/devcon/src/assets/images/ask_background.webp b/devcon/src/assets/images/ask_background.webp deleted file mode 100644 index 53e7044c7..000000000 Binary files a/devcon/src/assets/images/ask_background.webp and /dev/null differ diff --git a/devcon/src/assets/images/badger.gif b/devcon/src/assets/images/badger.gif deleted file mode 100644 index 39ded3427..000000000 Binary files a/devcon/src/assets/images/badger.gif and /dev/null differ diff --git a/devcon/src/assets/images/badger.webp b/devcon/src/assets/images/badger.webp deleted file mode 100644 index cf24db06a..000000000 Binary files a/devcon/src/assets/images/badger.webp and /dev/null differ diff --git a/devcon/src/assets/images/celebrate.gif b/devcon/src/assets/images/celebrate.gif deleted file mode 100644 index 9e9c16861..000000000 Binary files a/devcon/src/assets/images/celebrate.gif and /dev/null differ diff --git a/devcon/src/assets/images/celebrate.webp b/devcon/src/assets/images/celebrate.webp deleted file mode 100644 index ab3c46d04..000000000 Binary files a/devcon/src/assets/images/celebrate.webp and /dev/null differ diff --git a/devcon/src/assets/images/colombia.gif b/devcon/src/assets/images/colombia.gif deleted file mode 100644 index 2dbaad9fc..000000000 Binary files a/devcon/src/assets/images/colombia.gif and /dev/null differ diff --git a/devcon/src/assets/images/dance.gif b/devcon/src/assets/images/dance.gif deleted file mode 100644 index d4a7c4ae7..000000000 Binary files a/devcon/src/assets/images/dance.gif and /dev/null differ diff --git a/devcon/src/assets/images/dance2.gif b/devcon/src/assets/images/dance2.gif deleted file mode 100644 index e88bd01e4..000000000 Binary files a/devcon/src/assets/images/dance2.gif and /dev/null differ diff --git a/devcon/src/assets/images/dc-7/footer-bg.png b/devcon/src/assets/images/dc-7/footer-bg.png new file mode 100644 index 000000000..92af635b0 Binary files /dev/null and b/devcon/src/assets/images/dc-7/footer-bg.png differ diff --git a/devcon/src/assets/images/dc-7/logo-flowers.png b/devcon/src/assets/images/dc-7/logo-flowers.png new file mode 100644 index 000000000..8fc7d0635 Binary files /dev/null and b/devcon/src/assets/images/dc-7/logo-flowers.png differ diff --git a/devcon/src/assets/images/dc-7/rtd-grants.png b/devcon/src/assets/images/dc-7/rtd-grants.png new file mode 100644 index 000000000..09f993729 Binary files /dev/null and b/devcon/src/assets/images/dc-7/rtd-grants.png differ diff --git a/devcon/src/assets/images/deva_signature.png b/devcon/src/assets/images/deva_signature.png deleted file mode 100644 index e2a59543a..000000000 Binary files a/devcon/src/assets/images/deva_signature.png and /dev/null differ diff --git a/devcon/src/assets/images/highlight-chivas-sound.png b/devcon/src/assets/images/highlight-chivas-sound.png deleted file mode 100644 index 0eca43309..000000000 Binary files a/devcon/src/assets/images/highlight-chivas-sound.png and /dev/null differ diff --git a/devcon/src/assets/images/hug.gif b/devcon/src/assets/images/hug.gif deleted file mode 100644 index 37e0eb1b2..000000000 Binary files a/devcon/src/assets/images/hug.gif and /dev/null differ diff --git a/devcon/src/assets/images/invite-background.png b/devcon/src/assets/images/invite-background.png deleted file mode 100644 index f05d60c1a..000000000 Binary files a/devcon/src/assets/images/invite-background.png and /dev/null differ diff --git a/devcon/src/assets/images/lying-deva.png b/devcon/src/assets/images/lying-deva.png deleted file mode 100644 index e1d99a1be..000000000 Binary files a/devcon/src/assets/images/lying-deva.png and /dev/null differ diff --git a/devcon/src/assets/images/neo-matrix.png b/devcon/src/assets/images/neo-matrix.png deleted file mode 100644 index a82dc86d9..000000000 Binary files a/devcon/src/assets/images/neo-matrix.png and /dev/null differ diff --git a/devcon/src/assets/images/no-quests-hearts.png b/devcon/src/assets/images/no-quests-hearts.png deleted file mode 100644 index 62966ef77..000000000 Binary files a/devcon/src/assets/images/no-quests-hearts.png and /dev/null differ diff --git a/devcon/src/assets/images/nyan.gif b/devcon/src/assets/images/nyan.gif deleted file mode 100644 index 9742d3a65..000000000 Binary files a/devcon/src/assets/images/nyan.gif and /dev/null differ diff --git a/devcon/src/assets/images/nyan.webp b/devcon/src/assets/images/nyan.webp deleted file mode 100644 index c62748fc2..000000000 Binary files a/devcon/src/assets/images/nyan.webp and /dev/null differ diff --git a/devcon/src/assets/images/off-devcon.png b/devcon/src/assets/images/off-devcon.png deleted file mode 100644 index 668b19182..000000000 Binary files a/devcon/src/assets/images/off-devcon.png and /dev/null differ diff --git a/devcon/src/assets/images/pages/hero-bgs/about.jpg b/devcon/src/assets/images/pages/hero-bgs/about.jpg new file mode 100644 index 000000000..e53b2aa5b Binary files /dev/null and b/devcon/src/assets/images/pages/hero-bgs/about.jpg differ diff --git a/devcon/src/assets/images/pages/hero-bgs/get-involved.jpg b/devcon/src/assets/images/pages/hero-bgs/get-involved.jpg new file mode 100644 index 000000000..6f48ab641 Binary files /dev/null and b/devcon/src/assets/images/pages/hero-bgs/get-involved.jpg differ diff --git a/devcon/src/assets/images/pages/hero-bgs/news.jpg b/devcon/src/assets/images/pages/hero-bgs/news.jpg new file mode 100644 index 000000000..7d7b2e35d Binary files /dev/null and b/devcon/src/assets/images/pages/hero-bgs/news.jpg differ diff --git a/devcon/src/assets/images/participate_background.png b/devcon/src/assets/images/participate_background.png deleted file mode 100644 index 718676a3a..000000000 Binary files a/devcon/src/assets/images/participate_background.png and /dev/null differ diff --git a/devcon/src/assets/images/participate_background.webp b/devcon/src/assets/images/participate_background.webp deleted file mode 100644 index ad1f7a358..000000000 Binary files a/devcon/src/assets/images/participate_background.webp and /dev/null differ diff --git a/devcon/src/assets/images/party.png b/devcon/src/assets/images/party.png deleted file mode 100644 index 67eeebc1c..000000000 Binary files a/devcon/src/assets/images/party.png and /dev/null differ diff --git a/devcon/src/assets/images/pin-ipfs-quest.png b/devcon/src/assets/images/pin-ipfs-quest.png deleted file mode 100644 index cb9f1a180..000000000 Binary files a/devcon/src/assets/images/pin-ipfs-quest.png and /dev/null differ diff --git a/devcon/src/assets/images/poap-art.png b/devcon/src/assets/images/poap-art.png deleted file mode 100644 index a67c07cda..000000000 Binary files a/devcon/src/assets/images/poap-art.png and /dev/null differ diff --git a/devcon/src/assets/images/quests-along-the-road.png b/devcon/src/assets/images/quests-along-the-road.png deleted file mode 100644 index 094379d6b..000000000 Binary files a/devcon/src/assets/images/quests-along-the-road.png and /dev/null differ diff --git a/devcon/src/assets/images/quests.png b/devcon/src/assets/images/quests.png deleted file mode 100644 index 698887cf2..000000000 Binary files a/devcon/src/assets/images/quests.png and /dev/null differ diff --git a/devcon/src/assets/images/salsa.gif b/devcon/src/assets/images/salsa.gif deleted file mode 100644 index 1385288b0..000000000 Binary files a/devcon/src/assets/images/salsa.gif and /dev/null differ diff --git a/devcon/src/assets/images/salsa2.gif b/devcon/src/assets/images/salsa2.gif deleted file mode 100644 index 9e17d7699..000000000 Binary files a/devcon/src/assets/images/salsa2.gif and /dev/null differ diff --git a/devcon/src/assets/images/side-events-hero.png b/devcon/src/assets/images/side-events-hero.png deleted file mode 100644 index 185124aac..000000000 Binary files a/devcon/src/assets/images/side-events-hero.png and /dev/null differ diff --git a/devcon/src/assets/images/sitting-deva.png b/devcon/src/assets/images/sitting-deva.png deleted file mode 100644 index 99c3b8b26..000000000 Binary files a/devcon/src/assets/images/sitting-deva.png and /dev/null differ diff --git a/devcon/src/assets/images/trivia-night.png b/devcon/src/assets/images/trivia-night.png deleted file mode 100644 index 6abd6733d..000000000 Binary files a/devcon/src/assets/images/trivia-night.png and /dev/null differ diff --git a/devcon/src/assets/images/unicorn.gif b/devcon/src/assets/images/unicorn.gif deleted file mode 100644 index 03ad404df..000000000 Binary files a/devcon/src/assets/images/unicorn.gif and /dev/null differ diff --git a/devcon/src/assets/images/vitalik.png b/devcon/src/assets/images/vitalik.png deleted file mode 100644 index d27076f5f..000000000 Binary files a/devcon/src/assets/images/vitalik.png and /dev/null differ diff --git a/devcon/src/assets/images/vitalik_3x.png b/devcon/src/assets/images/vitalik_3x.png deleted file mode 100644 index 1b0f99e60..000000000 Binary files a/devcon/src/assets/images/vitalik_3x.png and /dev/null differ diff --git a/devcon/src/components/common/card/card.module.scss b/devcon/src/components/common/card/card.module.scss index 74e7cf935..7034a62d4 100644 --- a/devcon/src/components/common/card/card.module.scss +++ b/devcon/src/components/common/card/card.module.scss @@ -47,7 +47,7 @@ &:hover { .img-wrapper { .img { - transform: scale(1.15); + transform: scale(1.05); } } } diff --git a/devcon/src/components/common/carousel/Carousel.tsx b/devcon/src/components/common/carousel/Carousel.tsx index 938871fdc..cd952af8c 100644 --- a/devcon/src/components/common/carousel/Carousel.tsx +++ b/devcon/src/components/common/carousel/Carousel.tsx @@ -1,6 +1,7 @@ import React from 'react' import css from './carousel.module.scss' import Image from 'next/image' +import InfiniteScroll from 'lib/components/infinite-scroll/infinite-scroll' type CarouselProps = { title?: string @@ -24,15 +25,23 @@ export function Carousel(props: CarouselProps) {

{props.title}

- {/* TO-DO: Use next/image - couldn't get it working; goal is to set a fixed height and having width be decided by the intrinsic size of the image */}
+ + {props.images.map((image, index) => { + return {image.alt} + })} + +
+ + {/* TO-DO: Use next/image - couldn't get it working; goal is to set a fixed height and having width be decided by the intrinsic size of the image */} + {/*
{props.images.map((image, index) => { return {image.alt} })} {props.images.map((image, index) => { return {image.alt} })} -
+ */} ) } diff --git a/devcon/src/components/common/carousel/carousel.module.scss b/devcon/src/components/common/carousel/carousel.module.scss index 4f63dc772..2c3f844b0 100644 --- a/devcon/src/components/common/carousel/carousel.module.scss +++ b/devcon/src/components/common/carousel/carousel.module.scss @@ -43,7 +43,7 @@ animation: slide 120s linear infinite; } - > * { + img { height: 100%; width: auto !important; object-fit: contain; diff --git a/devcon/src/components/common/devcon-7-logo/Devcon7Logo.tsx b/devcon/src/components/common/devcon-7-logo/Devcon7Logo.tsx deleted file mode 100644 index 2f8cbf383..000000000 --- a/devcon/src/components/common/devcon-7-logo/Devcon7Logo.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import React, { useState } from 'react' -import Svg from './svg-test.svg' -import { Link } from '../link' -import css from './devcon-7-logo.module.scss' -import { motion } from 'framer-motion' - -const icon = { - hidden: { - pathLength: 0, - // pathSpacing: 0, - // pathOffset: 0, - transform: 'scale(0.5)', - fill: '#36364c0', - // fill: 'rgba(255, 255, 255, 0.5)', - }, - visible: { - pathLength: 1, - transform: 'scale(1)', - // pathSpacing: 1, - // pathOffset: 1, - fill: '#36364C', - }, -} - -export const Devcon7Logo = (props: any) => { - return ( - - - - - - - - - - - - - - ) -} diff --git a/devcon/src/components/common/devcon-7-logo/devcon-7-logo.module.scss b/devcon/src/components/common/devcon-7-logo/devcon-7-logo.module.scss deleted file mode 100644 index 69581190e..000000000 --- a/devcon/src/components/common/devcon-7-logo/devcon-7-logo.module.scss +++ /dev/null @@ -1,8 +0,0 @@ -.item { - width: 56%; - overflow: visible; - stroke: #000000; - stroke-width: 2; - stroke-linejoin: round; - stroke-linecap: round; - } \ No newline at end of file diff --git a/devcon/src/components/common/devcon-7-logo/index.ts b/devcon/src/components/common/devcon-7-logo/index.ts deleted file mode 100644 index e66eceaa8..000000000 --- a/devcon/src/components/common/devcon-7-logo/index.ts +++ /dev/null @@ -1,2 +0,0 @@ - -export { Devcon7Logo } from './Devcon7Logo' diff --git a/devcon/src/components/common/devcon-7-logo/svg-test.svg b/devcon/src/components/common/devcon-7-logo/svg-test.svg deleted file mode 100644 index 86a8231d0..000000000 --- a/devcon/src/components/common/devcon-7-logo/svg-test.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/devcon/src/components/common/devcon-7-logo/svg-testa.svg b/devcon/src/components/common/devcon-7-logo/svg-testa.svg deleted file mode 100644 index 08651fbd7..000000000 --- a/devcon/src/components/common/devcon-7-logo/svg-testa.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/devcon/src/components/common/layouts/Copyright.tsx b/devcon/src/components/common/layouts/Copyright.tsx index 57a167b72..6ba636963 100644 --- a/devcon/src/components/common/layouts/Copyright.tsx +++ b/devcon/src/components/common/layouts/Copyright.tsx @@ -7,7 +7,7 @@ export const Copyright = () => { return (
-

{intl('global_footer')}

+

Crafted with passion ✨ in the Infinite Garden.

{COPYRIGHT_NOTICE}

) diff --git a/devcon/src/components/common/layouts/footer/Footer.tsx b/devcon/src/components/common/layouts/footer/Footer.tsx index 322453f14..ccdd56a17 100644 --- a/devcon/src/components/common/layouts/footer/Footer.tsx +++ b/devcon/src/components/common/layouts/footer/Footer.tsx @@ -19,6 +19,10 @@ import IconTelegram from 'assets/icons/telegram.svg' import IconDiscord from 'assets/icons/discord.svg' import { CodeOfConduct, TermsOfService } from './Legal' import { Modal } from 'components/common/modal' +import LogoFlowers from 'assets/images/dc-7/logo-flowers.png' +import DC7Background from 'assets/images/dc-7/footer-bg.png' +import { Button } from 'lib/components/button' +import Image from 'next/image' type SocialMediaProps = { onShare?: () => void @@ -47,7 +51,7 @@ const ModalLink = (props: { children: any; title: string }) => { } export const SocialMedia = ({ onShare, url, className: extraClassName }: SocialMediaProps) => { - let className = css['social-media'] + let className = `${css['social-media']} text-xl` if (extraClassName) className += ` ${extraClassName}` @@ -59,9 +63,9 @@ export const SocialMedia = ({ onShare, url, className: extraClassName }: SocialM - + {/* - + */} @@ -84,11 +88,24 @@ export const Footer = () => { return (