diff --git a/angular.json b/angular.json index 67247ef..3aeb47a 100644 --- a/angular.json +++ b/angular.json @@ -10,7 +10,7 @@ }, "newProjectRoot": "projects", "projects": { - "headup_angular": { + "adastra_angular": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -27,7 +27,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser-esbuild", "options": { - "outputPath": "dist/headup_angular", + "outputPath": "dist/adastra_angular", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "tsconfig.app.json", @@ -120,13 +120,13 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "buildTarget": "headup_angular:build:production" + "buildTarget": "adastra_angular:build:production" }, "development": { - "buildTarget": "headup_angular:build:development" + "buildTarget": "adastra_angular:build:development" }, "local": { - "buildTarget": "headup_angular:build:local" + "buildTarget": "adastra_angular:build:local" } }, "defaultConfiguration": "development" @@ -134,7 +134,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "buildTarget": "headup_angular:build" + "buildTarget": "adastra_angular:build" } }, "test": { diff --git a/package-lock.json b/package-lock.json index 09d64c7..ed97b61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "headup-app", + "name": "adastra-app", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "headup-app", + "name": "adastra-app", "version": "1.0.0", "dependencies": { "@angular/animations": "^17.3.5", @@ -20,7 +20,7 @@ "@angular/platform-browser": "^17.3.5", "@angular/platform-browser-dynamic": "^17.3.8", "@angular/router": "^17.3.8", - "bootstrap": "^5.3.3", + "bootstrap": "^5.3.7", "chart.js": "^4.4.2", "chartist": "^1.3.0", "ng-chartist": "^8.2.0", @@ -6319,9 +6319,9 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", - "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz", + "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==", "funding": [ { "type": "github", diff --git a/package.json b/package.json index 5550f80..3b70bb6 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "headup-app", + "name": "adastra-app", "version": "1.0.0", "author": "Solide Apps ", "contributors": [ @@ -10,7 +10,7 @@ "start": "ng serve", "build": "ng build", "watch": "ng build --watch --configuration development", - "dev": "ng serve --configuration local", + "dev": "ng serve --configuration local --port 4201", "local": "APP_ENV=local ng serve --port 4400 --configuration local", "lint": "ng lint", "test": "ng test" @@ -32,7 +32,7 @@ "@angular/platform-browser": "^17.3.5", "@angular/platform-browser-dynamic": "^17.3.8", "@angular/router": "^17.3.8", - "bootstrap": "^5.3.3", + "bootstrap": "^5.3.7", "chart.js": "^4.4.2", "chartist": "^1.3.0", "ng-chartist": "^8.2.0", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 6fea8f2..a095620 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -14,16 +14,16 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have the 'headup_angular' title`, () => { + it(`should have the 'adastra_angular' title`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance; - expect(app.title).toEqual('headup_angular'); + expect(app.title).toEqual('adastra_angular'); }); it('should render title', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('h1')?.textContent).toContain('Hello, headup_angular'); + expect(compiled.querySelector('h1')?.textContent).toContain('Hello, adastra_angular'); }); }); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index edc959b..93135ac 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -32,7 +32,7 @@ export const MY_FORMATS = { styleUrl: './app.component.scss' }) export class AppComponent implements OnInit { - public title = 'Head Up'; + public title = 'Ad Astra'; constructor(private userService: UserService, private titleService: Title) { } diff --git a/src/app/components/auth/auth.component.ts b/src/app/components/auth/auth.component.ts index 654e0bd..339acc1 100644 --- a/src/app/components/auth/auth.component.ts +++ b/src/app/components/auth/auth.component.ts @@ -76,11 +76,11 @@ export class AuthComponent implements OnInit, OnDestroy { if (this.authType === 'register') { this.title = 'Création de compte'; this.btnTitle = 'Créer le compte'; - this.titleService.setTitle(`Head Up - Créer un compte`); + this.titleService.setTitle(`Ad Astra - Créer un compte`); } else { this.title = 'Se connecter'; this.btnTitle = 'Se connecter'; - this.titleService.setTitle(`Head Up - Connexion`); + this.titleService.setTitle(`Ad Astra - Connexion`); } // add form control for username if this is the register page if (this.authType === 'register') { diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html index 36ce21e..b5303cc 100644 --- a/src/app/components/home/home.component.html +++ b/src/app/components/home/home.component.html @@ -2,28 +2,25 @@

{{title}}

- - Dernier saut enregistré : {{ lastJump.numero }}ème à {{ lastJump.lieu }} le {{ lastJump.date | date: 'dd/MM/yyyy' }} -
{{ now | date: 'dd/MM/yyyy' }} - @if (!isJumpDay) { -
Aucun saut aujourd'hui - }
+
+

{{description}}

+
- - - - + + + + - + @@ -33,9 +30,8 @@ - - + @@ -48,10 +44,9 @@ - - - + + @@ -104,34 +99,5 @@ --> - +
\ No newline at end of file diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts index 28ad6ac..3cfcda9 100644 --- a/src/app/components/home/home.component.ts +++ b/src/app/components/home/home.component.ts @@ -37,12 +37,12 @@ import { JumpsService } from 'src/app/core/services'; export class HomeComponent implements OnInit { private _lastjump: Subscription = new Subscription(); private _lastjump$: Observable = new Observable(); - public title = 'Home'; + public title = 'Shop bientôt disponible!'; + public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.'; public errors: Errors = { errors: {} }; public lastJump: Jump = {} as Jump; public destroyRef = inject(DestroyRef); public now = new Date(); - public isJumpDay = false; constructor( private _jumpsService: JumpsService @@ -52,7 +52,6 @@ export class HomeComponent implements OnInit { this._lastjump$ = this._jumpsService.getLastJump().pipe(takeUntilDestroyed(this.destroyRef)); this._lastjump = this._lastjump$.subscribe((jump) => { this.lastJump = jump; - this.isJumpDay = this._isToday(new Date(this.lastJump.date)); }); } private _isToday(someDate: Date) { diff --git a/src/app/components/profile/profile.component.ts b/src/app/components/profile/profile.component.ts index 83f3d9d..0d3d6fe 100644 --- a/src/app/components/profile/profile.component.ts +++ b/src/app/components/profile/profile.component.ts @@ -38,7 +38,7 @@ export class ProfileComponent implements OnInit, OnDestroy { ) { } ngOnInit() { - this.titleService.setTitle(`Head Up - ${this.title}`); + this.titleService.setTitle(`Ad Astra - ${this.title}`); Object.assign(this.user, this.userService.getCurrentUser()); if (this.user.username) { this.bannerTitle = `@${this.user.username}`; diff --git a/src/app/components/settings/credentials/credentials.component.ts b/src/app/components/settings/credentials/credentials.component.ts index dd365fd..b5ef2fa 100644 --- a/src/app/components/settings/credentials/credentials.component.ts +++ b/src/app/components/settings/credentials/credentials.component.ts @@ -55,7 +55,7 @@ export class CredentialsComponent implements OnInit, OnDestroy { } ngOnInit() { - this.titleService.setTitle(`Head Up - ${this.title}`); + this.titleService.setTitle(`Ad Astra - ${this.title}`); Object.assign(this.user, this.userService.getCurrentUser()); this.credentialsForm.patchValue(this.user); if (this.user.username) { diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts index dec2075..c5aa06d 100644 --- a/src/app/components/settings/settings.component.ts +++ b/src/app/components/settings/settings.component.ts @@ -66,7 +66,7 @@ export class SettingsComponent implements OnInit, OnDestroy { } ngOnInit() { - this.titleService.setTitle(`Head Up - ${this.title}`); + this.titleService.setTitle(`Ad Astra - ${this.title}`); // Make a fresh copy of the current user's object to place in editable form fields Object.assign(this.user, this.userService.getCurrentUser()); // Fill the form diff --git a/src/app/components/shared/layout/footer.component.ts b/src/app/components/shared/layout/footer.component.ts index 6714d51..d0f9b4e 100644 --- a/src/app/components/shared/layout/footer.component.ts +++ b/src/app/components/shared/layout/footer.component.ts @@ -9,6 +9,6 @@ import { DatePipe } from '@angular/common'; }) export class FooterComponent { today: number = Date.now(); - siteLink = 'https://www.rampeur.com'; - author = 'Solide Apps'; + siteLink = 'https://www.adastra-cbd.com'; + author = 'Ad Astra'; } diff --git a/src/app/components/shared/layout/full.component.html b/src/app/components/shared/layout/full.component.html index 4901035..9fd7194 100755 --- a/src/app/components/shared/layout/full.component.html +++ b/src/app/components/shared/layout/full.component.html @@ -1,125 +1,44 @@
- @@ -130,9 +49,9 @@
- + + @{{ currentUser.username }} +
- @{{ currentUser.username }} @@ -164,10 +82,7 @@ -