Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
a7ea9c1
init: add webpack, eslint, prettier, babel, for react
UserJah Aug 16, 2022
44400bb
created api branch
jardozzz Aug 16, 2022
d81e03e
feat: start header
UserJah Aug 16, 2022
ef9adf1
Merge pull request #1 from UserJah/main-page
UserJah Aug 16, 2022
d7fb6d2
Merge pull request #2 from UserJah/develop
jardozzz Aug 16, 2022
023b50b
feat:add api for words,audio,images,add some cards
jardozzz Aug 16, 2022
2b135eb
feat: create logo and register and login forms
UserJah Aug 17, 2022
65860af
feat: start side menu
UserJah Aug 18, 2022
3a6edf8
feat: implement account login logic
PartyZzzan77 Aug 18, 2022
cf64ed0
feat:part of the game is done
jardozzz Aug 18, 2022
1dca23e
feat: complete side menu and add footer
UserJah Aug 18, 2022
3df2cf4
feat: implement registration logic
PartyZzzan77 Aug 19, 2022
a20e30d
feat: add main section, accordion and team present
UserJah Aug 19, 2022
d0221bf
feat:added some logic.sprint almost done
jardozzz Aug 22, 2022
a08dd34
feat: add team cards, add main image, add styles
UserJah Aug 22, 2022
ab88f33
Merge pull request #4 from UserJah/main-page
UserJah Aug 22, 2022
f543918
fix: merge conflict
PartyZzzan77 Aug 22, 2022
8d8a11f
Merge pull request #3 from UserJah/auth-requests
PartyZzzan77 Aug 22, 2022
64ed5ad
Merge pull request #5 from UserJah/api
jardozzz Aug 22, 2022
36beef3
fix: some bugs fixed
UserJah Aug 22, 2022
f8c5a2d
feat: add expired tokens update
PartyZzzan77 Aug 23, 2022
6f59a42
feat: create word list, start paganation functional
UserJah Aug 24, 2022
80536e2
feat: create page and group pagination
UserJah Aug 24, 2022
e913186
feat: cross-link
PartyZzzan77 Aug 25, 2022
359bc3f
feat:start to make audiochallenge
jardozzz Aug 26, 2022
602e12b
feat: add link styling
PartyZzzan77 Aug 26, 2022
7f74a4b
feat: define the active link styles in the menu
PartyZzzan77 Aug 26, 2022
a4bce33
refactor: define the function of defining an active link as utilitarian
PartyZzzan77 Aug 26, 2022
4ebc517
refactor: to separate the modal into components
PartyZzzan77 Aug 26, 2022
ca3338f
refactor: to separate the modal into components
PartyZzzan77 Aug 26, 2022
91e324d
fix: resolve merge conflict
PartyZzzan77 Aug 26, 2022
acf4461
refactor: remove the redundant module
PartyZzzan77 Aug 26, 2022
693b09c
fix: combine enumeration of AuthConstants
PartyZzzan77 Aug 26, 2022
95bbde6
feat:create bulk of audiochallgenge
jardozzz Aug 27, 2022
68c0282
feat: add token update after 3.5 hours
PartyZzzan77 Aug 28, 2022
9f65523
feat: add a project autodeployment script
PartyZzzan77 Aug 28, 2022
66342af
feat: implement statistical components
PartyZzzan77 Aug 28, 2022
237d736
feat:created audiochallenge with user interactions
jardozzz Aug 28, 2022
c04d8c8
Merge pull request #7 from UserJah/autodeploy
jardozzz Aug 28, 2022
63e5c55
Merge pull request #8 from UserJah/refresh-token
UserJah Aug 28, 2022
2891432
Merge pull request #9 from UserJah/statistics-page
UserJah Aug 28, 2022
1e789f6
Merge pull request #10 from UserJah/audiochallenge
UserJah Aug 28, 2022
0957864
Merge pull request #11 from UserJah/textbook
UserJah Aug 28, 2022
a8075f5
fix: merge conflict
PartyZzzan77 Aug 28, 2022
c51df38
Merge pull request #12 from UserJah/routing
PartyZzzan77 Aug 28, 2022
13037a9
feat: remove the dictionary
PartyZzzan77 Aug 28, 2022
7a3c30a
fix: link to the home page in the statistics
PartyZzzan77 Aug 28, 2022
361b225
feat: realise playing audio successively
UserJah Aug 29, 2022
7ac1a1b
refactor: change the logic when registering new users with prompts
PartyZzzan77 Aug 29, 2022
a10888a
refactor: user registration is implemented
PartyZzzan77 Aug 30, 2022
d86e5e2
feat: implement authorization logic
PartyZzzan77 Aug 30, 2022
45cdb80
refactor: decompose the authorization component
PartyZzzan77 Aug 30, 2022
f0a55db
feat: change the server address
PartyZzzan77 Aug 30, 2022
c4bc87b
feat: changed word card backround color when group changed
UserJah Aug 31, 2022
a5433c1
feat: create icons, add localstorage saving, add conditional rendering
UserJah Aug 31, 2022
fc4e0e4
feat: add buttons for games
UserJah Aug 31, 2022
0e51f82
refractor: format code
UserJah Aug 31, 2022
e5202c2
feat: change the status of a user in the local storage
PartyZzzan77 Aug 31, 2022
b8c7247
feat: add a change of nickname buttons when logging in
PartyZzzan77 Aug 31, 2022
f5eeb70
feat: add a page reload at login and logout
PartyZzzan77 Aug 31, 2022
e59983c
feat: change the server path
PartyZzzan77 Aug 31, 2022
ae95e2e
feat: add an audio call to the routing
PartyZzzan77 Aug 31, 2022
1a9efc6
feat: implement the display of statistics with wet data
PartyZzzan77 Aug 31, 2022
bec1273
feat: add a statistics object when logging into the account on the se…
PartyZzzan77 Sep 1, 2022
c4c1865
refactor: change the path to the server
PartyZzzan77 Sep 1, 2022
f628b1e
feat: create functional for difficulty words
UserJah Sep 2, 2022
e7be140
feat:add stats functionality in games
jardozzz Sep 2, 2022
43562fb
feat: add learning word functional, change come design, add remove fr…
UserJah Sep 2, 2022
ee80b0a
Merge pull request #13 from UserJah/develop
UserJah Sep 2, 2022
601182e
Merge pull request #14 from UserJah/textbook2
UserJah Sep 2, 2022
63778ce
Merge pull request #15 from UserJah/statistics-page
PartyZzzan77 Sep 2, 2022
dd4e120
Merge pull request #17 from UserJah/statistics-page
PartyZzzan77 Sep 2, 2022
194c829
feat:changed layout of sprint
jardozzz Sep 3, 2022
fb1e8af
Merge pull request #18 from UserJah/statistics-page
PartyZzzan77 Sep 3, 2022
7195388
fix: bad requests from TextBook fixed, add disabled buttons on learne…
UserJah Sep 3, 2022
9a9439f
fix: fex merge conflict
UserJah Sep 3, 2022
124e573
fix: remove disabled buttons
UserJah Sep 3, 2022
bd8d3b1
Merge pull request #19 from UserJah/statistics-page
PartyZzzan77 Sep 3, 2022
dd14923
123245
jardozzz Sep 3, 2022
e001e17
Merge branch 'develop' of https://github.com/UserJah/rslang into develop
jardozzz Sep 3, 2022
726a451
Merge pull request #20 from UserJah/statistics-page
PartyZzzan77 Sep 3, 2022
66fcd04
refactor: change the architecture of statistical components
PartyZzzan77 Sep 3, 2022
e4d172f
fix: change the path to the server
PartyZzzan77 Sep 3, 2022
f48027d
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 3, 2022
0942a42
fix: resolve the merger conflict
PartyZzzan77 Sep 3, 2022
1d98b4d
fix:fixed some bugs
jardozzz Sep 3, 2022
f304935
Merge branch 'develop' of https://github.com/UserJah/rslang into develop
jardozzz Sep 3, 2022
3d74285
feat: connect the game audio call to the sidebar
PartyZzzan77 Sep 3, 2022
afa2fee
Merge pull request #16 from UserJah/statistics-page
PartyZzzan77 Sep 2, 2022
2342722
feat: add validation of the login field
PartyZzzan77 Sep 3, 2022
507e184
feat: add games status on user words, add titles on words icons, chan…
UserJah Sep 3, 2022
8b57c50
feat: implement the display of statistics in the sprint game
PartyZzzan77 Sep 3, 2022
0283dbf
fix: fix bug with hard words
UserJah Sep 3, 2022
35398c6
feat: add video iframe on main page
UserJah Sep 3, 2022
8b04b88
feat: updating a token on a timer
PartyZzzan77 Sep 3, 2022
a559268
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 3, 2022
31abdd4
feat: create adaptive main page
UserJah Sep 3, 2022
df4e8c0
feat: add video-overview about RS lang app
UserJah Sep 3, 2022
0fdc4b3
fix: fix game reloading error
PartyZzzan77 Sep 3, 2022
581b609
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 3, 2022
becaf2a
Merge pull request #21 from UserJah/statistics-page
PartyZzzan77 Sep 3, 2022
0c475bc
feat: rename the imports
PartyZzzan77 Sep 3, 2022
6a5c897
fix all learned page now applies without reload
UserJah Sep 4, 2022
ec64f15
feat: implement routing to games from the tutorial page
PartyZzzan77 Sep 4, 2022
367e3bb
feat: implement the display of average statistics for the day
PartyZzzan77 Sep 4, 2022
3f5ba20
fix: In the case of a 403 error, the authorization window pops up
PartyZzzan77 Sep 4, 2022
6f4eab4
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 4, 2022
b197232
Merge pull request #22 from UserJah/statistics-page
PartyZzzan77 Sep 4, 2022
5892e52
fix: correct the calculation of the average percentage for the day
PartyZzzan77 Sep 4, 2022
0df0648
feat:added exit link to main page,fixed some bugs
jardozzz Sep 4, 2022
4f5d193
feat:add some css to game start screens
jardozzz Sep 4, 2022
e1e9f01
feat: implement the average number of new words per day
PartyZzzan77 Sep 4, 2022
cf4d66d
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 4, 2022
c5860d2
feat: styling a page for an unauthorized user
PartyZzzan77 Sep 4, 2022
e0e2bc9
feat: Initialize the statistics archive field on the server when you …
PartyZzzan77 Sep 4, 2022
6a2d27d
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 4, 2022
8c0eaca
Merge branch 'develop' of github.com:UserJah/rslang into statistics-page
PartyZzzan77 Sep 4, 2022
f630f77
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 4, 2022
a74074a
refactor: change the logic for defining paths for game components fro…
PartyZzzan77 Sep 4, 2022
41881fb
refacor: define a constant value for the number of pages and groups
PartyZzzan77 Sep 4, 2022
94b6dd5
fix: indexing of groups and pages when calling games from the tutorial
PartyZzzan77 Sep 4, 2022
09c3264
fix: round the value of the percent count
PartyZzzan77 Sep 4, 2022
eab3382
Merge branch 'statistics-page' of github.com:UserJah/rslang into develop
PartyZzzan77 Sep 3, 2022
278881b
feat;add some stats logic
jardozzz Sep 4, 2022
2e62b2a
fixed some bugs
jardozzz Sep 4, 2022
d53c8e7
feat: add routing to rs lang icon and delete console logs
UserJah Sep 4, 2022
0689490
fix:fixed some bugs
jardozzz Sep 4, 2022
9a711c8
Merge branch 'develop' of https://github.com/UserJah/rslang into develop
jardozzz Sep 4, 2022
95c3d97
fix: word streak now did'n delete
UserJah Sep 4, 2022
96c443d
fix: fix bug on previous commit
UserJah Sep 4, 2022
40629e4
fix: in word card fixed changing game status while type card changed
UserJah Sep 4, 2022
a686b14
Merge pull request #23 from UserJah/statistics-page
PartyZzzan77 Sep 4, 2022
0e92b8d
feat: change state from bool to number
UserJah Sep 4, 2022
703931b
fix:fixed some bugs
jardozzz Sep 5, 2022
7ab2245
fix:fixed bug with stats
jardozzz Sep 5, 2022
7967e21
fix: fix bug with game status display
UserJah Sep 5, 2022
9845487
Merge branch 'develop' of https://github.com/UserJah/rslang into develop
UserJah Sep 5, 2022
91865b5
fix: fix another bug in word card game status
UserJah Sep 5, 2022
e457a47
fix:and some more bugs fixed
jardozzz Sep 5, 2022
439d4c7
fix: fix game status bug in new word card
UserJah Sep 5, 2022
59bd93a
fix:and some more bugs fixed,beforeunload stats
jardozzz Sep 5, 2022
47fccba
added long-term stats data
jardozzz Sep 5, 2022
de2efc6
Merge pull request #26 from UserJah/statistics-page
PartyZzzan77 Sep 5, 2022
473a224
fix:fixed stat bugs on sprint and audio
jardozzz Sep 5, 2022
4925ebf
format:run prettier
jardozzz Sep 5, 2022
a340355
feat: initialize the statistics archive field on the server when logg…
PartyZzzan77 Sep 5, 2022
b55988c
feat: add add graphing library
PartyZzzan77 Sep 5, 2022
da30c7d
feat:some webpack work
jardozzz Sep 5, 2022
0d454d3
feat: add a graph by words for the whole period
PartyZzzan77 Sep 5, 2022
1aae57a
fix: start fixing bugs
PartyZzzan77 Sep 5, 2022
0a4068e
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 5, 2022
a51dfe7
refactor: add a statistics object to the server when a user registers
PartyZzzan77 Sep 5, 2022
37e6c06
feat: implement graphs of long-term statistics
PartyZzzan77 Sep 6, 2022
b205746
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 6, 2022
e5cf9b2
fix: show login window on 401 error
PartyZzzan77 Sep 7, 2022
5f448db
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 7, 2022
f14510a
refactor: remove the test code from the common/functions handleStat f…
PartyZzzan77 Sep 7, 2022
ba01f01
Merge pull request #24 from UserJah/statistics-page
PartyZzzan77 Sep 5, 2022
6f058e3
refactor: сhange the styles of the statistics page
PartyZzzan77 Sep 8, 2022
5490d3e
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 8, 2022
b6c15dd
Merge pull request #25 from UserJah/statistics-page
PartyZzzan77 Sep 5, 2022
e20584b
fix: correct display of graphs
PartyZzzan77 Sep 10, 2022
8513b2d
refactor: remove console.log
PartyZzzan77 Sep 10, 2022
7e2c25e
Merge remote-tracking branch 'origin/develop' into statistics-page
PartyZzzan77 Sep 10, 2022
d63d547
Merge pull request #27 from UserJah/statistics-page
PartyZzzan77 Sep 5, 2022
efb4c8e
doc: add readme
PartyZzzan77 Sep 18, 2022
272dabe
fix: removes syntax errors
PartyZzzan77 Sep 19, 2022
cc37c5c
fix: format the code
PartyZzzan77 Sep 19, 2022
ccd09fe
doc: add screenshots
PartyZzzan77 Sep 19, 2022
e950196
doc: add a roles
PartyZzzan77 Sep 19, 2022
a349566
doc: resize screenshots
PartyZzzan77 Sep 19, 2022
e820ccb
doc: resize screenshots for message boards
PartyZzzan77 Sep 19, 2022
2af09ed
Merge pull request #29 from UserJah/readme
PartyZzzan77 Sep 19, 2022
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 0 additions & 1 deletion README.md

This file was deleted.

20 changes: 20 additions & 0 deletions main-page/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"presets": [
"@babel/preset-env",
[
"@babel/preset-react",
{
"runtime": "automatic"
}
],
"@babel/preset-typescript"
],
"plugins": [
[
"@babel/plugin-transform-runtime",
{
"regenerator": true
}
]
]
}
35 changes: 35 additions & 0 deletions main-page/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = {
"env": {
"browser": true,
"node": true
},
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 2020,
sourceType: 'module',
},
settings: {
react: {
version: 'detect',
},
},
extends: [
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:@typescript-eslint/recommended',
"eslint:recommended",
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:jsx-a11y/recommended',
],
rules: {
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': ['error'],
'@typescript-eslint/no-var-requires': 'off',
'react/prop-types': 'off',
'react/jsx-uses-react': 'off',
'react/react-in-jsx-scope': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
},
}
2 changes: 2 additions & 0 deletions main-page/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build
node_modules
8 changes: 8 additions & 0 deletions main-page/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
semi: false,
trailingComma: 'es5',
singleQuote: true,
printWidth: 80,
tabWidth: 2,
endOfLine: 'auto'
}
106 changes: 106 additions & 0 deletions main-page/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# [RS School's final RS course - JavaScript/Front-end 2022Q1](https://rs.school/)

**[RS Lang](https://github.com/rolling-scopes-school/tasks/blob/master/tasks/stage-2/rs-lang/rslang.md)** is an application for learning foreign words, including an **electronic textbook** with a database of words to learn, **mini-games** to repeat them, a **statistics page** to track individual progress.

### To start application, do this 💻 👇🏻

```
git clone git@github.com:UserJah/rslang.git
cd rs-lang/main-page
npm install
npm start
```

## [Brief overview of the app 📺 ](https://youtu.be/SnHTTOM9OPY)

### Mentor

🦅 [ruslan547](https://github.com/ruslan547)

### Team

🐧 [UserJah](https://github.com/UserJah) <em>Team Lead</em><br/>
🦜 [jardozzz](https://github.com/jardozzz) <em>Teammate</em><br/>
🦉 [PartyZzzan77](https://github.com/PartyZzzan77) <em>Teammate</em>

---

### Technology Stack 📦

---

#### [Develop](https://github.com/UserJah/rslang/pull/28)

⚛️ [React](https://www.npmjs.com/package/react) <em>JavaScript library for building user interfaces</em><br/>

✅ <em>Popular, good documentation, extensive community</em><br/>
🤔 <em>Not the easiest one in the final bundle</em><br/>

---

🚦 [React-router-dom](https://www.npmjs.com/package/react-router-dom) <em>Great router, there are many methods and application cases</em><br/>

✅ <em>Great for SPA applications, good documentation</em><br/>
🤔 <em>There are difficulties in deploy</em><br/>

---

🎨 [Mui/material](https://mui.com/) <em>Popular library of ready-made components</em><br/>

✅ <em>popular, good documentation, lightweight </em><br/>
🤔 <em>Like everything needs to be studied</em><br/>

---

🗣 [ESLint(react-recommended)](https://eslint.org/) Static code analyzer, for quick troubleshooting<br/>

✅ <em>maintains the purity and unity of code writing, identifies bad practices</em><br/>
🤔 <em>Like everything needs to be studied</em> <br/>

---

📦 [Webpack](https://webpack.js.org/) <em>A great bundler for putting a project together</em><br/>

✅ Popular, flexible, good documentation<br/>
🤔 <em>There were difficulties in setting up</em> <br/>

---

🦆 [Typescript](https://www.typescriptlang.org/) <em>Great solution for stricter typing </em><br/>

✅ <em>Strict typing, compilation during development, good documentation</em><br/>
🤔 <em>A little more code in development</em><br/>

---

📈 [ChartJS](https://www.chartjs.org/) <em>An excellent library for building all kinds of charts of different complexity </em><br/>

✅ <em>Great documentation, typing, popular, easy to use</em><br/>
🤔 <em>Like everything needs to be studied</em><br/>

---

#### [Deploy](https://develop1--lovely-crumble-05c09a.netlify.app/)

**Front** 🧙🏻‍♂️ [Netlify](https://www.netlify.com/) <em>service for publishing and hosting static sites</em>

**Back** 🪄 [Heroku](https://heroku.com) + 📚 [MongoDB](https://www.mongodb.com/)

✅ <em>Popularity, good documentation, extensive community, accessibility</em><br/>

---

### Screenshots 🎆 🎇 🌅

[![main-page.png](https://i.postimg.cc/63wcKgh4/main-page.png)](https://postimg.cc/nsRBYdgn)
[![text-book.png](https://i.postimg.cc/g06cpB0p/text-book.png)](https://postimg.cc/3yYQC1pf)
[![audiochallenge-game.png](https://i.postimg.cc/cJDzDsW4/audiochallenge-game.png)](https://postimg.cc/3yv9NQWP)
[![sprint-game.png](https://i.postimg.cc/tTvHV3Jk/sprint-game.png)](https://postimg.cc/bDn572QS)
[![short-statistic.png](https://i.postimg.cc/J4LWHz49/short-statistic.png)](https://postimg.cc/QV0zRs7b)
[![long-statistic.png](https://i.postimg.cc/VN3hyKJ3/long-statistic.png)](https://postimg.cc/1grBwccH)

---

### Activity ⚽️

[![activity.png](https://i.postimg.cc/T3bm7QXy/activity.png)](https://postimg.cc/QFXHVQCs)
Loading