From 7397d1a2824493601b48035dc880fe542c497303 Mon Sep 17 00:00:00 2001 From: Anoop Date: Thu, 27 Oct 2022 18:45:06 +0530 Subject: [PATCH] Rebranded --- .../question-about-using-influxframework.md | 2 +- README.md | 2 +- influxframework/installer.py | 82 +------------------ .../public/js/influxframework/utils/help.js | 2 +- influxframework/website/js/website.js | 2 +- .../introduction_to_website.json | 4 +- 6 files changed, 7 insertions(+), 87 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/question-about-using-influxframework.md b/.github/ISSUE_TEMPLATE/question-about-using-influxframework.md index 2b853c0..1c10a48 100644 --- a/.github/ISSUE_TEMPLATE/question-about-using-influxframework.md +++ b/.github/ISSUE_TEMPLATE/question-about-using-influxframework.md @@ -14,6 +14,6 @@ for questions about using `bench`, probably the best place to start is the [benc For documentation issues, use the [InfluxFramework Framework Documentation](https://influxframework.com/docs) or the [developer cheetsheet](https://github.com/influxframework/influxframework/wiki/Developer-Cheatsheet) -For a slightly outdated yet informative developer guide: https://www.youtube.com/playlist?list=PL3lFfCEoMxvzHtsZHFJ4T3n5yMM3nGJ1W +For a slightly outdated yet informative developer guide: https://www.influxframework.com/playlist?list=PL3lFfCEoMxvzHtsZHFJ4T3n5yMM3nGJ1W > **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.** diff --git a/README.md b/README.md index 8d36e53..6c48ec3 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- a web framework with "batteries included" + a web framework with "batteries included"

it's pronounced - fra-pay diff --git a/influxframework/installer.py b/influxframework/installer.py index 081d146..ba9945a 100644 --- a/influxframework/installer.py +++ b/influxframework/installer.py @@ -162,88 +162,8 @@ def install_db( influxframework.flags.in_install_db = False -def find_org(org_repo: str) -> tuple[str, str]: - """find the org a repo is in - - find_org() - ref -> https://github.com/influxframework/bench/blob/develop/bench/utils/__init__.py#L390 - - :param org_repo: - :type org_repo: str - - :raises InvalidRemoteException: if the org is not found - - :return: organisation and repository - :rtype: Tuple[str, str] - """ - import requests - - from influxframework.exceptions import InvalidRemoteException - - for org in ["influxframework", "influxerp"]: - response = requests.head(f"https://api.github.com/repos/{org}/{org_repo}") - if response.status_code == 400: - response = requests.head(f"https://github.com/{org}/{org_repo}") - if response.ok: - return org, org_repo - - raise InvalidRemoteException - - -def fetch_details_from_tag(_tag: str) -> tuple[str, str, str]: - """parse org, repo, tag from string - - fetch_details_from_tag() - ref -> https://github.com/influxframework/bench/blob/develop/bench/utils/__init__.py#L403 - - :param _tag: input string - :type _tag: str - - :return: organisation, repostitory, tag - :rtype: Tuple[str, str, str] - """ - app_tag = _tag.split("@") - org_repo = app_tag[0].split("/") - - try: - repo, tag = app_tag - except ValueError: - repo, tag = app_tag + [None] - - try: - org, repo = org_repo - except Exception: - org, repo = find_org(org_repo[0]) - - return org, repo, tag - - def parse_app_name(name: str) -> str: - """parse repo name from name - - __setup_details_from_git() - ref -> https://github.com/influxframework/bench/blob/develop/bench/app.py#L114 - - - :param name: git tag - :type name: str - - :return: repository name - :rtype: str - """ - name = name.rstrip("/") - if os.path.exists(name): - repo = os.path.split(name)[-1] - elif is_git_url(name): - if name.startswith("git@") or name.startswith("ssh://"): - _repo = name.split(":")[1].rsplit("/", 1)[1] - else: - _repo = name.rsplit("/", 2)[2] - repo = _repo.split(".")[0] - else: - _, repo, _ = fetch_details_from_tag(name) - return repo - + return name def install_app(name, verbose=False, set_as_patched=True, force=False): from influxframework.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs diff --git a/influxframework/public/js/influxframework/utils/help.js b/influxframework/public/js/influxframework/utils/help.js index 63723e8..cdcf528 100644 --- a/influxframework/public/js/influxframework/utils/help.js +++ b/influxframework/public/js/influxframework/utils/help.js @@ -18,7 +18,7 @@ influxframework.help.show = function (doctype) { influxframework.help.show_video = function (youtube_id, title) { if (influxframework.utils.is_url(youtube_id)) { const expression = - '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^"&?\\s]{11})'; + '(?:influxframework.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^"&?\\s]{11})'; youtube_id = youtube_id.match(expression)[1]; } diff --git a/influxframework/website/js/website.js b/influxframework/website/js/website.js index 11183c3..118d1ec 100644 --- a/influxframework/website/js/website.js +++ b/influxframework/website/js/website.js @@ -461,7 +461,7 @@ $.extend(influxframework, { console.log(id); $video.find(".video-thumbnail").hide(); $video.append(` - + `); }); }, diff --git a/influxframework/website/onboarding_step/introduction_to_website/introduction_to_website.json b/influxframework/website/onboarding_step/introduction_to_website/introduction_to_website.json index 29c1d8f..31b7fc5 100644 --- a/influxframework/website/onboarding_step/introduction_to_website/introduction_to_website.json +++ b/influxframework/website/onboarding_step/introduction_to_website/introduction_to_website.json @@ -15,5 +15,5 @@ "show_full_form": 0, "title": "Introduction to Website", "validate_action": 0, - "video_url": "https://www.youtube.com/watch?v=lyW6mfFBSNw" -} \ No newline at end of file + "video_url": "https://www.influxframework.com/watch?v=lyW6mfFBSNw" +}