Skip to content

Commit

Permalink
Delete comments and logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@AshurovG
AshurovG committed Dec 15, 2024
1 parent 207d9c7 commit cde1845
Show file tree
Hide file tree
Showing 27 changed files with 10 additions and 190 deletions.
1 change: 0 additions & 1 deletion public/components/MovieDescription/MovieDescription.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
>Смотреть</button>
{{/if}}

{{! TODO: Совместный просмотр в разработке }}
{{#if isUserAuth}}
<button
id='watch-together-btn'
Expand Down
1 change: 0 additions & 1 deletion public/components/MovieDescription/MovieDescription.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ export class MovieDescription {
}
}

// TODO: Совместный просмор в разработке
handleWatchTogether() {
const watchTogetherBtn = document.getElementById(
'watch-together-btn',
Expand Down
9 changes: 0 additions & 9 deletions public/components/ProgressCard/ProgressCard.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ export class ProgressCard {
) as HTMLDivElement;

progressLine.style.width = `${percentage}%`;

// TODO: для тестирования ползунка
// console.log(this.#movie.title, progressLine.style.width);
// console.log(
// 'timecode',
// this.#movie.timeCode,
// ', duration',
// this.#movie.duration,
// );
}

renderTemplate() {
Expand Down
22 changes: 2 additions & 20 deletions public/components/RateBlock/RateBlock.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
width: fit-content;
height: fit-content;
transition: transform 0.3s ease;

// &:hover {
// transform: scale(1.1);
// }
}

&_stars {
Expand All @@ -97,18 +93,9 @@
background-position: center;
font-size: 13px;
font-weight: 400;
color: #000; /* Цвет текста */
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); /* Тень текста для лучшей читаемости */
color: #000;
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
user-select: none;
// &.hover-star {
// background-image: url('assets/icons/activeStarIcon.svg');
// }

// &.no-hover {
// &:hover {
// background-image: url('assets/icons/defaultStarIcon.svg');
// }
// }

&.active-star {
background-image: url('assets/icons/activeStarIcon.svg');
Expand All @@ -119,11 +106,6 @@
}
}

// .rating-star:hover,
// .rating-star:hover ~ .rating__star {
// background-image: url('assets/icons/activeStarIcon.svg');
// }

@include mobile {
.rate-block {
padding: 16px;
Expand Down
10 changes: 1 addition & 9 deletions public/components/RateBlock/RateBlock.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,9 @@ import { Actions } from 'flux/Actions';

export class RateBlock {
#movie!: MovieDetailed | null;
// #rating: number | undefined;
// #userRating: number;
#parent: HTMLElement;

constructor(
// rating: number | undefined,
// userRating: number,
parent: HTMLElement,
) {
// this.#rating = rating;
// this.#userRating = userRating;
constructor(parent: HTMLElement) {
this.#parent = parent;
}

Expand Down
51 changes: 0 additions & 51 deletions public/components/SearchBlock/SearchBlock.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
justify-content: space-between;
align-items: flex-end;
position: relative;
// gap: 8px;

&.active-search-bar {
border-bottom: 2px solid white;
Expand Down Expand Up @@ -134,7 +133,6 @@
@include mediumTablet {
.search-bar {
align-items: center;
// gap: 6px;

&.active-search-bar {
padding-bottom: 6px;
Expand Down Expand Up @@ -164,7 +162,6 @@
@include mobile {
.search-bar {
align-items: center;
// gap: 6px;

&.active-search-bar {
padding-bottom: 6px;
Expand Down Expand Up @@ -194,13 +191,6 @@
@include extraSmallMobile {
.search-bar {
align-items: center;
// gap: 6px;

// &__list {
// right: -40px;
// margin: 0 auto;
// width: 90vw;
// }
&.active-search-bar {
padding-bottom: 6px;
.search-bar {
Expand Down Expand Up @@ -232,51 +222,10 @@
padding-bottom: 6px;
.search-bar {
&__input {
// flex-grow: 1.3;
width: 60vw;
// width: 100%;
padding-left: 4px;
}
}
}
}
}

// @include ultraSmallMobile {
// .search-bar {
// align-items: center;
// // gap: 6px;

// &__list {
// right: -40px;
// margin: 0 auto;
// width: 90vw;
// }
// &.active-search-bar {
// padding-bottom: 6px;

// #header__container_logo {
// display: none;
// }
// .search-bar {
// &__input {
// width: 70px;
// padding-left: 4px;
// }
// }
// }

// &__search {
// font-size: 14px;
// }
// &__input {
// font-size: 14px;
// }
// &__close {
// height: 18px;
// &_icon {
// width: 18px;
// }
// }
// }
// }
9 changes: 1 addition & 8 deletions public/components/SearchBlock/SearchBlock.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@ export class SearchBlock {
this.#inputValue = '';
this.#inputValueEmmitter = new Emitter<string>('');

// const dataFetchingListener =
// searchBlockStore.dataLoadingEmmitter$.addListener(() => {
// this.renderItemsList();
// });

this.ngOnDestroy = () => {
// dataFetchingListener();
};
this.ngOnDestroy = () => {};
}

ngOnDestroy(): void {}
Expand Down
26 changes: 0 additions & 26 deletions public/components/SearchList/SearchList.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@

display: flex;
padding-left: 5%;
// justify-content: space-between;
gap: 8px;

&:hover {
Expand Down Expand Up @@ -101,28 +100,3 @@
}
}
}

// @include extraSmallMobile {
// .find-item-list {
// width: 100%;

// &__item {
// gap: 4px;

// &_image {
// height: 35px;
// }

// &_info {
// &_title {
// font-size: 14px;
// }
// }

// &_stats {
// font-size: 10px;
// gap: 3px;
// }
// }
// }
// }
1 change: 0 additions & 1 deletion public/components/SeriesList/SeriesList.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.series-list {
width: 100%;
// height: 400px;
height: 100%;
background-color: $series-menu-background;
padding: 15px 0;
Expand Down
3 changes: 0 additions & 3 deletions public/components/VideoPlayer/VideoPlayer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@

&_right {
position: static;
// right: -5px;
display: flex;
align-items: center;
gap: 10px;
Expand Down Expand Up @@ -252,13 +251,11 @@
transition:
opacity 0.2s ease-in-out,
visibility 0.2s ease-in-out;
// bottom 0.5s ease-in-out;

&_show {
opacity: 1;
visibility: visible;
z-index: 100;
// bottom: 50px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion public/modules/Serializer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export const serializeUserData = (user: any) => {
birthdate: user.birthdate,
sex: user.sex,
avatar: HOST + user.avatar_url,
isPremium: true,
isPremium: user.subscription_status,
expirationDate: user.subscription_expiration_date,
};
};
Expand Down
2 changes: 0 additions & 2 deletions public/modules/Validators.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
} from '../consts';

export function validateEmailAddress(emailAddress: string): boolean {
// const regex = /^[A-Z0-9._%+-]+@[A-Z0-9-]+.+.[A-Z]{2,4}$/i;
// const regex = /^[$\/@ "'`.!#\$%&'*+\-=?^_`{|}~a-zA-Z]+\.[a-z]{2,10}$/;
const regex1 =
/^[$\/@ "'`.!#\$%&'*+\-=?^_`{|}~a-zA-z0-9]+@[a-z]+\.[a-z]{2,10}$/;
return regex1.test(emailAddress);
Expand Down
2 changes: 0 additions & 2 deletions public/pages/ErrorPage/ErrorPage.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
max-width: $content-width-max;
margin: 0 auto;

// position: absolute;
// top: 50%;
transform: translateY(30%);

display: flex;
Expand Down
5 changes: 0 additions & 5 deletions public/pages/GenresPage/GenresPage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ export class GenresPage {
genresContainer.appendChild(newBlock);
}

// TODO: убрать проверку
movieGenre.movies = movieGenre.movies.filter(
(movie) => movie.title !== '1+1',
);

const slider = new Slider({
parent: newBlock,
id: movieGenre.id,
Expand Down
16 changes: 1 addition & 15 deletions public/pages/MainPage/MainPage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,7 @@ export class MainPage {
slider.render();
slider.render();
} else {
this.#movieSelections.slice(1).forEach((selection, index) => {
// TODO: убрать проверку
if (index === 0) {
selection.movies = selection.movies.filter(
(movie) => movie.title !== '1+1',
);
}

this.#movieSelections.slice(1).forEach((selection) => {
const newBlock = document.createElement('div');
newBlock.classList.add('main-page__block');
newBlock.id = `main-page-block-${selection.id}`;
Expand Down Expand Up @@ -135,12 +128,5 @@ export class MainPage {
pageElement.innerHTML = template();

this.renderBlocks();

//TODO: Вынести
// const coWatchBlockContainer = document.getElementById(
// 'cowatch-wrapper',
// ) as HTMLElement;
// const block = new CoWatchBlock(coWatchBlockContainer, false);
// block.render();
}
}
2 changes: 0 additions & 2 deletions public/pages/MoviePage/MoviePage.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
}

&__rating {
// margin-top: 30px;
width: fit-content;
max-width: 550px;
height: 200px;
Expand All @@ -35,7 +34,6 @@
}

&__description {
// padding-top: 30px;
width: 33vw;
max-width: 600px;
display: flex;
Expand Down
9 changes: 1 addition & 8 deletions public/pages/MoviePage/MoviePage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ export class MoviePage {
);
descriptionSkeleton.appendChild(descriptionTitleSkeleton);
descriptionSkeleton.appendChild(descriptionTextSkeleton);
//------------------

const rateSkeleton = document.createElement('div');
rateSkeleton.classList.add('movie-page-skeleton__rate');

Expand Down Expand Up @@ -349,13 +349,6 @@ export class MoviePage {
const pageElement = document.getElementsByTagName('main')[0];
window.scrollTo(0, 0);

// TODO: убрать моки
if (this.#movie?.title === '1+1') {
this.#movie.albumImage = "https://cassette-world.ru//static/movies_all/1_plus_1/poster.webp"
this.#movie.titleImage = "https://cassette-world.ru//static/movies_all/1_plus_1/logo.webp"
this.#movie.video = "https://cassette-world.ru//static/movies_all/1_plus_1/movie.mp4"
}

pageElement.innerHTML = template({
longDescription: this.#movie?.longDescription,
});
Expand Down
1 change: 0 additions & 1 deletion public/pages/ProfilePage/ProfilePage.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

display: grid;
grid-template-columns: 60% 35%;
// grid-template-rows: repeat(2, 1fr);
justify-content: space-between;
row-gap: 20px;
}
Expand Down
4 changes: 0 additions & 4 deletions public/pages/ProfilePage/ProfilePage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ export class ProfilePage {
usernameInput.addEventListener('input', () => {
this.controlButtonDisable();
});

// avatarInput.addEventListener('change', () => {
// this.controlButtonDisable();
// });
}

controlButtonDisable() {
Expand Down
Loading

0 comments on commit cde1845

Please sign in to comment.