simpledomcontrol 0.4.11__tar.gz → 0.4.13__tar.gz

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.4.11
+Version: 0.4.13
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0
@@ -20,8 +20,8 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: attrs (>=23.2.0,<24.0.0)
 Requires-Dist: channels (>=4.0.0,<5.0.0)
 Requires-Dist: channels-redis (>=4.2.0,<5.0.0)
-Requires-Dist: daphne (>=4.0.0,<5.0.0)
-Requires-Dist: django (>=5.0.1,<6.0.0)
+Requires-Dist: daphne (>=4.1.0,<5.0.0)
+Requires-Dist: django (>=5.0.3,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: regex (>=2023.12.25,<2024.0.0)
 Description-Content-Type: text/markdown

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.4.11"
+version = "0.4.13"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"
@@ -19,10 +19,10 @@ homepage = "https://github.com/StarmanMartin/sdc"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-daphne = "^4.0.0"
+daphne = "^4.1.0"
 channels = "^4.0.0"
 channels-redis = "^4.2.0"
-django = "^5.0.1"
+django = "^5.0.3"
 psycopg2-binary = "^2.9.9"
 attrs = "^23.2.0"
 regex = "^2023.12.25"

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_core/template_files/package.json

@@ -75,6 +75,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.4.11"
+    "sdc_client": "^0.4.13"
   }
 }

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_tools/Assets/src/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -9,7 +9,7 @@ export class SdcNavigatorController extends AbstractSDC {
     constructor() {
         super();
         this.contentUrl = "/sdc_view/sdc_tools/sdc_navigator"; //<sdc-navigator></sdc-navigator>
-
+        this._isLoggedIn = false;
         this._history_path = [];
         this._breadcrumb = [];
         this._history_idx = 0;
@@ -21,6 +21,7 @@ export class SdcNavigatorController extends AbstractSDC {
         this._is_processing = false;
         this._process_queue = [];
         this._current_process = null;
+        this._redirectAfterCurrentProcess = null;
 
         this._non_controller_path_prefix = '/';
         this._menu_id = 0;
@@ -58,6 +59,7 @@ export class SdcNavigatorController extends AbstractSDC {
     onLoad($html) {
         on('onNavLink', this);
         on('onNavigateToController', this);
+        on('_RedirectOnView', this);
         on('goTo', this);
         on('changeMenu', this);
         on('navigateToPage', this);
@@ -66,6 +68,7 @@ export class SdcNavigatorController extends AbstractSDC {
         on('logout', this);
 
         $html.find('.main-nav-import-container').append(this.$container.html());
+        this._isLoggedIn = $html.find('.main-page-frame').data('user');
         return super.onLoad($html);
     }
 
@@ -144,7 +147,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
     navigateToPage(target, args, _state) {
         this._current_process = [target, args];
-        this.state && this._updateButton(this.state.buttonSelector);
+        _state && this._updateButton(_state.buttonSelector);
         this._is_processing = true;
         this._origin_target = target;
 
@@ -185,9 +188,7 @@ export class SdcNavigatorController extends AbstractSDC {
             }
             this._is_processing = false;
             this._updateBreadcrumb();
-            this._current_process = null;
-            let next = this._process_queue.shift();
-            if (next) this._pushState(next);
+            this._checkProcessQueue();
             this.refresh();
             return;
         }
@@ -224,6 +225,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
 
     navLoaded(controller) {
+        console.log(this._current_process, controller.controller_name(), this._previous_args);
         let idx = this._history_path.length - 1;
         let last_view_array = this._preparedLastViewContainer(idx);
         last_view_array.active_container.removeClass('active loading').addClass('empty');
@@ -239,9 +241,7 @@ export class SdcNavigatorController extends AbstractSDC {
         } else {
             this._updateBreadcrumb();
             if (!this._manageDefault(last_view_array.empty_container)) {
-                let next = this._process_queue.shift();
-                this._current_process = null;
-                if (next) this._pushState(next, false);
+                this._checkProcessQueue();
             }
             setTimeout(() => {
                 this.$container.find('.header-loading').removeClass('active');
@@ -249,6 +249,23 @@ export class SdcNavigatorController extends AbstractSDC {
         }
     }
 
+    _checkProcessQueue() {
+        let next = this._process_queue.shift();
+        this._current_process = null;
+        if (next) {
+            this._pushState(next[0], next[1]);
+        } else if (this._redirectAfterCurrentProcess) {
+            const temp = this._redirectAfterCurrentProcess;
+            this._redirectAfterCurrentProcess=null;
+            this.goTo(temp);
+        }
+
+    }
+
+    _RedirectOnView($btn) {
+        this._redirectAfterCurrentProcess = $($btn).attr('href');
+    }
+
     _updateBreadcrumb() {
         this._breadcrumb.splice(this._history_path.length);
         const $breadcrumps = this.find('.breadcrumb');
@@ -393,6 +410,14 @@ export class SdcNavigatorController extends AbstractSDC {
             $button.addClass('active');
         }
 
+        if(this._isLoggedIn) {
+            this.find('.navigation-links.only-logged-in').show();
+            this.find('.navigation-links.only-logged-out').hide();
+        } else {
+            this.find('.navigation-links.only-logged-in').hide();
+            this.find('.navigation-links.only-logged-out').show();
+        }
+
         return $button;
     }
 
@@ -499,7 +524,7 @@ export class SdcNavigatorController extends AbstractSDC {
         const $sub_container = container.find(`.${SDC_DETAIL_CONTROLLER}`);
         const df = $sub_container.data('default-controller');
         if (df) {
-            this._pushState(`.~${df}`);
+            this._pushState(`.~${df}`, false);
             return true;
         }
 
@@ -508,7 +533,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
     _pushState(url, commit= true) {
         if(this._is_processing) {
-            this._process_queue.push(url);
+            this._process_queue.push([url, commit]);
             return;
         }
 
@@ -521,12 +546,15 @@ export class SdcNavigatorController extends AbstractSDC {
     }
 
     login() {
+        this._isLoggedIn = true;
         app.cleanCache();
         this.onNavigateToController(window.location.pathname);
     }
 
-    logout(pk) {
-        this.login(pk);
+    logout() {
+        this._isLoggedIn = false;
+        app.cleanCache();
+        this.onNavigateToController(window.location.pathname);
     }
 
 }

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_tools/Assets/tests/sdc_tools.test.js

@@ -63,7 +63,8 @@ describe('SdcNavigator', () => {
     test('Navigate next level [A.2]', async () => {
         trigger('goTo', './sdc-dummy', {text: 'SUB DUMMY A.2'});
         await new Promise(resolve => setTimeout(resolve, 100));
-        expect(controller.find('.1_sdc_sub_detail_container.active').text().trim()).toBe('SUB DUMMY A.2');
+        let idx = controller._origin_target.length - 1
+        expect(controller.find(`.${idx}_sdc_sub_detail_container.active`).text().trim()).toBe('SUB DUMMY A.2');
     });
 
     test('Navigate next level [B]', async () => {
@@ -94,7 +95,8 @@ describe('SdcNavigator', () => {
         trigger('goTo', ['/', 'sdc-dummy'], {text: 'DUMMY B'});
         trigger('goTo', ['', 'sdc-dummy', 'sdc-dummy'], {text: 'SUB DUMMY B'});
         trigger('goTo', ['..']);
-        await new Promise(resolve => setTimeout(resolve, 100));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        console.log(controller);
         expect(controller.find('.0_sdc_sub_detail_container.active').text().trim()).toBe('DUMMY B');
         expect(controller.find('.1_sdc_sub_detail_container.active').text().trim()).toBe('');
     });

simpledomcontrol-0.4.13/sdc_tools/templates/sdc_tools/sdc/sdc_navigator.html

@@ -0,0 +1,8 @@
+<div class="main-page-frame" data-user="{% if user.is_authenticated %}true{% else %}false{% endif %}">
+    <div class="main-nav-import-container">
+
+    </div>
+
+
+    <div class="sdc_detail_view"></div>
+</div>

simpledomcontrol-0.4.13/sdc_user/Assets/src/sdc_user/controller/sdc_user_nav_btn/sdc_user_nav_btn.js

@@ -0,0 +1,55 @@
+import {AbstractSDC, app, on} from 'sdc_client';
+
+
+class SdcUserNavBtnController extends AbstractSDC {
+
+    constructor() {
+        super();
+        this.contentUrl = "/sdc_view/sdc_user/sdc_user_nav_btn"; //<sdc-user-nav-btn></sdc-user-nav-btn>
+
+        /**
+         * Events is an array of dom events.
+         * The pattern is {'event': {'dom_selector': handler}}
+         * Uncommend the following line to add events;
+         */
+        // this.events.unshift({'click': {'.header-sample': (ev, $elem)=> $elem.css('border', '2px solid black')}}});
+    }
+
+    //-------------------------------------------------//
+    // Lifecycle handler                               //
+    // - onInit (tag parameter)                        //
+    // - onLoad (DOM not set)                          //
+    // - willShow  (DOM set)                           //
+    // - onRefresh  (recalled on reload)              //
+    //-------------------------------------------------//
+    // - onRemove                                      //
+    //-------------------------------------------------//
+
+    onInit() {
+        on('login', this);
+        on('logout', this);
+    }
+
+    onLoad($html) {
+        return super.onLoad($html);
+    }
+
+    willShow() {
+        return super.willShow();
+    }
+
+    onRefresh() {
+        return super.onRefresh();
+    }
+
+    login() {
+        this.reload();
+    }
+
+    logout() {
+        this.reload();
+    }
+
+}
+
+app.register(SdcUserNavBtnController);

simpledomcontrol-0.4.13/sdc_user/Assets/src/sdc_user/controller/sdc_user_nav_btn/sdc_user_nav_btn.scss

@@ -0,0 +1,3 @@
+[sdc-user-nav-btn] {
+
+}

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_user/Assets/src/sdc_user/sdc_user.organizer.js

@@ -1,2 +1,3 @@
+import {} from "./controller/sdc_user_nav_btn/sdc_user_nav_btn.js";
 import {} from "./controller/sdc_logout/sdc_logout.js";
 import {} from "./controller/sdc_login/sdc_login.js";

simpledomcontrol-0.4.13/sdc_user/Assets/src/sdc_user/sdc_user.style.scss

@@ -0,0 +1,2 @@
+@import "./controller/sdc_login/sdc_login.scss";
+@import "./controller/sdc_user_nav_btn/sdc_user_nav_btn.scss";

simpledomcontrol-0.4.13/sdc_user/Assets/tests/sdc_user.test.js

@@ -0,0 +1,37 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import {test_utils} from 'sdc_client';
+import '../src/sdc_user/sdc_user.organizer.js'
+
+
+describe('SdcNavigator', () => {
+    let controller;
+
+    beforeEach(async () => {
+        // Create new controller instance based on the standard process.
+        controller = await test_utils.get_controller('sdc_tools', {}, '<div><h1>Controller loading...</h1></div>');
+    });
+
+    test('Load Content', async () => {
+    });
+
+});
+
+describe('SdcUserNavBtn', () => {
+    let controller;
+
+    beforeEach(async () => {
+        // Create new controller instance based on the standard process.
+        controller = await test_utils.get_controller('sdc-user-nav-btn',
+                                                  {},
+                                                  '<div><h1>Controller Loaded</h1></div>');
+    });
+
+    test('Load Content', async () => {
+        const $div = $('body').find('sdc-user-nav-btn');
+        expect($div.length).toBeGreaterThan(0);
+    });
+
+});

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_user/sdc_urls.py

@@ -1,10 +1,11 @@
-from django.urls import path, re_path
+from django.urls import path
 from . import sdc_views
 
 # Do not add an app_name to this file
 
 urlpatterns = [
     # scd view below
+    path('sdc_user_nav_btn', sdc_views.SdcUserNavBtn.as_view(), name='scd_view_sdc_user_nav_btn'),
     path('sdc_logout', sdc_views.SdcLogout.as_view(), name='scd_view_sdc_logout'),
     path('sdc_login', sdc_views.SdcLogin.as_view(), name='scd_view_sdc_login'),
 ]

{simpledomcontrol-0.4.11 → simpledomcontrol-0.4.13}/sdc_user/sdc_views.py

@@ -48,5 +48,11 @@ class SdcLogout(SDCView):
         logout(request)
         return send_redirect(url=f'/~{settings.LOGIN_CONTROLLER}')
 
+    def get_content(self, request, *args, **kwargs):
+        return render(request, self.template_name)
+
+class SdcUserNavBtn(SDCView):
+    template_name='sdc_user/sdc/sdc_user_nav_btn.html'
+
     def get_content(self, request, *args, **kwargs):
         return render(request, self.template_name)

simpledomcontrol-0.4.13/sdc_user/templates/sdc_user/sdc/sdc_user_nav_btn.html

@@ -0,0 +1,5 @@
+{% if user.is_authenticated %}
+<sdc-logout></sdc-logout>
+{% else %}
+<a class="nav-link navigation-links" href="/sdc-login">Login</a>
+{% endif %}

simpledomcontrol-0.4.11/sdc_tools/templates/sdc_tools/sdc/sdc_navigator.html

@@ -1,8 +0,0 @@
-<div class="main-page-frame">
-    <div class="main-nav-import-container">
-
-    </div>
-
-
-    <div class="sdc_detail_view"></div>
-</div>

simpledomcontrol-0.4.11/sdc_user/Assets/src/sdc_user/sdc_user.style.scss

@@ -1 +0,0 @@
-@import "./controller/sdc_login/sdc_login.scss";

simpledomcontrol-0.4.11/sdc_user/Assets/tests/sdc_user.test.js

@@ -1,20 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-
-import {test_utils} from 'sdc_client';
-import '../src/sdc_user/sdc_user.organizer.js'
-
-
-describe('SdcNavigator', () => {
-    let controller;
-
-    beforeEach(async () => {
-        // Create new controller instance based on the standard process.
-        controller = await test_utils.get_controller('sdc_tools', {}, '<div><h1>Controller loading...</h1></div>');
-    });
-
-    test('Load Content', async () => {
-    });
-
-});