diff --git a/dist/index.js b/dist/index.js new file mode 100644 index 0000000000000000000000000000000000000000..3897d9c679abfa42b1353f3c59694f48d134fc4b --- /dev/null +++ b/dist/index.js @@ -0,0 +1,2 @@ +"use strict"; +console.log('Hello TypeScript!'); diff --git a/qualdev/TD-Debug.js b/qualdev/TD-Debug.js new file mode 100644 index 0000000000000000000000000000000000000000..02f1564d6c672ce327a362859bc05455d242212d --- /dev/null +++ b/qualdev/TD-Debug.js @@ -0,0 +1,56 @@ +//exo 1 : Point d'arret dans une boucle +function deb1() { + var j = 0; + for (var i = 0; i < 5; i++) { + j += i; + } + console.log(j); +} +// deb1(); +//exo 2 : point d'arret pour un tableau +function deb1_1() { + var j = 0; + var tab = []; + for (var i = 0; i < 5; i++) { + j += i; + tab[i] = j; + } + console.log(tab); +} +//deb1_1(); +//exo 3 : Point d'arret sur echange de valeur +function echangeParValeurRater(x, y) { + var tmp = y; + y = x; + x = tmp; + console.log(x, y); +} +//let x = 10; +//let y = 20; +//echangeParValeurRater(x, y); +//console.log(x, y); +//exo 4 : Point d'arret sur echange de valeur d'un tableau +function deb3(xy) { + var tmp = xy[0]; + xy[0] = xy[1]; + xy[1] = tmp; + console.log(xy); + xy = [100, 200]; +} +//let xy = [10, 20]; +//deb3(xy); +//console.log(xy); +// exo 5 : etude porté de variables +var j = 10; +//deb4(); +//console.log(j); +function deb4() { + var j = 25; + for (var i = 0; i < 10; i++) { + var j_1 = 2 * i; + console.log(j_1); + } + return j; +} + + diff --git a/qualdev/compte_rendu.txt b/qualdev/compte_rendu.txt index c7799e8e6478530a9bdddaac7059f37762590079..6f86fcb9f462601dfafc670e0281621381a026ff 100644 --- a/qualdev/compte_rendu.txt +++ b/qualdev/compte_rendu.txt @@ -1,4 +1,4 @@ -# Compte rendu TD1 : Utilisation de Git + Compte rendu TD1 : Utilisation de Git 1. Configuration de Git ``` @@ -27,7 +27,7 @@ git status ``` - Affiche les fichiers présents mais non suivis par Git. -**4. Ignorer le dossier .vscode** + 4. Ignorer le dossier .vscode ``` echo ".vscode/" >> .gitignore git status @@ -44,8 +44,8 @@ git commit -m "Initialisation du dépôt TypeScript avec fichiers sources" - Crée un commit avec un message clair. 6. Création du dépôt distant sur GitLab -- Création d'un projet **typescript_nom_prénom** sur GitLab. -- Ajout de l'enseignant en tant que **Developer**. +- Création d'un projet typescript_nom_prénom sur GitLab. +- Ajout de l'enseignant en tant que Developer. - Récupération de l'URL du dépôt distant. @@ -145,3 +145,128 @@ Utiliser : ''' git log origin/main..HEAD --oneline ''' + + + + +Compte rendu TP : Git + +1. Clonage d'un dépôt distant + +Alice (Création du dépôt sur GitLab) +``` +Créer un dépôt sur GitLab nommé tp-git (avec README activé) +``` + +Bob (Cloner le dépôt) +``` +git clone https://gitlab.univ-lorraine.fr/alice/tp-git.git +cd tp-git +git status +``` + +- Vérifie que le dépôt est bien cloné. + +--- + +2. Travail collaboratif et gestion de conflits + +Situation 1 : Alice travaille et Bob doit récupérer les mises à jour + + Alice : Ajout d'un fichier +``` +touch alice.txt +echo "Hello from Alice" > alice.txt +git add alice.txt +git commit -m "feat: ajout du fichier alice.txt" +git push +``` + +Bob : Récupération des mises à jour d'Alice +``` +git pull +ls -a Vérifie que alice.txt est bien présent +git log --oneline Vérifie l'historique des commits +``` + +--- + +Situation 2 : Alice et Bob travaillent sur des fichiers différents + +Alice : Modification et push +``` +echo "Modification Alice" >> alice.txt +git add alice.txt +git commit -m "feat: modification de alice.txt" +git push +``` + +Bob : Création d'un fichier bob.txt sans commit +``` +touch bob.txt +echo "Hello from Bob" > bob.txt +git status bob.txt est non suivi +git pull Récupère la modification d'Alice +``` + +- Il n’y a pas de conflit car Bob n'a pas encore commité. + +Bob : Ajout et push de bob.txt +``` +git add bob.txt +git commit -m "feat: ajout de bob.txt" +git push +``` + +--- + +Situation 3 : Gestion de conflit lors d’un pull + +Bob : Modification locale et Alice modifie le même fichier +``` +echo "Changement local de Bob" >> alice.txt +git add alice.txt +git commit -m "fix: modification locale de Bob" +``` + +Alice : Modifie et pousse ses changements +``` +echo "Modification distante d'Alice" >> alice.txt +git add alice.txt +git commit -m "fix: modification distante de Alice" +git push +``` + +Bob : Essayant de faire un pull, mais il y a un conflit +``` +git pull +``` + +- Git détecte un conflit sur `alice.txt`. +- Bob doit résoudre le conflit en éditant le fichier. + +Bob : Résolution du conflit +- Ouvrir `alice.txt` et choisir quelle version garder. +- Supprimer les marqueurs de conflit (`<<<<<<<`, `=======`, `>>>>>>>`). + +``` +git add alice.txt +git commit -m "fix: résolution du conflit sur alice.txt" +git push +``` + +Alice : Récupération des modifications de Bob +``` +git pull +``` + +--- + +4. Taguer la fin du TP +``` +git tag -a v1.0 -m "Rendu final du TP Git" +git push origin --tags +``` + + + diff --git a/qualdev/tp-git b/qualdev/tp-git new file mode 160000 index 0000000000000000000000000000000000000000..81ab3b34eccb26d4dc7d6e9786423cf036620292 --- /dev/null +++ b/qualdev/tp-git @@ -0,0 +1 @@ +Subproject commit 81ab3b34eccb26d4dc7d6e9786423cf036620292 diff --git a/qualdev/tp-git copy b/qualdev/tp-git copy new file mode 160000 index 0000000000000000000000000000000000000000..00fe4b65af26242b7685c984b89ddac4ae3447f9 --- /dev/null +++ b/qualdev/tp-git copy @@ -0,0 +1 @@ +Subproject commit 00fe4b65af26242b7685c984b89ddac4ae3447f9 diff --git a/sae-ihm-corona-richet-marchal b/sae-ihm-corona-richet-marchal new file mode 160000 index 0000000000000000000000000000000000000000..07d618a4ed22dcdb1f5f479c41f87376163db474 --- /dev/null +++ b/sae-ihm-corona-richet-marchal @@ -0,0 +1 @@ +Subproject commit 07d618a4ed22dcdb1f5f479c41f87376163db474 diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..5f64219e6adef7e225905e2435618a6b6e5efae4 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,116 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "libReplacement": true, /* Enable lib replacement. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ + // "erasableSyntaxOnly": true, /* Do not allow runtime constructs that are not part of ECMAScript. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true, + /* Ajoutez ces deux lignes */ + "rootDir": "./src", + "outDir": "./dist" /* Skip type checking all .d.ts files. */ + } +}