Browse Source

upgrade archi with modules

develop
seraph 2 years ago
parent
commit
7029368ab1
  1. 4
      .storybook/main.js
  2. 20
      .storybook/tsconfig.json
  3. 4
      .storybook/typings.d.ts
  4. 43
      README.md
  5. 3
      angular.json
  6. 44
      backend-api-endpoints-doc.md
  7. 46
      backend-api-endpoints-doc.txt
  8. 18
      e2e/tsconfig.json
  9. 30
      package.json
  10. 52
      src/app/app-routing.module.ts
  11. 47
      src/app/app.component.html
  12. 13
      src/app/app.component.scss
  13. 52
      src/app/app.component.ts
  14. 79
      src/app/app.module.ts
  15. 10
      src/app/core/components/footer/footer.component.html
  16. 74
      src/app/core/components/header/header.component.html
  17. 0
      src/app/core/components/header/header.component.scss
  18. 12
      src/app/core/components/header/header.component.spec.ts
  19. 16
      src/app/core/components/header/header.component.ts
  20. 19
      src/app/core/components/home/home.component.html
  21. 0
      src/app/core/components/home/home.component.scss
  22. 0
      src/app/core/components/home/home.component.spec.ts
  23. 12
      src/app/core/components/home/home.component.ts
  24. 1
      src/app/core/components/login/login.component.html
  25. 0
      src/app/core/components/login/login.component.scss
  26. 24
      src/app/core/components/login/login.component.spec.ts
  27. 12
      src/app/core/components/login/login.component.ts
  28. 2
      src/app/core/components/logo/logo.component.html
  29. 1
      src/app/core/components/navbar/navbar.component.html
  30. 12
      src/app/core/components/navbar/navbar.component.ts
  31. 3
      src/app/core/components/page-not-found/page-not-found.component.html
  32. 0
      src/app/core/components/selectors/language-selector/language-selector.component.html
  33. 0
      src/app/core/components/selectors/language-selector/language-selector.component.scss
  34. 0
      src/app/core/components/selectors/language-selector/language-selector.component.spec.ts
  35. 4
      src/app/core/components/selectors/language-selector/language-selector.component.ts
  36. 0
      src/app/core/components/selectors/theme-selector/theme-selector.component.html
  37. 0
      src/app/core/components/selectors/theme-selector/theme-selector.component.scss
  38. 0
      src/app/core/components/selectors/theme-selector/theme-selector.component.spec.ts
  39. 4
      src/app/core/components/selectors/theme-selector/theme-selector.component.ts
  40. 23
      src/app/core/components/sibebar/navigation/navigation.component.html
  41. 0
      src/app/core/components/sibebar/navigation/navigation.component.scss
  42. 0
      src/app/core/components/sibebar/navigation/navigation.component.spec.ts
  43. 18
      src/app/core/components/sibebar/navigation/navigation.component.ts
  44. 25
      src/app/core/core.module.ts
  45. 6
      src/app/core/enums/message-severity.enum.ts
  46. 4
      src/app/core/enums/poll-type.enum.ts
  47. 5
      src/app/core/enums/user-role.enum.ts
  48. 5
      src/app/core/enums/workflow-step.enum.ts
  49. 16
      src/app/core/models/poll.model.ts
  50. 2
      src/app/core/models/user.model.ts
  51. 109
      src/app/core/services/api.service.ts
  52. 16
      src/app/core/services/message-displayer.service.spec.ts
  53. 19
      src/app/core/services/message-displayer.service.ts
  54. 16
      src/app/core/services/mocking.service.spec.ts
  55. 37
      src/app/core/services/mocking.service.ts
  56. 39
      src/app/core/services/poll.service.ts
  57. 2
      src/app/core/services/theme.service.ts
  58. 20
      src/app/core/services/user.service.ts
  59. 16
      src/app/core/services/workflow.service.spec.ts
  60. 30
      src/app/core/services/workflow.service.ts
  61. 2
      src/app/core/utils/poll-utils.service.ts
  62. 27
      src/app/features/administration/administration-routing.module.ts
  63. 13
      src/app/features/administration/administration.component.html
  64. 4
      src/app/features/administration/administration.component.ts
  65. 25
      src/app/features/administration/administration.module.ts
  66. 1
      src/app/features/administration/edit-configuration/edit-configuration.component.html
  67. 0
      src/app/features/administration/edit-configuration/edit-configuration.component.scss
  68. 24
      src/app/features/administration/edit-configuration/edit-configuration.component.spec.ts
  69. 12
      src/app/features/administration/edit-configuration/edit-configuration.component.ts
  70. 33
      src/app/features/administration/edit-description/edit-description.component.html
  71. 0
      src/app/features/administration/edit-description/edit-description.component.scss
  72. 24
      src/app/features/administration/edit-description/edit-description.component.spec.ts
  73. 41
      src/app/features/administration/edit-description/edit-description.component.ts
  74. 1
      src/app/features/administration/edit-options/edit-options.component.html
  75. 0
      src/app/features/administration/edit-options/edit-options.component.scss
  76. 24
      src/app/features/administration/edit-options/edit-options.component.spec.ts
  77. 12
      src/app/features/administration/edit-options/edit-options.component.ts
  78. 33
      src/app/features/administration/poll-edit/poll-edit.component.html
  79. 0
      src/app/features/administration/poll-edit/poll-edit.component.scss
  80. 24
      src/app/features/administration/poll-edit/poll-edit.component.spec.ts
  81. 41
      src/app/features/administration/poll-edit/poll-edit.component.ts
  82. 59
      src/app/features/administration/profile/profile.component.html
  83. 0
      src/app/features/administration/profile/profile.component.scss
  84. 24
      src/app/features/administration/profile/profile.component.spec.ts
  85. 24
      src/app/features/administration/profile/profile.component.ts
  86. 1
      src/app/features/administration/stepper/stepper.component.html
  87. 0
      src/app/features/administration/stepper/stepper.component.scss
  88. 24
      src/app/features/administration/stepper/stepper.component.spec.ts
  89. 51
      src/app/features/administration/stepper/stepper.component.ts
  90. 0
      src/app/features/old-stuff/config/DateUtilities.ts
  91. 6
      src/app/features/old-stuff/config/PollConfig.ts
  92. 0
      src/app/features/old-stuff/config/PollUtilities.ts
  93. 0
      src/app/features/old-stuff/config/defaultConfigs.ts
  94. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.metadata.json
  95. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/date-value-accessor.ts
  96. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/index.metadata.json
  97. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/index.ts
  98. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/module.metadata.json
  99. 0
      src/app/features/old-stuff/custom-lib/date-value-accessor/module.ts
  100. 46
      src/app/features/old-stuff/old-stuff-routing.module.ts
  101. Some files were not shown because too many files have changed in this diff Show More

4
.storybook/main.js

@ -1,4 +0,0 @@
module.exports = {
stories: ['../src/**/*.stories.ts'],
addons: ['@storybook/addon-actions', '@storybook/addon-links', '@storybook/addon-notes'],
};

20
.storybook/tsconfig.json

@ -1,20 +0,0 @@
{
"extends": "../tsconfig.app.json",
"compilerOptions": {
"types": [
"node"
]
},
"exclude": [
"../src/test.ts",
"../src/**/*.spec.ts",
"../projects/**/*.spec.ts"
],
"include": [
"../src/**/*",
"../projects/**/*"
],
"files": [
"./typings.d.ts"
]
}

4
.storybook/typings.d.ts vendored

@ -1,4 +0,0 @@
declare module '*.md' {
const content: string;
export default content;
}

43
README.md

@ -1,27 +1,26 @@
## LIBRARIES USED
| lib name | usage |
| ------------------------------------------------------------------ | -------------------------------------- |
| [axios](https://github.com/axios/axios) | http client |
| [bulma](https://bulma.io/) | CSS framework |
| [chart.js](https://www.chartjs.org/) | Generate beautiful graphs |
| [compodoc](https://compodoc.app/) | Generate technic documentation |
| [date-fns](https://date-fns.org) | manipulate dates |
| ESlint, Prettier, Lint-staged | Format & lint code |
| [font-awesome](https://github.com/FortAwesome/angular-fontawesome) | Icons collection |
| [fullcalendar](https://fullcalendar.io/docs/initialize-es6) | Manage & display calendars |
| [husky](https://www.npmjs.com/package/husky) | Hook actions on commit |
| [jest](https://jestjs.io/) | test engine |
| [locale-enum](https://www.npmjs.com/package/locale-enum) | enum of all locales |
| [ngx-clipboard](https://www.npmjs.com/package/ngx-clipboard) | Handle clipboard |
| [ngx-markdown](https://www.npmjs.com/package/ngx-markdown) | markdown parser |
| [ngx-toaster](https://www.npmjs.com/package/ngx-toaster) | toast notifications |
| [ngx-webstorage](https://www.npmjs.com/package/ngx-webstorage) | handle localStorage & webStorage |
| [primeNG](https://www.primefaces.org/primeng/) | UI components collection |
| [quill](https://www.npmjs.com/package/quill) | powerful rich text editor. WYSIWYG. |
| [storybook](https://storybook.js.org/) | StyleGuide UI |
| [ts-mockito](https://www.npmjs.com/package/ts-mockito) | Mocks for testing. |
| [uuid](https://www.npmjs.com/package/uuid) | handle client-side generation of uuids |
| status | lib name | usage |
| ------- | -------------------------------------------------------------- | -------------------------------------- |
| | [axios](https://github.com/axios/axios) | http client |
| | [bulma](https://bulma.io/) | CSS framework |
| | [chart.js](https://www.chartjs.org/) | Display graphs. (Commes with MomentJS) |
| | [compodoc](https://compodoc.app/) | Generate technic documentation |
| | [date-fns](https://date-fns.org) | manipulate dates |
| | ESlint, Prettier, Lint-staged | Format & lint code |
| | [fork-awesome](https://forkaweso.me) | Icons collection |
| | [fullcalendar](https://fullcalendar.io/docs/initialize-es6) | Manage & display calendars |
| | [husky](https://www.npmjs.com/package/husky) | Hook actions on commit |
| | [jest](https://jestjs.io/) | test engine |
| removed | [locale-enum](https://www.npmjs.com/package/locale-enum) | enum of all locales |
| | [ngx-clipboard](https://www.npmjs.com/package/ngx-clipboard) | Handle clipboard |
| | [ngx-markdown](https://www.npmjs.com/package/ngx-markdown) | markdown parser |
| | [ngx-webstorage](https://www.npmjs.com/package/ngx-webstorage) | handle localStorage & webStorage |
| | [primeNG](https://www.primefaces.org/primeng/) | UI components collection |
| | [quill](https://www.npmjs.com/package/quill) | powerful rich text editor. WYSIWYG. |
| removed | [storybook](https://storybook.js.org/) | StyleGuide UI |
| | [ts-mockito](https://www.npmjs.com/package/ts-mockito) | Mocks for testing. |
| | [uuid](https://www.npmjs.com/package/uuid) | handle client-side generation of uuids |
---

3
angular.json

@ -22,7 +22,6 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"node_modules/fork-awesome/css/fork-awesome.min.css",
@ -50,9 +49,11 @@
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"crossOrigin": "anonymous",
"budgets": [
{
"type": "initial",

44
backend-api-endpoints-doc.md

@ -1,44 +0,0 @@
// TODO: File to be deleted : just temporary documentation of backend API endpoints
/**
*
* -------------------------- -------- -------- ------ ------------------------------------------------
Name Method Scheme Host Path
-------------------------- -------- -------- ------ ------------------------------------------------
_twig_error_test ANY ANY ANY /_error/{code}.{_format}
api_get_poll_comment GET ANY ANY /poll/{id}/comments
api_new_comment POST ANY ANY /poll/{id}/comment
api_poll_comments_delete DELETE ANY ANY /poll/{id}/comments
api_send_user_polls GET ANY ANY /send-polls-to-user/{email}
homepageget_default GET ANY ANY /
api_get_all_polls GET ANY ANY /poll/
api_get_poll GET ANY ANY /poll/{id}
api_update_poll PUT ANY ANY /poll/{id}/{token}
api_new_poll POST ANY ANY /poll/
api_test-mail-poll GET ANY ANY /poll/mail/test-mail-poll/{emailChoice}
api_poll_delete DELETE ANY ANY /poll/{id}
api_clean_expired_polls GET ANY ANY /poll/clean-polls
api_check_slug_is_unique GET ANY ANY /poll/admin/{token}
api_new_vote_stack POST ANY ANY /poll/{id}/vote
api_update_vote_stack PATCH ANY ANY /vote-stack/{id}/token/{modifierToken}
api_poll_votes_delete DELETE ANY ANY /poll/{id}/votes/{accessToken}
app.swagger GET ANY ANY /doc.json
-------------------------- -------- -------- ------ ------------------------------------------------
*/
/**
* WANTED CHANGES (seraf)
* -------------------------- -------- -------- ------ ------------------------------------------------
Name Method Scheme Host Path
-------------------------- -------- -------- ------ ------------------------------------------------
api_get_poll_comment GET ANY ANY /poll/{id}/comment
api_delete_poll_comments DELETE ANY ANY /poll/{id}/comment
api_user_polls_send_by_email GET ANY ANY /user/{email}/polls/send-by-email
api_get_user_polls GET ANY ANY /user/{email}/polls
api_get_poll_slug GET ANY ANY /poll/slug/{id}/{token}
api_clean_expired_polls GET ANY ANY /admin/clean-polls/{token}
api_test-mail-poll GET ANY ANY /poll/mail/test-mail-poll/{emailChoice}
api_update_vote_stack PATCH ANY ANY /vote-stack/{id}/token/{modifierToken}
-------------------------- -------- -------- ------ ------------------------------------------------
*/

46
backend-api-endpoints-doc.txt

@ -0,0 +1,46 @@
// TODO: File to be deleted : just temporary documentation of backend API endpoints
/**
*
* -------------------------- -------- -------- ------ ------------------------------------------------
Name Method Scheme Host Path
-------------------------- -------- -------- ------ ------------------------------------------------
_twig_error_test ANY ANY ANY /_error/{code}.{_format}
admin_homepage_get_default GET ANY ANY /admin/
admin_homepage_clean_expired_polls GET ANY ANY /admin/polls/clean/{token}
api_get_poll_comment GET ANY ANY /polls/{id}/comments
api_new_comment POST ANY ANY /polls/{id}/comments
api_poll_comments_delete DELETE ANY ANY /polls/{id}/comments
user_homepageget_default GET ANY ANY /users/
user_homepage_polls_send_by_email GET ANY ANY /users/{email}/polls/send-by-email
api_get_all_polls GET ANY ANY /polls/
api_get_poll GET ANY ANY /polls/{id}
api_update_poll PUT ANY ANY /polls/{id}/{token}
api_new_poll POST ANY ANY /polls/
api_test-mail-polls GET ANY ANY /polls/mail/test-mail-polls/{emailChoice}
api_poll_delete DELETE ANY ANY /polls/{id}
api_check_slug_is_unique GET ANY ANY /polls/slugs/{slug}
api_get_admin_config GET ANY ANY /polls/admin/{token}
api_new_vote_stack POST ANY ANY /polls/{id}/votes
api_update_vote_stack PATCH ANY ANY /votes-stacks/{id}/token/{modifierToken}
api_poll_votes_delete DELETE ANY ANY /polls/{id}/votes/{accessToken}
app.swagger GET ANY ANY /api/doc.json
-------------------------- -------- -------- ------ ------------------------------------------------
*/
/**
* WANTED CHANGES (seraf)
* -------------------------- -------- -------- ------ ------------------------------------------------
Name Method Scheme Host Path
-------------------------- -------- -------- ------ ------------------------------------------------
api_get_poll_comment GET ANY ANY /polls/{id}/comment
api_delete_poll_comments DELETE ANY ANY /polls/{id}/comment
api_user_polls_send_by_email GET ANY ANY /users/{email}/polls/send-by-email
api_get_user_polls GET ANY ANY /users/{email}/polls
api_get_poll_slug GET ANY ANY /polls/slug/{id}/{token}
api_clean_expired_polls GET ANY ANY /admin/clean-polls/{token}
api_test-mail-polls GET ANY ANY /polls/mail/test-mail-polls/{emailChoice}
api_update_vote_stack PATCH ANY ANY /votes-stack/{id}/token/{modifierToken}
-------------------------- -------- -------- ------ ------------------------------------------------
*/

18
e2e/tsconfig.json

@ -1,13 +1,9 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": ["jasmine", "jasminewd2", "node"]
}
}

30
package.json

@ -5,11 +5,8 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"compodoc": "compodoc -p tsconfig.json",
"build": "ng build --crossOrigin=anonymous --prod",
"package": "cat dist/framadate/*.js > dist/framadate/framadate-scripts-bundled.js && ls -l dist/framadate",
"bld:pkg": "npm run build && npm run package",
"build:demo": "ng build --crossOrigin=anonymous --extractCss=true --progress=true --prod && npm run package",
"build": "ng build --prod --progress=true",
"build-prod-stats": "ng build --prod --stats-json",
"test": "jest",
"test:watch": "jest --watch",
"test:ci": "jest --runInBand",
@ -18,13 +15,12 @@
"format:check": "prettier --list-different \"src/{app,environments,assets}/**/*{.ts,.js,.json,.css,.scss}\"",
"format:all": "prettier --write \"src/**/*.{js,jsx,ts,tsx,md,html,css,scss}\"",
"trans": "ng xi18n --output-path=src/locale --i18n-locale=fr",
"storybook": "start-storybook -p 6006",
"build-storybook": "build-storybook"
"compodoc": "compodoc -p tsconfig.app.json"
},
"private": false,
"dependencies": {
"@angular/animations": "^9.1.1",
"@angular/cdk": "^9.2.0",
"@angular/cdk": "^9.2.2",
"@angular/common": "^9.0.7",
"@angular/compiler": "^9.0.7",
"@angular/core": "^9.0.7",
@ -39,13 +35,11 @@
"angular-date-value-accessor": "^1.0.2",
"axios": "^0.19.2",
"bulma": "^0.8.2",
"chart.js": "^2.8.0",
"chart.js": "^2.9.3",
"date-fns": "^2.12.0",
"fork-awesome": "^1.1.7",
"locale-enum": "^1.1.0",
"ngx-clipboard": "^13.0.0",
"ngx-markdown": "^9.0.0",
"ngx-toaster": "^1.0.1",
"ngx-webstorage": "^5.0.0",
"primeicons": "^2.0.0",
"primeng": "^9.0.6",
@ -53,7 +47,7 @@
"rxjs": "^6.5.5",
"rxjs-compat": "^6.5.5",
"tslib": "^1.11.1",
"uuid": "^7.0.3",
"uuid": "^8.0.0",
"zone.js": "^0.10.3"
},
"devDependencies": {
@ -64,25 +58,19 @@
"@angular/language-service": "^9.0.7",
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@storybook/addon-actions": "^5.3.18",
"@storybook/addon-links": "^5.3.18",
"@storybook/addon-notes": "^5.3.18",
"@storybook/addons": "^5.3.18",
"@storybook/angular": "^5.3.18",
"@babel/preset-typescript": "^7.9.0",
"@compodoc/compodoc": "^1.1.11",
"@types/jest": "^25.2.1",
"@types/node": "^13.13.2",
"@types/uuid": "^7.0.2",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"babel-jest": "^25.4.0",
"babel-loader": "^8.1.0",
"babel-polyfill": "^6.26.0",
"compodoc": "^0.0.41",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-prettier": "^3.1.3",
"husky": "^4.2.5",
"jest": "^25.4.0",
"jest": "^25.5.1",
"jest-environment-jsdom-sixteen": "^1.0.3",
"jest-preset-angular": "^8.1.3",
"lint-staged": "^10.1.7",

52
src/app/app-routing.module.ts

@ -1,45 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { PageNotFoundComponent } from './core/components/page-not-found/page-not-found.component';
import { AdminComponent } from './pages/admin/admin.component';
import { AnswersComponent } from './pages/answers/answers.component';
import { CreateOrRetrieveComponent } from './pages/create-or-retrieve/create-or-retrieve.component';
import { DatesComponent } from './pages/dates/dates.component';
import { EndConfirmationComponent } from './pages/end-confirmation/end-confirmation.component';
import { BaseComponent } from './pages/example/base-page/base.component';
import { KindComponent } from './pages/example/kind/kind.component';
import { PicturesComponent } from './pages/example/pictures/pictures.component';
import { HomeComponent } from './pages/home/home.component';
import { PasswordComponent } from './pages/password/password.component';
import { PollDisplayComponent } from './pages/poll/poll-display/poll-display.component';
import { PollGraphicComponent } from './pages/poll/poll-graphic/poll-graphic.component';
import { ResumeComponent } from './pages/resume/resume.component';
import { VisibilityComponent } from './pages/visibility/visibility.component';
import { VotingChoiceComponent } from './pages/voting/voting-choice/voting-choice.component';
import { VotingComponent } from './pages/voting/voting.component';
import { HomeComponent } from './core/components/home/home.component';
import { LoginComponent } from './core/components/login/login.component';
import { PageNotFoundComponent } from './shared/components/page-not-found/page-not-found.component';
const routes: Routes = [
{ path: '', redirectTo: 'step/creation', pathMatch: 'full' },
{ path: 'admin/:token', component: AdminComponent }, // http://localhost:4200/#/admin/srfdgedsTGETHRYJtujTUjTUkTIUKTK
{ path: 'home', component: HomeComponent },
{ path: 'base', component: BaseComponent },
{ path: 'step/base', component: BaseComponent },
{ path: 'step/creation', component: CreateOrRetrieveComponent },
{ path: 'step/date', component: DatesComponent },
{ path: 'step/kind', component: KindComponent },
{ path: 'step/answers', component: AnswersComponent },
{ path: 'step/admin', component: AdminComponent },
{ path: 'step/pictures', component: PicturesComponent },
{ path: 'step/visibility', component: VisibilityComponent },
{ path: 'step/resume', component: ResumeComponent },
{ path: 'step/end', component: EndConfirmationComponent },
{ path: 'graphic/:poll', component: PollGraphicComponent },
{ path: 'vote/poll/id/:poll', component: PollDisplayComponent },
{ path: 'vote/poll/slug/:pollSlug', component: PollDisplayComponent },
{ path: 'votingchoice', component: VotingChoiceComponent },
{ path: 'voting', component: VotingComponent },
{ path: 'step/password', component: PasswordComponent },
{ path: '', component: HomeComponent },
{ path: 'login', component: LoginComponent },
{
path: 'administration',
loadChildren: () =>
@ -49,11 +17,19 @@ const routes: Routes = [
path: 'participation',
loadChildren: () => import('./features/participation/participation.module').then((m) => m.ParticipationModule),
},
{
path: 'oldstuff',
loadChildren: () => import('./features/old-stuff/old-stuff.module').then((m) => m.OldStuffModule),
},
{ path: '**', component: PageNotFoundComponent },
];
@NgModule({
imports: [RouterModule.forRoot(routes, { useHash: true, anchorScrolling: 'enabled' })],
imports: [
RouterModule.forRoot(routes, {
// enableTracing: true, // <-- debugging purposes only
}),
],
exports: [RouterModule],
})
export class AppRoutingModule {}

47
src/app/app.component.html

@ -1,42 +1,15 @@
<div id="big_container" [class]="themeClass">
<header class="big-header">
<div class="container">
<div class="columns is-mobile is-vcentered">
<div class="column is-pulled-left has-addons">
<img
(click)="toggleMenu()"
alt="menu icon"
class="menu_icon clickable"
src="assets/img/icone-menu.svg"
/>
<br />
<span (click)="toggleMenu()" class="menu_label">Menu</span>
</div>
<div class="column">
<app-logo></app-logo>
</div>
<div class="column">
<app-theme-selector></app-theme-selector>
</div>
<div class="column">
<app-language-selector></app-language-selector>
</div>
</div>
</div>
</header>
<app-header [isSidebarOpened]="isSidebarOpened" (toggleSidebarEE)="toggleSidebar($event)"></app-header>
<main>
<div class="container">
<div class="columns is-mobile">
<div class="column is-one-quarter togglable-menu" *ngIf="config.menuVisible">
<app-navigation [step]="step"></app-navigation>
<app-debugger *ngIf="isDebugMode"></app-debugger>
</div>
<div class="column">
<router-outlet></router-outlet>
</div>
</div>
</div>
<router-outlet></router-outlet>
</main>
<p-toast position="top-right"></p-toast>
<app-footer></app-footer>
</div>
<p-toast position="bottom-center"></p-toast>
<p-sidebar [(visible)]="isSidebarOpened">
<app-navigation></app-navigation>
</p-sidebar>

13
src/app/app.component.scss

@ -1,13 +0,0 @@
@charset "UTF-8";
.big-header {
padding: 0.5rem;
}
i {
display: block;
}
.language-selector {
width: auto;
}

52
src/app/app.component.ts

@ -1,14 +1,12 @@
import { DOCUMENT } from '@angular/common';
import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { NavigationStart, Router } from '@angular/router';
import { Observable, Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { Subscription } from 'rxjs';
import { environment } from '../environments/environment';
import { Theme } from './core/enums/theme.enum';
import { UserRole } from './core/enums/user-role.enum';
import { MockingService } from './core/services/mocking.service';
import { ThemeService } from './core/services/theme.service';
import { ConfigService } from './services/config.service';
@Component({
selector: 'app-root',
@ -18,24 +16,19 @@ import { ConfigService } from './services/config.service';
export class AppComponent implements OnInit, OnDestroy {
public appTitle: string = environment.appTitle;
public themeClass: string;
public isDebugMode = false;
public isSidebarOpened = false;
private themeSubscription: Subscription;
public step: string;
constructor(
private titleService: Title,
private themeService: ThemeService,
public config: ConfigService,
@Inject(DOCUMENT) private document,
private router: Router
private mockingService: MockingService
) {}
ngOnInit(): void {
if (!environment.production) {
this.isDebugMode = true;
this.appTitle += ' | DEV';
console.info(' ######### framadate | DEV ######### we are NOT in production env, filling with mock values');
this.appTitle += ' [DEV]';
this.mockingService.loadUser(UserRole.REGISTERED);
}
this.titleService.setTitle(this.appTitle);
this.themeSubscription = this.themeService.theme.subscribe((theme: Theme) => {
@ -50,8 +43,6 @@ export class AppComponent implements OnInit, OnDestroy {
this.themeClass = 'theme-light-watermelon';
}
});
this.detectCurrentTabOnRouteChange();
}
ngOnDestroy(): void {
@ -60,30 +51,7 @@ export class AppComponent implements OnInit, OnDestroy {
}
}
public detectCurrentTabOnRouteChange(): void {
this.router.events
.pipe(filter((event) => event instanceof NavigationStart))
.subscribe((event: NavigationStart) => {
this.scrollGoToTop();
this.updateCurrentTab(event);
// only if there is a poll ID
this.config.fetchPollFromRoute(event);
});
}
public scrollGoToTop(): void {
this.document.documentElement.scrollTop = 0;
}
public updateCurrentTab(event): void {
if (event.url) {
const tab: string[] = event.url.split('/');
this.step = tab && tab[2] ? tab[2] : 'home';
}
}
public toggleMenu(): void {
// TODO: move this logic elsewhere, probably in Navbar component
this.config.menuVisible = !this.config.menuVisible;
public toggleSidebar(status: boolean): void {
this.isSidebarOpened = status === true;
}
}

79
src/app/app.module.ts

@ -15,48 +15,13 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { ClipboardModule } from 'ngx-clipboard';
import { MarkdownModule } from 'ngx-markdown';
import { NgxWebstorageModule } from 'ngx-webstorage';
import { ConfirmationService, MessageModule, MessageService } from 'primeng';
import { ConfirmDialogModule } from 'primeng/confirmdialog';
import { DialogModule } from 'primeng/dialog';
import { ToastModule } from 'primeng/toast';
import { environment } from '../environments/environment';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { CoreModule } from './core/core.module';
import { DateValueAccessorModule } from './custom-lib/date-value-accessor';
import { AdminComponent } from './pages/admin/admin.component';
import { AnswersComponent } from './pages/answers/answers.component';
import { CreateOrRetrieveComponent } from './pages/create-or-retrieve/create-or-retrieve.component';
import { DatesComponent } from './pages/dates/dates.component';
import { EndConfirmationComponent } from './pages/end-confirmation/end-confirmation.component';
import { BaseComponent } from './pages/example/base-page/base.component';
import { KindComponent } from './pages/example/kind/kind.component';
import { PicturesComponent } from './pages/example/pictures/pictures.component';
import { HomeComponent } from './pages/home/home.component';
import { PasswordComponent } from './pages/password/password.component';
import { PollDisplayComponent } from './pages/poll/poll-display/poll-display.component';
import { PollGraphicComponent } from './pages/poll/poll-graphic/poll-graphic.component';
import { ResumeComponent } from './pages/resume/resume.component';
import { VisibilityComponent } from './pages/visibility/visibility.component';
import { ChoicesListComponent } from './pages/voting/choices-list/choices-list.component';
import { CommentsListComponent } from './pages/voting/comments-list/comments-list.component';
import { VotingChoiceComponent } from './pages/voting/voting-choice/voting-choice.component';
import { VotingCommentComponent } from './pages/voting/voting-comment/voting-comment.component';
import { VotingGraphComponent } from './pages/voting/voting-graph/voting-graph.component';
import { VotingNavigationComponent } from './pages/voting/voting-navigation/voting-navigation.component';
import { VotingSummaryComponent } from './pages/voting/voting-summary/voting-summary.component';
import { VotingComponent } from './pages/voting/voting.component';
import { ConfigService } from './services/config.service';
import { OldStuffModule } from './features/old-stuff/old-stuff.module';
import { SharedModule } from './shared/shared.module';
import { CopyTextComponent } from './ui/copy-text/copy-text.component';
import { DebuggerComponent } from './ui/debugger/debugger.component';
import { ResettableInputDirective } from './ui/directives/resettable-input.directive';
import { ErasableInputComponent } from './ui/erasable-input/erasable-input.component';
import { NavigationComponent } from './ui/navigation/navigation.component';
import { TwoLinksComponent } from './ui/navigation/two-links/two-links.component';
import { LanguageSelectorComponent } from './ui/selectors/language-selector/language-selector.component';
import { ThemeSelectorComponent } from './ui/selectors/theme-selector/theme-selector.component';
export class MyMissingTranslationHandler implements MissingTranslationHandler {
public handle(params: MissingTranslationHandlerParams): string {
@ -69,56 +34,19 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
}
@NgModule({
declarations: [
AdminComponent,
AnswersComponent,
AppComponent,
BaseComponent,
ChoicesListComponent,
CommentsListComponent,
CopyTextComponent,
CreateOrRetrieveComponent,
DatesComponent,
DebuggerComponent,
EndConfirmationComponent,
ErasableInputComponent,
HomeComponent,
KindComponent,
NavigationComponent,
PasswordComponent,
PicturesComponent,
PollDisplayComponent,
PollGraphicComponent,
ResettableInputDirective,
ResumeComponent,
ThemeSelectorComponent,
TwoLinksComponent,
VisibilityComponent,
VotingChoiceComponent,
VotingGraphComponent,
VotingComponent,
VotingCommentComponent,
VotingSummaryComponent,
VotingNavigationComponent,
LanguageSelectorComponent,
],
declarations: [AppComponent],
imports: [
AppRoutingModule,
BrowserAnimationsModule,
BrowserModule,
ClipboardModule,
CommonModule,
ConfirmDialogModule,
CoreModule,
DateValueAccessorModule,
DialogModule,
FormsModule,
HttpClientModule,
MarkdownModule.forRoot(),
MessageModule,
NgxWebstorageModule.forRoot({ prefix: environment.localStorage.key }),
SharedModule,
ToastModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
@ -131,8 +59,9 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
},
useDefaultLang: false,
}),
OldStuffModule,
],
providers: [ConfigService, ConfirmationService, MessageService, Title, TranslateService],
providers: [Title, TranslateService],
bootstrap: [AppComponent],
})
export class AppModule {}

10
src/app/core/components/footer/footer.component.html

@ -1 +1,9 @@
<p>footer works!</p>
<footer class="footer">
<div class="content has-text-centered">
<p>
<strong>Bulma</strong> by <a href="https://jgthms.com">Jeremy Thomas</a>. The source code is licensed
<a href="http://opensource.org/licenses/mit-license.php">MIT</a>. The website content is licensed
<a href="http://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY NC SA 4.0</a>.
</p>
</div>
</footer>

74
src/app/core/components/header/header.component.html

@ -0,0 +1,74 @@
<header>
<nav class="navbar" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
<a class="navbar-item">
<a class="navbar-item" role="button" (click)="toggleSidebarOpening()"> Dev menu </a>
</a>
<a
role="button"
class="navbar-burger burger"
aria-label="menu"
aria-expanded="false"
data-target="navbarBasicExample"
>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-start">
<a class="navbar-item" routerLink="/" routerLinkActive="is-active">
Home
</a>
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link"> Menu </a>
<div class="navbar-dropdown">
<a class="navbar-item" routerLink="administration" routerLinkActive="is-active">
Créer un sondage
</a>
<a class="navbar-item" routerLink="administration/profile" routerLinkActive="is-active">
Mes sondages
</a>
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link"> Modules </a>
<div class="navbar-dropdown">
<a class="navbar-item" routerLink="administration" routerLinkActive="is-active">
Administration
</a>
<a class="navbar-item" routerLink="participation" routerLinkActive="is-active">
Participation
</a>
<a class="navbar-item" routerLink="oldstuff" routerLinkActive="is-active">
Old stuff
</a>
</div>
</div>
</div>
<div class="navbar-item">
<app-theme-selector></app-theme-selector>
</div>
<div class="navbar-item">
<app-language-selector></app-language-selector>
</div>
<div class="navbar-end">
<div class="navbar-item">
<div class="buttons">
<a class="button is-primary">
<strong>Sign up</strong>
</a>
<a class="button is-light">
Log in
</a>
</div>
</div>
</div>
</div>
</nav>
</header>

0
src/app/core/components/navbar/navbar.component.scss → src/app/core/components/header/header.component.scss

12
src/app/core/components/navbar/navbar.component.spec.ts → src/app/core/components/header/header.component.spec.ts

@ -1,19 +1,19 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NavbarComponent } from './navbar.component';
import { HeaderComponent } from './header.component';
describe('NavbarComponent', () => {
let component: NavbarComponent;
let fixture: ComponentFixture<NavbarComponent>;
describe('HeaderComponent', () => {
let component: HeaderComponent;
let fixture: ComponentFixture<HeaderComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [NavbarComponent],
declarations: [HeaderComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NavbarComponent);
fixture = TestBed.createComponent(HeaderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

16
src/app/core/components/header/header.component.ts

@ -0,0 +1,16 @@
import { Component, EventEmitter, Output, Input } from '@angular/core';
@Component({
selector: 'app-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss'],
})
export class HeaderComponent {
@Input() isSidebarOpened: boolean;
@Output() toggleSidebarEE = new EventEmitter<boolean>();
public toggleSidebarOpening(): void {
this.isSidebarOpened = !this.isSidebarOpened;
this.toggleSidebarEE.emit(this.isSidebarOpened);
}
}

19
src/app/core/components/home/home.component.html

@ -0,0 +1,19 @@
<section class="hero">
<div class="hero-body">
<div class="container">
<h1 class="title">
Bienvenue sur Framasondage
</h1>
<h2 class="subtitle">
Se consulter simplement pour s’organiser collectivement.
</h2>
<div class="columns">
<div class="column">
<a role="button" class="button is-fullwidth" routerLink="administration">
Créer un nouveau sondage
</a>
</div>
</div>
</div>
</div>
</section>

0
src/app/pages/home/home.component.scss → src/app/core/components/home/home.component.scss

0
src/app/pages/home/home.component.spec.ts → src/app/core/components/home/home.component.spec.ts

12
src/app/core/components/home/home.component.ts

@ -0,0 +1,12 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss'],
})
export class HomeComponent implements OnInit {
constructor() {}
ngOnInit(): void {}
}

1
src/app/core/components/login/login.component.html

@ -0,0 +1 @@
<p>login works!</p>

0
src/app/core/components/page-not-found/page-not-found.component.scss → src/app/core/components/login/login.component.scss

24
src/app/core/components/login/login.component.spec.ts

@ -0,0 +1,24 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LoginComponent } from './login.component';
describe('LoginComponent', () => {
let component: LoginComponent;
let fixture: ComponentFixture<LoginComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [LoginComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(LoginComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

12
src/app/core/components/login/login.component.ts

@ -0,0 +1,12 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
styleUrls: ['./login.component.scss'],
})
export class LoginComponent implements OnInit {
constructor() {}
ngOnInit(): void {}
}

2
src/app/core/components/logo/logo.component.html

@ -1,5 +1,5 @@
<div class="home_link">
<a class="button" routerLink="/home" aria-roledescription="home">
<a class="button" routerLink="/" aria-roledescription="home">
<h1>
<span class="logo_first">Frama</span>
<span class="logo_second">Sondage</span>

1
src/app/core/components/navbar/navbar.component.html

@ -1 +0,0 @@
<p>navbar works!</p>

12
src/app/core/components/navbar/navbar.component.ts

@ -1,12 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-navbar',
templateUrl: './navbar.component.html',
styleUrls: ['./navbar.component.scss'],
})
export class NavbarComponent implements OnInit {
constructor() {}
ngOnInit(): void {}
}

3
src/app/core/components/page-not-found/page-not-found.component.html

@ -1,3 +0,0 @@
<div class="hero">
This page doesn't exist.
</div>

0
src/app/ui/selectors/language-selector/language-selector.component.html → src/app/core/components/selectors/language-selector/language-selector.component.html

0
src/app/ui/selectors/language-selector/language-selector.component.scss → src/app/core/components/selectors/language-selector/language-selector.component.scss

0
src/app/ui/selectors/language-selector/language-selector.component.spec.ts → src/app/core/components/selectors/language-selector/language-selector.component.spec.ts

4
src/app/ui/selectors/language-selector/language-selector.component.ts → src/app/core/components/selectors/language-selector/language-selector.component.ts

@ -1,8 +1,8 @@
import { Component, DoCheck, OnInit } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { Language } from '../../../core/enums/language.enum';
import { StorageService } from '../../../core/services/storage.service';
import { Language } from '../../../enums/language.enum';
import { StorageService } from '../../../services/storage.service';
@Component({
selector: 'app-language-selector',

0
src/app/ui/selectors/theme-selector/theme-selector.component.html → src/app/core/components/selectors/theme-selector/theme-selector.component.html

0
src/app/pages/answers/answers.component.scss → src/app/core/components/selectors/theme-selector/theme-selector.component.scss

0
src/app/ui/selectors/theme-selector/theme-selector.component.spec.ts → src/app/core/components/selectors/theme-selector/theme-selector.component.spec.ts

4
src/app/ui/selectors/theme-selector/theme-selector.component.ts → src/app/core/components/selectors/theme-selector/theme-selector.component.ts

@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { Theme } from '../../../core/enums/theme.enum';
import { ThemeService } from '../../../core/services/theme.service';
import { Theme } from '../../../enums/theme.enum';
import { ThemeService } from '../../../services/theme.service';
@Component({
selector: 'app-theme-selector',

23
src/app/core/components/sibebar/navigation/navigation.component.html

@ -0,0 +1,23 @@
<nav>
<a class="button" routerLink="administration" routerLinkActive="active"> AdministrationModule</a>
<a class="button" routerLink="participation/poll/SuperCustomSlug" routerLinkActive="active">
Participate to poll/SuperCustomSlug
</a>
<hr />
<a class="button" routerLink="oldstuff/home" routerLinkActive="active"> <i class="fa fa-home"></i> Accueil </a>
<a class="button" routerLink="oldstuff/step/creation" routerLinkActive="active"> Création </a>
<a class="button" routerLink="oldstuff/step/date" routerLinkActive="active"> Les Dates </a>
<a class="button" routerLink="oldstuff/step/answers" routerLinkActive="active"> Réponses </a>
<a class="button" routerLink="oldstuff/step/visibility" routerLinkActive="active"> Visibilité </a>
<a class="button" routerLink="oldstuff/step/resume" routerLinkActive="active"> Résumé </a>
<a class="button" routerLink="oldstuff/step/end" routerLinkActive="active"> Confirmation </a>
<a class="button" routerLink="oldstuff/step/admin"> Administration </a>
<hr />
<a class="button" routerLink="oldstuff/step/kind" routerLinkActive="active"> Page démo </a>
<a class="button" routerLink="oldstuff/vote/poll/id/1" routerLinkActive="active"> Sondage 1 </a>
<a class="button" routerLink="oldstuff/vote/poll/id/2" routerLinkActive="active"> Sondage 2 </a>
<a class="button" routerLink="oldstuff/vote/poll/id/3" routerLinkActive="active"> Sondage 3 (dessins animés) </a>
<a class="button" routerLink="oldstuff/graphic/toto" routerLinkActive="active"> Graphique </a>
</nav>

0
src/app/pages/example/base-page/base.component.scss → src/app/core/components/sibebar/navigation/navigation.component.scss

0
src/app/ui/navigation/navigation.component.spec.ts → src/app/core/components/sibebar/navigation/navigation.component.spec.ts

18
src/app/core/components/sibebar/navigation/navigation.component.ts

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { MockingService } from '../../../services/mocking.service';
import { Poll } from '../../../models/poll.model';
@Component({
selector: 'app-navigation',
templateUrl: './navigation.component.html',
styleUrls: ['./navigation.component.scss'],
})
export class NavigationComponent implements OnInit {
public pollsDatabase: Poll[] = [];
constructor(private mockingService: MockingService) {}
ngOnInit(): void {
this.pollsDatabase = this.mockingService.pollsDatabase;
}
}

25
src/app/core/core.module.ts

@ -1,17 +1,32 @@
import { CommonModule } from '@angular/common';
import { NgModule, Optional, SkipSelf } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { FooterComponent } from './components/footer/footer.component';
import { HeaderComponent } from './components/header/header.component';
import { HomeComponent } from './components/home/home.component';
import { LoginComponent } from './components/login/login.component';
import { LogoComponent } from './components/logo/logo.component';
import { NavbarComponent } from './components/navbar/navbar.component';
import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component';
import { LanguageSelectorComponent } from './components/selectors/language-selector/language-selector.component';
import { ThemeSelectorComponent } from './components/selectors/theme-selector/theme-selector.component';
import { NavigationComponent } from './components/sibebar/navigation/navigation.component';
import { throwIfAlreadyLoaded } from './guards/module-import.guard';
@NgModule({
declarations: [FooterComponent, LogoComponent, NavbarComponent, PageNotFoundComponent],
imports: [CommonModule, RouterModule],
exports: [FooterComponent, LogoComponent, NavbarComponent, PageNotFoundComponent],
declarations: [
FooterComponent,
HeaderComponent,
HomeComponent,
LanguageSelectorComponent,
LoginComponent,
LogoComponent,
NavigationComponent,
ThemeSelectorComponent,
],
imports: [CommonModule, FormsModule, RouterModule, TranslateModule],
exports: [HeaderComponent, FooterComponent, NavigationComponent, LoginComponent, LogoComponent],
})
export class CoreModule {
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {

6
src/app/core/enums/message-severity.enum.ts

@ -0,0 +1,6 @@
export enum MessageSeverity {
SUCCESS = 'success',
INFO = 'info',
WARN = 'warn',
ERROR = 'error',
}

4
src/app/core/enums/poll-type.enum.ts

@ -1,4 +0,0 @@
export enum PollType {
CLASSIC = 'CLASSIC',
DATES = 'DATES',
}

5
src/app/core/enums/user-role.enum.ts

@ -0,0 +1,5 @@
export enum UserRole {
ANONYMOUS = 'ANONYMOUS',
REGISTERED = 'ADMIN',
ADMIN = 'ADMIN',
}

5
src/app/core/enums/workflow-step.enum.ts

@ -0,0 +1,5 @@
export enum WorkflowStep {
DESCRIPTION = 'DESCRIPTION',
OPTIONS = 'OPTIONS',
CONFIGURATION = 'CONFIGURATION',
}

16
src/app/core/models/poll.model.ts

@ -1,19 +1,23 @@
import { PollType } from '../enums/poll-type.enum';
import { Answer } from './answer.model';
import { PollConfig } from './poll-config.model';
import { PollOption } from './poll-options.model';
import { User } from './user.model';
import { environment } from 'src/environments/environment';
export class Poll {
constructor(
public id: string,
public slug: string,
public type: PollType,
public isDateType: boolean,
public title: string,
public description: string,
public owner: User,
public config: PollConfig,
public slug: string,
public id: string,
public owner?: User,
public config?: PollConfig,
public options: PollOption[] = [],
public answers: Answer[] = []
) {}
public getUrl(): string {
return `${environment.api.baseHref}/${this.slug}`;
}
}

2
src/app/core/models/user.model.ts

@ -1,7 +1,9 @@
import { Poll } from './poll.model';
import { UserRole } from '../enums/user-role.enum';
export class User {
constructor(
public role: UserRole = UserRole.ANONYMOUS,
public isOwner: boolean = false,
public pseudo?: string,
public email?: string,

109
src/app/core/services/api.service.ts

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import axios, { AxiosResponse } from 'axios';
import axios, { AxiosInstance, AxiosResponse } from 'axios';
import { environment } from 'src/environments/environment';
import { Poll } from '../models/poll.model';
@ -9,14 +9,26 @@ import { User } from '../models/user.model';
providedIn: 'root',
})
export class ApiService {
private axiosInstance: AxiosInstance;
private readonly pollsEndpoint = environment.api.endpoints.polls.name;
private readonly commentsEndpoint = environment.api.endpoints.polls.comments.name;
private readonly votesEndpoint = environment.api.endpoints.polls.votes.name;
private readonly slugsEndpoint = environment.api.endpoints.polls.slugs.name;
private readonly votesStacksEndpoint = environment.api.endpoints.voteStack.name;
private readonly usersEndpoint = environment.api.endpoints.users.name;
private readonly usersPollsEndpoint = environment.api.endpoints.users.polls.name;
private readonly usersPollsSendEmailEndpoint = environment.api.endpoints.users.polls.sendEmail.name;
constructor() {
this.axiosInstance = axios.create({ baseURL: environment.api.baseHref });
}
////////////
// CREATE //
////////////
public async savePoll(poll: Poll): Promise<void> {
try {
await axios.post(`${environment.api.baseHref}${environment.api.endpoints.poll.name}`, {
params: { config: poll.config },
});
await this.axiosInstance.post(`${this.pollsEndpoint}`, { params: { config: poll.config } });
} catch (error) {
this.handleError(error);
}
@ -25,10 +37,9 @@ export class ApiService {
public async saveVote(poll: Poll): Promise<void> {
try {
// TODO: add the votestack in the params
await axios.post(
`${environment.api.baseHref}${environment.api.endpoints.poll.name}/${poll.id}${environment.api.endpoints.poll.vote.name}`,
{ params: { voteStack: {} } }
);
await this.axiosInstance.post(`${this.pollsEndpoint}/${poll.id}${this.votesEndpoint}`, {
params: { voteStack: {} },
});
} catch (error) {
this.handleError(error);
}
@ -37,10 +48,9 @@ export class ApiService {
public async saveComment(poll: Poll, comment: string): Promise<void> {
try {
// TODO: add the comment in the params
await axios.post(
`${environment.api.baseHref}${environment.api.endpoints.poll.name}/${poll.id}${environment.api.endpoints.poll.comment.name}`,
{ params: { comment } }
);
await this.axiosInstance.post(`${this.pollsEndpoint}/${poll.id}${this.commentsEndpoint}`, {
params: { comment },
});
} catch (error) {
this.handleError(error);
}
@ -52,22 +62,27 @@ export class ApiService {
public async isSlugAvailable(slug: string): Promise<boolean> {
try {
// TODO: scenario should be : if we can get this slug, it exists. if not, it doesn't. It's just a GET.
const response: AxiosResponse = await axios.get(
`${environment.api.baseHref}${environment.api.endpoints.poll.slug.name}/${slug}`
const response: AxiosResponse = await this.axiosInstance.get(
`${this.pollsEndpoint}${this.slugsEndpoint}/${slug}`
);
return response && response.status === 404 ? true : false;
if (response?.status !== 404) {
return false;
}
} catch (error) {
this.handleError(error);
if (error.response?.status === 404) {
return true;
} else {
this.handleError(error);
}
}
}
public async sendEmailToUserOfItsPollsList(email: string): Promise<Poll[]> {
public async sendEmailToUserOfItsPollsList(user: User): Promise<void> {
// If user is not authenticated: the list of polls is send to user's email by the backend.
try {
const response: AxiosResponse<Poll[]> = await axios.get<Poll[]>(
`${environment.api.baseHref}${environment.api.endpoints.user.polls.sendEmail.name}/${email}`
await this.axiosInstance.get<Poll[]>(
`${this.usersEndpoint}/${user.email}${this.usersPollsEndpoint}${this.usersPollsSendEmailEndpoint}`
);
return response ? response.data : [];
} catch (error) {
this.handleError(error);
}
@ -77,35 +92,28 @@ export class ApiService {
// If user is authenticated : retrieve polls & display directly in frontend.
// TODO: Backend should handle this case. Actually the endpoint doesn't exist in backend.
try {
const response: AxiosResponse<Poll[]> = await axios.get<Poll[]>(
`${environment.api.baseHref}${environment.api.endpoints.user.polls.name}/${user.email}`
const response: AxiosResponse<Poll[]> = await this.axiosInstance.get<Poll[]>(
`${this.usersEndpoint}/${user.email}${this.usersPollsEndpoint}`
);
return response ? response.data : [];
return response?.data;
} catch (error) {
this.handleError(error);
}
}
public async getPollsByUrl(url: string): Promise<Poll[]> {
public async getPollByIdentifier(identifier: string): Promise<Poll | undefined> {
// TODO: identifier should be decided according to backend : Id || Slug ?
try {