Skip to content
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

release #43

Merged
merged 119 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
207be6a
base repository structure
daronenko Oct 14, 2024
2cfff8b
Start feed page
MatiXxD Oct 15, 2024
9c56003
Done TrackList
MatiXxD Oct 16, 2024
e872d6e
Done trackList
MatiXxD Oct 16, 2024
a90e552
Done TrackList with ArtistList
MatiXxD Oct 18, 2024
f7ab602
Change index.css
MatiXxD Oct 18, 2024
dab6003
Add player
MatiXxD Oct 18, 2024
96ec51f
Merge pull request #20 from frontend-park-mail-ru/NM-11
MatiXxD Oct 18, 2024
78e8461
fsd architecture for login/signup
daronenko Oct 19, 2024
776ba48
Merged with NM-17
MatiXxD Oct 19, 2024
1e19858
Fixes after merge
MatiXxD Oct 19, 2024
97b3131
Merge pull request #22 from frontend-park-mail-ru/NM-11
MatiXxD Oct 19, 2024
a67a1d2
Add scss
MatiXxD Oct 19, 2024
30be2ea
Merge pull request #23 from frontend-park-mail-ru/NM-21
MatiXxD Oct 19, 2024
af3df55
add .min.css to .gitignore
daronenko Oct 19, 2024
95b8f9c
update npm prestart command
daronenko Oct 19, 2024
9fff004
add new constants
daronenko Oct 19, 2024
5abf2f6
implement validator function
daronenko Oct 19, 2024
54e9354
rename feed page file
daronenko Oct 19, 2024
e7b8c0c
update user store
daronenko Oct 19, 2024
f6124f0
update shared lib
daronenko Oct 19, 2024
2330425
remove compiled scss
daronenko Oct 19, 2024
53dfc9e
update sign in page
daronenko Oct 19, 2024
83f7404
update sign up page
daronenko Oct 19, 2024
ee1f258
Merge pull request #25 from frontend-park-mail-ru/NM-24
daronenko Oct 19, 2024
1f9a2b8
Fix images
MatiXxD Oct 20, 2024
982f3df
Fix header
MatiXxD Oct 20, 2024
cf445a8
refactor handlers
daronenko Oct 21, 2024
bc578ea
fix npm command
daronenko Oct 21, 2024
1f3909b
update email validation pattern
daronenko Oct 21, 2024
5495f5a
initial
bocharovatd Oct 23, 2024
c909b36
Merge pull request #29 from frontend-park-mail-ru/NM-26
MatiXxD Oct 23, 2024
acf749e
Base view for player
MatiXxD Oct 24, 2024
17d38ee
Rename + change colors
MatiXxD Oct 25, 2024
bbf9efb
First version of player
MatiXxD Oct 26, 2024
3b87817
Delete test tracks and add mp3 to gitignore
MatiXxD Oct 26, 2024
d71b5da
Player works with artist's page
MatiXxD Oct 26, 2024
88f8e1b
Little fixes with player logic
MatiXxD Oct 26, 2024
43179ab
Fix html tags + listen button now works
MatiXxD Oct 26, 2024
cfa4c0b
Done player
MatiXxD Oct 26, 2024
af86c49
Merge pull request #30 from frontend-park-mail-ru/NM-27
MatiXxD Oct 26, 2024
2a51905
fixes after first module
bocharovatd Oct 29, 2024
1981fc1
colors
bocharovatd Oct 29, 2024
e628820
Merge pull request #32 from frontend-park-mail-ru/NM-31
bocharovatd Oct 29, 2024
1d7d038
update package lock
daronenko Oct 30, 2024
5ca67e6
add working carousel w/o api request
damedelion Oct 31, 2024
94ed5ac
working carousel w/ api request v0
damedelion Oct 31, 2024
8e9aa63
update user entity
daronenko Oct 31, 2024
78a7292
update base html page
daronenko Oct 31, 2024
6b7ea24
add link handler for 'a' tag
daronenko Oct 31, 2024
0e33687
add response status handler
daronenko Oct 31, 2024
f4fa27b
update static server
daronenko Oct 31, 2024
2e0979f
add error page
daronenko Oct 31, 2024
9bfd245
add public errors for user
daronenko Oct 31, 2024
d4652f7
http status constants
daronenko Oct 31, 2024
70d451a
update username validation pattern
daronenko Oct 31, 2024
e04966b
remove handle link function from header
daronenko Oct 31, 2024
deda20e
rename 'getStore' method to 'loadUser'
daronenko Oct 31, 2024
85c4821
uncomment router error page rendering inside router
daronenko Oct 31, 2024
1912682
add html form support to http client
daronenko Oct 31, 2024
24c22dd
add edit user widget
daronenko Oct 31, 2024
31ed3a9
add upload avatar widget
daronenko Oct 31, 2024
430e57f
add edit profile page
daronenko Oct 31, 2024
cc75b29
add user card widget
daronenko Oct 31, 2024
9824194
add profile page
daronenko Oct 31, 2024
faa2c47
fix style code
daronenko Oct 31, 2024
eadbb91
Merge pull request #37 from frontend-park-mail-ru/NM-33
daronenko Oct 31, 2024
58c1bcd
webpack initial
bocharovatd Oct 31, 2024
837221d
chunks added
bocharovatd Oct 31, 2024
dec0ba9
Done service worker
MatiXxD Nov 1, 2024
cccd1d4
Done artist page
MatiXxD Nov 2, 2024
dec21cf
Done profile page
MatiXxD Nov 2, 2024
e0a0ff0
Done edit profile page
MatiXxD Nov 2, 2024
ca870cb
Add profile to header
MatiXxD Nov 2, 2024
2b7627e
Merge pull request #42 from frontend-park-mail-ru/NM-40
MatiXxD Nov 2, 2024
ac6039b
move storage logic to lib directory
daronenko Nov 3, 2024
4f7925f
add artist carousel
damedelion Nov 4, 2024
0e693ca
merge conflict with NM-35
damedelion Nov 4, 2024
e6355a3
Fix request
MatiXxD Nov 4, 2024
5999327
show more pages
bocharovatd Nov 4, 2024
f23ef3b
fix deploy
daronenko Nov 5, 2024
5ce7c38
change response body format
daronenko Nov 5, 2024
72d3925
Merge pull request #46 from frontend-park-mail-ru/deploy
MatiXxD Nov 5, 2024
58fd8f7
console logging
bocharovatd Nov 5, 2024
e32fc5d
Fix csrf
MatiXxD Nov 5, 2024
4110bba
Merge branch 'develop' into NM-41
daronenko Nov 6, 2024
6bc1b1e
fix deploy
daronenko Nov 6, 2024
253e090
Merge pull request #47 from frontend-park-mail-ru/NM-41
daronenko Nov 6, 2024
2550fe1
solve conflicts
bocharovatd Nov 6, 2024
4020ec6
Merge pull request #49 from frontend-park-mail-ru/NM-44
bocharovatd Nov 6, 2024
2dc0274
more pages fixes
bocharovatd Nov 6, 2024
3a58ce0
webpack conflicts solve
bocharovatd Nov 6, 2024
7faaca0
package json fixes
bocharovatd Nov 6, 2024
9ab4d57
lint fixes
bocharovatd Nov 6, 2024
ae1f2d0
lint fixes 2
bocharovatd Nov 6, 2024
c087354
Merge pull request #50 from frontend-park-mail-ru/NM-34
bocharovatd Nov 6, 2024
fd27a53
webpack merge fixes
bocharovatd Nov 6, 2024
549292c
play button
bocharovatd Nov 6, 2024
ab7dc8c
Merge pull request #51 from frontend-park-mail-ru/NM-48
bocharovatd Nov 6, 2024
3995137
remove dist
bocharovatd Nov 6, 2024
ea1551a
lint errors fixed
bocharovatd Nov 7, 2024
a581495
styles fixed
bocharovatd Nov 7, 2024
cc12c3a
rename public/images directory to public/static
daronenko Nov 7, 2024
3ca4eb7
Fix view profiles
MatiXxD Nov 7, 2024
ed6709d
Delete debug info
MatiXxD Nov 7, 2024
dd4be5f
Merge remote-tracking branch 'origin/NM-38' into develop
MatiXxD Nov 7, 2024
3709fdf
Fix links
MatiXxD Nov 7, 2024
80e0212
Fix profile imgae
MatiXxD Nov 7, 2024
6b97d14
return images directory
daronenko Nov 7, 2024
cba1672
setup ssl
daronenko Nov 7, 2024
342a6a9
Merge branch 'develop' into NM-52
daronenko Nov 7, 2024
bbb3662
Merge pull request #53 from frontend-park-mail-ru/NM-52
daronenko Nov 7, 2024
00c9c51
change exposing port in dockerfile
daronenko Nov 7, 2024
7e83519
update deploy link in readme
daronenko Nov 7, 2024
8372614
comments fixes
damedelion Nov 8, 2024
2971a5d
prod and dev docker container
daronenko Nov 8, 2024
5f6c04b
Fix styles
MatiXxD Nov 8, 2024
6abd144
merge with main
damedelion Nov 8, 2024
67106a2
Merge branch 'develop' of github.com:frontend-park-mail-ru/2024_2_Nov…
damedelion Nov 8, 2024
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
node_modules/
dist/
.idea/
.vscode/
.DS_Store

*.precompiled.js
*.min.css

*.mp3
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ENV_FILE = ./docker/.env
include $(ENV_FILE)

DOCKER_COMPOSE_PATH = ./docker/docker-compose.yaml
DOCKER_COMPOSE_PATH = ./docker/docker-compose.$(ENV).yaml

# use `gawk` on mac os
AWK := awk
Expand Down
8 changes: 6 additions & 2 deletions docker/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
SERVICE_NAME=novamusic
VERSION=v0.3
PORT=3000
VERSION=v0.17
ENV=dev

SSL_PATH=/etc/ssl/nova-music.ru
PUBLIC_KEY=fullchain.pem
PRIVATE_KEY=privkey.pem
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ COPY . .

EXPOSE 3000

CMD [ "npm", "run", "start" ]
CMD [ "npm", "run", "build" ]
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ services:
context: ..
env_file: .env
ports:
- 80:${PORT}
- 3000:3000
restart: on-failure
13 changes: 13 additions & 0 deletions docker/docker-compose.prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
novamusic-frontend:
image: daronenko/novamusic-frontend:${VERSION}
container_name: novamusic-frontend
build:
dockerfile: docker/Dockerfile
context: ..
env_file: .env
ports:
- 443:3000
restart: on-failure
volumes:
- /etc/ssl/nova-music.ru:/etc/ssl/nova-music.ru
Loading