Merge pull request #5 from PyConColombia/develop

Merge changes into dev

.editorconfig

@@ -0,0 +1,26 @@
+# EditorConfig: https://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.py]
+indent_style = space
+indent_size = 4
+max_line_length = 88
+
+[*.{js,jsx,ts,tsx}]
+indent_style = space
+indent_size = 2
+max_line_length = 80
+
+[*.{yml,yaml,json,css,styl}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.eslintignore

@@ -1,5 +1,3 @@
-.cache
-node_modules
-package.json
-package-lock.json
-public
+.next
+dist
+node_modules/

.eslintrc.json

@@ -0,0 +1,31 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "jest": true
+  },
+  "extends": [
+    "plugin:react/recommended",
+    "standard",
+    "eslint:recommended",
+    "plugin:prettier/recommended"
+  ],
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 12,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react",
+    "prettier",
+    "jest"
+  ],
+  "rules": {},
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}

.github/workflows/develop.yml

@@ -3,10 +3,10 @@ name: Staging Checks
 on:
   push:
     branches:
-      - dev
+      - develop
   pull_request:
     branches:
-      - dev
+      - develop
 
 jobs:
   format-js:
@@ -21,14 +21,14 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: "14.16"
+          node-version: '20.11'
       - name: Cache NPM
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-14.16-${{ hashFiles('pycon-website-template/package.json') }}
+          key: ${{ runner.os }}-node-20.11-${{ hashFiles('pycon-website-template/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-14.16-${{ hashFiles('pycon-website-template/package.json') }}
+            ${{ runner.os }}-node-20.11-
       - name: Install node dependencies
         run: |
           cd pycon-website-template/

.gitignore

@@ -1,73 +1,39 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
 
-# Optional npm cache directory
-.npm
+# testing
+/coverage
 
-# Optional eslint cache
-.eslintcache
+# next.js
+/.next/
+/out/
 
-# Optional REPL history
-.node_repl_history
+# production
+/build
 
-# Output of 'npm pack'
-*.tgz
+# misc
+.DS_Store
+*.pem
 
-# dotenv environment variable files
-.env*
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
-# gatsby files
-.cache/
-public
+# local env files
+.env*.local
 
-# Mac files
-.DS_Store
+# vercel
+.vercel
 
-# Yarn
-yarn-error.log
-.pnp/
-.pnp.js
-# Yarn Integrity file
-.yarn-integrity
+# typescript
+*.tsbuildinfo
+next-env.d.ts
 
-# Cache
-package-lock.json
 yarn.lock
+package-lock.json

.prettierrc

@@ -1,12 +1,8 @@
 {
-  "printWidth": 80,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "es5",
-  "bracketSpacing": true,
-  "jsxBracketSameLine": false,
-  "arrowParens": "always",
-  "endOfLine": "auto"
+    "semi": true,
+    "tabWidth": 2,
+    "printWidth": 100,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "jsxBracketSameLine": true
 }

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   }