diff --git a/.eslintrc.json b/.eslintrc.json index e8fd995..62a2ad6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -24,13 +24,19 @@ }, { "files": ["*.ts", "*.tsx"], - "extends": ["plugin:@nx/typescript"], - "rules": {} + "extends": ["plugin:@nx/typescript", "prettier"], + "rules": { + "@typescript-eslint/no-extra-semi": "error", + "no-extra-semi": "off" + } }, { "files": ["*.js", "*.jsx"], - "extends": ["plugin:@nx/javascript"], - "rules": {} + "extends": ["plugin:@nx/javascript", "prettier"], + "rules": { + "@typescript-eslint/no-extra-semi": "error", + "no-extra-semi": "off" + } } ] } diff --git a/.gitignore b/.gitignore index 5a0f8cd..6a212a8 100644 --- a/.gitignore +++ b/.gitignore @@ -52,4 +52,5 @@ firebase-debug.log !.yarn/sdks !.yarn/versions -.nx/cache \ No newline at end of file +.nx/cache +.nx/workspace-data \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index adf7fc6..2516005 100644 --- a/.prettierignore +++ b/.prettierignore @@ -16,3 +16,5 @@ /.nx/cache .angular + +/.nx/workspace-data \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index e97ea1b..0000000 --- a/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "tabWidth": 2, - "useTabs": false, - "singleQuote": true -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 62c9a0b..2417382 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,5 +25,6 @@ }, "editor.formatOnSave": false }, - "editor.fontLigatures": true + "editor.fontLigatures": true, + "prettier.configPath": ".prettierrc.json" } diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 87c0a25..af40310 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/apps/estrai.me/jest.config.ts b/apps/estrai.me/jest.config.ts index 4ba4985..b3c36f2 100644 --- a/apps/estrai.me/jest.config.ts +++ b/apps/estrai.me/jest.config.ts @@ -24,7 +24,5 @@ export default { 'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/html-comment', ], - transformIgnorePatterns: [ - `node_modules/(?!@angular|@ngneat/spectator|array-move|lodash-es)`, - ], + transformIgnorePatterns: [`node_modules/(?!@angular|@ngneat/spectator|array-move|lodash-es)`], }; diff --git a/apps/estrai.me/project.json b/apps/estrai.me/project.json index 768b396..592430e 100644 --- a/apps/estrai.me/project.json +++ b/apps/estrai.me/project.json @@ -19,10 +19,7 @@ "polyfills": ["zone.js"], "tsConfig": "apps/estrai.me/tsconfig.app.json", "inlineStyleLanguage": "scss", - "assets": [ - "apps/estrai.me/src/favicon.ico", - "apps/estrai.me/src/assets" - ], + "assets": ["apps/estrai.me/src/favicon.ico", "apps/estrai.me/src/assets"], "styles": ["apps/estrai.me/src/styles.scss"], "scripts": [] }, diff --git a/apps/estrai.me/src/app/app.config.ts b/apps/estrai.me/src/app/app.config.ts index 168f68f..c3b3e2d 100644 --- a/apps/estrai.me/src/app/app.config.ts +++ b/apps/estrai.me/src/app/app.config.ts @@ -1,10 +1,6 @@ -import { ApplicationConfig, importProvidersFrom } from '@angular/core'; +import { ApplicationConfig } from '@angular/core'; import { FIREBASE_OPTIONS } from '@angular/fire/compat'; -import { - PreloadAllModules, - provideRouter, - withPreloading, -} from '@angular/router'; +import { PreloadAllModules, provideRouter, withPreloading } from '@angular/router'; import { APP_ROUTES } from './app.routes'; import { AuthService, ProfileService, UserService } from '@data-access'; import { initializeApp, provideFirebaseApp } from '@angular/fire/app'; @@ -17,16 +13,16 @@ export const appConfig: ApplicationConfig = { providers: [ provideRouter( APP_ROUTES, - withPreloading(PreloadAllModules), + withPreloading(PreloadAllModules) // withDebugTracing(), ), - importProvidersFrom( - provideFirebaseApp(() => initializeApp(environment.firebase)), - ), + provideFirebaseApp(() => initializeApp(environment.firebase)), { provide: FIREBASE_OPTIONS, useValue: environment.firebase }, - importProvidersFrom(provideFirestore(() => getFirestore())), - importProvidersFrom(provideAuth(() => getAuth())), - importProvidersFrom(provideAnalytics(() => getAnalytics())), - importProvidersFrom(AuthService, ProfileService, UserService), + provideFirestore(() => getFirestore()), + provideAuth(() => getAuth()), + provideAnalytics(() => getAnalytics()), + AuthService, + ProfileService, + UserService, ], }; diff --git a/apps/estrai.me/src/app/app.routes.ts b/apps/estrai.me/src/app/app.routes.ts index f1639f7..b3448c8 100644 --- a/apps/estrai.me/src/app/app.routes.ts +++ b/apps/estrai.me/src/app/app.routes.ts @@ -14,34 +14,27 @@ export const APP_ROUTES: Routes = [ }, { path: 'about', - loadComponent: () => - import('./pages/about/about.component').then((m) => m.AboutComponent), + loadComponent: () => import('./pages/about/about.component').then(m => m.AboutComponent), }, { path: 'privacy', - loadComponent: () => - import('./pages/privacy/privacy.component').then( - (m) => m.PrivacyComponent, - ), + loadComponent: () => import('./pages/privacy/privacy.component').then(m => m.PrivacyComponent), }, { path: 'unauthorized', - loadComponent: () => - import('./pages/unauthorized/unauthorized.component').then( - (m) => m.UnauthorizedComponent, - ), + loadComponent: () => import('./pages/unauthorized/unauthorized.component').then(m => m.UnauthorizedComponent), }, { path: 'profile', - loadComponent: () => import('@profile').then((m) => m.ProfileComponent), + loadComponent: () => import('@profile').then(m => m.ProfileComponent), canActivate: [AngularFireAuthGuard], }, { path: 'auth', - loadChildren: () => import('@auth').then((m) => m.AUTH_ROUTES), + loadChildren: () => import('@auth').then(m => m.AUTH_ROUTES), }, { path: 'game', - loadChildren: () => import('@game').then((m) => m.GAME_ROUTES), + loadChildren: () => import('@game').then(m => m.GAME_ROUTES), }, ]; diff --git a/apps/estrai.me/src/app/pages/about/about.component.ts b/apps/estrai.me/src/app/pages/about/about.component.ts index 03a98c6..831b3a8 100644 --- a/apps/estrai.me/src/app/pages/about/about.component.ts +++ b/apps/estrai.me/src/app/pages/about/about.component.ts @@ -8,19 +8,16 @@ import { CommonModule } from '@angular/common'; template: `
-

- ABOUT -

+

ABOUT

What is Estrai.me?

- Raffle games are an exciting way to bring an extra element of fun - to your events. An online raffle game is a great tool for - increasing engagement and driving donations. With ESTRAI.me, you - can easily create a unique and memorable experience. + Raffle games are an exciting way to bring an extra element of fun to your events. An online raffle game is + a great tool for increasing engagement and driving donations. With ESTRAI.me, you can easily create a + unique and memorable experience.

@@ -28,13 +25,10 @@ import { CommonModule } from '@angular/common';

- ESTRAI.me give to you the ability to host an in person raffle - game. What you need is to login and create your event. Once you’ve - registered your event, you’ll be able to create a custom raffle - where participants can join and take free tickets to enter. Once - the tickets are purchased, participants can then enter the raffle. - The winner will be chosen at random and will be announced directly - on the ESTRAI.me page. + ESTRAI.me give to you the ability to host an in person raffle game. What you need is to login and create + your event. Once you’ve registered your event, you’ll be able to create a custom raffle where participants + can join and take free tickets to enter. Once the tickets are purchased, participants can then enter the + raffle. The winner will be chosen at random and will be announced directly on the ESTRAI.me page.

@@ -42,13 +36,10 @@ import { CommonModule } from '@angular/common';

- An online raffle game is a great way to engage your audience and - increase interaction and networking. It’s a fun and interactive - way to draw while. It’s also relatively easy to set up and manage, - allowing you to focus on other aspects of your event. Plus, since - tickets can be assigned electronically, it’s a great way improve - your event spend more time on engaging people for your event in - person. + An online raffle game is a great way to engage your audience and increase interaction and networking. It’s + a fun and interactive way to draw while. It’s also relatively easy to set up and manage, allowing you to + focus on other aspects of your event. Plus, since tickets can be assigned electronically, it’s a great way + improve your event spend more time on engaging people for your event in person.

@@ -56,11 +47,9 @@ import { CommonModule } from '@angular/common';

- This online raffle game is provided as a free service and without - any warranty of any kind. The game is provided without any - guarantee of results or accuracy. We assume no responsibility or - liability for any loss or damage incurred as a result of - participating in this game. All participants must comply with all + This online raffle game is provided as a free service and without any warranty of any kind. The game is + provided without any guarantee of results or accuracy. We assume no responsibility or liability for any + loss or damage incurred as a result of participating in this game. All participants must comply with all applicable laws and regulations.

@@ -69,9 +58,8 @@ import { CommonModule } from '@angular/common';

- ESTRAI.me is a great way to add an extra layer of fun and - excitement to your event. It’s an easy way to engage your - audience, and create a memorable experience. + ESTRAI.me is a great way to add an extra layer of fun and excitement to your event. It’s an easy way to + engage your audience, and create a memorable experience.

diff --git a/apps/estrai.me/src/app/pages/index/cards/cards.component.ts b/apps/estrai.me/src/app/pages/index/cards/cards.component.ts index 5529d8e..678fe37 100644 --- a/apps/estrai.me/src/app/pages/index/cards/cards.component.ts +++ b/apps/estrai.me/src/app/pages/index/cards/cards.component.ts @@ -9,181 +9,139 @@ import { CommonModule } from '@angular/common';
-

- MAIN FEATURE -

+

MAIN FEATURE

-

- Easy to create and manage your raffle in a second. -

+

Easy to create and manage your raffle in a second.

-
-
+
+
+ stroke="currentColor"> + d="M17.657 18.657A8 8 0 016.343 7.343S7 9 9 10c0-2 .5-5 2.986-7C14 5 16.09 5.777 17.656 7.343A7.975 7.975 0 0120 13a7.975 7.975 0 01-2.343 5.657z" /> + d="M9.879 16.121A3 3 0 1012.015 11L11 14H9c0 .768.293 1.536.879 2.121z" /> -

- Start in a second -

+

Start in a second

- Just log-in and create your game, it's totally free and really - fast! Less than a minute to create a new game and let people join - to the game! + Just log-in and create your game, it's totally free and really fast! Less than a minute to create a new + game and let people join to the game!

+ class="inline-flex p-2 text-red-500 capitalize transition-colors duration-200 transform bg-red-100 rounded-full dark:bg-red-500 dark:text-white hover:underline hover:text-red-600 dark:hover:text-red-500"> + stroke="currentColor"> + d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z" />
-
+
+ stroke="currentColor"> + d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z" /> -

- Easy to engage -

+

Easy to engage

- Even if you hosting your event or an online event.. if you want to - engage people with a give away... You can do it with estrai.me. + Even if you hosting your event or an online event.. if you want to engage people with a give away... You + can do it with estrai.me.

+ class="inline-flex p-2 text-red-500 capitalize transition-colors duration-200 transform bg-red-100 rounded-full dark:bg-red-500 dark:text-white hover:underline hover:text-red-600 dark:hover:text-red-500"> + stroke="currentColor"> + d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z" />
-
+
+ stroke="currentColor"> + d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z" /> -

+

Assign your prize with a click

- Using a realtime feature for the game, people will updated - realtime when they win! + Using a realtime feature for the game, people will updated realtime when they win!

+ class="inline-flex p-2 text-red-500 capitalize transition-colors duration-200 transform bg-red-100 rounded-full dark:bg-red-500 dark:text-white hover:underline hover:text-red-600 dark:hover:text-red-500"> + stroke="currentColor"> + d="M13 9l3 3m0 0l-3 3m3-3H8m13 0a9 9 0 11-18 0 9 9 0 0118 0z" />
diff --git a/apps/estrai.me/src/app/pages/index/index.component.ts b/apps/estrai.me/src/app/pages/index/index.component.ts index 904097a..d744593 100644 --- a/apps/estrai.me/src/app/pages/index/index.component.ts +++ b/apps/estrai.me/src/app/pages/index/index.component.ts @@ -8,24 +8,15 @@ import { UserService } from '@data-access'; @Component({ selector: 'app-index', standalone: true, - imports: [ - CommonModule, - RouterModule, - CardsComponent, - NotifyMeComponent, - NgOptimizedImage, - ], + imports: [CommonModule, RouterModule, CardsComponent, NotifyMeComponent, NgOptimizedImage], providers: [UserService], template: ` -
+

+ class="flex flex-col text-6xl font-black leading-none text-gray-800 uppercase font-bebas-neue sm:text-8xl dark:text-white"> Raffle Game for your live event!

@@ -35,24 +26,17 @@ import { UserService } from '@data-access';

Estrai.me is simple to use and allows to assign price randomly.

-

- Play for free! -

-
+

Play for free!

+
+ class="px-4 py-2 mr-4 text-white uppercase bg-red-600 border-2 border-transparent rounded-lg text-md hover:bg-red-800"> Get started + class="px-4 py-2 text-red-600 uppercase bg-transparent border-2 border-red-600 rounded-lg dark:text-white hover:bg-red-600 hover:text-white text-md"> Join a game
@@ -60,14 +44,12 @@ import { UserService } from '@data-access';
+ class="px-4 py-2 mr-4 text-white uppercase bg-red-600 border-2 border-transparent rounded-lg text-md hover:bg-red-800"> Login to start + class="px-4 py-2 text-red-600 uppercase bg-transparent border-2 border-red-600 rounded-lg dark:text-white hover:bg-red-800 hover:border-red-800 hover:text-white text-md"> Join a game
@@ -79,8 +61,7 @@ import { UserService } from '@data-access'; class="max-w-xs m-auto md:max-w-sm" width="384" height="387" - priority - /> + priority />
diff --git a/apps/estrai.me/src/app/pages/index/notify-me/notify-me.component.ts b/apps/estrai.me/src/app/pages/index/notify-me/notify-me.component.ts index 791341b..2b605d5 100644 --- a/apps/estrai.me/src/app/pages/index/notify-me/notify-me.component.ts +++ b/apps/estrai.me/src/app/pages/index/notify-me/notify-me.component.ts @@ -7,54 +7,41 @@ import { CommonModule } from '@angular/common'; imports: [CommonModule], template: `
-
+
+ alt="" />
-
-

+
+

Do you want to contribute to the project?

- Follow the project, share your feedback and if you are confident - with coding, contribute to add more features and cool things to the - application! + Follow the project, share your feedback and if you are confident with coding, contribute to add more + features and cool things to the application!

+ class="inline-flex items-center justify-center w-full px-5 py-3 overflow-hidden text-white transition-colors duration-300 bg-gray-900 rounded-lg shadow sm:w-auto sm:mx-2 hover:bg-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700 focus:ring focus:ring-gray-300 focus:ring-opacity-80"> + viewBox="0 0 1792 1792"> + d="M896 128q209 0 385.5 103t279.5 279.5 103 385.5q0 251-146.5 451.5t-378.5 277.5q-27 5-40-7t-13-30q0-3 .5-76.5t.5-134.5q0-97-52-142 57-6 102.5-18t94-39 81-66.5 53-105 20.5-150.5q0-119-79-206 37-91-8-204-28-9-81 11t-92 44l-38 24q-93-26-192-26t-192 26q-16-11-42.5-27t-83.5-38.5-85-13.5q-45 113-8 204-79 87-79 206 0 85 20.5 150t52.5 105 80.5 67 94 39 102.5 18q-39 36-49 103-21 10-45 15t-57 5-65.5-21.5-55.5-62.5q-19-32-48.5-52t-49.5-24l-20-3q-21 0-29 4.5t-5 11.5 9 14 13 12l7 5q22 10 43.5 38t31.5 51l10 23q13 38 44 61.5t67 30 69.5 7 55.5-3.5l23-4q0 38 .5 88.5t.5 54.5q0 18-13 30t-40 7q-232-77-378.5-277.5t-146.5-451.5q0-209 103-385.5t279.5-279.5 385.5-103zm-477 1103q3-7-7-12-10-3-13 2-3 7 7 12 9 6 13-2zm31 34q7-5-2-16-10-9-16-3-7 5 2 16 10 10 16 3zm30 45q9-7 0-19-8-13-17-6-9 5 0 18t17 7zm42 42q8-8-4-19-12-12-20-3-9 8 4 19 12 12 20 3zm57 25q3-11-13-16-15-4-19 7t13 15q15 6 19-6zm63 5q0-13-17-11-16 0-16 11 0 13 17 11 16 0 16-11zm58-10q-2-11-18-9-16 3-14 15t18 8 14-14z"> - - Estrai.me is open source, check the code on Github - + Estrai.me is open source, check the code on Github
diff --git a/apps/estrai.me/src/app/pages/unauthorized/unauthorized.component.ts b/apps/estrai.me/src/app/pages/unauthorized/unauthorized.component.ts index 73917d8..88179c7 100644 --- a/apps/estrai.me/src/app/pages/unauthorized/unauthorized.component.ts +++ b/apps/estrai.me/src/app/pages/unauthorized/unauthorized.component.ts @@ -8,27 +8,17 @@ import { RouterModule } from '@angular/router'; imports: [CommonModule, RouterModule], template: ` -
+

401

-
- Unauthorized -
+
Unauthorized
diff --git a/apps/estrai.me/src/app/shared/component/footer/footer.component.ts b/apps/estrai.me/src/app/shared/component/footer/footer.component.ts index d53e960..693d03a 100644 --- a/apps/estrai.me/src/app/shared/component/footer/footer.component.ts +++ b/apps/estrai.me/src/app/shared/component/footer/footer.component.ts @@ -8,20 +8,17 @@ import { RouterModule } from '@angular/router'; imports: [CommonModule, RouterModule], template: `