From 3dbaf42ea3fc03e8a4dee4ec3ab8257110520159 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Fri, 6 May 2022 18:33:50 +0530 Subject: [PATCH 1/5] wip --- .gitignore | 3 + app/jobs.py | 1 + app/lib.py | 2 + app/views.py | 103 ++- cdoc/settings.py | 11 +- cdoc/urls.py | 6 +- lib.py | 1 + templates_ftd/FPM.ftd | 8 + templates_ftd/assets/images/Icon.svg | 3 + templates_ftd/assets/images/Union.png | Bin 0 -> 241 bytes templates_ftd/assets/images/Vector.png | Bin 0 -> 397 bytes templates_ftd/assets/images/back-logo.png | Bin 0 -> 205 bytes templates_ftd/assets/images/fifthtry-logo.png | Bin 0 -> 1748 bytes templates_ftd/assets/images/icon-github.png | Bin 0 -> 397 bytes templates_ftd/assets/images/icon-language.png | Bin 0 -> 304 bytes templates_ftd/assets/images/icon-moon.png | Bin 0 -> 437 bytes templates_ftd/assets/images/icon9.png | Bin 0 -> 265 bytes templates_ftd/assets/images/lower-rect.png | Bin 0 -> 158 bytes .../assets/images/lower-rectangle.png | Bin 0 -> 138 bytes templates_ftd/assets/images/orgname.png | Bin 0 -> 298 bytes templates_ftd/assets/images/pull-request.png | Bin 0 -> 468 bytes .../assets/images/rectangle-white.png | Bin 0 -> 241 bytes templates_ftd/assets/images/rectangle.png | Bin 0 -> 282 bytes templates_ftd/assets/images/repo-code.png | Bin 0 -> 474 bytes .../assets/images/site-logo-black.png | Bin 0 -> 2655 bytes templates_ftd/assets/images/upper-rect.png | Bin 0 -> 158 bytes templates_ftd/config.ftd | 0 templates_ftd/custom-typo.ftd | 129 +++ templates_ftd/first.ftd | 3 + templates_ftd/index.ftd | 796 ++++++++++++++++++ templates_ftd/model.ftd | 0 templates_ftd/popup.ftd | 405 +++++++++ 32 files changed, 1465 insertions(+), 6 deletions(-) create mode 100644 templates_ftd/FPM.ftd create mode 100644 templates_ftd/assets/images/Icon.svg create mode 100644 templates_ftd/assets/images/Union.png create mode 100644 templates_ftd/assets/images/Vector.png create mode 100644 templates_ftd/assets/images/back-logo.png create mode 100644 templates_ftd/assets/images/fifthtry-logo.png create mode 100644 templates_ftd/assets/images/icon-github.png create mode 100644 templates_ftd/assets/images/icon-language.png create mode 100644 templates_ftd/assets/images/icon-moon.png create mode 100644 templates_ftd/assets/images/icon9.png create mode 100644 templates_ftd/assets/images/lower-rect.png create mode 100644 templates_ftd/assets/images/lower-rectangle.png create mode 100644 templates_ftd/assets/images/orgname.png create mode 100644 templates_ftd/assets/images/pull-request.png create mode 100644 templates_ftd/assets/images/rectangle-white.png create mode 100644 templates_ftd/assets/images/rectangle.png create mode 100644 templates_ftd/assets/images/repo-code.png create mode 100644 templates_ftd/assets/images/site-logo-black.png create mode 100644 templates_ftd/assets/images/upper-rect.png create mode 100644 templates_ftd/config.ftd create mode 100644 templates_ftd/custom-typo.ftd create mode 100644 templates_ftd/first.ftd create mode 100644 templates_ftd/index.ftd create mode 100644 templates_ftd/model.ftd create mode 100644 templates_ftd/popup.ftd diff --git a/.gitignore b/.gitignore index 4b1db45..a4fc8e9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ local_settings.py db.sqlite3 db.sqlite3-journal media +.DS_Store +*.packages +*.build # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/ # in your Git repository. Update and uncomment the following line accordingly. diff --git a/app/jobs.py b/app/jobs.py index bb447bf..0ad6a32 100644 --- a/app/jobs.py +++ b/app/jobs.py @@ -22,6 +22,7 @@ def sync_repositories_for_installation( installation_instance.installation_id, installation_instance.creator.get_active_access_token(), ) + print("sync_repositories_for_installation:::", github_manager) github_manager.sync_repositories() diff --git a/app/lib.py b/app/lib.py index a58b4e1..157adea 100644 --- a/app/lib.py +++ b/app/lib.py @@ -20,7 +20,9 @@ def __init__(self, installation_id: int, user_token: str): def sync_repositories(self): repo_generator = self.github_manager_instance.get_repositories() + print("sync_repositories::::", repo_generator) for repo in repo_generator: + print("repo:::", repo) app_models.GithubRepository.objects.get_or_create( repo_id=repo["id"], repo_name=repo["name"], diff --git a/app/views.py b/app/views.py index 8b4ee3b..c2bca1c 100644 --- a/app/views.py +++ b/app/views.py @@ -218,7 +218,7 @@ def post(self, request, *args, **kwargs): if not is_verified: return HttpResponse("Invalid signature", status=403) logger.info( - "Recieved Github webhook", + "Received Github webhook", extra={"data": {"headers": headers, "payload": payload}}, ) EVENT_TYPE = headers.get("X-Github-Event", None) @@ -353,6 +353,11 @@ def get(self, request): @method_decorator(login_required, name="dispatch") class AllPRView(TemplateView): + # if settings.USING_FTD: + # template_name = '/' + # else: + # template_name = "all_pr_for_org.html" + template_name = "all_pr_for_org.html" @log_http_event( @@ -370,9 +375,62 @@ def get(self, request, *args: Any, **kwargs: Any): github_user=github_user, installation=context["repo_mapping"].integration, ) + context.pop('repo_mapping') return self.render_to_response(context) def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: + def queryset_to_value(data): + import django + from datetime import date, datetime + print("get_context_data:", isinstance(data, django.db.models.query.QuerySet), isinstance(data, (datetime, date)), type(data)) + if settings.USING_FTD and isinstance(data, django.db.models.query.QuerySet): + value = list(data.values()) + for idx, val in enumerate(value): + print("isinstance(val, Dict):::", isinstance(val, Dict)) + if not isinstance(val, Dict): + continue + for k, v in val.items(): + value[idx][k] = queryset_to_value(v) + return value + elif settings.USING_FTD and isinstance(data, (datetime, date)): + return data.isoformat() + else: + return data + + def ftd_context(context): + # for key, value in context.items(): + # print("key:", key) + # context[key] = queryset_to_value(value) + new_context = { + "owner_account_name": context["repo_mapping"].code_repo.owner.account_name, + "code_repo_full_name": context["repo_mapping"].code_repo.repo_full_name, + "documentation_repo_full_name": context["repo_mapping"].documentation_repo.repo_full_name, + "open_prs": [], + } + for open_pr in context["open_prs"]: + code_pull_request = { + "pr_number": open_pr.code_pull_request.pr_number, + "pr_title": open_pr.code_pull_request.pr_title + } + documentation_pull_request = { + "pr_number": open_pr.documentation_pull_request.pr_number, + "pr_title": open_pr.documentation_pull_request.pr_title + } if open_pr.documentation_pull_request else None + approver_info = { + "approver": open_pr.get_latest_approval().approver.github_user.account_name if open_pr.get_latest_approval().approver else None, + "created_on": open_pr.get_latest_approval().created_on + } if open_pr.get_latest_approval() else None + open_pr_data = { + "pull_request_status": open_pr.pull_request_status, + "code_pull_request": code_pull_request, + "documentation_pull_request": documentation_pull_request, + "pull_request_status_display": open_pr.get_pull_request_status_display(), + "approver_info": approver_info + } + new_context["open_prs"].append(open_pr_data) + + return new_context + context = super().get_context_data(**kwargs) matches = self.request.resolver_match.kwargs context["all_installations"] = app_models.GithubAppInstallation.objects.filter( @@ -410,6 +468,15 @@ def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: context["all_documentation_prs"] = app_models.GithubPullRequest.objects.filter( repository=context["repo_mapping"].documentation_repo, pr_state="open" ) + + # if settings.USING_FTD: + # new_context = ftd_context(context) + # new_context["repo_mapping"] = context["repo_mapping"] + # new_context["view"] = context["view"] + # context = new_context + + print("context::::",context) + return context @@ -531,6 +598,10 @@ def post(self, request, *args, **kwargs): class AppIndexPage(TemplateView): + # if not settings.USING_FTD: + # template_name = "index.html" + # else: + # template_name = "/" template_name = "index.html" def get_okind_ekind(view, request, *args, **kwargs): @@ -571,6 +642,30 @@ def get(self, request, *args, **kwargs) -> HttpResponse: return super().get(request, *args, **kwargs) def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: + + # def serialize(data): + # from django.core import serializers + # if settings.USING_FTD: + # from django.core import serializers + # try: + # return serializers.serialize('json', data) + # except: + # return None + # else: + # return data + # + # + # def ftd_context(context): + # import django + # for key, value in context.items(): + # print("ftd_context",type(value), isinstance(value, django.db.models.query.QuerySet)) + # value = serialize(value) + # if value: + # context[key] = value + # context["is_authenticated"] = self.request.user.is_authenticated + # return context + # + context = super().get_context_data(**kwargs) if self.request.user.is_authenticated: all_installations = app_models.GithubAppInstallation.objects.filter( @@ -618,6 +713,12 @@ def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: req.prepare_url(url, params) context["github_login_url"] = req.url + + # if settings.USING_FTD: + # context = ftd_context(context) + + print("context::::", context) + return context diff --git a/cdoc/settings.py b/cdoc/settings.py index f42ebdc..e9f1024 100644 --- a/cdoc/settings.py +++ b/cdoc/settings.py @@ -35,6 +35,7 @@ "localhost", "0.0.0.0", "fifthtry-cdoc.herokuapp.com", + "a51f-14-141-47-2.in.ngrok.io", DEPLOYMENT_HOST_NAME, ] @@ -85,10 +86,10 @@ ], }, }, - # { - # "BACKEND": "ftd_django.TemplateBackend", - # "DIRS": ["cdoc-doc"], - # }, + { + "BACKEND": "ftd_django.TemplateBackend", + "DIRS": ["templates_ftd"], + }, ] WSGI_APPLICATION = "cdoc.wsgi.application" @@ -247,6 +248,8 @@ "NAME": BASE_DIR / "db.sqlite3", } +USING_FTD = False + try: from .local_settings import * # noqa except ModuleNotFoundError: diff --git a/cdoc/urls.py b/cdoc/urls.py index 14d211d..6efd024 100644 --- a/cdoc/urls.py +++ b/cdoc/urls.py @@ -56,7 +56,11 @@ ), path("ftd/", app_views.IndexView.as_view()), ] -# + ftd_django.static() + + + +if settings.USING_FTD: + urlpatterns += ftd_django.static() def make_v(template, context): diff --git a/lib.py b/lib.py index efbe787..5392ef3 100644 --- a/lib.py +++ b/lib.py @@ -108,6 +108,7 @@ def _get_repository_page(self, page: int, per_page: Optional[int] = None): f"https://api.github.com/user/installations/{self.installation_id}/repositories?per_page={per_page}&page={page}", headers=headers, ) + print("_get_repository_page response::", response.text) if response.ok: response_data = response.json() logger.info(response.content.decode()) diff --git a/templates_ftd/FPM.ftd b/templates_ftd/FPM.ftd new file mode 100644 index 0000000..d03199f --- /dev/null +++ b/templates_ftd/FPM.ftd @@ -0,0 +1,8 @@ +-- import: fpm + +-- fpm.package: templates-ftd +zip: github.com/priyanka9634/firsttry-ftd/archive/refs/heads/main.zip + +-- fpm.auto-import: templates-ftd/assets + +-- fpm.dependency: fifthtry.github.io/inter diff --git a/templates_ftd/assets/images/Icon.svg b/templates_ftd/assets/images/Icon.svg new file mode 100644 index 0000000..ec75180 --- /dev/null +++ b/templates_ftd/assets/images/Icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/templates_ftd/assets/images/Union.png b/templates_ftd/assets/images/Union.png new file mode 100644 index 0000000000000000000000000000000000000000..266e0769fbe443624e26045a2acbe6eef566f661 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWND9BhG zy?YV4GKIg7mm4>1iKZpxFxW- zS$H2{5nkXPr2n%2in^8pLsQtbuBhb`F5dHg?dB^`Gg)Gd;>z9n-phk-FlcseZd6SB zW+d_VKfyG3Y$-GX^S6T ho%BDUJ6Gu;qjK794V@UBP+myhAzoUI{0(Y92$7*Q3i3Nv$uO=OL5 zlSbZ^?e|mpt^fwCiTqKOqvOeIcllmpg?|P%T5X@+ER6CN-|ljaS&%%7cq)hVmvS2I zXUr-`sr0ESXw^vK-5Hg9(-A|>px}-hn0`HAY#^n|E$}BYY5bDcF)9d1 rIao#heE}EHqf*j8&PhTvkqy29T2*f<63tae00000NkvXXu0mjf2)~w#^4|I14-?iy0WWg+Z8+Vb&Z8pde#$ zkh>GZx^prwfgF}}M_)$E)e-c@N{3K5o$B+ufx04-t8w_|{?KKWC7I(BLCJGfa zh{`lfzBK>qu9VFD({Z0R#r~Qk$7Lcgv3b$tt%4_iiIg^ryDgdYFm=s|q{GX9trV}Z w;o1Akvm!^HS2?*HqbT(Pgg&ebxsLQ0NDLQRR910 literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/fifthtry-logo.png b/templates_ftd/assets/images/fifthtry-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a9dce49fdb3b00d90c0fc49f0bbb8404800e00fd GIT binary patch literal 1748 zcmV;_1}piAP)uN;$upn<^)(LD4YQM1ceh=oB(nHixb4TKqXFK)xhgVloP~x4SZ;@ zwlmU79|g?U{=K)Bc6MjAnw_1Q9T@;2r98sY0|u%S9V(!B`v%@#4c-NAal+5Hj)-!i* z{7&m1-_GiD8h+#7^7d6B*BYEKX&Tp<0JY4iGYInfFuOZKu>)}N=30ue?Rq!n| z-&~_nld*b=FaE1R!=3Pr6TymM(T}o?Ev>CB>p4T})7Ho>S>X&7FA3XZgWp$ZdVi7m zlJ?3NQadftgh}XsFM$&*HBpz*{$}^CEO&-FZ@}(5WrA0>*kh!K-IG9lli<~uoq}f? z=S#wDY`~rnGtWry)B-1vrgO)1id&Rk_=3^OoZ&}}m$vt5LA#C+rh=x0CUewf?H>$I zbm?c3P)WF4@ZUq=Ih12^HJT^uJ43f>yaHYu%Zw>8jaPHNMC(8WT0_5yPSYpH*}Cyt zu*TD2XXGEi8f&bv#*c+0G9ian(q~){MdW-{2N{iroEH@uGeX`FmV|P^&9XUiv~K+- zKDAle344TFPUTqN0)Z31h1r~k2^eaLfD^P+sE6&{vH{dV=p10~r6V z631!5d#HiNSJ(>oRu@K6oNm|XXVMP4;C>EjM|fhv|iHqegiq$7;@Dal6Ks@9gu zCy69dn(l1MRwkOPVa5?NeKp2PenRsjP5}_@T?>^cdubdT%(=GP_u=mfdU57(jcE# z3?F5tvLdwrxZ0sqi#+)`xkgF*1kJLQ+8u14v+1WW?-YwPYgH)wcwy6ZnV5cAkU5bC zy7da&c#;MZqu-oVMiLiWsGSuHTBwxX5c{A8X;={GLJz8h#lo0ZePSJVaChO}NOobjH9nil6v@vv^M+bdZjUVun zqXoHXKquJRz4Gbf_81-Nxrt8-d?)3<@SX(TOnD)?dYi`X3ke-kCt><#YBPEO%9g1` z()%|VErQwaq-3wh$VX$e6-kfXiN|z8UJSAPoH;iWCSQRZXb+e{$9SNX*=&qX2B!QB zI^O^fUIC=@pN5L;lOhS7j`O5NN!Aa_L4AUXK9>vhj|%9AkcN=tjBGX*3A@Xp6xy!) z>Ygt|$ew#?dVsJ*AXQ|8!kk+~NheMkM}XnuIL^CScxHh{1G;fcAJ)~0mqN{L$IG7$ zF96c~Pp@Z`+H*2F;n qi^p2%E5L&V1G3{(8Vz}>xBm|(Q69ptQ|Af*0000200009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPuHusN6mkT3^G*c^a^;UG(oW(&FWXz%uSe^;8%H!V$#NdN$9 zWRIMXZ}{Pf9FVQa1vBGDDa=TBWN4$X6#c&q)5fr!9pQ@f2a62IR^&Nu=tY8Mu?AU- z9X0Ix&hjR1`b?P~0kxyZb+j_a%qz<A$jijs90lVl?8;S_cGJp=t zg;cGBeV2Hp!qf|Pm%=UvCOWHFQLUJcis4M!@0F^mDy(uthDrxhh6Q;>k5!Gviuv~3 rL8TMqycMwh)iIhoCH{zJUd#UgqI1&yFHTEV00000NkvXXu0mjfDIcE! literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/icon-language.png b/templates_ftd/assets/images/icon-language.png new file mode 100644 index 0000000000000000000000000000000000000000..c5dd14456b15fa8821461e1e11474e20f8bf90a3 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoM!3HGxw}u@9Qk(@Ik;M!Q+`=Ht$S`Y;1W=H% zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFK>krr7srqa#=BE*^Bywbag9Bq(DTgqkss6S zk|`THPr7p*EAnX4ZLC_dD)iC4*X~!C{s^VH)ipkNz|!utHH}T?;{Ww!Q`h91{?@J# zT7dB=i|$%ZLS8C@^bc+5K7&Nxhx+GtTcN0<50 z_iL)kcJJGht}v{X)KJbj(jTfEr>|U7R8%m0T9OZq00QeBa#lz%}IJ xp>W^zx{8}$c5Wy)Tg+rNF~2@)b+P?Cc2@tdB@%Iu=Kwv#;OXk;vd$@?2>{JRa^wI2 literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/icon-moon.png b/templates_ftd/assets/images/icon-moon.png new file mode 100644 index 0000000000000000000000000000000000000000..71ead2a216b4fa922a2b98465f59569ea3e62305 GIT binary patch literal 437 zcmV;m0ZRUfP)P000;W1^@s654Bdt00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPU0?Gu*2I&UwbMw*@Ib-aEKi=It8O!#w zWGRR|46L;UxCdK1U@M7u3LI`=DzKQijNAhd$kokz@W8Q~TT3EV9svV$km1Hh@EJVQ zeay1#N0vfGP^-C`bEV9{Y9dg|5J3kfKX8-?@J73vq-7i%Spq)x-{X3G1$~XofR4n_ zo;~ZnWr)U!y~+ZSTpf4;rf$cdt}%0&DKh5W+XoQZ!+g+xf>6bB{|D3BxB~L_6CDnp z5&-<~_7XkIzMsr*eVfg=Np65^YtO;08W-0#H>piWLC3YqMjP5t+L_-dinLLeRMDJL zgjfjSDAZ!3Zse?qSl`61zb0gP%guNI{o|imuLP3%M^{h`s!(dP7%`X)_#(rn$FU>7 fz#5I($wS~5n9bfH-ZXO-00000NkvXXu0mjfUaGc1 literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/icon9.png b/templates_ftd/assets/images/icon9.png new file mode 100644 index 0000000000000000000000000000000000000000..3328f1de29a641c76ab28d992fd577995de594cc GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~g!3HGv?z=Y!NO2Z;L>4nJa0`PlBg3pY55jgR3=A9lx&I`x0{QbiT^vIy7^emuu*{KPUD0qrqc|pIig(0mH?G9c)I$ztaD0e0sss=AS(a> literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/orgname.png b/templates_ftd/assets/images/orgname.png new file mode 100644 index 0000000000000000000000000000000000000000..8e21defd386e7fe74de1546ca62c87d48e01465b GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAua$9mU;X$^Td{3U&MXzm-oS?SsQbi!w#*K z)@o`hk8Rzo^*wanrc2we^oO&b6_bAUJBRbIMoGg|>+8$(Cm##!aPf9m)Q$MhBil8> pZQtSa#_e0Hgzw48@P9Gc`JFX1&fPF{q9Mrh44$rjF6*2UngA)SX;=UN literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/pull-request.png b/templates_ftd/assets/images/pull-request.png new file mode 100644 index 0000000000000000000000000000000000000000..2a6a16c5169b0cfb7d087dfc4f55a3faaeb8b7b2 GIT binary patch literal 468 zcmV;_0W1EAP)ndR3_p%zRZ~ds3<_hDcxC-LfLp$s+(tL=DubgBr6pK zK~S`yNF^(}aCl*|x+=9*4p*pyX>PuoZ6BQCL^>-Sxzw>>qwV!FSO#`vSDpSH=BW$%tSeqn}NkuX^$!Tqx};o^OcN$dm0}9Bzz8nQl{0`V;YX` zS>bjaj}JC(b`w$#fAac9%?nc*#G&1j1QPAkcG{BN8Ay_r^1ZvViaBdk;AA3z;~h}( zJWYv`6n*KnBFl``fq9=Wi)E>VLF3AwY=ajqe+G$}N@kn_xb_WzAB+1ESV}wq0000< KMNUMnLSTY>`^azr literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/rectangle-white.png b/templates_ftd/assets/images/rectangle-white.png new file mode 100644 index 0000000000000000000000000000000000000000..ce5ee65b347413dc34a7a4f002859cac1e4cb14e GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAuyW_Xh=`|J~ z48!kP=51NZIx}|03~nu^Gwlr?lNb1vu88^A-Fp3oYhx4Z^!~e9jtiL@=W~ehE$jP# ji>dbLj#IWAuk-yhKFtZcJuAKv=pqJBS3j3^P6 literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/rectangle.png b/templates_ftd/assets/images/rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..1be78033a1ec93c64d25b5e1d949e14a9fd17089 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAu)v@U{qDW?2CpkoZ9Gi@ zimEyXs%F>n^BC@Mn*Vlz!+);*+nSk@!)7EZZEfDPFTMJ@#4LqI)i$?9HFf6y+P(Pa b?_-eFwsQ*>`?A!^B2avc_%J{~V zgjW6%R`yHC4Da!M?`MWbpaO-$=)+_H?ZO0KjE~tz`=y Q6951J07*qoM6N<$f@^)uWB>pF literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/site-logo-black.png b/templates_ftd/assets/images/site-logo-black.png new file mode 100644 index 0000000000000000000000000000000000000000..e425b55ea2f642a385dd21e78c0331c0ed5a36ab GIT binary patch literal 2655 zcmV-l3ZV6gP)dLxR0UU(t+qTbkU6!Ah3#J|Ej1utyazz(7)A}aRY3(+XX-Zd61iDvVg&-uO2 zz9*BJ&CKp>vTNpnA<68VInR0O_j%6AW<{gX%36!Eva(wI{{6e6s;cUVb+1}ABIV`f zmE`2)6snMdplpi@EqNBz)YMdD{rdH*a`o!f?TU+w)rb)z)PMm4)T2j_)XkeW)vH&p zLUCmXb?DGRjT|{r4H+^-J%9dOm6w;RNs}g3MdX3kuV3ry^`4dVp&B%(nYT&?u+A%wJ?5J+vzO6QI-mJcU{i+HJ{~r(|_Cc0MtIL-! z>#KL~-fHyd(Q5MK$?ERiyXwY`8>+IhGL&o+Q>#|3v|fe{8>aPvULHPtsH~7&@7aiT z(>32#R8;5-YZx_Zl$tkhp7!!vw{GbdhSa#!t5+`_hI{nrp`+@qUAxrBk00ZXiCFk5 z+R%$}`BSG(sdMMf>5wpf{CG8G$`qZa@7%ege*E|mNZK)$ubp!vgE0K`}W#f3B@m8zEo$%*x1lsFls;N}F%%)b8P$Bz>(aWYcD zPN1xB-@d9_w{95?%A~|WvE*62b;E`YO^!EEaIK#K0H&Tjd+N)iOP4OGw{PF72M-=N zj+r=dqW*mA)~&Jo?b@|d)22<+UVY%e0d@B5Sv6?Tpuj;HKySv38T$7%Yu4!bf}*0L zA{~MW#Te)L^XIkKrj6lQxuMEyKAAITj_TaGv#a7E6pXUG5V;sb5u*S}W&$Xq#Oc?s zpH457IHZ>?TebvV;xuZA#sg69=g*(@wiF&~DjyF;AyO8ZpYyxKemg*T!dxr!3!5WV02FToafRWkN-)2yvt`Scj+g^Q@7}$;j?rV3 zvuDqaIfW3!OyCyD$PT(po|g+g@T6Lv}vP5|N8ao)vQ^w^hSWB30be;3_K1a z+_r67%nA4#{^1wC#YtYBWsuvW>LC|E+UL_9melU>2G2FcS-B;zo8 z=JJz|eRs0tP&l_Dp%a>z_SP9E*HUNbcN zHF!_QW&t%!PJ-uh13v-+%*7@`m{WCiud=`A|+O-Dz(QaKaH(>)BWpe=ovgb{E>FA}CB?f@8B1?O# z(yfzaMo~YVENI1w6}5rX!KU^4X?CC>geMki3X;zVdD8n8qGrM6KYsjpJ&(e`>1^41(PB6NRyV^U)Cbjz{+G`h&mPKjhvY_19@0Wg zCbtJcc%O8?64}0#iUeozn@|1H^5x6_MAA*Elmi@n!DHCLp?sk{^IIOIisEfwk~YSU z9jm>V63?k6nJ8FFl+s4QlsJT9luM|h#Ci7YnM!A}AM}^HoBT`8mp-y6SGsJ5?nPR?G2HHqj~4>Hjuoa{BK} zYJIRrst)=G8lv;^@^ssf9F&`zs~JCW;zXba&Hn~6L0Kve`UkFHzN3lILy1Fa1M~4V z%0v1Ol%@Khf5Hl;#Np@*p@tF%%ge+PCtWBN2mP(_QQrzCe_&}aL5TxUpjVpdCC=Xn z%J_;(&kANTkT6GJm~7|Hoeh3RQ%Fq@%Hk?mYB&^2FPLy~=+L1?{Rifdk^^Oq3Z@Z( zQYmpr_y-RjZ1yEirh>AFS>k|#Q7k16=Y_)(C-XsBmUUxaG#dSfzAz;YEw*I8qba1O zApvC^I0Pq^mX=oYebMEXf{QKfS4ZU#Qb-w1RtcMJMdSkO%Kx7L0{}2RmUnjQCKvz! N002ovPDHLkV1i*6EEE6$ literal 0 HcmV?d00001 diff --git a/templates_ftd/assets/images/upper-rect.png b/templates_ftd/assets/images/upper-rect.png new file mode 100644 index 0000000000000000000000000000000000000000..258a53413e8bceae43c493186edf8692ca2dd6bd GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJy0V3D3_&Eb9&H|6fVg?3oVGw3ym^DWND9BhG z Date: Mon, 9 May 2022 13:01:52 +0530 Subject: [PATCH 2/5] Wip: index.ftd (working initial setup) --- app/views.py | 81 +- templates_ftd/FPM.ftd | 5 + templates_ftd/assets/images/icon-dark.svg | 3 + templates_ftd/assets/images/icon-github.svg | 3 + .../assets/images/logo-fifthtry-dark.svg | 16 + templates_ftd/custom-typo.ftd | 24 +- templates_ftd/index.ftd | 997 ++++++++---------- templates_ftd/login.ftd | 128 +++ templates_ftd/popup.ftd | 150 ++- templates_ftd/pull.ftd | 774 ++++++++++++++ 10 files changed, 1536 insertions(+), 645 deletions(-) create mode 100644 templates_ftd/assets/images/icon-dark.svg create mode 100644 templates_ftd/assets/images/icon-github.svg create mode 100644 templates_ftd/assets/images/logo-fifthtry-dark.svg create mode 100644 templates_ftd/login.ftd create mode 100644 templates_ftd/pull.ftd diff --git a/app/views.py b/app/views.py index c2bca1c..5481469 100644 --- a/app/views.py +++ b/app/views.py @@ -598,11 +598,12 @@ def post(self, request, *args, **kwargs): class AppIndexPage(TemplateView): - # if not settings.USING_FTD: - # template_name = "index.html" - # else: - # template_name = "/" - template_name = "index.html" + if not settings.USING_FTD: + template_name = "index.html" + else: + template_name = "/" + + # template_name = "index.html" def get_okind_ekind(view, request, *args, **kwargs): if request.method == "GET": @@ -643,28 +644,48 @@ def get(self, request, *args, **kwargs) -> HttpResponse: def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: - # def serialize(data): - # from django.core import serializers - # if settings.USING_FTD: - # from django.core import serializers - # try: - # return serializers.serialize('json', data) - # except: - # return None - # else: - # return data - # - # - # def ftd_context(context): - # import django - # for key, value in context.items(): - # print("ftd_context",type(value), isinstance(value, django.db.models.query.QuerySet)) - # value = serialize(value) - # if value: - # context[key] = value - # context["is_authenticated"] = self.request.user.is_authenticated - # return context - # + def ftd_context(context): + new_context = { + "github-login-url": context.get("github_login_url"), + "is-authenticated": self.request.user.is_authenticated, + "all-repo-map": [], + "unmapped_repos_display": [], + "available_repos_for_mapping": [] + } + + for repo_map in (context.get("all_repo_map") or []): + code_repo = { + "get-url": repo_map.code_repo.get_url(), + "repo-full-name": repo_map.code_repo.repo_full_name + } if repo_map.code_repo else None + + documentation_repo = { + "get-url": repo_map.documentation_repo.get_url(), + "repo-full-name": repo_map.documentation_repo.repo_full_name + } if repo_map.documentation_repo else None + + new_context["all-repo-map"].append({ + "code-repo": code_repo, + "documentation-repo": documentation_repo + }) + + for repo in (context.get("unmapped_repos_display") or []): + new_context["unmapped_repos_display"].append({ + "get-url": repo.get_url(), + "repo-full-name": repo.repo_full_name, + "id": repo.id, + }) + + for repo in (context.get("available_repos_for_mapping") or []): + new_context["available_repos_for_mapping"].append({ + "get-url": repo.get_url(), + "repo-full-name": repo.repo_full_name, + "id": repo.id, + }) + new_context["view"] = context["view"] + + return new_context + context = super().get_context_data(**kwargs) if self.request.user.is_authenticated: @@ -714,10 +735,10 @@ def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: context["github_login_url"] = req.url - # if settings.USING_FTD: - # context = ftd_context(context) + if settings.USING_FTD: + context = ftd_context(context) - print("context::::", context) + # print("context::::", context) return context diff --git a/templates_ftd/FPM.ftd b/templates_ftd/FPM.ftd index d03199f..a400daa 100644 --- a/templates_ftd/FPM.ftd +++ b/templates_ftd/FPM.ftd @@ -6,3 +6,8 @@ zip: github.com/priyanka9634/firsttry-ftd/archive/refs/heads/main.zip -- fpm.auto-import: templates-ftd/assets -- fpm.dependency: fifthtry.github.io/inter +-- fpm.font: Octicon +display: swap +style: normal +weight: normal +woff: -/fifthtry.github.io/octicon/static/octicons.woff \ No newline at end of file diff --git a/templates_ftd/assets/images/icon-dark.svg b/templates_ftd/assets/images/icon-dark.svg new file mode 100644 index 0000000..20e4065 --- /dev/null +++ b/templates_ftd/assets/images/icon-dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/templates_ftd/assets/images/icon-github.svg b/templates_ftd/assets/images/icon-github.svg new file mode 100644 index 0000000..bbad7bf --- /dev/null +++ b/templates_ftd/assets/images/icon-github.svg @@ -0,0 +1,3 @@ + + + diff --git a/templates_ftd/assets/images/logo-fifthtry-dark.svg b/templates_ftd/assets/images/logo-fifthtry-dark.svg new file mode 100644 index 0000000..34022b3 --- /dev/null +++ b/templates_ftd/assets/images/logo-fifthtry-dark.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/templates_ftd/custom-typo.ftd b/templates_ftd/custom-typo.ftd index e7250ed..63ea0bd 100644 --- a/templates_ftd/custom-typo.ftd +++ b/templates_ftd/custom-typo.ftd @@ -9,7 +9,7 @@ -- ftd.font-size copyies-lg: line-height: 20 size: 16 -tracking: 0.5 +letter-spacing: 0 -- ftd.type copyies: $fpm.font-display desktop: $copyies-lg @@ -21,7 +21,7 @@ weight: 700 -- ftd.font-size footer-txt: line-height: 16 size: 14 -tracking: 0.5 +letter-spacing: 0 -- ftd.type footer-font: $fpm.font-display desktop: $footer-txt @@ -32,7 +32,7 @@ weight: 400 -- ftd.font-size copy-lg: line-height: 24 size: 20 -tracking: 0.5 +letter-spacing: 0 -- ftd.type copy: $fpm.font-display desktop: $copy-lg @@ -43,12 +43,12 @@ weight: 400 -- ftd.font-size copy-tight-desktop: line-height: 20 size: 16 -tracking: 0.5 +letter-spacing: 0 -- ftd.font-size section-t: line-height: 44 size: 32 -tracking: 0.5 +letter-spacing: 0 -- ftd.type section-title: $fpm.font-display desktop: $section-t @@ -65,7 +65,7 @@ weight: 400 -- ftd.font-size heading-medium-desktop: line-height: 44 size: 34 -tracking: 0.5 +letter-spacing: 0 -- ftd.type heading-medium: $fpm.font-display desktop: $heading-medium-desktop @@ -76,7 +76,7 @@ weight: 400 -- ftd.font-size copy-relaxed-desktop: line-height: 24 size: 16 -tracking: 0.5 +letter-spacing: 0 -- ftd.type copy-relaxed: $fpm.font-display desktop: $copy-relaxed-desktop @@ -96,7 +96,7 @@ dark: #966220 -- ftd.font-size button-txt: line-height: 16 size: 16 -tracking: 0.5 +letter-spacing: 0 -- ftd.type button: $fpm.font-display desktop: $button-txt @@ -119,11 +119,11 @@ dark: rgba(150,98,32,1) -- ftd.color cta_hover: -light: rgba(79, 178, 223, 0.5) -dark: rgba(79, 178, 223, 0.5) +light: rgba(79, 178, 223, 0) +dark: rgba(79, 178, 223, 0) -- ftd.color backkk: -light: rgba(0, 0, 0, 0.9) -dark: rgba(0, 0, 0, 0.9) \ No newline at end of file +light: rgba(0, 0, 0, 0.8) +dark: rgba(0, 0, 0, 0.8) \ No newline at end of file diff --git a/templates_ftd/index.ftd b/templates_ftd/index.ftd index d149599..939d71b 100644 --- a/templates_ftd/index.ftd +++ b/templates_ftd/index.ftd @@ -3,342 +3,220 @@ -- import: fifthtry.github.io/inter/assets as font-assets -- import: templates-ftd/custom-typo as font -- fpm.font-display: $font-assets.fonts.Inter - +-- import: templates-ftd/pull as pull -- import: templates-ftd/popup as popup +-- import: templates-ftd/login as login + + +-- integer selected: 1 + +-- integer changes: $selected + +-- string abc: kkkk + + +-- fpm.toc-item list sub-sections: +$processor$: toc + +- Home: + - Home Index: /index/ + - Docs: /index/ + - Articles: /index/ + - Home Pictures: /index/ + +-- boolean close: false +-- ftd.font-size octicon-fs: +line-height: 16 +size: 16 +letter-spacing: 0 + +-- ftd.type octicon: +font: $assets.fonts.Octicon +desktop: $octicon-fs +mobile: $octicon-fs +xl: $octicon-fs +weight: 700 +-- boolean is-authenticated: false +$processor$: get-data --- record tc: -caption title: -integer index: -ftd.image-src icon-theme-mode: $assets.files.assets.images.icon-moon.png +-- optional string github-login-url: +$processor$: get-data --- tc list list-tc: --- list-tc: Commit to the process -index: 1 -icon-theme-mode: $assets.files.assets.images.icon-moon.png +-- record available-repos-for-mapping-data: +integer id: +string repo-full-name: +string get-url: --- list-tc: Own the changes -index:2 -icon-theme-mode: $assets.files.assets.images.icon-moon.png +-- available-repos-for-mapping-data list available-repos-for-mapping: +$processor$: get-data +[ + { + "get-url": "https://github.com/Arpita-Jaiswal/fpm-sample/pulls/", + "repo-full-name": "Arpita-Jaiswal/fpm-sample", + "id": 3 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/fpm-version-app/pulls/", + "repo-full-name": "Arpita-Jaiswal/fpm-version-app", + "id": 4 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/ftd-play/pulls/", + "repo-full-name": "Arpita-Jaiswal/ftd-play", + "id": 5 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/ftd.dev/pulls/", + "repo-full-name": "Arpita-Jaiswal/ftd.dev", + "id": 6 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/hindi-dictionary/pulls/", + "repo-full-name": "Arpita-Jaiswal/hindi-dictionary", + "id": 7 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/vivekanand/pulls/", + "repo-full-name": "Arpita-Jaiswal/vivekanand", + "id": 8 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/vivekanand-gu/pulls/", + "repo-full-name": "Arpita-Jaiswal/vivekanand-gu", + "id": 9 + }, + { + "get-url": "https://github.com/Arpita-Jaiswal/vivekanand-hi/pulls/", + "repo-full-name": "Arpita-Jaiswal/vivekanand-hi", + "id": 10 + } +] --- record section-data: -caption title: -string value: -string button-name: jkkk -string icon-1-text: -string icon-2-text: -ftd.image-src icon-2-mode: -ftd.image-src icon-3-mode: -tc list tc-var: -integer index: --- section-data list section-list: - --- section-list: #123 -value: hello -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -button-name: connect -icon-1-text: Add a Code PR to complete this pair -icon-2-text: Doc PR name -tc-var: $list-tc -index: 1 - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -button-name: connect -icon-1-text: #203 Code PR name -icon-2-text: Add a Documentation PR to complete this pair -tc-var: $list-tc -index: 2 - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -icon-1-text: #203 Code PR name -icon-2-text: #404 Doc PR name -button-name: connect -tc-var: $list-tc -index: 3 - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -icon-1-text:Doc PR name -icon-2-text:Add a Code PR to complete this pair -button-name: connect -tc-var: $list-tc -index: 4 - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -icon-1-text: #203 Code PR name -icon-2-text: #404 Doc PR name -button-name: approve -tc-var: $list-tc -index: 5 - - - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -icon-1-text: #203 Code PR name -icon-2-text: #404 Doc PR name -button-name: approve -tc-var: $list-tc -index: 6 - --- section-list: #124 -value: hello again -icon-2-mode: $assets.files.assets.images.icon-moon.png -icon-3-mode: $assets.files.assets.images.icon-moon.png -icon-1-text: #203 Code PR name -icon-2-text: #404 Doc PR name -button-name: approve -tc-var: $list-tc -index: 7 +-- record code-repo-data: +optional string repo-full-name: +optional string get-url: +-- record documentation-repo-data: +optional string repo-full-name: +optional string get-url: +-- record all-repo-map: +code-repo-data code-repo: +documentation-repo-data documentation-repo: +-- all-repo-map list kkk: +$processor$: get-data +[ + { + "code-repo": { + "get-url": "https://github.com/Arpita-Jaiswal/django-on-heroku/pulls/", + "repo-full-name": "Arpita-Jaiswal/django-on-heroku" + }, + "documentation-repo": { + "get-url": "https://github.com/Arpita-Jaiswal/blog/pulls/", + "repo-full-name": "Arpita-Jaiswal/blog" + } + } +] --- homepage: --- ftd.column homepage: -optional ftd.color bg-color: $fpm.color.main.background.base -background-color: $bg-color -width: fill -id: kk ---- container: ftd.main ---- header: -background:$fpm.color.glass.background.step-2 ---- ftd.column: -width: fill -padding-horizontal:155 -padding-vertical: 36 -id:main-section ---- navbar: -title: abd ---- ftd.row: -padding-top:32 -width:fill ---- ftd.row: -width: fill ---- search-btn: -title: search - ---- ftd.row: -padding-horizontal:64 ---- container: main-section ---- ftd.column: -margin-top:17 -width:fill -margin-bottom:84 -border-width: 1 -border-radius: 8 -border-color: $fpm.color.main.border-strong - ---- sectiodn: -icon-2-mode: $section-items.icon-2-mode -icon-3-mode: $section-items.icon-3-mode -icon-1-text:$section-items.icon-1-text -icon-2-text:$section-items.icon-2-text -index: $section-items.index -button-name: $section-items.button-name -list-item: $section-items.tc-var -$loop$: $section-list as $section-items - - - - - - - - --- ftd.column header: -optional ftd.image-src site-logo: $assets.files.assets.images.fifthtry-logo.png -optional ftd.image-src icon-theme-mode: $assets.files.assets.images.icon-moon.png -optional ftd.image-src icon-github: $assets.files.assets.images.icon-github.png -string site-url: / -width:fill -ftd.color background: $fpm.color.main.background.base -background-color: $background -id:header-item -padding-horizontal:32 - - ---- ftd.row: -width:fill -id:main-row - - ---- ftd.row: -width:fill -padding-vertical:24 - - ---- ftd.image: -src:$site-logo - - - ---- container: main-row - ---- ftd.row: -id:right-side-header -padding-vertical:28 -spacing:32 - - ---- ftd.image: -src:$icon-theme-mode - - - - ---- ftd.image: -src:$icon-github - - - - - - --- ftd.column navbar: -caption title: -optional ftd.image-src orgname-logo: $assets.files.assets.images.orgname.png -string site-url: / -optional ftd.image-src code-repo-logo:$assets.files.assets.images.repo-code.png -optional ftd.image-src pull-logo:$assets.files.assets.images.pull-request.png -optional ftd.image-src site-logo: -width:fill +-- homepage: ---- ftd.row: -width:fill - ---- ftd.row: -width:fill -id:nav-right +-- ftd.column homepage: +optional ftd.color bg-color: $fpm.color.main.background.base +background-color: $bg-color +width: fill ---- ftd.image: -src:$orgname-logo -margin-top:5 -margin-right:13 +--- pull.header: +background: $fpm.color.glass.background.step-2 +--- container: ftd.main ---- ftd.text: Orgname -color: $font.cta_primary_base -role: $fpm.type.title-large +--- login.login-content: Login to Github +sub-heading-main: Click below to login with github +cta-text: sign up with +url: $github-login-url +if: not $is-authenticated +--- container: ftd.main --- ftd.column: +width: fill +padding-horizontal:280 +padding-vertical: 36 +id:main-section +align: center +spacing: 36 +id: section-conatiner + +--- popup.logo-with-text: +logo: $assets.files.assets.images.pull-request.png +logo-text: Connections + +--- pull.search-btn: +title: search ---- ftd.row: -spacing: 10 - ---- ftd.image: -src:$code-repo-logo -margin-top:8 - - ---- ftd.row: +--- ftd.text: Mapping +padding-bottom: $fpm.space.space-3 +role: $fpm.type.heading-small +color: $fpm.color.main.text-strong --- ftd.column: -spacing:7 - ---- logo-text: code-repo - - - ---- logo-text: doc-repo - - - ---- container: nav-right - +width:fill +border-width: 1 +border-radius: 8 +border-color: $fpm.color.main.border-strong ---- ftd.image: -src:$pull-logo -margin-top:12 -padding-left:10 +--- mapping-loop: +documentation-repo: $obj.documentation-repo +code-repo: $obj.code-repo +$loop$:$kkk as $obj +--- container: section-conatiner ---- ftd.text: Pull Request +--- ftd.text: Available repos +padding-bottom: $fpm.space.space-3 +role: $fpm.type.heading-small color: $fpm.color.main.text-strong -role: $fpm.type.title-large -padding:5 - - --- ftd.text logo-text: -caption title: -text: $title -ftd.color text-color: $fpm.color.glass.text-strong -color: $text-color - - - - - - - --- ftd.input search-btn:search -caption title: -cursor: pointer +--- ftd.column: width:fill -color: $fpm.color.main.error.base -border-radius: 8 -padding-vertical: 14 -padding-horizontal: 28 border-width: 1 -align:left -placeholder: $title -background-color: $fpm.color.main.background.base -color: $fpm.color.main.error.base -border-color: $fpm.color.main.error.base - - - - - - - - - +border-radius: 8 +border-color: $fpm.color.main.border-strong +--- available-loop: +index: $obj.id +children: $obj.repo-full-name +$loop$: $available-repos-for-mapping as $obj @@ -347,380 +225,252 @@ border-color: $fpm.color.main.error.base --- ftd.column sectiodn: -string button-name: -string icon-1-text: -ftd.image-src icon-2-mode: -ftd.image-src icon-3-mode: -string icon-2-text: -integer index: -tc list list-item: +-- ftd.row mapping-loop: +optional ftd.image-src button-name: +optional ftd.image-src doc-logo: +optional ftd.image-src code-logo: width: fill border-bottom: 1 border-color: $fpm.color.main.text padding-horizontal:30 padding-vertical: 20 +code-repo-data code-repo: +code-repo-data documentation-repo: ---- ftd.row: -width:fill -id:jj - ----ftd.row: -width: fill - ---- leftside: - button-name: $button-name - icon-1-text: $icon-1-text - icon-2-text: $icon-2-text - list-title-copy: $list-item - index: $index - - ---- container:jj - ---- ftd.row: - - ---- rightside: - button-name: $button-name - index: $index - - --- ftd.column leftside: -optional ftd.image-src moon-logo: $assets.files.assets.images.repo-code.png -optional ftd.image-src rectangle-logo: $assets.files.assets.images.rectangle.png -optional ftd.image-src open-close-logo: $assets.files.assets.images.icon9.png -optional ftd.image-src upper-rect-logo: $assets.files.assets.images.lower-rectangle.png -optional ftd.image-src lower-rect-logo: $assets.files.assets.images.lower-rect.png -optional ftd.image-src vector-logo: $assets.files.assets.images.Vector.png -optional string button-name: -string icon-1-text: -string icon-2-text: -tc list list-title-copy: +--- ftd.column: width: fill -padding-vertical: 20 -integer index: - - - ---- ftd.row: -if: $index == 3 -anchor:parent -top:35 -left:-2 - ---- ftd.image: -src: $vector-logo ---- container:ftd.main ---- ftd.row: -if: $index == 4 -anchor:parent -top:35 -left:-2 - ---- ftd.image: -src: $vector-logo ---- container:ftd.main ---- ftd.row: -if: $index == 5 -anchor:parent -top:35 -left:-2 - ---- ftd.image: -src: $vector-logo - ---- container:ftd.main ---- ftd.row: -width:fill -align: center -id:jkkk -spacing:10 +id: left-side --- ftd.row: -align: center -spacing:5 - +spacing: 4 +padding-top: 4 ---- ftd.column: -align: center --- ftd.image: -src: $upper-rect-logo +padding-top: 8 +src: $assets.files.assets.images.lower-rectangle.png ---- container: jkkk - ---- ftd.column: -align: center --- ftd.image: -src: $open-close-logo - ---- container: jkkk +padding-top: 4 +src: $assets.files.assets.images.icon9.png +--- ftd.text: $code-repo.repo-full-name +link: $code-repo.get-url +color: $fpm.color.main.text +role: $fpm.type.label-small ---- ftd.text: $icon-1-text -role: $font.copy-tight -color: $fpm.color.main.text -color if $index == 1: $fpm.color.main.error.text -color if $index == 2: $fpm.color.main.warning.base +--- container: left-side ---- container: ftd.main --- ftd.row: -width:fill -align: center -spacing: 10 -id:jkkk - ---- ftd.row: -align: center -spacing: 10 -id:jkkkl - ---- ftd.column: -align: center +spacing: 4 +padding-top: 4 --- ftd.image: -src: $lower-rect-logo +padding-top: 8 +src: $assets.files.assets.images.lower-rect.png ---- container: jkkkl ---- ftd.column: -align: center --- ftd.image: -src: $rectangle-logo - ---- container: jkkkl - - ---- ftd.text: $icon-2-text -role: $font.copy-tight -color: $fpm.color.main.text-strong -color if $index == 1: $fpm.color.main.warning.base -color if $index == 2: $fpm.color.main.warning.base - - - - - - - - - --- ftd.column rightside: -optional ftd.image-src site-logo: $assets.files.assets.images.repo-code.png -optional ftd.image-src back-logo: $assets.files.assets.images.back-logo.png -optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png -optional ftd.color bg-color: $fpm.color.glass.background.base -optional string button-name: -boolean mouse-in: false -integer index: - - - - ---- ftd.row: -if: $index == 1 - ---- overview: -index: $index -model-title:Attach Documentation -text-align: left -width:916 -border-wi:0 -outlines: $font.cta_primary_base -button-name: $button-name - ---- popup.model-body: -sub-heading-main: A healthy code always carry good Documentation -sub-heading-secondary: Attach one for: -code-logo: $assets.files.assets.images.rectangle.png -code-text: #222 Code PR Name -footer-text: My PR doesnt need a connection +padding-top: 4 +src: $assets.files.assets.images.rectangle-white.png +--- ftd.text: $documentation-repo.repo-full-name +link: $documentation-repo.get-url +color: $fpm.color.main.text +role: $fpm.type.label-small --- container: ftd.main +--- ftd.column: ---- ftd.row: -if: $index == 2 +--- ftd.text :˃ +role: $octicon +border-radius: 8 +padding-horizontal: $fpm.space.space-4 +padding-vertical: $fpm.space.space-2 +background-color: $fpm.color.main.cta-primary.base ---- overview: -index: $index -text-align: left -model-title:Attach Code PR -border-wi:8 -width:916 -outlines: $font.cta_primary_base -button-name: $button-name ---- popup.model-body: -sub-heading-main: A healthy code always carry good Documentation -sub-heading-secondary:Attach one for: -code-logo: $assets.files.assets.images.rectangle.png -code-text: #222 Code PR Name +-- ftd.row available-loop: +optional ftd.image-src button-name: +optional ftd.image-src doc-logo: $assets.files.assets.images.orgname.png +width: fill +border-bottom: 1 +border-color: $fpm.color.main.text +padding-horizontal:30 +padding-vertical: 20 +string children: +integer index: ---- container: ftd.main --- ftd.row: -if: $index == 3 width:fill +margin-top: 8 +spacing: 4 ---- verified-text: -status: Approved +--- ftd.image: +src: $doc-logo -Approved by @{white:sharmashobit}20 min ago +--- ftd.text: $children +link: $children +color: $fpm.color.main.text +role: $fpm.type.label-small --- container: ftd.main --- ftd.row: -if: $index == 4 - ---- overview: -open-1: false -text-align: center -model-title: Are you sure? -index: $index -width:614 -outlines: $font.shadow-box -button-name: $button-name ---- popup.model-content: -sub-heading-main: A healthy code always carry good Documentation -cta-text: search -logo-text: #222 Code PR Name -moon-logo: $assets.files.assets.images.rectangle.png +--- overview: connect +heading-name: $children -does not need any associated documentation. +--- both-buttonn: +repo-name: $children +title-right: code-repo +title-left: documentation-repo +about-repo-left: Code Repository: +about-repo-right: Documentation Repository: +heading-name-right: Attach Documentation repository +heading-name-left: Attach Code repository -This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics ---- container: ftd.main ---- ftd.row: -if: $index == 5 -width:fill - - ---- verified-text: -status: Approved +-- ftd.row both-buttonn: +width: fill +caption title-right: +caption title-left: +string about-repo-right: +string about-repo-left: +caption heading-name-right: +caption heading-name-left: +string repo-name: +spacing: 8 -Approved by @{white:sharmashobit}20 min ago +--- code-repo: $title-right +about-repo: $about-repo-right +repo-name: $repo-name +heading-name: $heading-name-left --- container: ftd.main ---- ftd.row: -if: $index == 6 - ---- overview: -open-1: false -text-align: center -model-title: Approve Changes -index: $index -outlines: $font.shadow-box -width:614 -button-name: $button-name +--- code-repo: $title-left +about-repo: $about-repo-left +repo-name: $repo-name +heading-name: $heading-name-right ---- popup.model-content: -sub-heading-main: A healthy code always carry good Documentation -logo-text: #222 Code PR Name -moon-logo: $assets.files.assets.images.icon-github.png -does not need any associated documentation -This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics - - - ---- container: ftd.main - ---- ftd.row: -if: $index == 7 +-- ftd.column overview: +caption title: +optional string heading-name: +boolean open-1: false +optional integer border-wi: 0 +optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png +open: true +append-at: col-id ---- overview: -open-1: false -text-align: center -model-title: Are you sure -index: $index -outlines: $font.shadow-box -width:614 -button-name: $button-name +--- ftd.text : $title +role: $font.button +background-color: $fpm.color.main.cta-primary.base +color: $fpm.color.main.background.base +background-color if $MOUSE-IN: $font.cta_hover +color if $MOUSE-IN: $fpm.color.main.error.base +border-radius: 8 +padding-vertical: 12 +padding-horizontal: 16 +border-width: 1 +border-color: $fpm.color.main.border-strong +$on-click$: $open-1 = true ---- popup.model-content: -cta-text: search -logo-text: #222 Code PR Name -moon-logo: $assets.files.assets.images.icon-github.png -moon-logos-text:#203 Code PR name -moon-logo: $assets.files.assets.images.rectangle.png -repo-code-logo: $assets.files.assets.images.repo-code.png -footer-text:Note: Please ask the Dev/Documentor to come in sync if this is not the case +--- ftd.column : +z-index: 100 +anchor: window +top: 0 +left: 0 +width: percent 100 +height: percent 100 +background-color: $font.backkk +id: kjlk +if: $open-1 -does not need any associated documentation. -This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics +--- ftd.column: +background-color: $fpm.color.main.background.base +width: 614 +move-right: 500 +move-down: 200 +border-width: 1 +padding-top: $fpm.space.space-3 +padding-bottom: $fpm.space.space-8 +padding-horizontal: $fpm.space.space-8 +boolean mouse-in: false +border-color: $fpm.color.main.border-strong +id: col-id +shadow-offset-x: 3 +shadow-offset-y: 4 +shadow-size: 1 +shadow-blur: 4 +border-top: 1 +border-radius: 8 +border-color: $fpm.color.main.cta-primary.base +shadow-color: $fpm.color.main.cta-primary.base +id: model-contete +--- ftd.row: +width: fill --- ftd.text white: yo +--- ftd.text: $heading-name +role: $fpm.type.heading-medium color: $fpm.color.main.text-strong -role: $font.copy-tight +width: fill --- ftd.column verified-text: -optional string status: -body body: +--- ftd.image: +src: $cross-logo +$on-click$: $open-1 = false ---- ftd.column: -width: fill -align: right +--- container: model-contete ---- ftd.row: -align: right +--- ftd.text: This repo is a: +role: $fpm.type.copy-relaxed +color: $fpm.color.main.text +width: fill ---- ftd.text:$status -color: $fpm.color.main.text -text-align: right -role: $font.copy ---- container: ftd.main +--- container: model-contete --- ftd.row: -width:fill - ---- ftd.text: -text: $body -white-space: nowrap -role: $font.copy -color: $fpm.color.main.text +width: fill +id: col-id +open: true --- ftd.column overview: -optional string button-name: +-- ftd.column code-repo: +caption button-name: +string about-repo: +string heading-name: +string repo-name: boolean open-1: false -integer index: -string width: -string text-align: optional integer border-wi: 0 -ftd.color outlines: -string model-title: +string heading-name: optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png open: true append-at: col-id --- ftd.text : $button-name -text: $button-name -role: $fpm.type.label-large +role: $fpm.type.label-big ftd.color button-bg: $fpm.color.main.background.base ftd.color button-color: $fpm.color.main.error.base background-color: $font.cta_primary_base @@ -751,11 +501,9 @@ if: $open-1 --- ftd.column: background-color: $fpm.color.main.background.base -width: $width -move-right:275 -move-down: 100 +width: 650 border-width: 1 -padding-vertical: 35 +padding-vertical: 12 padding-horizontal: 24 boolean mouse-in: false border-color: $fpm.color.main.border-strong @@ -766,31 +514,118 @@ shadow-size: 1 shadow-blur: 4 border-top: $border-wi border-radius: 8 -border-color: $outlines -shadow-color: $outlines -id: model-contete +shadow-color: $fpm.color.main.cta-primary.base +spacing: 24 --- ftd.row: width:fill ---- ftd.row: -width: fill -padding-bottom: 24 ---- ftd.text: $model-title -text-align: $text-align -role: $font.heading-medium +--- ftd.text: $heading-name +role: $fpm.type.heading-medium color: $fpm.color.main.text-strong width: fill --- ftd.image: -src: $cross-logo +src: $assets.files.assets.images.Union.png /$on-click-outside$: $open-1 = true $on-click$: $open-1 = false ---- container: model-contete +--- ftd.text: +text: $abc +--- container: col-id + + +--- ftd.text: $repo-name +role: $fpm.type.copy-relaxed +color: $fpm.color.main.text +width: fill + +--- container: col-id + + +--- ftd.row: +width: fill + + +--- ftd.text: $about-repo +role: $fpm.type.copy-relaxed +color: $fpm.color.main.text +width: fill + +--- search-btn: search +available-repos-for-mapping: $available-repos-for-mapping + + + +--- container: col-id + +--- ftd.row: +align: center +margin-top: $fpm.space.space-4 +margin-bottom: $fpm.space.space-4 + + +--- popup.button: attach +button-bg: $fpm.color.main.cta-primary.base + + +-- ftd.row search-btn: +available-repos-for-mapping-data list available-repos-for-mapping: +caption title: +boolean open: false +$on-click$: toggle $open +open: true +append-at: kk + +--- ftd.input: $abc +cursor: pointer +width:fill +height: 34 +color: $fpm.color.main.text +border-radius: 8 +padding-vertical: 14 +padding-horizontal: 28 +border-width: 1 +placeholder:$abc +background-color: $fpm.color.main.background.base +border-color: $fpm.color.main.text + +--- ftd.text: ﹀ +if: $available-repos-for-mapping is not empty +color: $fpm.color.main.text +position: center +move-right: -20 --- ftd.column: width: fill -id: col-id +anchor: parent +z-index: 4 +top: 20 +background-color: $fpm.color.main.text-strong +left: 0 + +--- show-children: +if: $open +if: $available-repos-for-mapping is not empty +index: $obj.id +children: $obj.repo-full-name +$loop$: $available-repos-for-mapping as $obj + + + + +-- ftd.row show-children: +width: fill +id: kk +integer index: +background-color if $MOUSE-IN:$fpm.color.main.cta-primary.base +string children: + +--- ftd.text: $children +$on-click$: $abc = $children +role: $fpm.type.copy-tight +color: $fpm.color.main.text-strong +white-space: nowrap +width: fill diff --git a/templates_ftd/login.ftd b/templates_ftd/login.ftd new file mode 100644 index 0000000..8a85ef6 --- /dev/null +++ b/templates_ftd/login.ftd @@ -0,0 +1,128 @@ +-- import: fpm +-- import: templates-ftd/assets +-- import: fifthtry.github.io/inter/assets as font-assets +-- import: templates-ftd/custom-typo as font +-- fpm.font-display: $font-assets.fonts.Inter + +/-- boolean is-authenticated: true + +/-- boolean verify: false + +/-- is-authenticated: false +if: $verify == true + + + + + +/-- login-content: Login to Github +sub-heading-main: click below to login with github +cta-text: sign up with +url: https://github.com/apps/continuous-documentation + + +-- ftd.column login-content : +optional caption title: +optional string sub-heading-main: +optional string cta-text: +string url: +z-index: 100 +anchor: parent +top: 0 +left: 0 +width: percent 100 +height: percent 100 +background-color: $font.backkk + + +--- ftd.column: +optional caption title: +optional string sub-heading-main: +optional string cta-text: +background-color: $fpm.color.main.background.base +width: 614 +move-right: 400 +move-down: 200 +border-width: 1 +padding-vertical: 35 +padding-horizontal: 32 +boolean mouse-in: false +border-color: $fpm.color.main.border-strong +id: col-id +shadow-offset-x: 3 +shadow-offset-y: 4 +shadow-size: 1 +shadow-blur: 4 +border-top: 3 +border-radius: 8 +border-color: $fpm.color.main.warning.text +shadow-color: $fpm.color.main.warning.text +padding-horizontal: 42 +id: model-contete + +--- ftd.row: +width:fill +padding-bottom: 90 + +--- ftd.text: $title +text-align: center +role: $fpm.type.heading-medium +color: $fpm.color.main.text-strong +width: fill + + +--- container: model-contete + +--- ftd.column: +width: fill +id: col-id +padding-bottom: 12 + +--- ftd.text: $sub-heading-main +if: $sub-heading-main is not null +text-align: center +width: fill +role: $fpm.type.copy-relaxed +color: $fpm.color.main.text +padding-bottom: 32 + +--- github-button: +sign-in: $cta-text +link: $url + + + + + + + +-- ftd.row github-button: +boolean is-authenticated: false +optional string sign-in: +optional string github-cta: +optional string width: +ftd.image-src icon-github: $assets.files.assets.images.icon-github.svg +string link: https://github.com/apps/continuous-documentation +padding-horizontal: $fpm.space.space-4 +padding-vertical: $fpm.space.space-3 +color: $fpm.color.main.background.step-1 +background-color: $fpm.color.main.cta-primary.base +border-radius: 4 +/$on-click$: $verify = true +width: $width +spacing: 4 +cursor: pointer +link: $link +align: center + + +--- ftd.text: $sign-in +role: $font.button +white-space: nowrap +align: center +text-align: center +padding-top: 2 +color: $fpm.color.main.background.step-1 + +--- ftd.image: +src: $icon-github diff --git a/templates_ftd/popup.ftd b/templates_ftd/popup.ftd index 21acf34..21ff21a 100644 --- a/templates_ftd/popup.ftd +++ b/templates_ftd/popup.ftd @@ -1,4 +1,3 @@ - -- import: fpm -- import: templates-ftd/assets -- import: fifthtry.github.io/inter/assets as font-assets @@ -24,8 +23,6 @@ icon-theme-mode: $assets.files.assets.images.icon-moon.png -- record section-data: -caption title: -string value: string button-name:connect string logo-text: optional ftd.image-src icon-theme-mode: $assets.files.assets.images.icon-moon.png @@ -33,20 +30,17 @@ optional ftd.image-src icon-theme-mode: $assets.files.assets.images.icon-moon.pn -- section-data list section-list: --- section-list: #123 -value: hello +-- section-list: logo-text:#123 Some Doc PR icon-theme-mode: $assets.files.assets.images.icon-moon.png button-name: connect --- section-list: #123 -value: hello +-- section-list: logo-text:#123 Some Doc PR icon-theme-mode: $assets.files.assets.images.icon-moon.png button-name: connect --- section-list: #123 -value: hello +-- section-list: icon-theme-mode: $assets.files.assets.images.icon-moon.png logo-text:#123 Some Doc PR button-name: connect @@ -106,7 +100,7 @@ margin-bottom: 27 margin-bottom: 27 --- logo-with-text: -moon-logo: $code-logo +logo: $code-logo logo-text: $code-text @@ -164,7 +158,7 @@ width:fill padding-vertical: 20 --- logo-with-text: -moon-logo: $icon-theme-mode +logo: $icon-theme-mode logo-text: $logo-text @@ -211,10 +205,9 @@ background-color: $fpm.color.main.background.base color: $fpm.color.main.error.base border-color: $fpm.color.main.border-strong - --- ftd.text: text: $cta-text -role: $fpm.type.label-large +role: $fpm.type.label-big color: $fpm.color.main.error.base @@ -224,6 +217,7 @@ color: $fpm.color.main.error.base -- ftd.text button: caption title: text: $title +align: center role: $font.button ftd.color button-bg: $fpm.color.main.background.base ftd.color button-color: $fpm.color.main.error.base @@ -232,7 +226,7 @@ color: $fpm.color.main.background.base background-color if $MOUSE-IN: $font.cta_hover color if $MOUSE-IN: $fpm.color.main.error.base border-radius: 8 -padding-vertical: 8 +padding-vertical: 12 padding-horizontal: 16 border-width: 1 border-color: $fpm.color.main.border-strong @@ -274,7 +268,7 @@ padding-bottom:11 align: center --- logo-with-text: -moon-logo: $moon-logo +logo: $moon-logo logo-text: $logo-text --- container: ftd.main @@ -311,7 +305,7 @@ spacing: 10 --- logo-with-text: -moon-logo: $moon-logo +logo: $moon-logo logo-text: $logo-text --- container: image-text-container @@ -323,7 +317,7 @@ spacing: 10 id:jkkk --- logo-with-text: -moon-logo: $moon-logo +logo: $moon-logo logo-text: $logo-text @@ -389,17 +383,129 @@ white-space: nowrap -- ftd.row logo-with-text: width:fill -optional ftd.image-src moon-logo: +optional ftd.image-src logo: optional string logo-text: spacing: 10 --- ftd.image: -src: $moon-logo -height: 15 -width: 15 +padding-top: $fpm.space.space-2 +src: $logo +height: 24 +width: auto --- ftd.text: $logo-text color: $fpm.color.main.text-strong -role: $font.footer-font \ No newline at end of file +role: $fpm.type.heading-small + + + + + + + + + +-- login-content: Login to Github +sub-heading-main: click below to login with github +cta-text: sign up with + + +-- ftd.column login-content : +optional caption title: +optional string sub-heading-main: +optional string cta-text: +z-index: 100 +anchor: window +top: 0 +left: 0 +width: percent 100 +height: percent 100 +background-color: $font.backkk + + +--- ftd.column: +optional caption title: +optional string sub-heading-main: +optional string cta-text: +background-color: $fpm.color.main.background.base +width: 614 +move-right: 400 +move-down: 200 +border-width: 1 +padding-vertical: 35 +padding-horizontal: 32 +boolean mouse-in: false +border-color: $fpm.color.main.border-strong +id: col-id +shadow-offset-x: 3 +shadow-offset-y: 4 +shadow-size: 1 +shadow-blur: 4 +border-top: 3 +border-radius: 8 +border-color: $fpm.color.main.warning.text +shadow-color: $fpm.color.main.warning.text +padding-horizontal: 42 +id: model-contete + +--- ftd.row: +width:fill +padding-bottom: 90 + +--- ftd.text: $title +text-align: center +role: $fpm.type.heading-medium +color: $fpm.color.main.text-strong +width: fill + + +--- container: model-contete + +--- ftd.column: +width: fill +id: col-id +padding-bottom: 12 + + +--- ftd.text: $sub-heading-main +if: $sub-heading-main is not null +text-align: center +width: fill +role: $fpm.type.copy-relaxed +color: $fpm.color.main.text +padding-bottom: 32 + +--- github-button: +sign-in: $cta-text + + +-- ftd.row github-button: +optional string sign-in: +optional string github-cta: +optional string width: +optional ftd.image-src icon-github: $assets.files.assets.images.icon-github.svg +optional string link: https://github.com/apps/continuous-documentation +padding-horizontal: $fpm.space.space-4 +padding-vertical: $fpm.space.space-3 +color: $fpm.color.main.background.step-1 +background-color: $fpm.color.main.cta-primary.base +border-radius: 4 +width: $width +spacing: 4 +cursor: pointer +link: $link +align: center + +--- ftd.text: $sign-in +role: $font.button +white-space: nowrap +align: center +text-align: center +padding-top: 2 +color: $fpm.color.main.background.step-1 + +--- ftd.image: +src: $icon-github + diff --git a/templates_ftd/pull.ftd b/templates_ftd/pull.ftd new file mode 100644 index 0000000..8978b24 --- /dev/null +++ b/templates_ftd/pull.ftd @@ -0,0 +1,774 @@ +-- import: fpm +-- import: templates-ftd/assets +-- import: fifthtry.github.io/inter/assets as font-assets +-- import: templates-ftd/custom-typo as font +-- fpm.font-display: $font-assets.fonts.Inter + +-- import: templates-ftd/popup as popup + + + + +-- record tc: +caption title: +integer index: +ftd.image-src icon-theme-mode: $assets.files.assets.images.icon-moon.png + + +-- tc list list-tc: + +-- list-tc: Commit to the process +index: 1 +icon-theme-mode: $assets.files.assets.images.icon-moon.png + + +-- list-tc: Own the changes +index:2 +icon-theme-mode: $assets.files.assets.images.icon-moon.png + + + +-- record section-data: +string button-name: +string doc-text: +string code-text: +ftd.image-src doc-logo: +ftd.image-src code-logo: +integer index: + +-- section-data list section-list: + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +button-name: connect +doc-text: Add a Code PR to complete this pair +code-text: Doc PR name +index: 1 + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +button-name: connect +doc-text: #203 Code PR name +code-text: Add a Documentation PR to complete this pair +index: 2 + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +doc-text: #203 Code PR name +code-text: #404 Doc PR name +button-name: connect +index: 3 + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +doc-text:Doc PR name +code-text:Add a Code PR to complete this pair +button-name: connect +index: 4 + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +doc-text: #203 Code PR name +code-text: #404 Doc PR name +button-name: approve +index: 5 + + + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +doc-text: #203 Code PR name +code-text: #404 Doc PR name +button-name: approve +index: 6 + +-- section-list: +doc-logo: $assets.files.assets.images.icon-moon.png +code-logo: $assets.files.assets.images.icon-moon.png +doc-text: #203 Code PR name +code-text: #404 Doc PR name +button-name: approve +index: 7 + + + +/-- popup.login-content: Login to Github +sub-heading-main: click below to login with github +cta-text: sign up with + + + +-- homepage: + + + + +-- ftd.column homepage: +optional ftd.color bg-color: $fpm.color.main.background.base +background-color: $bg-color +width: fill +id: kk + + +--- container: ftd.main + +--- header: +background:$fpm.color.glass.background.step-2 + + + + +--- ftd.column: +width: fill +padding-horizontal:155 +padding-vertical: 36 +id:main-section + +--- navbar: +title: abd + +--- ftd.row: +padding-top:32 +width:fill + +--- ftd.row: +width: fill + +--- search-btn: +title: search + +--- ftd.row: +padding-horizontal:64 + +--- container: main-section + +--- ftd.column: +margin-top:17 +width:fill +margin-bottom:84 +border-width: 1 +border-radius: 8 +border-color: $fpm.color.main.border-strong + +--- sections: +doc-logo: $section-items.doc-logo +code-logo: $section-items.code-logo +doc-text:$section-items.doc-text +code-text:$section-items.code-text +index: $section-items.index +button-name: $section-items.button-name +$loop$: $section-list as $section-items + + + + + + + + +-- ftd.column header: +optional ftd.image-src site-logo: $assets.files.assets.images.logo-fifthtry-dark.svg +optional ftd.image-src icon-github: $assets.files.assets.images.icon-github.svg +string site-url: / +width:fill +ftd.color background: $fpm.color.main.background.base +background-color: $background +id:header-item +padding-horizontal:32 + + +--- ftd.row: +width:fill +id:main-row + + +--- ftd.row: +width:fill +padding-vertical:24 + + +--- ftd.image: +src:$site-logo + + + +--- container: main-row + +--- ftd.row: +id:right-side-header +padding-vertical:28 +spacing:32 + + + +--- ftd.image: +src:$icon-github + + +-- ftd.row navbar: +caption title: +optional ftd.image-src orgname-logo: $assets.files.assets.images.orgname.png +string site-url: / +optional ftd.image-src code-repo-logo:$assets.files.assets.images.repo-code.png +optional ftd.image-src pull-logo:$assets.files.assets.images.pull-request.png +optional ftd.image-src site-logo: +optional string org-text: Orgname +optional string code-text: Code Repo +optional string doc-text: Doc Repo +optional string pull-text: Pull requests +width: fill +align: center + +/--- ftd.row: +width:fill + +--- ftd.column: +width:fill +id:nav-right + + +--- ftd.image: +src:$orgname-logo +margin-top:5 +margin-right:13 + +--- ftd.text: $org-text +color: $font.cta_primary_base +role: $fpm.type.heading-large + +--- container: ftd.main + + + +--- ftd.row: +spacing: 10 + +--- ftd.image: +src:$code-repo-logo +margin-top:8 + + +--- ftd.row: + +--- ftd.column: +spacing:7 + +--- logo-text: $code-text + + + +--- logo-text: $doc-text + + + +--- container: ftd.main + + +--- ftd.image: +src:$pull-logo +margin-top:12 +padding-left:10 + + +--- ftd.text: $pull-text +color: $fpm.color.main.text-strong +role: $fpm.type.heading-large +padding:5 + + +-- ftd.text logo-text: +caption title: +text: $title +ftd.color text-color: $fpm.color.glass.text-strong +color: $text-color + + + + + + + + +-- ftd.input search-btn:search +caption title: +cursor: pointer +width:fill +color: $fpm.color.main.text +border-radius: 8 +padding-vertical: 14 +padding-horizontal: 28 +border-width: 1 +align:left +placeholder: $title +background-color: $fpm.color.main.background.base +border-color: $fpm.color.main.text + +--- ftd.text: $title +role: $fpm.type.label-big +color: $fpm.color.main.text-strong + + + + + + + + + + + + + + + +-- ftd.row sections: +string button-name: +string doc-text: +ftd.image-src doc-logo: +ftd.image-src code-logo: +string code-text: +integer index: +width: fill +border-bottom: 1 +border-color: $fpm.color.main.text +padding-horizontal:30 +padding-vertical: 20 + + + +---ftd.row: +width: fill + +--- leftside: + button-name: $button-name + doc-text: $doc-text + code-text: $code-text + index: $index + + +--- container:ftd.main + +--- ftd.row: + + +--- rightside: + button-name: $button-name + index: $index + + +-- ftd.column leftside: +optional ftd.image-src moon-logo: $assets.files.assets.images.repo-code.png +optional ftd.image-src rectangle-logo: $assets.files.assets.images.rectangle.png +optional ftd.image-src open-close-logo: $assets.files.assets.images.icon9.png +optional ftd.image-src upper-rect-logo: $assets.files.assets.images.lower-rectangle.png +optional ftd.image-src lower-rect-logo: $assets.files.assets.images.lower-rect.png +optional ftd.image-src vector-logo: $assets.files.assets.images.Vector.png +optional string button-name: +string doc-text: +optional integer index: +string code-text: +width: fill +padding-vertical: 20 +integer index: + + + +--- ftd.row: +if: $index == 3 +anchor:parent +top:35 +left:-2 + +--- ftd.image: +src: $vector-logo + +--- container:ftd.main + +--- ftd.row: +if: $index == 4 +anchor:parent +top:35 +left:-2 + +--- ftd.image: +src: $vector-logo +--- container:ftd.main +--- ftd.row: +if: $index == 5 +anchor:parent +top:35 +left:-2 + +--- ftd.image: +src: $vector-logo + +--- container:ftd.main +--- ftd.row: +width:fill +align: center +id:jkkk +spacing:10 + +--- ftd.row: +align: center +spacing:5 + + +--- ftd.column: +align: center + +--- ftd.image: +src: $upper-rect-logo + + +--- container: jkkk + +--- ftd.column: +align: center + +--- ftd.image: +src: $open-close-logo + +--- container: jkkk + + + + +--- ftd.text: $doc-text +role: $font.copy-tight +color: $fpm.color.main.text +color if $index == 1: $fpm.color.main.error.text +color if $index == 2: $fpm.color.main.warning.base + +--- container: ftd.main + +--- ftd.row: +width:fill +align: center +spacing: 10 +id:jkkk + +--- ftd.row: +align: center +spacing: 10 +id:jkkkl + +--- ftd.column: +align: center + +--- ftd.image: +src: $lower-rect-logo + +--- container: jkkkl + +--- ftd.column: +align: center + +--- ftd.image: +src: $rectangle-logo + +--- container: jkkkl + + +--- ftd.text: $code-text +role: $font.copy-tight +color: $fpm.color.main.text-strong +color if $index == 1: $fpm.color.main.warning.base +color if $index == 2: $fpm.color.main.warning.base + + + + + + + + + +-- ftd.column rightside: +optional ftd.image-src site-logo: $assets.files.assets.images.repo-code.png +optional ftd.image-src back-logo: $assets.files.assets.images.back-logo.png +optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png +optional ftd.color bg-color: $fpm.color.glass.background.base +optional string button-name: +boolean mouse-in: false +integer index: + + + + +--- ftd.row: +if: $index == 1 + +--- overview: +index: $index +model-title:Attach Documentation +text-align: left +width:916 +border-wi:0 +outlines: $font.cta_primary_base +button-name: $button-name + +--- popup.model-body: +sub-heading-main: A healthy code always carry good Documentation +sub-heading-secondary: Attach one for: +code-logo: $assets.files.assets.images.rectangle.png +code-text: #222 Code PR Name +footer-text: My PR doesnt need a connection + + +--- container: ftd.main + + +--- ftd.row: +if: $index == 2 + +--- overview: +index: $index +text-align: left +model-title:Attach Code PR +border-wi:8 +width:916 +outlines: $font.cta_primary_base +button-name: $button-name + +--- popup.model-body: +sub-heading-main: A healthy code always carry good Documentation +sub-heading-secondary:Attach one for: +code-logo: $assets.files.assets.images.rectangle.png +code-text: #222 Code PR Name + + + +--- container: ftd.main +--- ftd.row: +if: $index == 3 +width:fill + +--- verified-text: +status: Approved + +Approved by @{white:sharmashobit}20 min ago + + +--- container: ftd.main + +--- ftd.row: +if: $index == 4 + +--- overview: +open-1: false +text-align: center +model-title: Are you sure? +index: $index +width:614 +outlines: $font.shadow-box +button-name: $button-name + +--- popup.model-content: +sub-heading-main: A healthy code always carry good Documentation +cta-text: search +logo-text: #222 Code PR Name +moon-logo: $assets.files.assets.images.rectangle.png + +does not need any associated documentation. + +This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics + + + +--- container: ftd.main +--- ftd.row: +if: $index == 5 +width:fill + + +--- verified-text: +status: Approved + +Approved by @{white:sharmashobit}20 min ago + + +--- container: ftd.main + +--- ftd.row: +if: $index == 6 + +--- overview: +open-1: false +text-align: center +model-title: Approve Changes +index: $index +outlines: $font.shadow-box +width:614 +button-name: $button-name + +--- popup.model-content: +sub-heading-main: A healthy code always carry good Documentation +logo-text: #222 Code PR Name +moon-logo: $assets.files.assets.images.icon-github.png +does not need any associated documentation + + +This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics + + + +--- container: ftd.main + +--- ftd.row: +if: $index == 7 + +--- overview: +open-1: false +text-align: center +model-title: Are you sure +index: $index +outlines: $font.shadow-box +width:614 +button-name: $button-name + +--- popup.model-content: +cta-text: search +logo-text: #222 Code PR Name +moon-logo: $assets.files.assets.images.icon-github.png +moon-logos-text:#203 Code PR name +moon-logo: $assets.files.assets.images.rectangle.png +repo-code-logo: $assets.files.assets.images.repo-code.png +footer-text:Note: Please ask the Dev/Documentor to come in sync if this is not the case + +does not need any associated documentation. + +This action should be used sparingly. It may be reviewed by your Manager,and will affect your organizations’ dev statistics + + + + +-- ftd.text white: yo +color: $fpm.color.main.text-strong +role: $font.copy-tight + +-- ftd.column verified-text: +optional string status: +body body: + +--- ftd.column: +width: fill +align: right + +--- ftd.row: +align: right + +--- ftd.text:$status +color: $fpm.color.main.text +text-align: right +role: $font.copy + +--- container: ftd.main + +--- ftd.row: +width:fill + +--- ftd.text: +text: $body +white-space: nowrap +role: $font.copy +color: $fpm.color.main.text + + + +-- ftd.column overview: +optional string button-name: +boolean open-1: false +integer index: +string width: +string text-align: +optional integer border-wi: 0 +ftd.color outlines: +string model-title: +optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png +open: true +append-at: col-id + + +--- ftd.text : $button-name +text: $button-name +role: $fpm.type.label-big +ftd.color button-bg: $fpm.color.main.background.base +ftd.color button-color: $fpm.color.main.error.base +background-color: $font.cta_primary_base +color: $fpm.color.main.background.base +background-color if $MOUSE-IN: $font.cta_hover +color if $MOUSE-IN: $fpm.color.main.error.base +border-radius: 8 +padding-vertical: 8 +padding-horizontal: 16 +border-width: 1 +border-color: $fpm.color.main.border-strong +margin-top:20 +$on-click$: $open-1 = true + + +--- ftd.column : +z-index: 100 +anchor: window +top: 0 +left: 0 +width: percent 100 +height: percent 100 +background-color: $font.backkk +id: kjlk +if: $open-1 + + + +--- ftd.column: +background-color: $fpm.color.main.background.base +width: $width +move-right:275 +move-down: 100 +border-width: 1 +padding-vertical: 35 +padding-horizontal: 24 +boolean mouse-in: false +border-color: $fpm.color.main.border-strong +id: col-id +shadow-offset-x: 3 +shadow-offset-y: 4 +shadow-size: 1 +shadow-blur: 4 +border-top: $border-wi +border-radius: 8 +border-color: $outlines +shadow-color: $outlines +id: model-contete + +--- ftd.row: +width:fill + +--- ftd.row: +width: fill +padding-bottom: 24 + +--- ftd.text: $model-title +text-align: $text-align +role: $font.heading-medium +color: $fpm.color.main.text-strong +width: fill + +--- ftd.image: +src: $assets.files.assets.images.Union.png +/$on-click-outside$: $open-1 = true +$on-click$: $open-1 = false + +--- container: model-contete + +--- ftd.column: +width: fill +id: col-id + From 1dc5c78556b708de255fd42ce378685d4839eb7f Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Mon, 9 May 2022 13:47:11 +0530 Subject: [PATCH 3/5] Working index.ftd --- app/views.py | 8 +-- templates_ftd/FPM.ftd | 1 - templates_ftd/index.ftd | 105 ++++++++++------------------------------ 3 files changed, 30 insertions(+), 84 deletions(-) diff --git a/app/views.py b/app/views.py index 5481469..806dd0e 100644 --- a/app/views.py +++ b/app/views.py @@ -649,8 +649,8 @@ def ftd_context(context): "github-login-url": context.get("github_login_url"), "is-authenticated": self.request.user.is_authenticated, "all-repo-map": [], - "unmapped_repos_display": [], - "available_repos_for_mapping": [] + "unmapped-repos-display": [], + "available-repos-for-mapping": [] } for repo_map in (context.get("all_repo_map") or []): @@ -670,14 +670,14 @@ def ftd_context(context): }) for repo in (context.get("unmapped_repos_display") or []): - new_context["unmapped_repos_display"].append({ + new_context["unmapped-repos-display"].append({ "get-url": repo.get_url(), "repo-full-name": repo.repo_full_name, "id": repo.id, }) for repo in (context.get("available_repos_for_mapping") or []): - new_context["available_repos_for_mapping"].append({ + new_context["available-repos-for-mapping"].append({ "get-url": repo.get_url(), "repo-full-name": repo.repo_full_name, "id": repo.id, diff --git a/templates_ftd/FPM.ftd b/templates_ftd/FPM.ftd index a400daa..e64d807 100644 --- a/templates_ftd/FPM.ftd +++ b/templates_ftd/FPM.ftd @@ -1,7 +1,6 @@ -- import: fpm -- fpm.package: templates-ftd -zip: github.com/priyanka9634/firsttry-ftd/archive/refs/heads/main.zip -- fpm.auto-import: templates-ftd/assets diff --git a/templates_ftd/index.ftd b/templates_ftd/index.ftd index 939d71b..39fc826 100644 --- a/templates_ftd/index.ftd +++ b/templates_ftd/index.ftd @@ -18,7 +18,7 @@ -- fpm.toc-item list sub-sections: $processor$: toc -- Home: +- Home: - Home Index: /index/ - Docs: /index/ - Articles: /index/ @@ -55,49 +55,7 @@ string get-url: -- available-repos-for-mapping-data list available-repos-for-mapping: $processor$: get-data -[ - { - "get-url": "https://github.com/Arpita-Jaiswal/fpm-sample/pulls/", - "repo-full-name": "Arpita-Jaiswal/fpm-sample", - "id": 3 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/fpm-version-app/pulls/", - "repo-full-name": "Arpita-Jaiswal/fpm-version-app", - "id": 4 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/ftd-play/pulls/", - "repo-full-name": "Arpita-Jaiswal/ftd-play", - "id": 5 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/ftd.dev/pulls/", - "repo-full-name": "Arpita-Jaiswal/ftd.dev", - "id": 6 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/hindi-dictionary/pulls/", - "repo-full-name": "Arpita-Jaiswal/hindi-dictionary", - "id": 7 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/vivekanand/pulls/", - "repo-full-name": "Arpita-Jaiswal/vivekanand", - "id": 8 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/vivekanand-gu/pulls/", - "repo-full-name": "Arpita-Jaiswal/vivekanand-gu", - "id": 9 - }, - { - "get-url": "https://github.com/Arpita-Jaiswal/vivekanand-hi/pulls/", - "repo-full-name": "Arpita-Jaiswal/vivekanand-hi", - "id": 10 - } -] - +[] -- record code-repo-data: @@ -109,25 +67,14 @@ optional string get-url: optional string repo-full-name: optional string get-url: --- record all-repo-map: +-- record all-repo-map-data: code-repo-data code-repo: documentation-repo-data documentation-repo: --- all-repo-map list kkk: +-- all-repo-map-data list all-repo-map: $processor$: get-data -[ - { - "code-repo": { - "get-url": "https://github.com/Arpita-Jaiswal/django-on-heroku/pulls/", - "repo-full-name": "Arpita-Jaiswal/django-on-heroku" - }, - "documentation-repo": { - "get-url": "https://github.com/Arpita-Jaiswal/blog/pulls/", - "repo-full-name": "Arpita-Jaiswal/blog" - } - } -] +[] @@ -180,25 +127,25 @@ id: section-conatiner --- popup.logo-with-text: logo: $assets.files.assets.images.pull-request.png logo-text: Connections - + --- pull.search-btn: title: search --- ftd.text: Mapping padding-bottom: $fpm.space.space-3 role: $fpm.type.heading-small -color: $fpm.color.main.text-strong +color: $fpm.color.main.text-strong --- ftd.column: width:fill border-width: 1 border-radius: 8 -border-color: $fpm.color.main.border-strong +border-color: $fpm.color.main.border-strong --- mapping-loop: documentation-repo: $obj.documentation-repo code-repo: $obj.code-repo -$loop$:$kkk as $obj +$loop$: $all-repo-map as $obj --- container: section-conatiner @@ -211,7 +158,7 @@ color: $fpm.color.main.text-strong width:fill border-width: 1 border-radius: 8 -border-color: $fpm.color.main.border-strong +border-color: $fpm.color.main.border-strong --- available-loop: index: $obj.id @@ -227,8 +174,8 @@ $loop$: $available-repos-for-mapping as $obj -- ftd.row mapping-loop: optional ftd.image-src button-name: -optional ftd.image-src doc-logo: -optional ftd.image-src code-logo: +optional ftd.image-src doc-logo: +optional ftd.image-src code-logo: width: fill border-bottom: 1 border-color: $fpm.color.main.text @@ -246,13 +193,13 @@ spacing: 4 padding-top: 4 ---- ftd.image: +--- ftd.image: padding-top: 8 src: $assets.files.assets.images.lower-rectangle.png ---- ftd.image: +--- ftd.image: padding-top: 4 src: $assets.files.assets.images.icon9.png @@ -270,13 +217,13 @@ role: $fpm.type.label-small spacing: 4 padding-top: 4 ---- ftd.image: +--- ftd.image: padding-top: 8 src: $assets.files.assets.images.lower-rect.png ---- ftd.image: +--- ftd.image: padding-top: 4 src: $assets.files.assets.images.rectangle-white.png @@ -299,7 +246,7 @@ background-color: $fpm.color.main.cta-primary.base -- ftd.row available-loop: -optional ftd.image-src button-name: +optional ftd.image-src button-name: optional ftd.image-src doc-logo: $assets.files.assets.images.orgname.png width: fill border-bottom: 1 @@ -315,7 +262,7 @@ width:fill margin-top: 8 spacing: 4 ---- ftd.image: +--- ftd.image: src: $doc-logo @@ -331,7 +278,7 @@ role: $fpm.type.label-small --- overview: connect heading-name: $children ---- both-buttonn: +--- both-buttonn: repo-name: $children title-right: code-repo title-left: documentation-repo @@ -372,7 +319,7 @@ heading-name: $heading-name-right -- ftd.column overview: caption title: optional string heading-name: -boolean open-1: false +boolean open-1: false optional integer border-wi: 0 optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png open: true @@ -383,12 +330,12 @@ role: $font.button background-color: $fpm.color.main.cta-primary.base color: $fpm.color.main.background.base background-color if $MOUSE-IN: $font.cta_hover -color if $MOUSE-IN: $fpm.color.main.error.base +color if $MOUSE-IN: $fpm.color.main.error.base border-radius: 8 padding-vertical: 12 padding-horizontal: 16 border-width: 1 -border-color: $fpm.color.main.border-strong +border-color: $fpm.color.main.border-strong $on-click$: $open-1 = true --- ftd.column : @@ -413,7 +360,7 @@ padding-top: $fpm.space.space-3 padding-bottom: $fpm.space.space-8 padding-horizontal: $fpm.space.space-8 boolean mouse-in: false -border-color: $fpm.color.main.border-strong +border-color: $fpm.color.main.border-strong id: col-id shadow-offset-x: 3 shadow-offset-y: 4 @@ -461,7 +408,7 @@ caption button-name: string about-repo: string heading-name: string repo-name: -boolean open-1: false +boolean open-1: false optional integer border-wi: 0 string heading-name: optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png @@ -476,12 +423,12 @@ ftd.color button-color: $fpm.color.main.error.base background-color: $font.cta_primary_base color: $fpm.color.main.background.base background-color if $MOUSE-IN: $font.cta_hover -color if $MOUSE-IN: $fpm.color.main.error.base +color if $MOUSE-IN: $fpm.color.main.error.base border-radius: 8 padding-vertical: 8 padding-horizontal: 16 border-width: 1 -border-color: $fpm.color.main.border-strong +border-color: $fpm.color.main.border-strong margin-top:20 $on-click$: $open-1 = true From 2290724ce2ae623fb0a8836d21ed0dcab737cbbd Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Mon, 9 May 2022 15:33:41 +0530 Subject: [PATCH 4/5] upgrade ftd_django version --- requirements.in | 2 +- requirements.txt | 6 +++--- templates_ftd/index.ftd | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements.in b/requirements.in index 58d386a..440740e 100644 --- a/requirements.in +++ b/requirements.in @@ -13,4 +13,4 @@ whitenoise sentry-sdk rq django-rq -ftd-django==0.1.1 +ftd-django==0.1.3 diff --git a/requirements.txt b/requirements.txt index 3bdcdf6..3f52f28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -41,11 +41,11 @@ django-extensions==3.1.5 # via -r requirements.in django-rq==2.5.1 # via -r requirements.in -ftd==0.1.2 +ftd==0.1.3 # via ftd-django -ftd-django==0.1.1 +ftd-django==0.1.3 # via -r requirements.in -ftd-sys==0.1.0 +ftd-sys==0.1.1 # via ftd gunicorn==20.1.0 # via -r requirements.in diff --git a/templates_ftd/index.ftd b/templates_ftd/index.ftd index 39fc826..ca0b00e 100644 --- a/templates_ftd/index.ftd +++ b/templates_ftd/index.ftd @@ -45,6 +45,7 @@ $processor$: get-data -- optional string github-login-url: $processor$: get-data +null -- record available-repos-for-mapping-data: integer id: From 163bd42d4d5ff7a0c150b33598302f00f3856d77 Mon Sep 17 00:00:00 2001 From: Arpita-Jaiswal Date: Mon, 9 May 2022 16:30:47 +0530 Subject: [PATCH 5/5] Some fixes in templates_ftd/index.ftd --- templates_ftd/index.ftd | 63 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/templates_ftd/index.ftd b/templates_ftd/index.ftd index ca0b00e..d6158c2 100644 --- a/templates_ftd/index.ftd +++ b/templates_ftd/index.ftd @@ -246,18 +246,20 @@ background-color: $fpm.color.main.cta-primary.base + + + -- ftd.row available-loop: optional ftd.image-src button-name: optional ftd.image-src doc-logo: $assets.files.assets.images.orgname.png width: fill border-bottom: 1 -border-color: $fpm.color.main.text +border-color: $fpm.color.main.text padding-horizontal:30 padding-vertical: 20 string children: integer index: - --- ftd.row: width:fill margin-top: 8 @@ -266,7 +268,6 @@ spacing: 4 --- ftd.image: src: $doc-logo - --- ftd.text: $children link: $children color: $fpm.color.main.text @@ -276,10 +277,10 @@ role: $fpm.type.label-small --- ftd.row: ---- overview: connect +--- overview: Connect heading-name: $children ---- both-buttonn: +--- both-button: repo-name: $children title-right: code-repo title-left: documentation-repo @@ -291,7 +292,7 @@ heading-name-left: Attach Code repository --- ftd.row both-buttonn: +-- ftd.row both-button: width: fill caption title-right: caption title-left: @@ -307,7 +308,6 @@ about-repo: $about-repo-right repo-name: $repo-name heading-name: $heading-name-left - --- container: ftd.main --- code-repo: $title-left @@ -317,6 +317,13 @@ heading-name: $heading-name-right + + + + + + + -- ftd.column overview: caption title: optional string heading-name: @@ -326,7 +333,7 @@ optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png open: true append-at: col-id ---- ftd.text : $title +--- ftd.text: $title role: $font.button background-color: $fpm.color.main.cta-primary.base color: $fpm.color.main.background.base @@ -339,7 +346,7 @@ border-width: 1 border-color: $fpm.color.main.border-strong $on-click$: $open-1 = true ---- ftd.column : +--- ftd.column: z-index: 100 anchor: window top: 0 @@ -371,13 +378,11 @@ border-top: 1 border-radius: 8 border-color: $fpm.color.main.cta-primary.base shadow-color: $fpm.color.main.cta-primary.base -id: model-contete - +id: model-content --- ftd.row: width: fill - --- ftd.text: $heading-name role: $fpm.type.heading-medium color: $fpm.color.main.text-strong @@ -387,7 +392,7 @@ width: fill src: $cross-logo $on-click$: $open-1 = false ---- container: model-contete +--- container: model-content --- ftd.text: This repo is a: role: $fpm.type.copy-relaxed @@ -395,7 +400,7 @@ color: $fpm.color.main.text width: fill ---- container: model-contete +--- container: model-content --- ftd.row: width: fill @@ -411,13 +416,11 @@ string heading-name: string repo-name: boolean open-1: false optional integer border-wi: 0 -string heading-name: optional ftd.image-src cross-logo: $assets.files.assets.images.Union.png open: true append-at: col-id - ---- ftd.text : $button-name +--- ftd.text: $button-name role: $fpm.type.label-big ftd.color button-bg: $fpm.color.main.background.base ftd.color button-color: $fpm.color.main.error.base @@ -432,9 +435,9 @@ border-width: 1 border-color: $fpm.color.main.border-strong margin-top:20 $on-click$: $open-1 = true +$on-click$: $abc = $repo-name - ---- ftd.column : +--- ftd.column: z-index: 100 anchor: window top: 0 @@ -445,8 +448,6 @@ background-color: $font.backkk id: kjlk if: $open-1 - - --- ftd.column: background-color: $fpm.color.main.background.base width: 650 @@ -468,7 +469,6 @@ spacing: 24 --- ftd.row: width:fill - --- ftd.text: $heading-name role: $fpm.type.heading-medium color: $fpm.color.main.text-strong @@ -479,11 +479,8 @@ src: $assets.files.assets.images.Union.png /$on-click-outside$: $open-1 = true $on-click$: $open-1 = false ---- ftd.text: -text: $abc --- container: col-id - --- ftd.text: $repo-name role: $fpm.type.copy-relaxed color: $fpm.color.main.text @@ -491,11 +488,9 @@ width: fill --- container: col-id - --- ftd.row: width: fill - --- ftd.text: $about-repo role: $fpm.type.copy-relaxed color: $fpm.color.main.text @@ -504,8 +499,6 @@ width: fill --- search-btn: search available-repos-for-mapping: $available-repos-for-mapping - - --- container: col-id --- ftd.row: @@ -513,11 +506,17 @@ align: center margin-top: $fpm.space.space-4 margin-bottom: $fpm.space.space-4 - ---- popup.button: attach +--- popup.button: Attach button-bg: $fpm.color.main.cta-primary.base + + + + + + + -- ftd.row search-btn: available-repos-for-mapping-data list available-repos-for-mapping: caption title: @@ -535,7 +534,7 @@ border-radius: 8 padding-vertical: 14 padding-horizontal: 28 border-width: 1 -placeholder:$abc +placeholder: $abc background-color: $fpm.color.main.background.base border-color: $fpm.color.main.text