up ordre du jour app

ordre-du-jour/odj/package.json

@@ -1,44 +0,0 @@
-{
-  "name": "odj",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test",
-    "serve:ssr:odj": "node dist/odj/server/server.mjs"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^17.0.0",
-    "@angular/common": "^17.0.0",
-    "@angular/compiler": "^17.0.0",
-    "@angular/core": "^17.0.0",
-    "@angular/forms": "^17.0.0",
-    "@angular/platform-browser": "^17.0.0",
-    "@angular/platform-browser-dynamic": "^17.0.0",
-    "@angular/platform-server": "^17.0.0",
-    "@angular/router": "^17.0.0",
-    "@angular/ssr": "^17.0.5",
-    "express": "^4.18.2",
-    "rxjs": "~7.8.0",
-    "tslib": "^2.3.0",
-    "zone.js": "~0.14.2"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "^17.0.5",
-    "@angular/cli": "^17.0.5",
-    "@angular/compiler-cli": "^17.0.0",
-    "@types/express": "^4.17.17",
-    "@types/jasmine": "~5.1.0",
-    "@types/node": "^18.18.0",
-    "jasmine-core": "~5.1.0",
-    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.2.2"
-  }
-}

ordre-du-jour/odj/server.ts

@@ -1,56 +0,0 @@
-import { APP_BASE_HREF } from '@angular/common';
-import { CommonEngine } from '@angular/ssr';
-import express from 'express';
-import { fileURLToPath } from 'node:url';
-import { dirname, join, resolve } from 'node:path';
-import bootstrap from './src/main.server';
-
-// The Express app is exported so that it can be used by serverless Functions.
-export function app(): express.Express {
-  const server = express();
-  const serverDistFolder = dirname(fileURLToPath(import.meta.url));
-  const browserDistFolder = resolve(serverDistFolder, '../browser');
-  const indexHtml = join(serverDistFolder, 'index.server.html');
-
-  const commonEngine = new CommonEngine();
-
-  server.set('view engine', 'html');
-  server.set('views', browserDistFolder);
-
-  // Example Express Rest API endpoints
-  // server.get('/api/**', (req, res) => { });
-  // Serve static files from /browser
-  server.get('*.*', express.static(browserDistFolder, {
-    maxAge: '1y'
-  }));
-
-  // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
-    const { protocol, originalUrl, baseUrl, headers } = req;
-
-    commonEngine
-      .render({
-        bootstrap,
-        documentFilePath: indexHtml,
-        url: `${protocol}://${headers.host}${originalUrl}`,
-        publicPath: browserDistFolder,
-        providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
-      })
-      .then((html) => res.send(html))
-      .catch((err) => next(err));
-  });
-
-  return server;
-}
-
-function run(): void {
-  const port = process.env['PORT'] || 4000;
-
-  // Start up the Node server
-  const server = app();
-  server.listen(port, () => {
-    console.log(`Node Express server listening on http://localhost:${port}`);
-  });
-}
-
-run();

ordre-du-jour/odj/src/app/app.config.server.ts

@@ -1,11 +0,0 @@
-import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
-import { provideServerRendering } from '@angular/platform-server';
-import { appConfig } from './app.config';
-
-const serverConfig: ApplicationConfig = {
-  providers: [
-    provideServerRendering()
-  ]
-};
-
-export const config = mergeApplicationConfig(appConfig, serverConfig);

ordre-du-jour/odj/src/app/app.config.ts

@@ -1,9 +0,0 @@
-import { ApplicationConfig } from '@angular/core';
-import { provideRouter } from '@angular/router';
-
-import { routes } from './app.routes';
-import { provideClientHydration } from '@angular/platform-browser';
-
-export const appConfig: ApplicationConfig = {
-  providers: [provideRouter(routes), provideClientHydration()]
-};

ordre-du-jour/odj/src/app/app.routes.ts

@@ -1,3 +0,0 @@
-import { Routes } from '@angular/router';
-
-export const routes: Routes = [];

ordre-du-jour/odj/src/app/odj/odj.component.html

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

ordre-du-jour/odj/src/app/odj/odj.component.spec.ts

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

ordre-du-jour/odj/src/app/odj/odj.component.ts

@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-odj',
-  standalone: true,
-  imports: [],
-  templateUrl: './odj.component.html',
-  styleUrl: './odj.component.scss'
-})
-export class OdjComponent {
-
-}

ordre-du-jour/odj/src/main.server.ts

@@ -1,7 +0,0 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { AppComponent } from './app/app.component';
-import { config } from './app/app.config.server';
-
-const bootstrap = () => bootstrapApplication(AppComponent, config);
-
-export default bootstrap;

ordre-du-jour/odj/src/main.ts

@@ -1,6 +0,0 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { AppComponent } from './app/app.component';
-
-bootstrapApplication(AppComponent, appConfig)
-  .catch((err) => console.error(err));

ordre-du-jour/odj2/README.md

@@ -1,6 +1,6 @@
-# Odj
+# Odj2
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 17.0.5.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 16.2.0.
 
 ## Development server
 

ordre-du-jour/odj2/angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "odj": {
+    "odj2": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -15,11 +15,11 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:application",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/odj",
+            "outputPath": "dist/odj2",
             "index": "src/index.html",
-            "browser": "src/main.ts",
+            "main": "src/main.ts",
             "polyfills": [
               "zone.js"
             ],
@@ -32,12 +32,7 @@
             "styles": [
               "src/styles.scss"
             ],
-            "scripts": [],
+            "scripts": []
-            "server": "src/main.server.ts",
-            "prerender": true,
-            "ssr": {
-              "entry": "server.ts"
-            }
           },
           "configurations": {
             "production": {
@@ -56,9 +51,12 @@
               "outputHashing": "all"
             },
             "development": {
+              "buildOptimizer": false,
               "optimization": false,
+              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true
+              "sourceMap": true,
+              "namedChunks": true
             }
           },
           "defaultConfiguration": "production"
@@ -67,10 +65,10 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "buildTarget": "odj:build:production"
+              "browserTarget": "odj2:build:production"
             },
             "development": {
-              "buildTarget": "odj:build:development"
+              "browserTarget": "odj2:build:development"
             }
           },
           "defaultConfiguration": "development"
@@ -78,7 +76,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "odj:build"
+            "browserTarget": "odj2:build"
           }
         },
         "test": {

ordre-du-jour/odj2/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "odj2",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "watch": "ng build --watch --configuration development",
+    "test": "ng test"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^16.2.0",
+    "@angular/common": "^16.2.0",
+    "@angular/compiler": "^16.2.0",
+    "@angular/core": "^16.2.0",
+    "@angular/forms": "^16.2.0",
+    "@angular/platform-browser": "^16.2.0",
+    "@angular/platform-browser-dynamic": "^16.2.0",
+    "@angular/router": "^16.2.0",
+    "rxjs": "~7.8.0",
+    "tslib": "^2.3.0",
+    "zone.js": "~0.13.0"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "^16.2.0",
+    "@angular/cli": "~16.2.0",
+    "@angular/compiler-cli": "^16.2.0",
+    "@types/jasmine": "~4.3.0",
+    "jasmine-core": "~4.6.0",
+    "karma": "~6.4.0",
+    "karma-chrome-launcher": "~3.2.0",
+    "karma-coverage": "~2.2.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
+    "typescript": "~5.1.3"
+  }
+}

ordre-du-jour/odj2/src/app/app.component.html

@@ -135,7 +135,7 @@
             {{ subjects[currentSubjectId].title }}
           </h1>
           <p>{{ subjects[currentSubjectId].duration }} min, par {{ subjects[currentSubjectId].author }}</p>
-<!--          <p>Reste: {{ countRemainingMinutes(subjects[currentSubjectId]) }} min</p>-->
+          <!--          <p>Reste: {{ countRemainingMinutes(subjects[currentSubjectId]) }} min</p>-->
           <div class="actions">
 
 
@@ -174,8 +174,8 @@
                 getSecondsBetweenTwoDates(
                   null,
                   subjects[currentSubjectId].endDate
-                  )
+                )
-              - subjects[currentSubjectId].spentSeconds
+                - subjects[currentSubjectId].spentSeconds
               )
               }}
             </div>

ordre-du-jour/odj2/src/app/app.component.spec.ts

@@ -2,11 +2,9 @@ import { TestBed } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async () => {
+  beforeEach(() => TestBed.configureTestingModule({
-    await TestBed.configureTestingModule({
+    declarations: [AppComponent]
-      imports: [AppComponent],
+  }));
-    }).compileComponents();
-  });
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
@@ -14,16 +12,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have the 'odj' title`, () => {
+  it(`should have as title 'odj2'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
-    expect(app.title).toEqual('odj');
+    expect(app.title).toEqual('odj2');
   });
 
   it('should render title', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Hello, odj');
+    expect(compiled.querySelector('.content span')?.textContent).toContain('odj2 app is running!');
   });
 });

ordre-du-jour/odj2/src/app/app.component.ts

@@ -1,9 +1,4 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {RouterOutlet} from '@angular/router';
-import {FormsModule} from "@angular/forms";
-
-
 interface Topic {
   id: number, // numéro du sujet
   title: string, // titre du sujet à aborder
@@ -16,12 +11,11 @@ interface Topic {
   spentSeconds: number, // nombre de secondes passées au sujet
 }
 
+
 @Component({
   selector: 'app-root',
-  standalone: true,
-  imports: [CommonModule, RouterOutlet, FormsModule],
   templateUrl: './app.component.html',
-  styleUrl: './app.component.scss',
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent implements OnInit, OnDestroy {
   title = 'odj';
@@ -30,7 +24,12 @@ export class AppComponent implements OnInit, OnDestroy {
   startTime: string = "20:30";
   // startTime: string = "17:00";
   endTime: string = "22:00";
-  today: any = new Date();
+
+  timeProxy: any = {
+    hour: 10,
+    min: 30,
+  }
+  today: Date = new Date();
   // champs habituels pour le compte rendu:
   scribe: string = 'tykayn';
   private timekeeper: string = 'Chuck Norris';

ordre-du-jour/odj2/src/app/app.module.ts

@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { AppComponent } from './app.component';
+import {DatePipe, JsonPipe, NgForOf, NgIf} from "@angular/common";
+import {ReactiveFormsModule} from "@angular/forms";
+import {RouterOutlet} from "@angular/router";
+import { FormsModule } from '@angular/forms';
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    FormsModule,
+    BrowserModule,
+    DatePipe,
+    JsonPipe,
+    NgForOf,
+    NgIf,
+    ReactiveFormsModule,
+    RouterOutlet
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

ordre-du-jour/odj2/src/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Odj</title>
+  <title>Odj2</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">

ordre-du-jour/odj2/src/main.ts

@@ -0,0 +1,7 @@
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));

ordre-du-jour/odj2/src/styles.scss

@@ -1 +1,5 @@
 /* You can add global styles to this file, and also import other style files */
+body{
+  width: 30rem;
+  margin: 1rem auto;
+}

ordre-du-jour/odj2/tsconfig.app.json

@@ -3,14 +3,10 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
-    "types": [
+    "types": []
-      "node"
-    ]
   },
   "files": [
-    "src/main.ts",
+    "src/main.ts"
-    "src/main.server.ts",
-    "server.ts"
   ],
   "include": [
     "src/**/*.d.ts"

ordre-du-jour/odj2/tsconfig.json

@@ -2,6 +2,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
@@ -9,9 +10,9 @@
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "esModuleInterop": true,
     "sourceMap": true,
     "declaration": false,
+    "downlevelIteration": true,
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,

osm-itineraire-userscript/index.js

@@ -65,7 +65,7 @@ function calculateEmissionsAndDisplay (distance) {
 
 	let textCompare = `<div class="impact-climat">
 <style>
-.impact-climat{
+.impact-climat, .text-right{
 text-align: right;
 padding: 1rem;
 }

rangement/README.md

@@ -19,6 +19,6 @@ Inspiré des travaux de Karl Voit et de ses libs python GuessFileName, append2na
 ➡️
 🎉
 
-## options
+## options
 * -n , dry-run, ne pas renommer
 * --photos-folder, spécifie un dossier pour les photos