JodieAddis · JodieAddis · Feb 19, 2024 · Feb 17, 2024 · Feb 17, 2024 · Feb 17, 2024
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,2 @@
 dist/
-node_modules/
+node_modules/
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,13 +1,9 @@
 {
   "env": {
     "browser": true,
-    "es2021": true
+    "es2015": true
   },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
     "ecmaVersion": "latest",

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -0,0 +1,78 @@
+name: Deploy to Github Pages
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - develop
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  lint_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      - name: Install Node versions
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: "npm"
+
+      - name: Install
+        run: npm i
+
+      - name: Linter
+        run: npm run linter
+
+      - name: Test
+        run: npm run test
+
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    needs: lint_and_test
+
+    environment:
+      name: github-pages
+      url: ${{steps.deployment.outputs.page_url}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: "npm"
+
+      - run: npm i
+
+      - name: Configure GH pages
+        uses: actions/configure-pages@v3
+
+      - name: Tailwind
+        run: npm run design
+
+      - name: Compile TS to JS
+        run: npm run compile
+
+      - name: Copy index.html in dist folder
+        run: cp index.html ./dist/
+
+      - name: Copy font to dist
+        run: cp -r ./public/font ./dist/public/font
+
+      - name: Uploading Artifacts
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ./dist/
+
+      - name: Deploy to GH pages
+        uses: actions/deploy-pages@v1
+        id: deployment
diff --git a/index.html b/index.html
@@ -5,7 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Password Generator</title>
     <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" href="dist/output.css" />
+    <!--<link rel="stylesheet" href="dist/output.css" /> Dev -->
+    <link rel="stylesheet" href="public/output.css" />
   </head>
   <body class="flex h-full w-full items-center bg-darkBalticSea">
     <main class="flex h-5/6 w-full flex-col items-center justify-center">
@@ -141,6 +142,7 @@
         </div>
       </form>
     </main>
-    <script type="module" src="/dist/index.js"></script>
+    <!--<script type="module" src="/dist/index.js"></script> Dev-->
+    <script type="module" src="index.js"></script>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "scripts": {
     "dev:compile": "tsc --watch",
-    "dev:design": "npx tailwindcss -i ./public/style/tailwind.css -o ./dist/output.css --watch",
+    "dev:design": "npx tailwindcss -i ./public/style/tailwind.css -o ./dist/public/output.css --watch",
     "dev:formater": "prettier --write .",
     "compile": "tsc",
-    "design": "npx tailwindcss -i ./public/style/tailwind.css -o ./dist/output.css",
-    "linter": "eslint --ignore-path .eslintignore --ext .js .",
+    "design": "npx tailwindcss -i ./public/style/tailwind.css -o ./dist/public/output.css",
+    "linter": "eslint --ignore-path .eslintignore --ext .ts .",
     "test": "vitest"
   },
   "devDependencies": {

diff --git a/readme.md b/readme.md
@@ -1,3 +1,13 @@
-# Password generator
+# "Password Generator"
 
-Lien du figma en description de la carte trello.
+## About the project
+
+This application allows users to generate random passwords. These are generated based on the criteria selected by the users: lowercase, uppercase, numbers, and symbols. The password can be copied/pasted via an icon. The generator also indicates the strength of the password according to levels: 'too weak', 'weak', 'medium', and 'strong'.
+
+## Objectives
+
+Creation of a password generator working with JavaScript, modules, and unit tests. The design is implemented using the Tailwind framework.
+
+## Coding Technologies Used
+
+ <img src="https://skillicons.dev/icons?i=git,html,css,tailwind,js"/>
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
 import { clipboardText } from "./utils/clipboardText.js";
-import { countCheckedInputs } from "./utils/countCheckedInputs.js";
+import { calculatePasswordStrength } from "./utils/calculatePasswordStrength.js";
 import { currentLength } from "./utils/currentLength.js";
 import { generatePassword } from "./utils/generatePassword.js";
 import { strengthLevel } from "./utils/strengthLevel.js";
@@ -24,7 +24,6 @@ const handleSubmit = () => {
   const passwordLength = document.querySelector(
     "#password-length",
   ) as HTMLInputElement;
-  const allCheckbox = document.querySelectorAll(".input_checkbox");
 
   if (form) {
     form.addEventListener("submit", (e) => {
@@ -45,7 +44,7 @@ const handleSubmit = () => {
         );
         displayPassword.innerHTML = password;
         clipboardText(password);
-        const count = countCheckedInputs(password);
+        const count = calculatePasswordStrength(password);
         strengthLevel(count);
       }
     });

diff --git a/src/type/type.ts b/src/type/type.ts
@@ -1,5 +1,5 @@
 export type InputType = {
-  length: Number;
+  length: number;
   hasLowerCase: boolean;
   hasUpperCase: boolean;
   hasNumbers: boolean;

diff --git a/src/utils/calculatePasswordStrength.spec.ts b/src/utils/calculatePasswordStrength.spec.ts
@@ -0,0 +1,24 @@
+import { describe, it, expect } from "vitest";
+import { calculatePasswordStrength } from "./calculatePasswordStrength";
+
+describe("strengthLevel Unit Test Suite", () => {
+  it("should return something", () => {
+    expect(calculatePasswordStrength("gqgcgfznlx")).toBeDefined();
+  });
+  it("should return 1", () => {
+    expect(calculatePasswordStrength("gqgcgfznlx")).toBe(1);
+    expect(calculatePasswordStrength("HTQYSTCKNF")).toBe(1);
+    expect(calculatePasswordStrength("8628445976")).toBe(1);
+    expect(calculatePasswordStrength("^)^&^!^&*)")).toBe(1);
+  });
+
+  it("should return 2", () => {
+    expect(calculatePasswordStrength("MdampZhLLe")).toBe(2);
+  });
+  it("should return 3", () => {
+    expect(calculatePasswordStrength("wg6BPPYq0t")).toBe(3);
+  });
+  it("should return 4", () => {
+    expect(calculatePasswordStrength("&E!@Zr8iyv")).toBe(4);
+  });
+});
diff --git a/src/utils/calculatePasswordStrength.ts b/src/utils/calculatePasswordStrength.ts
@@ -0,0 +1,10 @@
+export const calculatePasswordStrength = (password: string): number => {
+  let count = 0;
+
+  if (password.match(/[a-z]+/)) count += 1;
+  if (password.match(/[A-Z]+/)) count += 1;
+  if (password.match(/[0-9]+/)) count += 1;
+  if (password.match(/[!@#$%^&*()]+/)) count += 1;
+
+  return count;
+};
diff --git a/src/utils/countCheckedInputs.spec.ts b/src/utils/countCheckedInputs.spec.ts
diff --git a/src/utils/countCheckedInputs.ts b/src/utils/countCheckedInputs.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,6 +6,6 @@
     "strict": true,
     "noImplicitAny": true,
   },
-  "include": ["src", "dist/index.js"],
+  "include": ["src"],
   "exclude": ["node_modules/", "src/**/*.spec.ts"],
 }