Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
d0c1373
init: start project
kvalexandr Mar 19, 2021
92b378d
Merge pull request #1 from natein/init-project
kvalexandr Mar 19, 2021
d9e227c
feat: add template site
kvalexandr Mar 21, 2021
4571729
Merge pull request #2 from natein/ebook
kvalexandr Mar 21, 2021
7d181f3
feat: add home page, and header/footer styles
spaceragga Mar 21, 2021
0573d31
feat: add style for card words
kvalexandr Mar 21, 2021
bc3fb7e
feat: add home page, and header/footer styles
spaceragga Mar 21, 2021
fa77199
Merge pull request #11 from natein/ebook
kvalexandr Mar 21, 2021
49658d8
feat: some new content in home page
spaceragga Mar 21, 2021
0937a7a
fix: del yarn.lock
spaceragga Mar 21, 2021
0ede8a4
feat: some new content in home page
spaceragga Mar 21, 2021
6352551
fix: del yarn.lock
spaceragga Mar 21, 2021
1e1dd3c
feat: add words panel, buttons, routing
kvalexandr Mar 22, 2021
1e8f6d4
fix: routing section
kvalexandr Mar 22, 2021
64a323b
Merge pull request #13 from natein/ebook
kvalexandr Mar 22, 2021
26fd309
style: new body font
spaceragga Mar 22, 2021
8b85e1a
feat: audio words
kvalexandr Mar 23, 2021
923c1d4
fix: playing audio
kvalexandr Mar 23, 2021
c055f4d
rafactor: api, action, reducer for ebook
kvalexandr Mar 23, 2021
0b006f1
Merge branch 'develop' into ebook
kvalexandr Mar 23, 2021
9c6e52e
Merge pull request #14 from natein/ebook
kvalexandr Mar 23, 2021
d0b398b
feat: replacement of the main page blocks
spaceragga Mar 23, 2021
903e891
rafactor: components Words
kvalexandr Mar 23, 2021
694ec1c
rafactor: components Words
kvalexandr Mar 23, 2021
702a782
feat: some new style and login icon
spaceragga Mar 23, 2021
a6dcbb6
feat: add login and singup page, new store, login actions and reducers
spaceragga Mar 23, 2021
16d3d77
Merge branch 'develop' into ebook
kvalexandr Mar 24, 2021
7436b89
feat: constant list games
kvalexandr Mar 24, 2021
2b287a0
Merge pull request #16 from natein/ebook
kvalexandr Mar 24, 2021
faabe0a
fix: routing
kvalexandr Mar 24, 2021
87c97a5
Merge branch 'develop' into layout
kvalexandr Mar 24, 2021
1cea920
fix: routing
kvalexandr Mar 24, 2021
425864d
Merge pull request #17 from natein/layout
kvalexandr Mar 24, 2021
a328e17
feat: add login/sign-up page
aleksei-bulgak Mar 24, 2021
2c40dd6
fix: after rebase on latest develop
aleksei-bulgak Mar 24, 2021
ca5f71d
feat: moved user info into separate reducer
aleksei-bulgak Mar 24, 2021
b7104c5
Merge pull request #18 from natein/login-page
spaceragga Mar 24, 2021
ce57742
feat: add pagination
kvalexandr Mar 24, 2021
06931f2
Merge branch 'develop' into ebook
kvalexandr Mar 24, 2021
3195ca6
feat: add assets for about team page
natein Mar 25, 2021
92cd087
feat: add about team page
natein Mar 25, 2021
4c67056
feat: add route
natein Mar 25, 2021
7e40e95
feat: add team data
natein Mar 25, 2021
3cb2556
feat: add save user info in localstorage and add save word in UsersWords
kvalexandr Mar 25, 2021
daefc4f
Merge pull request #19 from natein/about-team
natein Mar 25, 2021
9fe7043
Merge branch 'develop' into ebook
kvalexandr Mar 25, 2021
1eb11c2
fix: name userService
kvalexandr Mar 25, 2021
84bcb66
fix: name userService
kvalexandr Mar 25, 2021
24afb44
refactor: user action and reducer
kvalexandr Mar 25, 2021
b9357a3
Merge pull request #20 from natein/ebook
kvalexandr Mar 25, 2021
3aa054f
feat: add new style, add modal and some func
spaceragga Mar 25, 2021
39f14db
Merge branch 'develop' of https://github.com/natein/rslang into develop
spaceragga Mar 25, 2021
0d2d12f
feat: add modal info
spaceragga Mar 25, 2021
5568c3b
feat: start screen
Kvadeck Mar 25, 2021
d072971
feat: start screen
Kvadeck Mar 25, 2021
42d30fe
Merge branch 'develop' into game-savanna
Kvadeck Mar 25, 2021
133fb68
style: some new style homepage, footer, modal
spaceragga Mar 25, 2021
0322723
Merge branch 'develop' into game-savanna
Kvadeck Mar 26, 2021
85e187a
feat: add raw statistics page and four chart
spaceragga Mar 26, 2021
653917c
fix: main element position (#22)
aleksei-bulgak-study Mar 26, 2021
9957b46
refactor: code appearance and display
spaceragga Mar 26, 2021
2a5e1ec
Merge branch 'develop' into game-savanna
Kvadeck Mar 27, 2021
afcf164
feat: hud and timer
Kvadeck Mar 27, 2021
f856c17
feat: sprint game ui components
aleksei-bulgak Mar 27, 2021
fbc8756
fix: warning in use effect
aleksei-bulgak Mar 27, 2021
78df37c
feat: choose words
Kvadeck Mar 27, 2021
e69c226
feat: add custom reducer for games
aleksei-bulgak Mar 28, 2021
48af1a5
fix: add separate route for sprint game opened from left menu
aleksei-bulgak Mar 28, 2021
f93a442
fix: sending word on backend when user answer on sprint game
aleksei-bulgak Mar 28, 2021
6cb5ed2
fix: moved common style for sprint game into top page
aleksei-bulgak Mar 28, 2021
008bac7
feat: adding word to dictionary hard and delete word
kvalexandr Mar 28, 2021
120019a
refactor: ebook words
kvalexandr Mar 29, 2021
6a37409
refactor: words panel
kvalexandr Mar 29, 2021
a18a0ce
feat: add dictionary
kvalexandr Mar 29, 2021
3f4efaf
refactor: dictionary
kvalexandr Mar 29, 2021
9b07e05
Merge branch 'develop' into ebook
kvalexandr Mar 29, 2021
9e203ae
Merge branch 'sprint-game' into game-savanna
Kvadeck Mar 30, 2021
753bd73
feat: merge sprint
Kvadeck Mar 30, 2021
1e5dcd8
feat: rafactor dictionary and add recover word
kvalexandr Mar 30, 2021
2f82252
feat: add pagination dictionary
kvalexandr Mar 30, 2021
9bf1816
Merge pull request #24 from natein/ebook
kvalexandr Mar 30, 2021
af32170
feat: add deleting page if deleting all words
kvalexandr Mar 30, 2021
fec2873
feat: add settings
kvalexandr Mar 30, 2021
16f9099
Merge pull request #25 from natein/ebook
spaceragga Mar 31, 2021
4114bca
build: del i18next
spaceragga Mar 31, 2021
c8ef5a7
Merge branch 'develop' into statistics
spaceragga Mar 31, 2021
73636ca
Merge pull request #26 from natein/statistics
spaceragga Mar 31, 2021
a81644f
feat: answer word animation
Kvadeck Mar 31, 2021
28f469d
style: fix dashboard styles
spaceragga Mar 31, 2021
a97d902
feat: timer correct answer
Kvadeck Mar 31, 2021
1e84697
feat: Sprint game (#23)
aleksei-bulgak-study Apr 1, 2021
a06d994
fix: complexity level selection for sprint game
Apr 1, 2021
cf0be59
feat: sound, keypress, mistakes, lifes
Kvadeck Apr 1, 2021
9a097d4
feat: add statistics update on game
Apr 2, 2021
048e9c0
Merge branch 'develop' into game-savanna
Kvadeck Apr 2, 2021
aed0402
feat: add crystal, timer text
Kvadeck Apr 2, 2021
f683e29
Merge pull request #21 from natein/game-savanna
Kvadeck Apr 2, 2021
494ca7b
feat: add review page
spaceragga Mar 31, 2021
028e3d1
feat: add review state and create new review
spaceragga Apr 1, 2021
b77ac4b
feat: only ui add statistics
Kvadeck Apr 2, 2021
996aebe
feat: add simple validation on review, disabled button
spaceragga Apr 2, 2021
f818985
Merge pull request #27 from natein/review
spaceragga Apr 2, 2021
155ceaa
feat: add audiocall game
kvalexandr Apr 2, 2021
42d10c3
fix: removed unused imports. update redirect after login
aleksei-bulgak Apr 3, 2021
ebb4da5
rafactor: game ui
kvalexandr Apr 3, 2021
dcac716
feat: add key control
kvalexandr Apr 3, 2021
c29bf7d
merge: develop
kvalexandr Apr 3, 2021
72f87e8
refactor: stat page
kvalexandr Apr 3, 2021
f702b3a
refactor: link game
kvalexandr Apr 3, 2021
8d83f8d
feat: add user words
kvalexandr Apr 3, 2021
6930c7b
fix: game
kvalexandr Apr 3, 2021
f8466b0
fix: description game
kvalexandr Apr 4, 2021
fef5600
fix: game
kvalexandr Apr 4, 2021
e9fbe8d
Merge pull request #28 from natein/audio-game
kvalexandr Apr 5, 2021
074cde5
feat: add user statistics by day sending
Apr 5, 2021
e7cad31
fix: update audio game statistics sending
Apr 5, 2021
b7f64cc
feat: add general statistics population on existing userWord answer
Apr 5, 2021
5088ade
Merge branch 'develop' into savanna-statistics
Kvadeck Apr 5, 2021
4746d84
Merge branch 'develop' into savanna-statistics
Kvadeck Apr 5, 2021
aa1b277
feat: add overal statistics splitted by day
Apr 5, 2021
b95d4c7
fix: formula for statistics
Apr 5, 2021
46c2a8a
feat: add day correct answers statistics
aleksei-bulgak Apr 5, 2021
ab354f7
fix: add tooltip for words learned per pay
Apr 6, 2021
495b7fd
feat: add day statistics by game
Apr 6, 2021
0510402
feat: savanna fixes
Kvadeck Apr 6, 2021
d0a30da
Merge remote-tracking branch 'origin/user_statistics' into savanna-st…
Kvadeck Apr 6, 2021
3ff2d6b
feat: review put and get backend
spaceragga Apr 6, 2021
52b25ed
feat: add route wordList, game list sidebar remove
Kvadeck Apr 6, 2021
8fdc644
feat: todo clean up.
Kvadeck Apr 6, 2021
b851f37
feat: review clean up
Kvadeck Apr 7, 2021
4dcb2eb
Merge pull request #30 from natein/savanna-statistics
Kvadeck Apr 7, 2021
de571f8
feat: savanna fixes
Kvadeck Apr 7, 2021
4aac929
feat: savanna useEffect update
Kvadeck Apr 7, 2021
adbc144
feat: savanna words check, clean up.
Kvadeck Apr 7, 2021
2c0cba0
fix: displaying current points bonus
Apr 7, 2021
d1da0dd
style: new main bg and some style fixes
spaceragga Apr 7, 2021
601e658
style: add logo and fix some style
spaceragga Apr 8, 2021
1676ae2
feat: add words stats
kvalexandr Apr 8, 2021
c0a186c
feat: add 404 route (#33)
Kvadeck Apr 8, 2021
fec43d7
feat: statistics, fullscreen, crystal, complexity (#36)
Kvadeck Apr 8, 2021
3b134c6
fix: reset bonus to intial value on wrong answer
aleksei-bulgak Apr 8, 2021
ee9f6fd
feat: back browser btn work in sprint, audiocall
Kvadeck Apr 9, 2021
a5b714e
style: change font, bg position, button style and add raw modal about
spaceragga Apr 9, 2021
f2bc473
refactor: review loader and modal about
spaceragga Apr 9, 2021
2303fb2
fix: styles for login input fields
Apr 9, 2021
253d253
fix: statistics
Apr 9, 2021
cc6a0af
feat: add modal video
spaceragga Apr 9, 2021
4032991
fix: update description of performed work by Alekse Bulgak
aleksei-bulgak Apr 10, 2021
e64048e
feat: add group in dictionary
kvalexandr Apr 11, 2021
9b0254a
merge: develop
kvalexandr Apr 11, 2021
a3b9852
Merge pull request #37 from natein/ebook-stats
kvalexandr Apr 12, 2021
87b4fc9
feat: add functionality to calculate longest chain of correct answers
Apr 12, 2021
f203f21
feat: logo text
Kvadeck Apr 12, 2021
b4ed7e2
Merge branch 'develop' of https://github.com/natein/rslang into develop
Kvadeck Apr 12, 2021
af5356c
Merge branch 'develop' of https://github.com/natein/rslang into develop
Kvadeck Apr 12, 2021
e1cb922
feat: Dashboard clean up
Kvadeck Apr 12, 2021
0380794
feat: add our-game component
natein Apr 13, 2021
634aff7
feat: add our-game page
natein Apr 13, 2021
8922c3b
feat: add our-game route
natein Apr 13, 2021
9035227
fix: change background
natein Apr 13, 2021
13d1e18
feat: add our-game data
natein Apr 13, 2021
787808b
style: fix small size view main page, about and review
spaceragga Apr 13, 2021
b499f99
fix: statistics page on small screens (#40)
aleksei-bulgak-study Apr 13, 2021
2ed9633
fix: onKeyPress function trigger
Apr 13, 2021
92039e8
fix: add statistics sending for our game
Apr 13, 2021
aa274ee
fix: translate UI
natein Apr 13, 2021
201f094
feat: add real info
natein Apr 13, 2021
cd953c1
fix: change last name
natein Apr 13, 2021
2d22773
Merge pull request #41 from natein/about-team-info
natein Apr 13, 2021
9edb114
feat: statistic words learn for dicionary
kvalexandr Apr 14, 2021
1638845
fix: remove font weight and unused dependence
natein Apr 14, 2021
127654a
Merge pull request #39 from natein/our-game
natein Apr 14, 2021
5e36284
feat: background only main and game page
Kvadeck Apr 14, 2021
1cc70c8
feat: submit review btn color fix
Kvadeck Apr 14, 2021
7d18de7
feat: submit review color fix
Kvadeck Apr 14, 2021
580508d
Merge pull request #42 from natein/ebook-update
kvalexandr Apr 14, 2021
5dd7eb5
feat: add intial tests config and test for about team component (#44)
aleksei-bulgak-study Apr 14, 2021
ec816b6
fix: css (#43)
kvalexandr Apr 14, 2021
329a2d1
style: fix button about and review
spaceragga Apr 14, 2021
be19a82
feat: update video link (#45)
aleksei-bulgak-study Apr 14, 2021
10d4bea
fix: our game words rerender (#46)
aleksei-bulgak-study Apr 29, 2021
3ffc9bb
docs: update readme file with info about application (#47)
aleksei-bulgak-study Apr 29, 2021
01a9e4b
build: add typeScript
spaceragga Apr 29, 2021
41c10e8
feat: add tsconfig
spaceragga Apr 29, 2021
a7afc11
refactor: add some new dep for ts and ref app
spaceragga Apr 30, 2021
decddc3
refactor: change class to fc
spaceragga May 1, 2021
0545a09
Update README.md
spaceragga May 2, 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
6 changes: 6 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
}
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
REACT_APP_API=https://react-rslang-team15.herokuapp.com
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*
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 120,
"tabWidth": 4
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib"
}
65 changes: 64 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,65 @@
# rslang
# RS Lang
Application for learning English language.

# [UI part of application](https://rslang-team15-natein.netlify.app)

Stack:
- react
- redux
- react-router
- typescript

Styling:
- material-ui
- styled-components
- devexpress(for charts)

Testing libraries:
- Jest
- React testing library

Additional tools:
- eslint
- prettier

To start application you need to perform two steps:
1. `npm ci`
2. `npm run start`

Application will start at port 3000

To specify link to backend application you need to provide environment variable `REACT_APP_API` on start-up.
Alternatevly you can create `.env` file in the root folder of frontend application and specify single line:

```
REACT_APP_API=https://react-rslang-team15.herokuapp.com
```

value can be changed based on your backend application url. Note that for local deployment you need to use http instead of https

# [Backend part of application](https://github.com/kvalexandr/react-rslang-be)

Stack:
- Node.JS
- Express
- mongoose
- helmet

To start application locally you need perform such steps:
- `npm ci`
- `npm run start:dev`

Application will start at port 3001

Additionaly you need to create `.env` file in backend application root directory and specify such variables in it:

```
MONGO_CONNECTION_STRING=mongodb+srv://databaseUserName:password@cluster0.ucess.mongodb.net/learnwords
JWT_SECRET_KEY=jwtSecretKey
JWT_REFRESH_SECRET_KEY=refreshSecretKey
PORT=3001
AUTH_MODE=true
```
### NOTE that specified values is not real values and if you really want to start application locally please contact any team member

### Second NOTE: UI application points to backend application that is deployed on heroku. If you want to point it to your local build then you need to change value on `REACT_APP_API` in .env file stored in UI repository
24 changes: 24 additions & 0 deletions __tests__/test.utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react'
import { render as rtlRender } from '@testing-library/react'
import { createStore } from 'redux'
import { Provider } from 'react-redux'
import reducer from '../src/reducers'

function render(
ui,
{
initialState,
store = createStore(reducer, initialState),
...renderOptions
} = {}
) {
function Wrapper({ children }) {
return <Provider store={store}>{children}</Provider>
}
return rtlRender(ui, { wrapper: Wrapper, ...renderOptions })
}

// re-export everything
export * from '@testing-library/react'
// override render method
export { render }
Loading