unictive-angular 1.0.40 → 1.0.43

package/bin/utils/createStructure.js

@@ -17,6 +17,7 @@ const folders_to_copy = [
   "src/app/app.ts",
   "src/app/app.html",
   "src/environments",
+  "tools",
 
   // "package.json",
   // "tailwind.config.js",

package/bin/utils/resource/src/app/API/auth/auth.service.ts

@@ -90,14 +90,8 @@ export class AuthService extends AbstractApiService<any> {
     })
 
     return Entity_User.load(async () => {
-      let isRole = null;
-      await this.helper.getStorage('role').then((res) => {
-        if (res) {
-          isRole = res;
-        }
-      });
 
-      const res = await this.get(isRole ? `/refresh?role=${isRole}` : '/refresh');
+      const res = await this.get('/refresh');
       if (res) {
         this.setLogin(true);
         this.helper.setStorage('users', res?.data?.user);

package/bin/utils/resource/src/app/core/config/list-store.ts

@@ -0,0 +1,209 @@
+import { signal, computed } from '@angular/core';
+
+export interface PaginationMeta {
+    current_page: number;
+    from: number;
+    last_page: number;
+    per_page: number;
+    to: number;
+    total: number;
+}
+
+export interface PaginatedResponse<T, M = PaginationMeta> {
+    data: T[];
+    meta: M;
+}
+
+export interface EntityState<T, M = PaginationMeta> {
+    value: T[];
+    loading: boolean;
+    error?: string;
+    meta?: M;
+}
+
+export function ListStoreFactory<
+    T extends Record<any, any>,
+    M extends PaginationMeta = PaginationMeta,
+    K extends keyof T = 'id'
+>(keyField?: K | any) {
+
+    const field = (keyField ?? ('id' as K));
+
+    const _state = signal<EntityState<T, M>>({
+        value: [],
+        loading: false,
+    });
+
+    // ========================
+    // Computed Selectors
+    // ========================
+
+    const all = computed(() => _state().value);
+    const count = computed(() => _state().value.length);
+    const meta = computed(() => _state().meta);
+    const loading = computed(() => _state().loading);
+    const error = computed(() => _state().error);
+
+    const hasNextPage = computed(() => {
+        const m = _state().meta;
+        if (!m) return false;
+        return m.current_page < m.last_page;
+    });
+
+    const currentPage = computed(() => _state().meta?.current_page ?? 1);
+
+    const mapByKey = computed(() => {
+        const map = new Map<T[K], T>();
+        for (const item of _state().value) {
+            map.set(item[field], item);
+        }
+        return map;
+    });
+
+    const getByKey = (key: T[K]) =>
+        computed(() => mapByKey().get(key));
+
+    // ========================
+    // Private Helpers
+    // ========================
+
+    function deduplicate(items: T[]): T[] {
+        const map = new Map<T[K], T>();
+        for (const item of items) {
+            map.set(item[field], item);
+        }
+        return Array.from(map.values());
+    }
+
+    function setLoading(value: boolean) {
+        _state.update(s => ({ ...s, loading: value }));
+    }
+
+    function setError(message?: string) {
+        _state.update(s => ({ ...s, error: message }));
+    }
+
+    // ========================
+    // Public API
+    // ========================
+
+    async function loadPage(
+        page: number,
+        fetchFn: (page: number) => Promise<PaginatedResponse<T, M>>
+    ) {
+        setLoading(true);
+        setError(undefined);
+
+        try {
+            const response = await fetchFn(page);
+
+            console.log(response);
+            _state.update(curr => ({
+                value: page === 1
+                    ? response.data
+                    : deduplicate([...curr.value, ...response.data]),
+                meta: response.meta,
+                loading: false,
+            }));
+
+            return response;
+        } catch (err: any) {
+            setLoading(false);
+            setError(err?.message ?? 'Unknown error');
+            return null;
+        }
+    }
+
+    // --- Async Loader ---
+    async function load(
+        page: number,
+        fetchFn: (page: number) => Promise<PaginatedResponse<T, M>>
+    ) {
+        _state.update((curr) => ({
+            ...curr,
+            loading: true,
+            error: undefined,
+        }));
+        try {
+            const response = await fetchFn(page);
+            // console.log('Entity Store Loaded Data:', data);
+            _state.set({ value: response.data, meta: response.meta, loading: false });
+            return response.data;
+        } catch (err: any) {
+            _state.update((curr) => ({
+                ...curr,
+                loading: false,
+                error: err.message ?? 'Unknown error',
+            }));
+            return [];
+        }
+    }
+
+
+
+    async function loadNextPage(
+        fetchFn: (page: number) => Promise<PaginatedResponse<T, M>>
+    ) {
+        if (!hasNextPage() || loading()) return;
+
+        const nextPage = currentPage() + 1;
+        return loadPage(nextPage, fetchFn);
+    }
+
+    async function refresh(
+        fetchFn: (page: number) => Promise<PaginatedResponse<T, M>>
+    ) {
+        return loadPage(1, fetchFn);
+    }
+
+    function reset() {
+        _state.set({
+            value: [],
+            loading: false,
+        });
+    }
+
+    function clear() {
+        reset();
+    }
+
+    function update(key: T[K], partial: Partial<T>) {
+        _state.update(curr => ({
+            ...curr,
+            value: curr.value.map(i =>
+                i[field] === key ? { ...i, ...partial } : i
+            ),
+        }));
+    }
+
+    function remove(key: T[K]) {
+        _state.update(curr => ({
+            ...curr,
+            value: curr.value.filter(i => i[field] !== key),
+        }));
+    }
+
+    return {
+        state: _state,
+
+        // selectors
+        all,
+        count,
+        meta,
+        loading,
+        error,
+        hasNextPage,
+        currentPage,
+        getByKey,
+
+        // actions
+        load,
+        loadPage,
+        loadNextPage,
+        refresh,
+        update,
+        remove,
+        reset,
+        clear,
+    };
+}

package/bin/utils/resource/src/app/core/guards/login.guard.ts

@@ -15,12 +15,7 @@ export const loginGuard: CanActivateFn = (route, state) => {
   return storage.get(environment.tokenName).pipe(
     map((token: any) => {
       if (token) {
-        const appId = route.queryParams['appId'];
-        const redirect = route.queryParams['redirect'];
 
-        if (appId && redirect) {
-          window.location.href = redirect + '?token=' + token.token;
-        }
 
         router.navigateByUrl('/home');
         // helper.showPopup(

package/bin/utils/resource/src/app/shared/ui/input-text/input-text.component.ts

@@ -1,12 +1,19 @@
+import { CommonModule } from '@angular/common';
 import { Component, forwardRef, input, Input, OnInit } from '@angular/core';
 import { ControlValueAccessor, FormControl, FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule } from '@angular/forms';
 import { AlertErrorInputComponent } from '@shared/widgets/alert-error-input/alert-error-input.component';
+import { FloatLabelModule } from "primeng/floatlabel";
 
 @Component({
   selector: 'input-text',
   styleUrls: ['./input-text.component.scss'],
-  standalone: true,
-  imports: [ReactiveFormsModule, FormsModule, AlertErrorInputComponent],
+  imports: [
+    ReactiveFormsModule,
+    FormsModule,
+    AlertErrorInputComponent,
+    FloatLabelModule,
+    CommonModule
+  ],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
@@ -15,17 +22,43 @@ import { AlertErrorInputComponent } from '@shared/widgets/alert-error-input/aler
     },
   ],
   template: `
-  <input (ngModelChange)="onValueChange($event)" [(ngModel)]="value" type="email"
-          class="w-full px-4 py-2 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500"
-          [placeholder]="placeholder()" />
+  <div class="rounded-lg bg-white px-4 py-2">
+    <label class="block text-[#657687] mb-0 text-sm" [for]="label()"
+    >{{label()}}</label>
+      @if(this.type == 'password'){
+      <div class="relative">
+        <input [autocomplete]="false" (ngModelChange)="onValueChange($event)" [(ngModel)]="value" [type]="showPassword ? 'text' : type"
+        class="w-full p-0! border-none! rounded-lg focus:outline-none! focus:ring-0"
+        [placeholder]="placeholder()" />        
+        <i
+          class="pi absolute right-0 top-0 -translate-y-1/2 cursor-pointer text-gray-500 hover:text-gray-700"
+          [ngClass]="showPassword ? 'pi-eye' : 'pi-eye-slash'"
+          (click)="showPassword = !showPassword"
+        ></i>             
+      </div>
+      }  
+      @else {
+            <input (ngModelChange)="onValueChange($event)" [(ngModel)]="value" [type]="type"
+      class="w-full p-0! border-none! rounded-lg focus:outline-none! focus:ring-0"
+      [placeholder]="placeholder()" />
+      }
+  </div>
           <alert-error [control]="control" [label]="label()"></alert-error>
           `
 })
 export class InputTextComponent implements ControlValueAccessor, OnInit {
 
+  showPassword = false;
   @Input() control!: FormControl | any;
-  placeholder = input('Enter your email'); //default
-  label = input('label'); //default
+  @Input() idLabel = "";
+  @Input() variant: "floating" | "normal" = "normal";
+  @Input() name = "";
+  @Input() typeLabel: "over" | "on" | "in" = "in";
+  @Input() type: "password" | "email" | "text" | "number" = "text";
+
+  placeholder = input("Enter your email"); //default
+  label = input("label"); //default
+  form: any = input();
 
   value: any;
 
@@ -56,6 +89,9 @@ export class InputTextComponent implements ControlValueAccessor, OnInit {
   onValueChange(value: any) {
     this.onChange(value);
   }
+  togglePassword() {
+    this.showPassword = !this.showPassword;
+  }
 
   // Fungsi yang akan dipanggil ketika nilai diubah
   onChange: (date: any) => void = () => { };

package/bin/utils/resource/tools/dx.js

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+
+const { execSync } = require("child_process");
+
+function run(cmd) {
+  console.log(`\n$ ${cmd}`);
+  execSync(cmd, { stdio: "inherit" });
+}
+
+function branch() {
+  return execSync("git rev-parse --abbrev-ref HEAD").toString().trim();
+}
+
+const cmd = process.argv[2];
+const arg = process.argv.slice(3).join(" ");
+
+switch (cmd) {
+
+  case "feature":
+
+    if (!arg) {
+      console.log("❌ feature name required");
+      process.exit();
+    }
+
+    run("git fetch origin");
+    run("git checkout development");
+    run("git pull origin development");
+    run(`git checkout -b feature/${arg}`);
+
+    console.log(`✅ feature/${arg} created`);
+    break;
+
+
+  case "sync":
+
+    const b = branch();
+
+    run("git fetch origin");
+    run("git checkout development");
+    run("git pull origin development");
+    run(`git checkout ${b}`);
+    run("git rebase development");
+
+    console.log("✅ branch synced");
+    break;
+
+
+  case "commit":
+
+    if (!arg) {
+      console.log("❌ commit message required");
+      process.exit();
+    }
+
+    run("git add .");
+    run(`git commit -m "${arg}"`);
+    run(`git push origin ${branch()}`);
+
+    break;
+
+
+  case "pr":
+
+    const bp = branch();
+
+    run(`gh pr create --base development --head ${bp} --title "${bp}"`);
+
+    break;
+
+
+  case "finish":
+
+    const bf = branch();
+
+    run("git checkout development");
+    run("git pull origin development");
+    run(`git merge ${bf}`);
+    run("git push origin development");
+
+    run(`git branch -d ${bf}`);
+    run(`git push origin --delete ${bf}`);
+
+    console.log("🎉 feature merged");
+    break;
+
+
+  case "start":
+
+    console.log("🚀 starting dev environment");
+
+    run("git pull");
+    run("npm install");
+    run("ng serve");
+
+    break;
+
+
+  case "release":
+
+    console.log("📦 releasing project");
+
+    run("git checkout staging");
+    run("git merge development");
+    run("git push origin staging");
+
+    break;
+
+
+  default:
+
+    console.log(`
+DX CLI
+
+dx feature <name>   create feature branch
+dx sync             sync with development
+dx commit "msg"     commit + push
+dx pr               create pull request
+dx finish           merge feature
+dx start            start dev environment
+dx release          release to staging
+`);
+}

package/bin/utils/updatePackageJson.js

@@ -8,7 +8,8 @@ const listPackagesToInstall = [
   "npm i @ngx-pwa/local-storage --legacy-peer-deps",
   "npm i primeng --legacy-peer-deps",
   "npm i primeicons @primeuix/themes quill --legacy-peer-deps",
-  "npm i sweetalert2  --legacy-peer-deps"
+  "npm i sweetalert2  --legacy-peer-deps",
+  "npm i @angular/animations --legacy-peer-deps",
 ];
 
 
@@ -41,6 +42,13 @@ async function update_package_json() {
 
 
 
+  // ------------------- Bin -------------------
+  pkg.bin = pkg.bin || {};
+  pkg.bin["dx"] = "./tools/dx.js";
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+  show_status('Menambahkan field "bin" ke package.json!', "success");
+
+
   listPackagesToInstall.forEach(command => {  
     console.log(`Menjalankan: ${command}`);
     try {
@@ -51,6 +59,9 @@ async function update_package_json() {
     }
   });
 
+
+
+
   
 
   // ------------------- Angular file replacements -------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unictive-angular",
-  "version": "1.0.40",
+  "version": "1.0.43",
   "description": "CLI untuk membuat project Angular dengan struktur kustom (Modules, Core, API, Shared).",
   "scripts": {
     "build": "npm version patch && npm publish --access public"