Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
079fbb7
init: start rslang-task
LexSava Mar 20, 2021
67a1c7b
feat: add task.md
dzmitryNz Mar 21, 2021
2fa7f48
fix: task.md
dzmitryNz Mar 21, 2021
dbe8ea5
fix: be overview
dzmitryNz Mar 22, 2021
1479e1e
feat: added the required dependencies
LexSava Mar 22, 2021
88c292f
feat: add header
LexSava Mar 22, 2021
564dfb0
feat: add block main
LexSava Mar 22, 2021
ccbbbde
feat: add Loading screen
LexSava Mar 22, 2021
6a1b793
fead: add cards
LexSava Mar 22, 2021
6e893b5
feat: add cards
LexSava Mar 22, 2021
5a1f999
feat: completed home page
LexSava Mar 23, 2021
7eb36d0
feat: add LoadableComponent
LexSava Mar 23, 2021
aa89e07
Merge pull request #1 from LexSava/home-page
LexSava Mar 23, 2021
0c7f595
fix: fix code HomePage
LexSava Mar 23, 2021
1a7c6bb
feat: Add main menu.
LexSava Mar 23, 2021
2083214
fix: changed the menu
LexSava Mar 23, 2021
fae32ea
feat: add menu
LexSava Mar 24, 2021
df5d7ef
fix: add Route in main
LexSava Mar 24, 2021
8ef0721
Merge pull request #2 from LexSava/tutorial-page
LexSava Mar 24, 2021
69bd804
feat: finished the study page
LexSava Mar 24, 2021
7f25e33
Merge pull request #3 from LexSava/tutorial-page
LexSava Mar 24, 2021
bd0847d
feat: sugnin
dzmitryNz Mar 24, 2021
2c3820c
Merge pull request #4 from LexSava/signup-signin
dzmitryNz Mar 24, 2021
1644458
feat: add all components for the page TutorialPage
LexSava Mar 24, 2021
c57e294
Merge pull request #5 from LexSava/tutorial-page
LexSava Mar 25, 2021
afde848
feat: update package.json
dzmitryNz Mar 25, 2021
77016af
feat: add cards of mini game
tomsonst Mar 25, 2021
07534a5
Merge pull request #6 from LexSava/mini-games
tomsonst Mar 26, 2021
016e824
refactor: deleted comments.
LexSava Mar 26, 2021
14e9714
refactor: deleted comments.
LexSava Mar 26, 2021
065e41d
Merge pull request #7 from LexSava/develop
dzmitryNz Mar 26, 2021
c4e9136
feat: fix login signup, add getUserData, get Words
dzmitryNz Mar 26, 2021
8d5d63a
Merge pull request #8 from LexSava/signup-signin
LexSava Mar 26, 2021
8311c6a
Merge branch 'tutorial-page' of https://github.com/LexSava/rslang int…
LexSava Mar 26, 2021
1f36867
feat: add VocabularySections
LexSava Mar 26, 2021
f5fc718
refactor: deleted comments.
LexSava Mar 26, 2021
4b2820a
feat: add VocabularySections
LexSava Mar 26, 2021
e94e763
feat: add counting selected words
LexSava Mar 26, 2021
21181c9
Merge branch 'tutorial-page' of https://github.com/LexSava/rslang int…
LexSava Mar 26, 2021
49ea0ec
fix: fixed bugs when pulling
LexSava Mar 26, 2021
afd09e4
fix: remove Example.tsx
dzmitryNz Mar 27, 2021
39e7adc
feat: Added delete function
LexSava Mar 28, 2021
b099b36
feat: added sorting by dictionary sections
LexSava Mar 28, 2021
dbf293a
feat: added functionality
LexSava Mar 28, 2021
cbd27a0
feat: add style VocabularySections
LexSava Mar 28, 2021
b3e8a98
Merge pull request #10 from LexSava/vocabulary
tomsonst Mar 28, 2021
9a0682b
Merge pull request #11 from LexSava/develop
dzmitryNz Mar 29, 2021
ab55ef7
feat: add NewWordsSection
LexSava Mar 29, 2021
8ece152
feat: ref errors on Modal, add autocomplete, add redirect on tutorial…
dzmitryNz Mar 29, 2021
139248a
feat: added audio playback
LexSava Mar 29, 2021
1edd8db
feat: add name field on register form, crate def statistics and setti…
dzmitryNz Mar 29, 2021
849e809
Merge pull request #13 from LexSava/signup-signin
LexSava Mar 29, 2021
3538dff
feat: completed the functionality of the block for learning new words
LexSava Mar 29, 2021
1db8938
fix: changed the structure of catching bugs
LexSava Mar 29, 2021
428cd82
feat: added example editing function for word
LexSava Mar 29, 2021
129d8ce
feat: add function close page
LexSava Mar 30, 2021
ce0c750
fix: removed unnecessary components
LexSava Mar 30, 2021
bc6d542
feat: add NewWordsSection
LexSava Mar 29, 2021
8abf67c
feat: added audio playback
LexSava Mar 29, 2021
150cc13
feat: completed the functionality of the block for learning new words
LexSava Mar 29, 2021
69800ab
fix: changed the structure of catching bugs
LexSava Mar 29, 2021
9e8c111
feat: added example editing function for word
LexSava Mar 29, 2021
d714690
feat: add function close page
LexSava Mar 30, 2021
0840d31
fix: removed unnecessary components
LexSava Mar 30, 2021
9434b8e
Merge branch 'study-section' of https://github.com/LexSava/rslang int…
LexSava Mar 30, 2021
021f47e
Merge pull request #14 from LexSava/study-section
dzmitryNz Mar 30, 2021
986be00
Merge pull request #15 from LexSava/develop
dzmitryNz Mar 30, 2021
8cfd120
feat: add game preview page
Mar 30, 2021
2a28cab
fix: merge conflicts
Mar 30, 2021
609ce8c
Merge pull request #16 from LexSava/audiocall
tomsonst Mar 31, 2021
956315c
feat: refact login and register, add signOut, resize pics
dzmitryNz Apr 1, 2021
8a87137
Delete package-lock.json
dzmitryNz Apr 1, 2021
d194458
Delete package-lock.json
dzmitryNz Apr 1, 2021
320e038
Delete package-lock.json
dzmitryNz Apr 1, 2021
5d0eb2d
Delete package-lock.json
dzmitryNz Apr 1, 2021
e50b9a7
Merge pull request #19 from LexSava/signup-signin
LexSava Apr 1, 2021
ea99432
Merge branch 'develop' of https://github.com/LexSava/rslang into develop
dzmitryNz Apr 1, 2021
bb893ae
feat: update manifest remove react logos
dzmitryNz Apr 1, 2021
aa40dc2
feat: added functionality to add words to different sections
LexSava Mar 31, 2021
d0bd13b
feat: configured data transfer from the main page
LexSava Mar 31, 2021
1bd7a36
feat: Added word transfer through the dictionary
LexSava Mar 31, 2021
b833e73
feat: added word deletion
LexSava Mar 31, 2021
89674c2
feat: added the functionality of the dictionary
LexSava Apr 1, 2021
b5fda31
refactor: updated package json file
LexSava Apr 1, 2021
9a93907
Merge pull request #20 from LexSava/stydy-vocabulary
dzmitryNz Apr 1, 2021
a89a351
feat: added the style of the active item to the menu
LexSava Apr 1, 2021
8ddfe43
refactor: deleted unnecessary comments
LexSava Apr 1, 2021
0b74a4e
feat: savanna add, gamesPreview add getWords
dzmitryNz Apr 2, 2021
c84e938
feat: add statistics graph
LexSava Apr 2, 2021
5817d3f
Merge pull request #21 from LexSava/savana
LexSava Apr 2, 2021
1da26c8
feat: savannah draft
dzmitryNz Apr 2, 2021
013f7ac
init: create component SprintGame
tomsonst Apr 2, 2021
a5e5c8e
Merge pull request #22 from LexSava/develop
dzmitryNz Apr 3, 2021
4cb29a3
feat: added percentage of correct answers to statistics
LexSava Apr 3, 2021
16edea6
feat: added best streak result
LexSava Apr 3, 2021
a6057a1
feat: Added an array of data for plotting graphs
LexSava Apr 3, 2021
84ce157
feat: added the style of the active item to the menu
LexSava Apr 1, 2021
f389d3e
refactor: deleted unnecessary comments
LexSava Apr 1, 2021
8f9f942
feat: add statistics graph
LexSava Apr 2, 2021
cb1c32b
feat: added percentage of correct answers to statistics
LexSava Apr 3, 2021
21b167c
feat: added best streak result
LexSava Apr 3, 2021
9c3c2ad
feat: Added an array of data for plotting graphs
LexSava Apr 3, 2021
326ad17
Merge branch 'statistics' of https://github.com/LexSava/rslang into s…
LexSava Apr 3, 2021
7ee7c42
Merge pull request #24 from LexSava/statistics
dzmitryNz Apr 3, 2021
6217f43
fix: update audio call url path
Apr 3, 2021
df9a8e8
Merge branch 'develop' into audiocall
Apr 3, 2021
f5c2f11
feat: base game refact add statistic
dzmitryNz Apr 3, 2021
0fbe5d0
feat: add wordComponent
tomsonst Apr 4, 2021
3ddbcb4
feat: savanna draft done
dzmitryNz Apr 4, 2021
adda60d
fix: conflict
dzmitryNz Apr 4, 2021
9bd411a
fix: pack.json
dzmitryNz Apr 4, 2021
c42e1ea
feat: avatar add
dzmitryNz Apr 4, 2021
fef4bb4
feat: add buttons and delete WordComponent
tomsonst Apr 4, 2021
4894d35
feat: add main audio call game logic
Apr 4, 2021
f044ba4
Merge pull request #26 from LexSava/savana
ivanova-anastasia Apr 4, 2021
e03987b
Merge pull request #27 from LexSava/develop
dzmitryNz Apr 5, 2021
d4e8888
fix: assets
dzmitryNz Apr 5, 2021
3d88ce4
feat: added sound for wrong answer
LexSava Apr 5, 2021
1582bbe
fix: fix conflict in merge
tomsonst Apr 5, 2021
c2079ec
feat: speak-it
dzmitryNz Apr 5, 2021
18d419f
Merge pull request #28 from LexSava:savana
dzmitryNz Apr 5, 2021
39497dc
feat: add sound and animation
tomsonst Apr 5, 2021
56b70a5
feat: speakit stat fix
dzmitryNz Apr 5, 2021
4584b16
fix: buttons create
dzmitryNz Apr 5, 2021
7f23c5c
feat: registration data on statistics
dzmitryNz Apr 6, 2021
69c7891
Merge branch 'develop' into audiocall
Apr 6, 2021
e33c304
Merge pull request #29 from LexSava/audiocall
LexSava Apr 6, 2021
fecd408
feat: made changes to the construction of statistics and fixed minor …
LexSava Apr 6, 2021
ce0dde4
fix: fix style css
LexSava Apr 6, 2021
5c8eb1d
fix: removed unnecessary elements from pages
LexSava Apr 6, 2021
1c233ab
feat: added sound for wrong answer
LexSava Apr 5, 2021
8ac926f
feat: made changes to the construction of statistics and fixed minor …
LexSava Apr 6, 2021
8bc2242
fix: fix style css
LexSava Apr 6, 2021
e4906ad
fix: removed unnecessary elements from pages
LexSava Apr 6, 2021
036a806
Merge branch 'statistics' of https://github.com/LexSava/rslang into s…
LexSava Apr 6, 2021
7c8c980
Merge pull request #31 from LexSava/statistics
dzmitryNz Apr 6, 2021
34728b2
add sound
tomsonst Apr 6, 2021
316635f
Merge branch 'develop' into SprintGame
tomsonst Apr 6, 2021
8fb8967
fix: sifgnout button login setStatistics
dzmitryNz Apr 6, 2021
773ce44
feat: speakit add
dzmitryNz Apr 6, 2021
62e1456
feat: savanna update
dzmitryNz Apr 7, 2021
5a62c74
Merge pull request #33 from LexSava/develop
dzmitryNz Apr 7, 2021
5d4d2c6
merge develop
dzmitryNz Apr 7, 2021
228a1fb
feat: keys events advancet buttons add
dzmitryNz Apr 7, 2021
65abbb4
Merge branch 'develop' into savana
dzmitryNz Apr 7, 2021
a8282bb
Merge pull request #36 from LexSava/savana
LexSava Apr 7, 2021
fc22b6d
feat: team description add
dzmitryNz Apr 7, 2021
941b944
feat: team description update
dzmitryNz Apr 7, 2021
4b9ae31
Merge pull request #37 from LexSava/develop
dzmitryNz Apr 7, 2021
0fedbc1
fix: fixed a bug with statistics readin
LexSava Apr 7, 2021
32359cc
fix: fixed a bug with statistics readin
LexSava Apr 7, 2021
17ba1fc
Merge branch 'statistics' of https://github.com/LexSava/rslang into s…
LexSava Apr 7, 2021
0a7b78f
fix: deleted comments
LexSava Apr 7, 2021
a384397
Merge pull request #38 from LexSava/statistics
dzmitryNz Apr 7, 2021
2485e32
Merge pull request #39 from LexSava/develop
dzmitryNz Apr 7, 2021
02661df
feat: add words and buttons in statistic
tomsonst Apr 7, 2021
a887eef
fix: resolve merge conflict
tomsonst Apr 7, 2021
a4fd859
Merge pull request #40 from LexSava/SprintGame
dzmitryNz Apr 7, 2021
1348f82
feat: speakit feat training
dzmitryNz Apr 7, 2021
37e9cac
Merge branch 'speakit' of https://github.com/LexSava/rslang into speakit
dzmitryNz Apr 7, 2021
d64b1bd
feat: add hotkeys support in audiocall game
Apr 7, 2021
63f7546
feat: speach revognition done? add statistics
dzmitryNz Apr 8, 2021
37111bd
feat: add hotkeys
tomsonst Apr 8, 2021
a7a2c8e
Merge pull request #41 from LexSava/audiocall
tomsonst Apr 8, 2021
2af907a
Merge branch 'develop' into SprintGame
tomsonst Apr 8, 2021
bb9186d
feat: speakit done refactor savanna
dzmitryNz Apr 9, 2021
9ba7cc1
feat: add result game screen
Apr 9, 2021
f212c5d
Merge pull request #42 from LexSava/speakit
ivanova-anastasia Apr 9, 2021
f92f00e
fix: spech recognition dev dependencies
dzmitryNz Apr 10, 2021
48872db
Merge pull request #43 from LexSava/audiocall
LexSava Apr 10, 2021
52eb8be
fix: dev dep
dzmitryNz Apr 10, 2021
261ffd2
feat: add sent data statistic
tomsonst Apr 11, 2021
233b199
feat: add animation of timer
tomsonst Apr 11, 2021
abd8bc1
fix: changed the construction of statistics for graphs
LexSava Apr 12, 2021
0031fd0
Merge branch 'develop' into SprintGame
tomsonst Apr 12, 2021
46efc9a
Merge pull request #44 from LexSava/SprintGame
dzmitryNz Apr 12, 2021
aa9637b
feat: savanna animation, save settings, autologin if right token
dzmitryNz Apr 12, 2021
2419b26
feat: fix animation merge dev
dzmitryNz Apr 12, 2021
ff639d6
Merge branch 'develop' into speakit
dzmitryNz Apr 12, 2021
fa22d4d
feat: add defSettings
dzmitryNz Apr 12, 2021
3178437
Merge pull request #45 from LexSava/speakit
LexSava Apr 13, 2021
4265b53
fix: changed the construction of statistics for graphs
LexSava Apr 12, 2021
5143cc1
feat: add sending statistics in call game
Apr 13, 2021
852cd75
Merge branch 'develop' into audiocall
Apr 13, 2021
409aca7
Merge pull request #46 from LexSava/audiocall
dzmitryNz Apr 13, 2021
ca85bb4
feat: added saving statistics for charts
LexSava Apr 13, 2021
10bb906
Merge branch 'statistics' of https://github.com/LexSava/rslang into s…
LexSava Apr 13, 2021
c78a1e0
refactor: deleted unnecessary comments
LexSava Apr 13, 2021
f9ce9e2
Merge pull request #47 from LexSava/statistics
dzmitryNz Apr 13, 2021
f020031
feat: ourgame init
dzmitryNz Apr 13, 2021
8c13489
docs: add developer description
Apr 13, 2021
9de17cb
feat: ourgame add cards, savanna fix render error
dzmitryNz Apr 14, 2021
e833f51
fix: removed the bug of building statistics
LexSava Apr 14, 2021
fc73d0b
Merge pull request #48 from LexSava/audiocall
tomsonst Apr 14, 2021
06e3029
add description of my work in this project
tomsonst Apr 14, 2021
023be03
Merge pull request #49 from LexSava/SprintGame
tomsonst Apr 14, 2021
ebef3ab
fix: changed the way of sending statistics to the server
LexSava Apr 15, 2021
c26ea81
fix: removed the bug of building statistics
LexSava Apr 14, 2021
a0c7ac0
fix: changed the way of sending statistics to the server
LexSava Apr 15, 2021
3a8be30
Merge branch 'statistics' of https://github.com/LexSava/rslang into s…
LexSava Apr 15, 2021
bdc9792
Merge pull request #50 from LexSava/statistics
dzmitryNz Apr 15, 2021
db8adda
refactor: deleted comments
LexSava Apr 15, 2021
bc9b4ec
fix: remove console.log, fix savanna
dzmitryNz Apr 15, 2021
a9c80c7
fix: changed get date
LexSava Apr 15, 2021
e33c865
Merge branch 'develop' of https://github.com/LexSava/rslang into develop
LexSava Apr 15, 2021
54450af
fix: changed the request for sending statistics for charts
LexSava Apr 15, 2021
21a1051
fix: remove console.logs fix game page for 4 games
dzmitryNz Apr 15, 2021
f1301c9
feat: add video
LexSava Apr 15, 2021
ab97609
feat: update readme fix register
dzmitryNz Apr 15, 2021
adc57cd
Merge branch 'develop' of https://github.com/LexSava/rslang into develop
dzmitryNz Apr 15, 2021
8a4ab8f
feat: add username, link to settings
dzmitryNz Apr 15, 2021
9f26734
feat: settings add
dzmitryNz Apr 15, 2021
bf691d6
fix: vocabulary def settings
dzmitryNz Apr 15, 2021
ce84bcc
feat: disabled save add
dzmitryNz Apr 15, 2021
c41b8f7
feat: description add
dzmitryNz Apr 15, 2021
704a8c5
Merge branch 'ourgame' into develop
dzmitryNz Apr 15, 2021
d0ba04b
fix: readme
dzmitryNz Apr 15, 2021
5947b94
fix: readme
dzmitryNz Apr 15, 2021
35d9f5b
fix: Fixed a bug with plotting
LexSava Apr 16, 2021
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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
# rslang
# rslang

Front-end Таска "Rslang" команда #108

для локального развёртывания приложения необходимо выполнить следующие шаги:

- клонировать репозиторий в локальную папку на компьютере, желательно не использовать в пути к папке приложения русских букв и большой вложенности папок.

- установить необходимые зависимости приложения командой npm install

- после успешной установки можно запустить приложение командой react-scripts start, приложение скомпилируется и откроется на dev-сервере

- в файле /src/api/defData в константе url устанавливается путь к api серверу базы данных, по умолчанию установлен https://rslang.tk

- инструкция по развёртыванию api сервера в read.me бэкэнд сервера.
345 changes: 345 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading