Skip to content

Commit

Permalink
Merge pull request #364 from Magickbase/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith-CY authored Oct 17, 2023
2 parents e9e9d2e + 50839f8 commit 98d32d3
Show file tree
Hide file tree
Showing 12 changed files with 174 additions and 44 deletions.
9 changes: 9 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-after-install.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-disable */
//prettier-ignore
module.exports = {
name: "@yarnpkg/plugin-after-install",
factory: function (require) {
"use strict";var plugin=(()=>{var s=Object.defineProperty;var g=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var C=Object.prototype.hasOwnProperty;var n=(t=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(t,{get:(o,e)=>(typeof require<"u"?require:o)[e]}):t)(function(t){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+t+'" is not supported')});var I=(t,o)=>{for(var e in o)s(t,e,{get:o[e],enumerable:!0})},h=(t,o,e,a)=>{if(o&&typeof o=="object"||typeof o=="function")for(let r of x(o))!C.call(t,r)&&r!==e&&s(t,r,{get:()=>o[r],enumerable:!(a=g(o,r))||a.enumerable});return t};var k=t=>h(s({},"__esModule",{value:!0}),t);var P={};I(P,{default:()=>y});var d=n("@yarnpkg/core");var f=n("@yarnpkg/core"),c={afterInstall:{description:"Hook that will always run after install",type:f.SettingsType.STRING,default:""}};var u=n("clipanion"),p=n("@yarnpkg/core");var m=n("@yarnpkg/shell"),l=async(t,o)=>{var r;let e=t.get("afterInstall"),a=!!((r=t.projectCwd)!=null&&r.endsWith(`dlx-${process.pid}`));return e&&!a?(o&&console.log("Running `afterInstall` hook..."),(0,m.execute)(e,[],{cwd:t.projectCwd||void 0})):0};var i=class extends u.Command{async execute(){let o=await p.Configuration.find(this.context.cwd,this.context.plugins);return l(o,!1)}};i.paths=[["after-install"]];var w={configuration:c,commands:[i],hooks:{afterAllInstalled:async(t,o)=>{if((o==null?void 0:o.mode)===d.InstallMode.UpdateLockfile)return;if(await l(t.configuration,!0))throw new Error("The `afterInstall` hook failed, see output above.")}}},y=w;return k(P);})();
return plugin;
}
};
8 changes: 8 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
nodeLinker: node-modules

plugins:
# This is to solve the problem where prepare and postinstall is not available in yarn 3.
# Refs: https://github.com/yarnpkg/yarn/issues/5476#issuecomment-1713264396
- path: .yarn/plugins/@yarnpkg/plugin-after-install.cjs
spec: 'https://raw.githubusercontent.com/mhassan1/yarn-plugin-after-install/v0.5.0/bundles/@yarnpkg/plugin-after-install.js'

afterInstall: yarn afterInstall

yarnPath: .yarn/releases/yarn-3.6.3.cjs
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dev": "next dev",
"lint": "next lint",
"start": "next start",
"prepare": "husky install"
"afterInstall": "husky install"
},
"dependencies": {
"@headlessui/react": "^1.7.13",
Expand Down Expand Up @@ -42,7 +42,7 @@
"sass": "^1.58.3",
"superjson": "1.13.1",
"swiper": "^9.1.0",
"zod": "^3.20.6"
"zod": "^3.22.3"
},
"devDependencies": {
"@svgr/webpack": "^8.0.0",
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"community_fund_dao": "Community\nFund DAO",
"forum": "Forum",
"rfcs": "RFCs",
"ckb_nodes": "CKB Node Probe",
"mining": "Mining",
"wallets": "Wallets",
"learn": "Learn",
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"community_fund_dao": "Community\nFund DAO",
"forum": "Foro",
"rfcs": "RFCs",
"ckb_nodes": "CKB Node Sonda",
"mining": "Minería",
"wallets": "Wallets",
"learn": "Aprende",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"community_fund_dao": "Community\nFund DAO",
"forum": "Forum",
"rfcs": "RFCs",
"ckb_nodes": "Sonde du nœud CKB",
"mining": "Minage",
"wallets": "Portefeuilles",
"learn": "Apprendre",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"community_fund_dao": "Community\nFund DAO",
"forum": "Fórum",
"rfcs": "RFCs",
"ckb_nodes": "Sonda de nó CKB",
"mining": "Mineração",
"wallets": "Carteiras",
"learn": "Aprender",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"community_fund_dao": "社区基金 DAO",
"forum": "论坛",
"rfcs": "RFCs",
"ckb_nodes": " CKB 节点探针",
"mining": "挖矿",
"wallets": "钱包",
"learn": "学习",
Expand Down
1 change: 1 addition & 0 deletions src/components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export const Footer: FC<FooterProps> = props => {
{ label: t('community_fund_dao'), url: 'https://dao.ckb.community/' },
{ label: t('nervos_talk_forum'), url: 'https://talk.nervos.org/' },
{ label: t('rfcs'), url: 'https://github.com/nervosnetwork/rfcs/' },
{ label: t('ckb_nodes'), url: 'https://nodes.ckb.dev/' },
],
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ $defaultHeaderHeight: 90px;
.menu {
display: flex;
flex-direction: column;
height: 150px;
height: 165px;
padding: 0 15px;
color: var(--colorPrimary);
background: var(--colorPrimaryBg);
Expand Down
3 changes: 3 additions & 0 deletions src/components/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ const MenuPopover: FC = () => {
<StyledLink href="https://github.com/nervosnetwork/rfcs" className={styles.link}>
{t('rfcs')}
</StyledLink>
<StyledLink href="https://nodes.ckb.dev/" className={styles.link}>
{t('ckb_nodes')}
</StyledLink>
</div>
</div>

Expand Down
Loading

1 comment on commit 98d32d3

@vercel
Copy link

@vercel vercel bot commented on 98d32d3 Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.