diff --git a/README.md b/README.md index d2716399..6a9a613b 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ npm install You can get these by setting up a firebase web app [here](https://console.firebase.google.com/u/0/). -Also note that you'll need to set up a Realtime Database, *not* a Firestore Database, to get the correct value for `FIREBASE_DATABASEURL`. Be sure to set it to test mode so you can read/write data. Just remember to either revert these or remove the database after your testing is completed. +Also note that you'll need to set up a Realtime Database, _not_ a Firestore Database, to get the correct value for `FIREBASE_DATABASEURL`. Be sure to set it to test mode so you can read/write data. Just remember to either revert these or remove the database after your testing is completed. ``` FIREBASE_APIKEY="" diff --git a/__mocks__/gatsby-plugin-firebase/auth/auth.js b/__mocks__/gatsby-plugin-firebase/auth/auth.js index 93273ffa..16fa59d3 100644 --- a/__mocks__/gatsby-plugin-firebase/auth/auth.js +++ b/__mocks__/gatsby-plugin-firebase/auth/auth.js @@ -45,9 +45,8 @@ class Auth { this.onAuthStateChangedObservers.push(observer); return () => { - this._onAuthStateChangedObservers = this.onAuthStateChangedObservers.filter( - (obs) => obs !== observer, - ); + this._onAuthStateChangedObservers = + this.onAuthStateChangedObservers.filter((obs) => obs !== observer); }; } diff --git a/__mocks__/gatsby-plugin-firebase/functions/functions.js b/__mocks__/gatsby-plugin-firebase/functions/functions.js index 3a4d6b1d..6973a8fd 100644 --- a/__mocks__/gatsby-plugin-firebase/functions/functions.js +++ b/__mocks__/gatsby-plugin-firebase/functions/functions.js @@ -23,9 +23,8 @@ class Functions { this._uuid = uuidv4(); this._httpsCallables = {}; - this._httpsCallables[ - FunctionsConstants.deleteUserFunctionName - ] = deleteUser; + this._httpsCallables[FunctionsConstants.deleteUserFunctionName] = + deleteUser; } static get instance() { diff --git a/functions/package-lock.json b/functions/package-lock.json index 4b0f551f..ba7edb9d 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "functions", "dependencies": { "firebase-admin": "^9.9.0", "firebase-functions": "^3.14.1", diff --git a/gatsby-config.js b/gatsby-config.js index 624e1946..a21d4146 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -5,7 +5,7 @@ module.exports = { title: 'Reactive Resume', siteUrl: 'https://rxresu.me', description: 'A free and open source resume builder.', - version: '2.7.8', + version: '2.7.9', }, flags: { PRESERVE_WEBPACK_CACHE: true }, plugins: [ diff --git a/src/data/demoState.json b/src/data/demoState.json index b83ba39d..8b6d9bff 100644 --- a/src/data/demoState.json +++ b/src/data/demoState.json @@ -142,61 +142,20 @@ "language": "en", "layout": { "castform": [ - [ - "awards", - "certifications", - "languages", - "hobbies" - ], - [ - "objective", - "work", - "education", - "skills", - "projects", - "references" - ] + ["awards", "certifications", "languages", "hobbies"], + ["objective", "work", "education", "skills", "projects", "references"] ], "celebi": [ - [ - "awards", - "certifications", - "languages", - "hobbies" - ], - [ - "objective", - "work", - "education", - "skills", - "projects", - "references" - ] + ["awards", "certifications", "languages", "hobbies"], + ["objective", "work", "education", "skills", "projects", "references"] ], "gengar": [ - [ - "objective", - "skills" - ], - [ - "awards", - "certifications", - "languages", - "references", - "hobbies" - ], - [ - "work", - "education", - "projects" - ] + ["objective", "skills"], + ["awards", "certifications", "languages", "references", "hobbies"], + ["work", "education", "projects"] ], "glalie": [ - [ - "awards", - "certifications", - "hobbies" - ], + ["awards", "certifications", "hobbies"], [ "objective", "work", @@ -208,37 +167,13 @@ ] ], "onyx": [ - [ - "objective", - "work", - "education", - "projects" - ], - [ - "hobbies", - "languages", - "awards", - "certifications" - ], - [ - "skills", - "references" - ] + ["objective", "work", "education", "projects"], + ["hobbies", "languages", "awards", "certifications"], + ["skills", "references"] ], "pikachu": [ - [ - "skills", - "languages", - "hobbies", - "awards", - "certifications" - ], - [ - "work", - "education", - "projects", - "references" - ] + ["skills", "languages", "hobbies", "awards", "certifications"], + ["work", "education", "projects", "references"] ] }, "template": "castform" @@ -409,4 +344,4 @@ } ] } -} \ No newline at end of file +} diff --git a/src/pages/app/__tests__/builder.settings.deleteAccount.test.js b/src/pages/app/__tests__/builder.settings.deleteAccount.test.js index 72bc54fe..96519862 100644 --- a/src/pages/app/__tests__/builder.settings.deleteAccount.test.js +++ b/src/pages/app/__tests__/builder.settings.deleteAccount.test.js @@ -32,7 +32,8 @@ async function setup(signInWithGoogle, failReauthentication) { mockFirebaseCurrentUserReauthenticateWithPopupErrorMessage, ); }); - FirebaseStub.auth().currentUser.reauthenticateWithPopup = mockFirebaseCurrentUserReauthenticateWithPopup; + FirebaseStub.auth().currentUser.reauthenticateWithPopup = + mockFirebaseCurrentUserReauthenticateWithPopup; } else { mockFirebaseCurrentUserReauthenticateWithPopupErrorMessage = null; mockFirebaseCurrentUserReauthenticateWithPopup = jest.spyOn( diff --git a/src/styles/forms.css b/src/styles/forms.css index 78cd5f81..6481dc55 100644 --- a/src/styles/forms.css +++ b/src/styles/forms.css @@ -3,17 +3,17 @@ label { } label > span:first-child { - @apply mb-1 text-primary-600 font-semibold tracking-wide text-xs uppercase; + @apply mb-1 text-xs font-semibold tracking-wide uppercase text-primary-600; } label > p { - @apply mt-1 text-red-600 text-xs; + @apply mt-1 text-xs text-red-600; } label input, label textarea, label select { - @apply w-full py-3 px-4 rounded text-primary-900 bg-primary-200 border border-transparent appearance-none; + @apply w-full px-4 py-3 border border-transparent rounded appearance-none text-primary-900 bg-primary-200; } label input::placeholder, diff --git a/src/styles/global.css b/src/styles/global.css index 92f256da..f7628067 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -32,7 +32,7 @@ a:hover { } hr { - @apply w-full border-primary-200 h-1; + @apply w-full h-1 border-primary-200; } ul { @@ -117,7 +117,7 @@ section { font-weight: bold; } -input[type="range"]::-webkit-slider-thumb { +input[type='range']::-webkit-slider-thumb { cursor: ew-resize; box-shadow: -405px 0 0 400px #605e5c; diff --git a/src/styles/tailwind.css b/src/styles/tailwind.css index 7fcc9a4d..5021f650 100644 --- a/src/styles/tailwind.css +++ b/src/styles/tailwind.css @@ -1,31 +1,38 @@ @tailwind base; @tailwind components; @tailwind utilities; + #page .text-xs { - font-size: var(--text-xs-size); + font-size: var(--text-xs-size); line-height: var(--text-xs-line-height); } + #page .text-sm { - font-size: var(--text-sm-size); + font-size: var(--text-sm-size); line-height: var(--text-sm-line-height); } + #page .text-lg { - font-size: var(--text-lg-size); + font-size: var(--text-lg-size); line-height: var(--text-lg-line-height); } + #page .text-xl { - font-size: var(--text-xl-size); + font-size: var(--text-xl-size); line-height: var(--text-xl-line-height); } + #page .text-2xl { - font-size: var(--text-2xl-size); + font-size: var(--text-2xl-size); line-height: var(--text-2xl-line-height); } + #page .text-3xl { - font-size: var(--text-3xl-size); + font-size: var(--text-3xl-size); line-height: var(--text-3xl-line-height); } + #page .text-4xl { - font-size: var(--text-4xl-size); + font-size: var(--text-4xl-size); line-height: var(--text-4xl-line-height); -} \ No newline at end of file +} diff --git a/src/styles/toastify.css b/src/styles/toastify.css index bfe70256..5bbd9808 100644 --- a/src/styles/toastify.css +++ b/src/styles/toastify.css @@ -1,7 +1,7 @@ -@import "~react-toastify/dist/ReactToastify.css"; +@import '~react-toastify/dist/ReactToastify.css'; .Toastify__toast { - @apply px-8 py-6 shadow rounded; + @apply px-8 py-6 rounded shadow; } .Toastify__toast--default { @@ -9,7 +9,7 @@ } .Toastify__toast-body { - font-family: "Montserrat", sans-serif; + font-family: 'Montserrat', sans-serif; @apply font-medium; } diff --git a/src/templates/Castform.js b/src/templates/Castform.js index ad16693a..ce194272 100644 --- a/src/templates/Castform.js +++ b/src/templates/Castform.js @@ -64,7 +64,7 @@ const Castform = ({ data }) => { >
{ })}
-
+
{layout[1] && layout[1].map((x) => {