diff --git a/package.json b/package.json index 9c2a10f..4bbaf1d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "*.{html,md,css,less,js,ts,tsx,json}": "prettier --write" }, "dependencies": { - "boot-cell": "^2.0.0-beta.10", + "boot-cell": "^2.0.0-beta.11", "browser-unhandled-rejection": "^1.0.2", "cell-router": "^3.0.0-rc.5", "classnames": "^2.5.1", @@ -40,7 +40,7 @@ "html-to-image": "^1.11.11", "koajax": "^0.9.6", "lodash.groupby": "^4.6.0", - "marked": "^11.2.0", + "marked": "^12.0.0", "mobx": "^6.12.0", "mobx-i18n": "^0.5.0", "web-cell": "^3.0.0-rc.8", @@ -53,17 +53,17 @@ "@parcel/transformer-typescript-tsc": "~2.11.0", "@parcel/transformer-webmanifest": "~2.11.0", "@types/lodash.groupby": "^4.6.9", - "@types/node": "^18.19.10", + "@types/node": "^18.19.14", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", - "husky": "^9.0.7", - "lint-staged": "^15.2.0", + "husky": "^9.0.10", + "lint-staged": "^15.2.2", "parcel": "~2.11.0", "postcss": "^8.4.33", "postcss-modules": "^4.3.1", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "typescript": "~5.3.3", "workbox-cli": "^7.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7fddbde..95e0556 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: boot-cell: - specifier: ^2.0.0-beta.10 - version: 2.0.0-beta.10(typescript@5.3.3) + specifier: ^2.0.0-beta.11 + version: 2.0.0-beta.11(typescript@5.3.3) browser-unhandled-rejection: specifier: ^1.0.2 version: 1.0.2 @@ -30,8 +30,8 @@ dependencies: specifier: ^4.6.0 version: 4.6.0 marked: - specifier: ^11.2.0 - version: 11.2.0 + specifier: ^12.0.0 + version: 12.0.0 mobx: specifier: ^6.12.0 version: 6.12.0 @@ -65,8 +65,8 @@ devDependencies: specifier: ^4.6.9 version: 4.6.9 '@types/node': - specifier: ^18.19.10 - version: 18.19.10 + specifier: ^18.19.14 + version: 18.19.14 '@typescript-eslint/eslint-plugin': specifier: ^6.20.0 version: 6.20.0(@typescript-eslint/parser@6.20.0)(eslint@8.56.0)(typescript@5.3.3) @@ -80,11 +80,11 @@ devDependencies: specifier: ^9.1.0 version: 9.1.0(eslint@8.56.0) husky: - specifier: ^9.0.7 - version: 9.0.7 + specifier: ^9.0.10 + version: 9.0.10 lint-staged: - specifier: ^15.2.0 - version: 15.2.0 + specifier: ^15.2.2 + version: 15.2.2 parcel: specifier: ~2.11.0 version: 2.11.0(postcss@8.4.33)(typescript@5.3.3) @@ -95,8 +95,8 @@ devDependencies: specifier: ^4.3.1 version: 4.3.1(postcss@8.4.33) prettier: - specifier: ^3.2.4 - version: 3.2.4 + specifier: ^3.2.5 + version: 3.2.5 typescript: specifier: ~5.3.3 version: 5.3.3 @@ -2603,6 +2603,12 @@ packages: dependencies: tslib: 2.6.2 + /@swc/helpers@0.5.6: + resolution: {integrity: sha512-aYX01Ke9hunpoCexYAgQucEpARGQ5w/cqHFrIR+e9gdKb1QWTsVJuTJ2ozQzIAxLyRQe/m+2RqzkyOOGiMKRQA==} + dependencies: + tslib: 2.6.2 + dev: false + /@swc/types@0.1.5: resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==} dev: true @@ -2630,7 +2636,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.14 dev: true /@types/lodash.groupby@4.6.9: @@ -2647,8 +2653,8 @@ packages: resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} dev: true - /@types/node@18.19.10: - resolution: {integrity: sha512-IZD8kAM02AW1HRDTPOlz3npFava678pr8Ie9Vp8uRhBROXAv8MXT2pCnGZZAKYdromsNQLHQcfWQ6EOatVLtqA==} + /@types/node@18.19.14: + resolution: {integrity: sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==} dependencies: undici-types: 5.26.5 dev: true @@ -2660,13 +2666,13 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.14 dev: true /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.14 dev: true /@types/semver@7.5.6: @@ -3021,8 +3027,8 @@ packages: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} dev: true - /boot-cell@2.0.0-beta.10(typescript@5.3.3): - resolution: {integrity: sha512-a5/tBFKWfTJsOjDAQINDQGY5Qbzh9uyQo3tPo60QCLUtEt6vNDXxeOJHDdhrPN0GxZNLIiykYZESmLFcPb9fqA==} + /boot-cell@2.0.0-beta.11(typescript@5.3.3): + resolution: {integrity: sha512-UtQWtgYyyn5Z324Gvm1ThcKAzYpL5EnxsKvsk1C651+5mw28VOmErwXCTXoUHBMti75fRNkP4sNrXbbCsWnxzQ==} peerDependencies: '@fortawesome/fontawesome-free': ^6 '@nuintun/qrcode': ^3 @@ -3032,7 +3038,7 @@ packages: iterable-observer: ^1 share-api-polyfill: ^1 dependencies: - '@swc/helpers': 0.5.3 + '@swc/helpers': 0.5.6 classnames: 2.5.1 dom-renderer: 2.0.6(typescript@5.3.3) mobx: 6.12.0 @@ -4270,8 +4276,8 @@ packages: engines: {node: '>=16.17.0'} dev: true - /husky@9.0.7: - resolution: {integrity: sha512-vWdusw+y12DUEeoZqW1kplOFqk3tedGV8qlga8/SF6a3lOiWLqGZZQvfWvY0fQYdfiRi/u1DFNpudTSV9l1aCg==} + /husky@9.0.10: + resolution: {integrity: sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==} engines: {node: '>=18'} hasBin: true dev: true @@ -4648,7 +4654,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.19.10 + '@types/node': 18.19.14 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -4897,8 +4903,8 @@ packages: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} dev: true - /lint-staged@15.2.0: - resolution: {integrity: sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==} + /lint-staged@15.2.2: + resolution: {integrity: sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==} engines: {node: '>=18.12.0'} hasBin: true dependencies: @@ -4907,7 +4913,7 @@ packages: debug: 4.3.4 execa: 8.0.1 lilconfig: 3.0.0 - listr2: 8.0.0 + listr2: 8.0.1 micromatch: 4.0.5 pidtree: 0.6.0 string-argv: 0.3.2 @@ -4916,8 +4922,8 @@ packages: - supports-color dev: true - /listr2@8.0.0: - resolution: {integrity: sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==} + /listr2@8.0.1: + resolution: {integrity: sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==} engines: {node: '>=18.0.0'} dependencies: cli-truncate: 4.0.0 @@ -5065,8 +5071,8 @@ packages: engines: {node: '>=8'} dev: true - /marked@11.2.0: - resolution: {integrity: sha512-HR0m3bvu0jAPYiIvLUUQtdg1g6D247//lvcekpHO1WMvbwDlwSkZAX9Lw4F4YHE1T0HaaNve0tuAWuV1UJ6vtw==} + /marked@12.0.0: + resolution: {integrity: sha512-Vkwtq9rLqXryZnWaQc86+FHLC6tr/fycMfYAhiOIXkrNmeGAyhSxjqu0Rs1i0bBqw5u0S7+lV9fdH2ZSVaoa0w==} engines: {node: '>= 18'} hasBin: true dev: false @@ -5645,8 +5651,8 @@ packages: engines: {node: '>=4'} dev: true - /prettier@3.2.4: - resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} hasBin: true dev: true diff --git a/source/component/Carousel.tsx b/source/component/Carousel.tsx deleted file mode 100644 index 4305d95..0000000 --- a/source/component/Carousel.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import { FC, WebCellProps } from 'web-cell'; - -export interface CarouselItemProps extends WebCellProps { - interval?: number; -} - -export const CarouselItem: FC = ({ - className = '', - interval, - children, - ...props -}) => ( -
- {children} -
-); - -export const CarouselCaption: FC> = ({ - className = '', - children, - ...props -}) => ( -
- {children} -
-); diff --git a/source/page/2018-Code4City/index.tsx b/source/page/2018-Code4City/index.tsx index 5ffbf41..eb08947 100644 --- a/source/page/2018-Code4City/index.tsx +++ b/source/page/2018-Code4City/index.tsx @@ -1,6 +1,12 @@ import { FC } from 'web-cell'; -import { Image, Button } from 'boot-cell'; -import { CarouselCaption, CarouselItem } from '../../component/Carousel'; +import { PageProps } from 'cell-router'; +import { + Image, + Button, + Carousel, + CarouselCaption, + CarouselItem +} from 'boot-cell'; import { GuestCard } from './GuestCard'; import * as style from './index.module.less'; @@ -8,8 +14,8 @@ import BG_mountain from './image/BG-mountain.png'; import BG_points from './image/BG-points.png'; import { review, awards, vips, sponsors } from './data'; -export const Code4City: FC = () => ( - <> +export const Code4City: FC = props => ( +
(
- + {review.map(({ imageURL, title }) => ( ( ))} - +

( style={{ backgroundImage: `url(${BG_points})` }} >
-

- 合作单位 -

+

合作单位

{sponsors.map(({ title, list }) => (
@@ -195,5 +199,5 @@ export const Code4City: FC = () => (
- +

); diff --git a/source/page/index.tsx b/source/page/index.tsx index 8fb326c..153eb50 100644 --- a/source/page/index.tsx +++ b/source/page/index.tsx @@ -6,6 +6,7 @@ import { CommunityPage } from './Community'; import { ActivityPage } from './Activity'; import { Page2017 } from './2017'; import { Page2018 } from './2018'; +import { Code4City } from './2018-Code4City'; const { Route } = createRouter(); @@ -15,7 +16,7 @@ export const PageRouter = () => ( - {/* { paths: ['2018/Code4City'], component: Code4City }, */} + {/* { paths: ['2019'], component: Page2019 }, { paths: ['2019/invitation'], component: InvitationCard },