Merge pull request #1 from dev-generator/folder-restructure

Folder restructure
dev-generator · May 16, 2021 · a18b840 · a18b840
2 parents f8bbbb4 + 9cb470a
commit a18b840
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 36 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -2,8 +2,9 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/components/*": ["components/*"],
-      "@/data/*": ["data/*"]
+      "@/components/*": ["src/components/*"],
+      "@/data/*": ["src/data/*"],
+      "@/styles/*": ["src/styles/*"]
     }
   }
 }
diff --git a/pages/_app.js b/pages/_app.js
diff --git a/components/Faq.js → src/components/Faq.js b/components/Faq.js → src/components/Faq.js
diff --git a/components/Features.js → src/components/Features.js b/components/Features.js → src/components/Features.js
diff --git a/components/Footer.js → src/components/Footer.js b/components/Footer.js → src/components/Footer.js
diff --git a/components/Generators.js → src/components/Generators.js b/components/Generators.js → src/components/Generators.js
diff --git a/components/Hero.js → src/components/Hero.js b/components/Hero.js → src/components/Hero.js
diff --git a/components/Navigation.js → src/components/Navigation.js b/components/Navigation.js → src/components/Navigation.js
diff --git a/components/Sponsor.js → src/components/Sponsor.js b/components/Sponsor.js → src/components/Sponsor.js
diff --git a/components/Team.js → src/components/Team.js b/components/Team.js → src/components/Team.js
diff --git a/data/faqs.js → src/data/faqs.js b/data/faqs.js → src/data/faqs.js
@@ -1,4 +1,4 @@
-export const faqs = [
+const faqs = [
   {
     id: 1,
     question: 'Is this secure?',

diff --git a/data/features.js → src/data/features.js b/data/features.js → src/data/features.js
@@ -6,7 +6,7 @@ import {
   ClipboardListIcon,
 } from '@heroicons/react/outline'
 
-export const features = [
+const features = [
   {
     name: 'Enter Details',
     description: 'Add your data when it is applicable for a specific file to generate.',

diff --git a/data/footer-navigation.js → src/data/footer-navigation.js b/data/footer-navigation.js → src/data/footer-navigation.js
@@ -1,4 +1,4 @@
-export const navigation = {
+const navigation = {
   features: [
     { name: 'Features', href: '/#features' },
     { name: 'Ruby Gems', href: '/#ruby-gems' },

diff --git a/data/generators.js → src/data/generators.js b/data/generators.js → src/data/generators.js
@@ -1,4 +1,4 @@
-export const generators = [
+const generators = [
   {
     id: 'ruby-gems',
     name: 'Ruby Gems',

diff --git a/data/navigation.js → src/data/navigation.js b/data/navigation.js → src/data/navigation.js
@@ -1,4 +1,4 @@
-export const navigation = [
+const navigation = [
   { name: 'The Team', href: '/#the-team' },
   { name: 'Features', href: '/#features' },
   { name: 'Ruby Gems', href: '/#ruby-gems' },

diff --git a/data/team-members.js → src/data/team-members.js b/data/team-members.js → src/data/team-members.js
@@ -1,4 +1,4 @@
-export const people = [
+const people = [
   {
     name: 'Christopher Pezza',
     role: 'Lead Developer',

diff --git a/src/pages/_app.js b/src/pages/_app.js
@@ -0,0 +1,46 @@
+import '@/styles/globals.css'
+import Head from 'next/head'
+import Router from 'next/router'
+import ProgressBar from '@badrap/bar-of-progress'
+
+const progress = new ProgressBar({
+  size: 2,
+  color: '#22D3EE',
+  className: 'bar-of-progress',
+  delay: 100,
+})
+
+// this fixes safari jumping to the bottom of the page
+// when closing the search modal using the `esc` key
+if (typeof window !== 'undefined') {
+  progress.start()
+  progress.finish()
+}
+
+Router.events.on('routeChangeStart', progress.start)
+Router.events.on('routeChangeComplete', () => {
+  progress.finish()
+  window.scrollTo(0, 0)
+})
+Router.events.on('routeChangeError', progress.finish)
+
+function App({ Component, pageProps }) {
+  return (
+    <>
+      <Head>
+        <meta
+          name="description"
+          content="Generate files for various linters, base files, etc. without having to manually create or remember every available input that has to go into a file."
+        />
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+        <link rel="manifest" href="/site.webmanifest" />
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+      <Component {...pageProps} />
+    </>
+  )
+}
+
+export default App
diff --git a/pages/_document.js → src/pages/_document.js b/pages/_document.js → src/pages/_document.js
@@ -5,15 +5,6 @@ export default class MyDocument extends Document {
     return (
       <Html lang="en">
         <Head>
-          <meta
-            name="description"
-            content="Generate files for various linters, base files, etc. without having to manually create or remember every available input that has to go into a file."
-          />
-          <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-          <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-          <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-          <link rel="manifest" href="/site.webmanifest" />
-          <link rel="icon" href="/favicon.ico" />
           <script
             async
             src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}`}

diff --git a/pages/index.js → src/pages/index.js b/pages/index.js → src/pages/index.js
diff --git a/pages/privacy.js → src/pages/privacy.js b/pages/privacy.js → src/pages/privacy.js
diff --git a/styles/globals.css → src/styles/globals.css b/styles/globals.css → src/styles/globals.css
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -2,7 +2,7 @@ const colors = require('tailwindcss/colors');
 
 module.exports = {
   mode: 'jit',
-  purge: ['./pages/**/*.js', './components/**/*.js'],
+  purge: ['./src/pages/**/*.js', './src/components/**/*.js'],
   darkMode: false,
   theme: {
     colors: {