Skip to content

Commit

Permalink
Merge branch 'main' into LMST2-58-Detail-Association
Browse files Browse the repository at this point in the history
  • Loading branch information
marion-sgr authored Jun 5, 2024
2 parents 2bf3499 + 4098e57 commit 0c7a059
Show file tree
Hide file tree
Showing 13 changed files with 1,573 additions and 614 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Run `ng generate component component-name` to generate a new component. You can

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.

## Documentation

Run `npm run doc` to generate the documentation. The documentation will be stored in the `documentation/` directory.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
Expand Down
358 changes: 247 additions & 111 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"build": "ng build",
"build:prod": "ng build --configuration production",
"watch": "ng build --watch --configuration development",
"test": "ng test"
"test": "ng test",
"doc": "npx compodoc -p tsconfig.doc.json"
},
"private": true,
"dependencies": {
Expand All @@ -26,7 +27,7 @@
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@tinymce/tinymce-angular": "^7.0.0",
"@tinymce/tinymce-angular": "^8.0.0",
"ngx-toastr": "^18.0.0",
"primeicons": "^7.0.0",
"primeng": "^16.9.1",
Expand All @@ -36,7 +37,7 @@
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.2.5",
"@angular-devkit/build-angular": "^16.2.14",
"@angular/cli": "^16.2.5",
"@angular/compiler-cli": "^16.2.0",
"@types/jasmine": "~4.3.0",
Expand Down
5 changes: 5 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { ErreurComponent } from './components/erreur/erreur.component';
import { AuthGuard } from '@auth0/auth0-angular';
import { TchatComponent } from './components/tchat/tchat.component';
import { AssociationsDetailsComponent } from './components/associations/associations-details/associations-details.component';
import { BugComponent } from './components/bug/bug.component';

const routes: Routes = [
{
Expand Down Expand Up @@ -79,6 +80,10 @@ const routes: Routes = [
path : 'callback',
component : HomeComponent
},
{
path: 'bug',
component: BugComponent
},
{
path: '**',
redirectTo: 'erreur',
Expand Down
3 changes: 3 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ import { TchatMessageComponent } from './components/tchat/tchat-message/tchat-me
import { FileUploadModule } from 'primeng/fileupload';
import { AccordionModule } from 'primeng/accordion';
import { ToastModule } from 'primeng/toast';
import { BugComponent } from './components/bug/bug.component';


import { AssociationsDetailsComponent } from './components/associations/associations-details/associations-details.component';

Expand All @@ -69,6 +71,7 @@ import { AssociationsDetailsComponent } from './components/associations/associat
TchatIconComponent,
TchatMessageComponent,
AssociationsDetailsComponent,
BugComponent,
],
imports: [
BrowserModule,
Expand Down
5 changes: 5 additions & 0 deletions src/app/components/bug/bug.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- bug-report.component.html -->
<div class="iframe-container">
<iframe scrolling="no" data-tally-src="https://tally.so/embed/woBOee" width="100%" height="100%" frameborder="0" marginheight="0" marginwidth="0" title="Signaler un bug" style="width: 100%; height: 100%; border: none; scrollbar-width: none!important;"></iframe>
</div>

19 changes: 19 additions & 0 deletions src/app/components/bug/bug.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* bug-report.component.css */
.iframe-container {
position: relative;
width: 100%;
height: 100vh; /* Utilisez 100vh pour occuper toute la hauteur de la fenêtre */
overflow: hidden;
}

.iframe-container iframe {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
border: none;
}

21 changes: 21 additions & 0 deletions src/app/components/bug/bug.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { BugComponent } from './bug.component';

describe('BugComponent', () => {
let component: BugComponent;
let fixture: ComponentFixture<BugComponent>;

beforeEach(() => {
TestBed.configureTestingModule({
declarations: [BugComponent]
});
fixture = TestBed.createComponent(BugComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
18 changes: 18 additions & 0 deletions src/app/components/bug/bug.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { AfterViewInit, Component } from '@angular/core';

@Component({
selector: 'app-bug',
templateUrl: './bug.component.html',
styleUrls: ['./bug.component.scss']
})
export class BugComponent implements AfterViewInit {

constructor() { }

ngAfterViewInit(): void {
const script = document.createElement('script');
script.src = 'https://tally.so/widgets/embed.js';
script.async = true;
document.body.appendChild(script);
}
}
171 changes: 139 additions & 32 deletions src/app/components/erreur/erreur.component.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,142 @@
<!--dust particel-->
<div>
<div class="starsec"></div>
<div class="starthird"></div>
<div class="starfourth"></div>
<div class="starfifth"></div>
</div>
<!--Dust particle end--->
<!-- Source : https://codepen.io/sieumongcanh/pen/jOBPdMd?editors=1010 -->
<div class="huge-side left-side col-xs-12 col-sm-6 col-md-6 col-lg-6">
<div class="huge-content col-xs-8 col-xs-offset-2">
<h1>404</h1>
<h2>OOPS... PAGE NON TROUVÉE</h2>
<a class="btn" [routerLink]="'/'">
<span class="mask"></span>
Retour à l'accueil
</a>


<div class="lamp__wrap">
<div class="lamp">
<div class="cable"></div>
<div class="cover"></div>
<div class="in-cover">
<div class="bulb"></div>
<div class="all">
<div class="yarn"></div>
<div class="cat-wrap">
<div class="cat">
<div class="cat-upper">
<div class="cat-leg"></div>
<div class="cat-leg"></div>
<div class="cat-head">
<div class="cat-ears">
<div class="cat-ear"></div>
<div class="cat-ear"></div>
</div>
<div class="cat-face">
<div class="cat-eyes"></div>
<div class="cat-mouth"></div>
<div class="cat-whiskers"></div>
</div>
</div>
</div>
<div class="cat-lower-wrap">
<div class="cat-lower">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-paw">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-leg">
<div class="cat-paw">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail">
<div class="cat-tail -end">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="light"></div>
</div>
</div>
<!-- END Lamp -->
<section class="error">
<!-- Content -->
<div class="error__content">
<div class="error__message message">
<h1 class="message__title">404</h1>
<p class="message__text">Page non trouvée...</p>
</div>
<div class="error__nav e-nav">
<a [routerLink]="'/'" class="e-nav__link"></a>
</div>
</div>
<!-- END Content -->

</section>
</div>
Loading

0 comments on commit 0c7a059

Please sign in to comment.