Compare commits

..

19 Commits

Author SHA1 Message Date
48a0f90597 chore(release): 3.5.1 2022-07-30 13:01:00 +02:00
05d3f1f06f fix(server): don't initialize sendgrid if the apikey is empty 2022-07-30 12:57:35 +02:00
4d43f6a642 feat(client): ask for confirmation when resetting a resume 2022-07-30 12:56:40 +02:00
f7363ccdd7 Merge branch 'main' of github.com:AmruthPillai/Reactive-Resume 2022-07-30 12:56:13 +02:00
07c91e9ac2 feat(docker): remove ports from postgres docker instance 2022-07-30 12:56:04 +02:00
cbe08f1d2c Merge pull request #950 from AmruthPillai/dependabot/github_actions/docker/build-push-action-3.1.0
chore(deps): bump docker/build-push-action from 3.0.0 to 3.1.0
2022-07-30 12:43:46 +02:00
c2617a8277 Merge pull request #944 from AmruthPillai/i18n_main
New Crowdin updates
2022-07-30 12:43:36 +02:00
fe72d2de41 chore(release): 3.5.0 2022-07-30 12:42:31 +02:00
23667e218f chore(deps): updating project dependencies to their latest versions 2022-07-30 12:41:37 +02:00
977fa72dde fix(client): 🐛 fix mui rendering of utc dates 2022-07-30 12:21:05 +02:00
5197f954c0 fix(client): 🐛 attempt to fix the one-off date issue
use utc functions from dayjs to correspond to the same date on the server
2022-07-31 02:13:08 -08:00
58341e4cd2 New translations builder.json (Serbian (Cyrillic)) 2022-07-28 13:44:38 +02:00
1559703567 chore(deps): bump docker/build-push-action from 3.0.0 to 3.1.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-25 02:24:03 +00:00
0a1fd50d07 New translations dashboard.json (Norwegian) 2022-07-17 03:00:38 +02:00
1c19062c63 chore(release): 3.4.8 2022-07-13 11:08:14 +02:00
25cf594eb9 feat(google): add toast to display error message from google 2022-07-13 11:05:27 +02:00
1c3beee6cd chore(deps): update dependencies 2022-07-13 09:40:29 +02:00
95c3d4c315 Merge pull request #937 from AmruthPillai/dependabot/gradle/app/org.jetbrains.kotlin.android-1.7.10
chore(deps): bump org.jetbrains.kotlin.android from 1.7.0 to 1.7.10 in /app
2022-07-12 15:33:31 +02:00
85df339e56 chore(deps): bump org.jetbrains.kotlin.android in /app
Bumps [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) from 1.7.0 to 1.7.10.
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.10/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.0...v1.7.10)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-11 02:40:56 +00:00
30 changed files with 2136 additions and 4397 deletions

View File

@ -31,7 +31,7 @@ jobs:
password: ${{ secrets.GH_TOKEN }}
- name: Build and Push Client Image
uses: docker/build-push-action@v3.0.0
uses: docker/build-push-action@v3.1.0
with:
context: .
push: true
@ -68,7 +68,7 @@ jobs:
password: ${{ secrets.GH_TOKEN }}
- name: Build and Push Server Image
uses: docker/build-push-action@v3.0.0
uses: docker/build-push-action@v3.1.0
with:
context: .
push: true

View File

@ -21,5 +21,10 @@
"i18n-ally.namespace": true,
"i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
"i18n-ally.sortKeys": true,
"scss.validate": false
"scss.validate": false,
"conventionalCommits.scopes": [
"client",
"server",
"docker"
]
}

View File

@ -2,6 +2,34 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [3.5.1](https://github.com/AmruthPillai/Reactive-Resume/compare/v3.5.0...v3.5.1) (2022-07-30)
### Features
* **client:** :sparkles: ask for confirmation when resetting a resume ([4d43f6a](https://github.com/AmruthPillai/Reactive-Resume/commit/4d43f6a6427198e62e9fcb995f1a28c0ee4de71e))
* **docker:** :zap: remove ports from postgres docker instance ([07c91e9](https://github.com/AmruthPillai/Reactive-Resume/commit/07c91e9ac21e8ef120d08ab92363d8e48a55aaba))
### Bug Fixes
* **server:** :zap: don't initialize sendgrid if the apikey is empty ([05d3f1f](https://github.com/AmruthPillai/Reactive-Resume/commit/05d3f1f06fbffd899269a5c4dea3c52cf408125f))
## [3.5.0](https://github.com/AmruthPillai/Reactive-Resume/compare/v3.4.8...v3.5.0) (2022-07-30)
### Bug Fixes
* **client:** :bug: attempt to fix the one-off date issue ([5197f95](https://github.com/AmruthPillai/Reactive-Resume/commit/5197f954c0baed3daf1c7e2c79b607354ef42024))
* **client:** :bug: fix mui rendering of utc dates ([977fa72](https://github.com/AmruthPillai/Reactive-Resume/commit/977fa72ddeeeebf7463d43a820e85f783489a4dc))
### [3.4.8](https://github.com/AmruthPillai/Reactive-Resume/compare/v3.4.7...v3.4.8) (2022-07-13)
### Features
* **google:** add toast to display error message from google ([25cf594](https://github.com/AmruthPillai/Reactive-Resume/commit/25cf594eb948e1c2d6157028ee1fff2799df5f92))
### [3.4.7](https://github.com/AmruthPillai/Reactive-Resume/compare/v3.4.6...v3.4.7) (2022-06-30)

View File

@ -1,7 +1,7 @@
plugins {
id 'com.android.application' version '7.1.2' apply false
id 'com.android.library' version '7.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
}
task clean(type: Delete) {

View File

@ -15,7 +15,7 @@ import dayjs from 'dayjs';
import get from 'lodash/get';
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
import { useMemo } from 'react';
import { useMemo, useState } from 'react';
import { useMutation } from 'react-query';
import Heading from '@/components/shared/Heading';
@ -36,6 +36,8 @@ const Settings = () => {
const { locale, ...router } = useRouter();
const [confirmReset, setConfirmReset] = useState(false);
const resume = useAppSelector((state) => state.resume);
const theme = useAppSelector((state) => state.build.theme);
const pages = useAppSelector((state) => state.resume.metadata.layout);
@ -48,7 +50,7 @@ const Settings = () => {
const dateConfig: DateConfig = useMemo(() => get(resume, 'metadata.date'), [resume]);
const isDarkMode = useMemo(() => theme === 'dark', [theme]);
const exampleString = useMemo(() => `Eg. ${dayjs().format(dateConfig.format)}`, [dateConfig.format]);
const exampleString = useMemo(() => `Eg. ${dayjs().utc().format(dateConfig.format)}`, [dateConfig.format]);
const themeString = useMemo(() => (isDarkMode ? 'Matte Black Everything' : 'As bright as your future'), [isDarkMode]);
const { mutateAsync: loadSampleDataMutation } = useMutation<Resume, ServerError, LoadSampleDataParams>(
@ -78,9 +80,14 @@ const Settings = () => {
};
const handleResetResume = async () => {
await resetResumeMutation({ id });
if (!confirmReset) {
return setConfirmReset(true);
}
queryClient.invalidateQueries(`resume/${username}/${slug}`);
await resetResumeMutation({ id });
await queryClient.invalidateQueries(`resume/${username}/${slug}`);
setConfirmReset(false);
};
return (
@ -202,7 +209,11 @@ const Settings = () => {
<DeleteForever />
</ListItemIcon>
<ListItemText
primary={t<string>('builder.rightSidebar.sections.settings.resume.reset.primary')}
primary={
confirmReset
? 'Are you sure?'
: t<string>('builder.rightSidebar.sections.settings.resume.reset.primary')
}
secondary={t<string>('builder.rightSidebar.sections.settings.resume.reset.secondary')}
/>
</ListItemButton>

View File

@ -63,7 +63,7 @@ const ResumeInput: React.FC<Props> = ({ type = 'text', label, path, className, m
renderInput={(params) => <TextField {...params} error={false} className={className} />}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && onChangeValue('');
date && dayjs(date).isValid() && onChangeValue(date.toISOString());
date && dayjs(date).utc().isValid() && onChangeValue(dayjs(date).utc().toISOString());
}}
/>
);

View File

@ -87,16 +87,24 @@ const LoginModal: React.FC = () => {
const handleLoginWithGoogle = async () => {
google.accounts.id.initialize({
auto_select: true,
itp_support: true,
client_id: env('GOOGLE_CLIENT_ID'),
callback: async (response: any) => {
await loginWithGoogleMutation({ credential: response.credential });
handleClose();
},
auto_select: false,
});
google.accounts.id.prompt();
google.accounts.id.prompt((notification: any) => {
if (notification.isNotDisplayed() || notification.isSkippedMoment()) {
const reason = notification.getNotDisplayedReason() || notification.getSkippedReason();
toast.error(`Google returned an error while trying to sign in: ${reason}.`);
toast("Please try logging in using email/password, or use another browser that supports Google's One Tap API.");
}
});
};
const PasswordVisibility = (): React.ReactElement => {

View File

@ -134,7 +134,7 @@ const AwardModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -134,7 +134,7 @@ const CertificateModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -150,7 +150,7 @@ const CustomModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField
@ -174,7 +174,7 @@ const CustomModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -173,7 +173,7 @@ const EducationModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField
@ -197,7 +197,7 @@ const EducationModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -143,7 +143,7 @@ const ProjectModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField
@ -167,7 +167,7 @@ const ProjectModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -134,7 +134,7 @@ const PublicationModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -140,7 +140,7 @@ const VolunteerModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField
@ -164,7 +164,7 @@ const VolunteerModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -140,7 +140,7 @@ const WorkModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField
@ -164,7 +164,7 @@ const WorkModal: React.FC = () => {
views={['year', 'month', 'day']}
onChange={(date: Date | null, keyboardInputValue: string | undefined) => {
isEmpty(keyboardInputValue) && field.onChange('');
date && dayjs(date).isValid() && field.onChange(date.toISOString());
date && dayjs(date).utc().isValid() && field.onChange(dayjs(date).utc().toISOString());
}}
renderInput={(params) => (
<TextField

View File

@ -13,38 +13,38 @@
"@emotion/css": "^11.9.0",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@hookform/resolvers": "2.9.3",
"@hookform/resolvers": "2.9.7",
"@monaco-editor/react": "^4.4.5",
"@mui/icons-material": "^5.8.4",
"@mui/lab": "^5.0.0-alpha.88",
"@mui/material": "^5.8.6",
"@mui/system": "^5.8.6",
"@mui/x-date-pickers": "5.0.0-alpha.7",
"@next/env": "^12.2.0",
"@mui/lab": "^5.0.0-alpha.92",
"@mui/material": "^5.9.2",
"@mui/system": "^5.9.2",
"@mui/x-date-pickers": "5.0.0-beta.3",
"@next/env": "^12.2.3",
"@reduxjs/toolkit": "^1.8.3",
"axios": "^0.27.2",
"clsx": "^1.1.1",
"dayjs": "^1.11.3",
"clsx": "^1.2.1",
"dayjs": "^1.11.4",
"downloadjs": "^1.4.7",
"joi": "^17.6.0",
"lodash": "^4.17.21",
"md5-hex": "^4.0.0",
"monaco-editor": "^0.33.0",
"nanoid": "^3.0.0",
"next": "12.2.0",
"next-i18next": "^11.0.0",
"nanoid": "^3.3.4",
"next": "12.2.3",
"next-i18next": "^11.3.0",
"react": "18.2.0",
"react-beautiful-dnd": "^13.1.0",
"react-colorful": "^5.5.1",
"react-dnd": "16.0.1",
"react-dnd-html5-backend": "16.0.1",
"react-dom": "18.2.0",
"react-hook-form": "^7.33.0",
"react-hot-toast": "2.2.0",
"react-hotkeys-hook": "^3.4.6",
"react-hook-form": "^7.34.0",
"react-hot-toast": "2.3.0",
"react-hotkeys-hook": "^3.4.7",
"react-icons": "^4.4.0",
"react-markdown": "^8.0.3",
"react-query": "^3.39.1",
"react-query": "^3.39.2",
"react-redux": "^8.0.2",
"react-zoom-pan-pinch": "^2.1.3",
"redux": "^4.2.0",
@ -56,27 +56,27 @@
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@babel/core": "^7.18.6",
"@babel/core": "^7.18.9",
"@reactive-resume/schema": "workspace:*",
"@tailwindcss/typography": "^0.5.2",
"@tailwindcss/typography": "^0.5.4",
"@types/downloadjs": "^1.4.3",
"@types/lodash": "^4.14.182",
"@types/node": "18.0.0",
"@types/react": "18.0.14",
"@types/node": "18.6.2",
"@types/react": "18.0.15",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-redux": "^7.1.24",
"@types/tailwindcss": "^3.0.11",
"@types/uuid": "^8.3.4",
"@types/webfontloader": "^1.6.34",
"autoprefixer": "^10.4.7",
"autoprefixer": "^10.4.8",
"csstype": "^3.1.0",
"eslint": "^8.18.0",
"eslint-config-next": "12.2.0",
"next-sitemap": "^3.1.7",
"eslint": "^8.20.0",
"eslint-config-next": "12.2.3",
"next-sitemap": "^3.1.15",
"postcss": "^8.4.14",
"prettier": "^2.7.1",
"sass": "^1.53.0",
"tailwindcss": "^3.1.4",
"sass": "^1.54.0",
"tailwindcss": "^3.1.7",
"typescript": "^4.7.4"
}
}

View File

@ -54,7 +54,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
</LocalizationProvider>
</ReduxProvider>
<Script src="https://accounts.google.com/gsi/client" />
<Script src="https://accounts.google.com/gsi/client" async defer />
</>
);
};

View File

@ -0,0 +1,25 @@
{
"create-resume": {
"subtitle": "Start fra begynnelsen",
"title": "Opprett ny CV"
},
"import-external": {
"subtitle": "LinkedIn, JSON Resume, Reactive Resume",
"title": "Importer fra eksterne kilder"
},
"resume": {
"menu": {
"delete": "Slett",
"duplicate": "Dupliser",
"open": "Åpen",
"rename": "Endre navn",
"share-link": "Del lenke",
"tooltips": {
"delete": "Er du sikker på at du vil slette dette resymeet? Dette er en irreversibel handling.",
"share-link": "Du må endre synligheten til resymeet ditt til offentlig for å gjøre det synlig for andre."
}
},
"timestamp": "Sist oppdatert for {{timestamp}} siden"
},
"title": "Oversikt"
}

View File

@ -0,0 +1,361 @@
{
"common": {
"actions": {
"add": "Dodaj Novi {{token}}",
"delete": "Obriši {{token}}",
"edit": "Ažuriraj {{token}}"
},
"columns": {
"heading": "Kolone",
"tooltip": "Promeni broj kolona"
},
"form": {
"date": {
"label": "Datum"
},
"description": {
"label": "Opis"
},
"email": {
"label": "Imejl Adresa"
},
"end-date": {
"help-text": "Ostavi ovo polje prazno, ukoliko još postoji",
"label": "Datum kraja"
},
"keywords": {
"label": "Ključne reči"
},
"level": {
"label": "Nivo"
},
"levelNum": {
"label": "Nivo (Broj)"
},
"name": {
"label": "Ime"
},
"phone": {
"label": "Broj Telefona"
},
"position": {
"label": "Pozicija"
},
"start-date": {
"label": "Datum Početka"
},
"subtitle": {
"label": "Podnaslov"
},
"summary": {
"label": "Rezime"
},
"title": {
"label": "Naslov"
},
"url": {
"label": "Veb Sajt"
}
},
"glossary": {
"page": "Stranica"
},
"list": {
"actions": {
"delete": "Obriši",
"duplicate": "Dupliraj",
"edit": "Edituj"
},
"empty-text": "Ova lista je prazna."
},
"tooltip": {
"delete-item": "Da li sigurno želiš da izbrišeš ovu stavku? Ovo je nepovratna akcija.",
"delete-section": "Obriši Sekciju",
"rename-section": "Preimenuj Sekciju",
"toggle-visibility": "Prebaci Vidljivost"
}
},
"controller": {
"tooltip": {
"center-artboard": "Centriraj Kanvas",
"copy-link": "Kopiraj link u rezime",
"export-pdf": "Eksportuj PDF",
"toggle-orientation": "Uključi/Isključi Orijentaciju Stranice",
"toggle-page-break-line": "Uključi/Isključi liniju preloma stranice",
"toggle-sidebars": "Uključi/Isključi Sidebar",
"zoom-in": "Zumiraj",
"zoom-out": "Odzumiraj"
}
},
"header": {
"menu": {
"delete": "Obriši",
"duplicate": "Dupliraj",
"rename": "Preimenuj",
"share-link": "Podeli Link",
"tooltips": {
"delete": "Da li sigurno želiš da obrišeš ovaj rezime? Ovo je nepovratna akcija.",
"share-link": "Moraš da promeniš vidljivost rezimea na javno kako bi bio vidljiv drugima."
}
}
},
"leftSidebar": {
"sections": {
"awards": {
"form": {
"awarder": {
"label": "Dodelio nagradu"
}
}
},
"basics": {
"actions": {
"photo-filters": "Filteri za Slike"
},
"heading": "Osnovno",
"headline": {
"label": "Naslov"
},
"name": {
"label": "Puno Ime"
},
"birthdate": {
"label": "Datum Rođenja"
},
"photo-filters": {
"effects": {
"border": {
"label": "Okvir"
},
"grayscale": {
"label": "Sivi Ton"
},
"heading": "Efekti"
},
"shape": {
"heading": "Oblik"
},
"size": {
"heading": "Veličina (u pikselima)"
}
},
"photo-upload": {
"tooltip": {
"remove": "Obriši Sliku",
"upload": "Učitaj Sliku"
}
}
},
"certifications": {
"form": {
"issuer": {
"label": "Izdavač"
}
}
},
"education": {
"form": {
"area-study": {
"label": "Oblast Edukacije"
},
"courses": {
"label": "Kursevi"
},
"degree": {
"label": "Stepen"
},
"grade": {
"label": "Ocena"
},
"institution": {
"label": "Institucija"
}
}
},
"location": {
"address": {
"label": "Adresa"
},
"city": {
"label": "Grad"
},
"country": {
"label": "Zemlja"
},
"heading": "Lokacija",
"postal-code": {
"label": "Poštanski Broj"
},
"region": {
"label": "Region"
}
},
"profiles": {
"form": {
"network": {
"label": "Mreža"
},
"username": {
"label": "Korisničko ime"
}
},
"heading": "Profili",
"heading_one": "Profil"
},
"publications": {
"form": {
"publisher": {
"label": "Izdavač"
}
}
},
"references": {
"form": {
"relationship": {
"label": "Veza"
}
}
},
"section": {
"heading": "Sekcija"
},
"volunteer": {
"form": {
"organization": {
"label": "Organizacija"
}
}
}
}
},
"rightSidebar": {
"sections": {
"css": {
"heading": "Prilagodi CSS"
},
"export": {
"heading": "Eksportuj",
"json": {
"primary": "JSON",
"secondary": "Preuzmi JSON verziju tvog rezimea koja se može importovati nazad u Reactive Resume."
},
"pdf": {
"loading": {
"primary": "Generišem PDF",
"secondary": "Sačekaj dok se tvoj PDF generiše, ovo može da potraje do 15 sekundi."
},
"normal": {
"primary": "PDF",
"secondary": "Preuzmi PDF verziju rezimea koju možeš da štampaš i pošalješ za svoj posao iz snova. Ovaj fajl se ne može importovati ponovo kako bi se ponovo ažurirao."
}
}
},
"layout": {
"heading": "Izgled",
"tooltip": {
"reset-layout": "Resetuj izgled"
}
},
"links": {
"bugs-features": {
"body": "Nešto de sprečava da napraviš svoj rezime? Ili imaš neku super ideju kao predlog? Kreiraj task na GitHub-u za početak.",
"button": "GitHub Problemi",
"heading": "Bagovi? Zahtevi za novu funkcionalnost?"
},
"donate": {
"body": "Ako ti se sviđa Reactive Resume, razmotri o donaciji kako bi aplikacija nastavila da funkcioniše i bude dostupna, bez reklama i besplatna zauvek.",
"button": "Kupi mi kafu",
"heading": "Doniraj za Reactive Resume"
},
"github": "Izvorni Kod",
"heading": "Linkovi"
},
"settings": {
"global": {
"date": {
"primary": "Datum",
"secondary": "Format datuma koji se koristi u aplikaciji"
},
"heading": "Globalno",
"language": {
"primary": "Jezik",
"secondary": "Jezika prikaza za korišćenje u celoj aplikaciji"
},
"theme": {
"primary": "Tema"
}
},
"heading": "Podešavanja",
"page": {
"break-line": {
"primary": "Prelomi Redova",
"secondary": "Pokaži liniju na svakoj stranici kako bi se obeležila visina A4 stranice"
},
"heading": "Strana",
"orientation": {
"disabled": "Nema efekat kada postoji samo jedna stranica",
"primary": "Orijentacija",
"secondary": "Da li prikazujem stranice horizontalno ili vertikalno"
}
},
"resume": {
"heading": "Rezime",
"reset": {
"primary": "Resetuje sve",
"secondary": "Previše grešaka? Klikni ovde da resetuješ sve izmene i počneš izpočetka. Vodi računa, ova akcija se ne može promeniti."
},
"sample": {
"primary": "Učitaj podatke kao primer",
"secondary": "Ne znaš gde da počneš? Klikni ovde da učitaš podatke kao primer i vidiš kako ceo rezime može da izgleda."
}
}
},
"sharing": {
"heading": "Deljenje",
"short-url": {
"label": "Kao Kratak URL"
},
"visibility": {
"subtitle": "Dozvoli svakom sa linkom da pogleda tvoj rezime",
"title": "Javno"
}
},
"templates": {
"heading": "Šabloni"
},
"theme": {
"form": {
"background": {
"label": "Pozadina"
},
"primary": {
"label": "Glavni"
},
"text": {
"label": "Tekst"
}
},
"heading": "Tema"
},
"typography": {
"form": {
"font-family": {
"label": "Porodica Fontova"
},
"font-size": {
"label": "Veličina Fonta"
}
},
"heading": "Tipografija",
"widgets": {
"body": {
"label": "Sadržaj"
},
"headings": {
"label": "Naslovi"
}
}
}
}
}
}

View File

@ -19,7 +19,7 @@ export const dateFormatOptions: string[] = [
'YYYY',
];
export const getRelativeTime = (timestamp: dayjs.ConfigType): string => dayjs(timestamp).toNow(true);
export const getRelativeTime = (timestamp: dayjs.ConfigType): string => dayjs(timestamp).utc().toNow(true);
export const formatDateString = (date: string | DateRange, formatStr: string): string | null => {
const presentString = i18n?.t<string>('common.date.present') ?? '';
@ -28,9 +28,9 @@ export const formatDateString = (date: string | DateRange, formatStr: string): s
// If `date` is a string
if (isString(date)) {
if (!dayjs(date).isValid()) return null;
if (!dayjs(date).utc().utc().isValid()) return null;
return dayjs(date).format(formatStr);
return dayjs(date).utc().format(formatStr);
}
// If `date` is a DateRange

View File

@ -1,5 +1,6 @@
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
import utc from 'dayjs/plugin/utc';
import { useRouter } from 'next/router';
import { useEffect } from 'react';
@ -7,6 +8,7 @@ const DateWrapper: React.FC<React.PropsWithChildren<unknown>> = ({ children }) =
const { locale } = useRouter();
useEffect(() => {
dayjs.extend(utc);
dayjs.extend(relativeTime);
// Locales

View File

@ -8,8 +8,6 @@ services:
- POSTGRES_DB=postgres
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
ports:
- 5432:5432
volumes:
- pgdata:/var/lib/postgresql/data
healthcheck:

View File

@ -14,14 +14,14 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@algolia/client-search": "^4.13.1",
"@docusaurus/core": "2.0.0-beta.21",
"@docusaurus/preset-classic": "2.0.0-beta.21",
"@algolia/client-search": "^4.14.2",
"@docusaurus/core": "2.0.0-rc.1",
"@docusaurus/preset-classic": "2.0.0-rc.1",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.1.1",
"clsx": "^1.2.1",
"prism-react-renderer": "^1.3.5",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"browserslist": {
"production": [
@ -36,7 +36,7 @@
]
},
"devDependencies": {
"@types/react": "^18.0.14",
"@types/react": "^17.0.2",
"typescript": "^4.7.4"
}
}

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "reactive-resume",
"version": "3.4.7",
"version": "3.5.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "reactive-resume",
"version": "3.4.7",
"version": "3.5.1",
"workspaces": [
"schema",
"client",

View File

@ -1,6 +1,6 @@
{
"name": "reactive-resume",
"version": "3.4.7",
"version": "3.5.1",
"private": true,
"workspaces": [
"schema",
@ -34,17 +34,14 @@
"start": "env-cmd --silent concurrently --kill-others \"pnpm run start:*\""
},
"dependencies": {
"@aws-sdk/client-s3": "^3.120.0",
"@docusaurus/core": "^2.0.0-beta.21",
"@docusaurus/preset-classic": "^2.0.0-beta.21",
"concurrently": "^7.2.2",
"concurrently": "^7.3.0",
"env-cmd": "^10.1.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
"@typescript-eslint/eslint-plugin": "^5.31.0",
"@typescript-eslint/parser": "^5.31.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.18.0",
"eslint": "^8.20.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.2.1",

5879
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
"lint": "eslint --fix --ext .ts ./src"
},
"devDependencies": {
"eslint": "^8.18.0",
"eslint": "^8.20.0",
"typescript": "^4.7.4"
}
}

View File

@ -10,63 +10,63 @@
"lint": "eslint --fix --ext .ts ./src"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.120.0",
"@nestjs/axios": "^0.0.8",
"@nestjs/common": "^8.4.7",
"@nestjs/config": "^2.1.0",
"@nestjs/core": "^8.4.7",
"@nestjs/jwt": "^8.0.1",
"@nestjs/mapped-types": "^1.0.1",
"@nestjs/passport": "^8.2.2",
"@nestjs/platform-express": "^8.4.7",
"@nestjs/schedule": "^2.0.1",
"@nestjs/serve-static": "^2.2.2",
"@nestjs/terminus": "^8.1.0",
"@nestjs/typeorm": "^8.1.4",
"@aws-sdk/client-s3": "^3.137.0",
"@nestjs/axios": "^0.1.0",
"@nestjs/common": "^9.0.7",
"@nestjs/config": "^2.2.0",
"@nestjs/core": "^9.0.7",
"@nestjs/jwt": "^9.0.0",
"@nestjs/mapped-types": "^1.1.0",
"@nestjs/passport": "^9.0.0",
"@nestjs/platform-express": "^9.0.7",
"@nestjs/schedule": "^2.1.0",
"@nestjs/serve-static": "^3.0.0",
"@nestjs/terminus": "^9.0.0",
"@nestjs/typeorm": "^9.0.0",
"@sendgrid/mail": "^7.7.0",
"@types/passport": "^1.0.9",
"bcrypt": "^5.0.1",
"cache-manager": "^4.0.1",
"cache-manager": "^4.1.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.13.2",
"cookie-parser": "^1.4.6",
"csvtojson": "^2.0.10",
"dayjs": "^1.11.3",
"google-auth-library": "^8.1.0",
"dayjs": "^1.11.4",
"google-auth-library": "^8.1.1",
"joi": "^17.6.0",
"lodash": "^4.17.21",
"multer": "^1.4.4",
"nanoid": "^3.0.0",
"nanoid": "^3.3.4",
"node-stream-zip": "^1.15.0",
"passport": "^0.6.0",
"passport-jwt": "^4.0.0",
"passport-local": "^1.0.0",
"pdf-lib": "^1.17.1",
"pg": "^8.7.3",
"playwright-chromium": "^1.23.1",
"playwright-chromium": "^1.24.2",
"reflect-metadata": "^0.1.13",
"rimraf": "^3.0.2",
"rxjs": "^7.5.5",
"rxjs": "^7.5.6",
"typeorm": "0.3.7",
"uuid": "^8.3.2"
},
"devDependencies": {
"@nestjs/cli": "^8.2.8",
"@nestjs/schematics": "^8.0.11",
"@nestjs/cli": "^9.0.0",
"@nestjs/schematics": "^9.0.1",
"@reactive-resume/schema": "workspace:*",
"@types/bcrypt": "^5.0.0",
"@types/cookie-parser": "^1.4.3",
"@types/express": "^4.17.13",
"@types/lodash": "^4.14.182",
"@types/multer": "^1.4.7",
"@types/node": "^18.0.0",
"eslint": "^8.18.0",
"@types/node": "^18.6.2",
"eslint": "^8.20.0",
"prettier": "^2.7.1",
"source-map-support": "^0.5.21",
"ts-loader": "^9.3.1",
"ts-node": "^10.8.1",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.0.0",
"typescript": "^4.7.4",
"webpack": "^5.73.0"
"webpack": "^5.74.0"
}
}

View File

@ -15,6 +15,7 @@ import {
} from '@reactive-resume/schema';
import csv from 'csvtojson';
import dayjs from 'dayjs';
import utc from 'dayjs/plugin/utc';
import { readFile, unlink } from 'fs/promises';
import { cloneDeep, get, isEmpty, merge } from 'lodash';
import StreamZip from 'node-stream-zip';
@ -28,7 +29,9 @@ import { ResumeService } from '@/resume/resume.service';
@Injectable()
export class IntegrationsService {
constructor(private resumeService: ResumeService) {}
constructor(private resumeService: ResumeService) {
dayjs.extend(utc);
}
async linkedIn(userId: number, path: string): Promise<ResumeEntity> {
let archive: StreamZip.StreamZipAsync;
@ -39,7 +42,7 @@ export class IntegrationsService {
const resume: Partial<Resume> = cloneDeep(defaultState);
// Basics
const timestamp = dayjs().format(FILENAME_TIMESTAMP);
const timestamp = dayjs().utc().format(FILENAME_TIMESTAMP);
merge<Partial<Resume>, DeepPartial<Resume>>(resume, {
name: `Imported from LinkedIn (${timestamp})`,
slug: `imported-from-linkedin-${timestamp}`,
@ -269,7 +272,7 @@ export class IntegrationsService {
const resume: Partial<Resume> = cloneDeep(defaultState);
// Metadata
const timestamp = dayjs().format(FILENAME_TIMESTAMP);
const timestamp = dayjs().utc().format(FILENAME_TIMESTAMP);
merge<Partial<Resume>, DeepPartial<Resume>>(resume, {
name: `Imported from JSON Resume (${timestamp})`,
slug: `imported-from-json-resume-${timestamp}`,
@ -604,7 +607,7 @@ export class IntegrationsService {
const resume: Partial<Resume> = cloneDeep(jsonResume);
// Metadata
const timestamp = dayjs().format(FILENAME_TIMESTAMP);
const timestamp = dayjs().utc().format(FILENAME_TIMESTAMP);
merge<Partial<Resume>, DeepPartial<Resume>>(resume, {
name: `Imported from Reactive Resume (${timestamp})`,
slug: `imported-from-reactive-resume-${timestamp}`,
@ -625,7 +628,7 @@ export class IntegrationsService {
const resume: Partial<Resume> = cloneDeep(defaultState);
// Metadata
const timestamp = dayjs().format(FILENAME_TIMESTAMP);
const timestamp = dayjs().utc().format(FILENAME_TIMESTAMP);
merge<Partial<Resume>, DeepPartial<Resume>>(resume, {
name: `Imported from Reactive Resume V2 (${timestamp})`,
slug: `imported-from-reactive-resume-v2-${timestamp}`,
@ -948,6 +951,6 @@ export class IntegrationsService {
}
private parseDate = (date: string): string => {
return isEmpty(date) ? '' : dayjs(date).toISOString();
return isEmpty(date) ? '' : dayjs(date).utc().toISOString();
};
}

View File

@ -7,7 +7,11 @@ import { User } from '@/users/entities/user.entity';
@Injectable()
export class MailService {
constructor(private configService: ConfigService) {
SendGrid.setApiKey(this.configService.get<string>('sendgrid.apiKey'));
const sendGridApiKey = this.configService.get<string>('sendgrid.apiKey');
if (sendGridApiKey) {
SendGrid.setApiKey(this.configService.get<string>('sendgrid.apiKey'));
}
}
async sendEmail(mail: SendGrid.MailDataRequired) {