Skip to content

Dev 0.2 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 108 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
286a44e
feat: add button for slide verses
DenisArger Aug 31, 2023
5207fd2
feat: add pagination for verses
DenisArger Aug 31, 2023
a298a67
feat: add ref on youtube
DenisArger Aug 31, 2023
0dfe865
feat: add switch dark mode
DenisArger Aug 31, 2023
3130dd2
feat: add original verses
DenisArger Aug 31, 2023
944c879
fix: edi text about
DenisArger Sep 1, 2023
ed10ed8
fix: edit file json
DenisArger Sep 1, 2023
02f4a50
fix: the theme switching icon has been reduced
DenisArger Sep 1, 2023
984475c
fix: changed the algorithm for switching between languages and transl…
DenisArger Sep 1, 2023
c6c2150
style: the font of the main text has been enlarged
DenisArger Sep 1, 2023
994d51c
fix: the logo is placed in the center
DenisArger Sep 1, 2023
9ed0de6
refactor: delete extract code
DenisArger Sep 1, 2023
0fba6a4
refactor: add file VerseUtils foк getLanguageGroups
DenisArger Sep 1, 2023
1785ae4
feat: edit count: count language
DenisArger Sep 1, 2023
9aea1ca
fix: edit translate about Project and goal
DenisArger Sep 1, 2023
30376cf
style: changes after autoformatting
DenisArger Sep 6, 2023
11ec226
fix: delete proTypes PrevVerseButton
DenisArger Sep 6, 2023
a714fce
fix: edit languageVariants
DenisArger Sep 6, 2023
947af6d
perf: delene youtube png
DenisArger Sep 6, 2023
7f102cc
fix: rename verseUtils
DenisArger Sep 6, 2023
19b163e
refactor: Switching dark and light mode in a separate component
DenisArger Sep 6, 2023
1bd716c
fix: delete react-icons
DenisArger Sep 6, 2023
5e437d2
fix: youtube icon from svg
DenisArger Sep 6, 2023
441e993
fix: delete NextVerseButton PrevVerseButton
DenisArger Sep 6, 2023
2abcfc1
fix: delete useEffect
DenisArger Sep 6, 2023
415690a
fix: delete extract div
DenisArger Sep 6, 2023
cd03b87
fix: set localStorage move to useEffect
DenisArger Sep 6, 2023
6892ed2
feat: add load verse from url
DenisArger Sep 7, 2023
f4785fb
fix: delete console.log
DenisArger Sep 7, 2023
9b8d4fa
fix: switching verse and language swapped places
DenisArger Sep 11, 2023
e7250d2
style: edit bg color and main color
DenisArger Sep 11, 2023
51b6086
fix: fixed a typo in the menu
DenisArger Sep 13, 2023
c6a1ece
feat: add fuction getTotalVerseCount
DenisArger Sep 19, 2023
0dc2d02
feat: add show count all verses
DenisArger Sep 19, 2023
6e494b4
feat:
DenisArger Sep 19, 2023
0d2680d
style: add style for animation slider
DenisArger Sep 20, 2023
907d27e
fix: styling from button
DenisArger Sep 20, 2023
ae8743e
feat:
DenisArger Sep 20, 2023
3ad9a95
feat:
DenisArger Sep 20, 2023
36ac7b8
fix: add atom translateIndexState
DenisArger Sep 20, 2023
87f2904
fix: add check unique lang
DenisArger Sep 21, 2023
a351bcb
fix: replace label on span, check langOrigin English
DenisArger Sep 21, 2023
bb2990b
fix: show verses and switch lang from languageGroup
DenisArger Sep 21, 2023
4bc8229
fix: used useSetRecoilState for setTranslateIndex
DenisArger Sep 26, 2023
0505db6
fix: add new verses
DenisArger Sep 26, 2023
bb1f108
fix: load verse from url
DenisArger Sep 26, 2023
b64d4db
fix: edit logo 3 16
DenisArger Sep 26, 2023
d92d502
fix: edit webmanifest
DenisArger Sep 26, 2023
a327659
fix: edit ref
DenisArger Sep 26, 2023
f605d25
fix: edir ref in .json
DenisArger Sep 26, 2023
d24fca2
fix: add key for cycle
DenisArger Sep 27, 2023
0d77abe
fix: edit verses
DenisArger Sep 27, 2023
e676482
style: edit favicon
DenisArger Oct 5, 2023
0564fdb
fix: buttons switch lang move to count verse
DenisArger Oct 11, 2023
6a6fe44
fix: edit logo
DenisArger Oct 11, 2023
9cb8084
fix: enable placeholder for search verse
DenisArger Oct 11, 2023
aec8cff
fix: edit color logo for dark theme
DenisArger Oct 12, 2023
2e15762
fix: delete file logo.svg
DenisArger Oct 12, 2023
ca8c69c
fix: edit layout verse and slider
DenisArger Oct 12, 2023
48adea6
style: edit dot4 for dark theme
DenisArger Oct 12, 2023
a02a91c
style: edit bg color for dark theme
DenisArger Oct 12, 2023
25d4422
style: display value text-alight center
DenisArger Oct 12, 2023
b19ebdc
feat: add swipes left and right
DenisArger Oct 12, 2023
633482b
fix: delete extracted function
DenisArger Oct 12, 2023
51be1f0
fix: add vertical-align-5px
DenisArger Oct 13, 2023
2b8cbbc
fix:
DenisArger Oct 13, 2023
1c23337
fix: text alight left
DenisArger Oct 13, 2023
7531179
style: add custom style primary and widget
DenisArger Oct 17, 2023
63b883b
refactor: delete verseUtils
DenisArger Oct 17, 2023
8b83ec1
fix: typo fixed
DenisArger Oct 17, 2023
dc8968a
fix: delete space
DenisArger Oct 17, 2023
3557f70
fix: add localStorage darkMode
DenisArger Oct 17, 2023
ac5c9dd
fix: duration 300 mc, delete loadFromUrl, add useMemo
DenisArger Oct 17, 2023
29b3aca
fix: delete mt-[-20px]
DenisArger Oct 17, 2023
7f7914f
style: select lang on centre
DenisArger Oct 17, 2023
bfcb7a8
style: edit layout
DenisArger Oct 18, 2023
63fb61d
fix: edit layout nameTranslate
DenisArger Oct 18, 2023
3224813
style: edit slaider rw for dark theme
DenisArger Oct 18, 2023
e62831f
style: edit slaider on left
DenisArger Oct 18, 2023
09a9b60
feat: check undefined foundVerseIndex
DenisArger Oct 18, 2023
0f78196
style: add dark Theme for About
DenisArger Oct 18, 2023
d0f4d5d
fix: edit switch darkTheme, fix ls, add recoil
DenisArger Oct 18, 2023
5927c24
fix: edit time 400 ms
DenisArger Oct 18, 2023
7c6ff7e
fix: delete space
DenisArger Oct 18, 2023
d6a7142
fix: export get Language Groups instead of languageGroups
DenisArger Oct 18, 2023
d159713
style: delete extract div, space and style
DenisArger Oct 19, 2023
ff89217
style: edit bg for modale page
DenisArger Oct 19, 2023
b1d2a54
fix: sort alphabetically
DenisArger Oct 19, 2023
20a37a4
style: delete extract style
DenisArger Oct 19, 2023
a57f849
refactor: optimize switch dark Theme
DenisArger Oct 19, 2023
d01c0da
fix: delete extarct style
DenisArger Oct 19, 2023
4ecb20a
style:
DenisArger Oct 19, 2023
dc04737
style: import svg as component success
DenisArger Oct 19, 2023
61017e6
style: slider styles swapped
DenisArger Oct 19, 2023
6794b04
fix: quotes replace with backticks
DenisArger Oct 19, 2023
fa50f19
fix: delete class from svg and add to components
DenisArger Oct 23, 2023
37c494c
feat: add isCheck formData
DenisArger Oct 23, 2023
db7cc88
style: add hover button
DenisArger Oct 23, 2023
45be0e9
style: add file pretierrc
DenisArger Oct 23, 2023
615206b
style: formatting about prettier
DenisArger Oct 23, 2023
aab3be1
perf: add extensions.json
DenisArger Oct 24, 2023
2570bc4
style: add space in end file
DenisArger Oct 24, 2023
b3f2c74
style: delete style from svg
DenisArger Oct 24, 2023
499eaf5
style: delete double styles
DenisArger Oct 24, 2023
dd45e1d
fix: delete function getLanguageGroups
DenisArger Oct 24, 2023
76b1536
fix: edit warining in deploy
DenisArger Oct 24, 2023
244a16e
style: edit hover for dark theme
DenisArger Oct 25, 2023
6d2f609
fix: fix hover about
DenisArger Oct 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ module.exports = {
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
'prettier',
],
ignorePatterns: ['dist', 'netlify', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
plugins: ['react-refresh', 'prettier'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
'prettier/prettier': 'error',
},
};
}
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"parser": "flow",
"useTabs": false,
"printWidth": 90,
"tabWidth": 2,
"trailingComma": "es5",
"singleQuote": true,
"bracketSameLine": false,
"semi": false
}
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"vivaxy.vscode-conventional-commits"
]
}
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<title>3:16 John</title>
</head>

<body>
<body class="bg-white text-black dark:bg-primary dark:text-white">
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>

</body>

</html>
2 changes: 1 addition & 1 deletion netlify/functions/sendFeedback.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const axios = require('axios');

exports.handler = async function (event) {
export async function handler(event) {
let sendInfo;
try {
sendInfo = JSON.parse(event.body);
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"@headlessui/react": "^1.7.16",
"axios": "^1.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-swipeable": "^7.0.1"
},
"devDependencies": {
"@types/react": "^18.2.15",
Expand All @@ -32,6 +33,7 @@
"react-i18next": "^13.1.2",
"recoil": "^0.7.7",
"tailwindcss": "^3.3.3",
"vite": "^4.4.5"
"vite": "^4.4.5",
"vite-plugin-svgr": "^4.1.0"
}
}
Binary file modified public/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon.ico
Binary file not shown.
19 changes: 12 additions & 7 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"AboutProject": "About project",
"AboutProjectText": "English. Lorem ipsum dolor sit amet consectetur. Massa nunc tempor velit vivamus vitae auctor. A sagittis sit nunc sed blandit. Ipsum eu orci magna sed ipsum tristique nec. Eget mi faucibus est nunc arcu viverra.",
"AboutProjectText": "John 3:16 is a project aimed at making a well-known verse available in all languages of the world.",
"By": "by",
"ContactUs": "Contact us",
"Country": "Country",
"TranslatedLanguage": "Translated language out of",
"TranslatedLanguage_few": "Translated {{count}} languages out of",
"TranslatedLanguage_many": "Translated {{count}} languages out of",
"TranslatedLanguage_one": "Translated {{count}} languages out of",
"TranslatedLanguage_other": "Translated {{count}} languages out of",
"CountVerse": "Just one verse translation",
"CountVerse_few": "Total {{count}} verse translations",
"CountVerse_many": "Total {{count}} verse translations",
"CountVerse_one": "Total {{count}} verse translation",
"CountVerse_other": "Total {{count}} verse translations",
"Language": "Language",
"Language_few": "{{count}} languages",
"Language_many": "{{count}} languages",
Expand All @@ -18,9 +18,14 @@
"Message": "Message",
"NotAllFieldFull": "Not all fields are filled in",
"OurGoal": "Our goal",
"OurGoalText": "Our goal is to have John 3:16 translated into all the languages of the world by 2033.",
"OurGoalText": "Our goal is to support the vision of translating the Bible until 2033 into all languages of the world.",
"PrivacyPolicyMessage": "By clicking the 'Submit' button, you agree to the privacy policy.",
"Send": "Send",
"TranslatedLanguage": "Translated language out of",
"TranslatedLanguage_few": "Translated {{count}} languages out of",
"TranslatedLanguage_many": "Translated {{count}} languages out of",
"TranslatedLanguage_one": "Translated {{count}} languages out of",
"TranslatedLanguage_other": "Translated {{count}} languages out of",
"YourEmail": "Your email",
"YourMessageHasBeenSent": "Your message has been sent",
"YourName": "Your name"
Expand Down
19 changes: 12 additions & 7 deletions public/locales/ru/translation.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"AboutProject": "О проекте",
"AboutProjectText": "На русском. Lorem ipsum dolor sit amet consectetur. Massa nunc tempor velit vivamus vitae auctor. A sagittis sit nunc sed blandit. Ipsum eu orci magna sed ipsum tristique nec. Eget mi faucibus est nunc arcu viverra.",
"AboutProjectText": "Иоанна 3:16 - проект, цель которого сделать доступным хорошо известный стих на все языки мира.",
"By": "от",
"ContactUs": "Свяжитесь с нами",
"Country": "Страна",
"TranslatedLanguage": "Переведен язык из",
"TranslatedLanguage_few": "Переведены {{count}} языка из",
"TranslatedLanguage_many": "Переведено {{count}} языков из",
"TranslatedLanguage_one": "Переведен {{count}} язык из",
"TranslatedLanguage_other": "Переведены {{count}} языка из",
"CountVerse": "Всего один перевод стиха",
"CountVerse_few": "Всего {{count}} перевода стиха",
"CountVerse_many": "Всего {{count}} переводов стиха",
"CountVerse_one": "Всего {{count}} перевод стих",
"CountVerse_other": "Всего {{count}} переводов стиха",
"Language": "Язык",
"Language_few": "{{count}} языка",
"Language_many": "{{count}} языков",
Expand All @@ -18,9 +18,14 @@
"Message": "Сообщение",
"NotAllFieldFull": "Не все поля заполнены",
"OurGoal": "Наша цель",
"OurGoalText": "Наша цель - до 2033 года перевести стих Иоанна 3:16 на все языки мира.",
"OurGoalText": "Наша цель - поддержать видение по переводу Библии до 2033 года на все языки мира.",
"PrivacyPolicyMessage": "Нажимая кнопку 'Отправить', вы соглашаетесь с политикой конфиденциальности.",
"Send": "Отправить",
"TranslatedLanguage": "Переведен язык из",
"TranslatedLanguage_few": "Переведены {{count}} языка из",
"TranslatedLanguage_many": "Переведено {{count}} языков из",
"TranslatedLanguage_one": "Переведен {{count}} язык из",
"TranslatedLanguage_other": "Переведены {{count}} языка из",
"YourEmail": "Ваш email",
"YourMessageHasBeenSent": "Ваше сообщение отправлено",
"YourName": "Ваше имя"
Expand Down
Binary file modified public/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
157 changes: 123 additions & 34 deletions public/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import LanguageSelect from './components/LanguageSelect';
import Header from './components/Header';
import VerseSlider from './components/VerseSlider';
import About from './components/About';
import LanguageSelect from './components/LanguageSelect'
import Header from './components/Header'
import VerseSlider from './components/VerseSlider'
import About from './components/About'

function App() {
return (
Expand All @@ -11,7 +11,7 @@ function App() {
<VerseSlider />
<About />
</div>
);
)
}

export default App;
export default App
14 changes: 12 additions & 2 deletions src/atoms.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import { atom } from 'recoil';
import { atom } from "recoil";

export const languageIndexState = atom({
key: 'languageIndexState',
key: "languageIndexState",
default: 0,
});

export const translateIndexState = atom({
key: "translateIndexState",
default: 0,
});

export const darkModeState = atom({
key: "darkModeState",
default: false,
});
Loading