Merge branch 'development/components' into migrate-typography-to-tail…

…wind
dev-launchers · Jan 18, 2025 · 62099be · 62099be
2 parents c01f907 + 7a1bd48
commit 62099be
Show file tree

Hide file tree

Showing 75 changed files with 4,019 additions and 917 deletions.
diff --git a/apps/app/pages/about.js b/apps/app/pages/about.js
@@ -0,0 +1,8 @@
+import Page from '@devlaunchers/website/src/pages/about';
+import App from '@devlaunchers/website/src/pages/_app';
+//export { getStaticProps } from '@devlaunchers/website/src/pages/index';
+
+/////////////////////////////////////////
+
+import { constructAppPage } from '../utils/routingTools.js';
+export default constructAppPage(App, Page);
diff --git a/apps/app/pages/collaborate.js b/apps/app/pages/collaborate.js
@@ -0,0 +1,8 @@
+import Page from '@devlaunchers/website/src/pages/collaborate.js';
+import App from '@devlaunchers/website/src/pages/_app';
+//export { getStaticProps } from '@devlaunchers/website/src/pages/index';
+
+/////////////////////////////////////////
+
+import { constructAppPage } from '../utils/routingTools.js';
+export default constructAppPage(App, Page);
diff --git a/apps/app/pages/resources.js b/apps/app/pages/resources.js
@@ -0,0 +1,8 @@
+import Page from '@devlaunchers/website/src/pages/resources';
+import App from '@devlaunchers/website/src/pages/_app';
+//export { getStaticProps } from '@devlaunchers/website/src/pages/index';
+
+/////////////////////////////////////////
+
+import { constructAppPage } from '../utils/routingTools.js';
+export default constructAppPage(App, Page);
diff --git a/apps/app/public/background-shape.png b/apps/app/public/background-shape.png
diff --git a/apps/app/public/dev_image (1).png b/apps/app/public/dev_image (1).png
diff --git a/apps/app/public/dev_image (2).png b/apps/app/public/dev_image (2).png
diff --git a/apps/app/public/dev_image (3).png b/apps/app/public/dev_image (3).png
diff --git a/apps/app/public/dev_image (4).png b/apps/app/public/dev_image (4).png
diff --git a/apps/app/public/dev_image (5).png b/apps/app/public/dev_image (5).png
diff --git a/apps/app/public/dev_image.png b/apps/app/public/dev_image.png
diff --git a/apps/app/public/figma.svg b/apps/app/public/figma.svg
diff --git a/apps/app/public/github.svg b/apps/app/public/github.svg
diff --git a/apps/app/public/grad-01.png b/apps/app/public/grad-01.png
diff --git a/apps/app/public/grad-02.png b/apps/app/public/grad-02.png
diff --git a/apps/app/public/images/home/build.png b/apps/app/public/images/home/build.png
diff --git a/apps/app/public/images/home/google.png b/apps/app/public/images/home/google.png
diff --git a/apps/app/public/images/home/ideas.png b/apps/app/public/images/home/ideas.png
diff --git a/apps/app/public/images/home/krafties.png b/apps/app/public/images/home/krafties.png
diff --git a/apps/app/public/images/home/lead.png b/apps/app/public/images/home/lead.png
diff --git a/apps/app/public/images/home/learning.png b/apps/app/public/images/home/learning.png
diff --git a/apps/app/public/images/home/logo-figma.png b/apps/app/public/images/home/logo-figma.png
diff --git a/apps/app/public/images/home/logo-github.png b/apps/app/public/images/home/logo-github.png
diff --git a/apps/app/public/images/home/logo-react.png b/apps/app/public/images/home/logo-react.png
diff --git a/apps/app/public/images/home/logo-shadcn.png b/apps/app/public/images/home/logo-shadcn.png
diff --git a/apps/app/public/images/home/logo-tailwind.png b/apps/app/public/images/home/logo-tailwind.png
diff --git a/apps/app/public/images/home/logo-typescript.png b/apps/app/public/images/home/logo-typescript.png
diff --git a/apps/app/public/images/home/map.png b/apps/app/public/images/home/map.png
diff --git a/apps/app/public/images/home/microsoft.png b/apps/app/public/images/home/microsoft.png
diff --git a/apps/app/public/images/home/partner.png b/apps/app/public/images/home/partner.png
diff --git a/apps/app/public/react.svg b/apps/app/public/react.svg
diff --git a/apps/app/public/shadcn.svg b/apps/app/public/shadcn.svg
diff --git a/apps/app/public/tailwind.svg b/apps/app/public/tailwind.svg
diff --git a/apps/app/public/typescript.svg b/apps/app/public/typescript.svg