From 15a2ea0e4179440cbb5efb775fa346037a45d01c Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Mon, 23 Oct 2023 17:59:17 +0800 Subject: [PATCH 01/21] refactor: redesign style of job card and event card --- homepage/public/css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index b02c442f..11128874 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -937,6 +937,15 @@ code { .logo-margin { margin: 0 15px; } +.avatar { + margin: 0.5rem auto; + height: 10rem; + width: 10rem; + border-radius: 50%; +} +.avatar-event { + background-color: #f1c287; +} @media only screen and (max-width: 991px) { .blogs-list .item { width: 50% !important; From a75ee6dc42fad5f217674a5f8bfe173f49d367bb Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 24 Oct 2023 08:14:06 +0700 Subject: [PATCH 02/21] refactor: redesign style of job card and event card --- homepage/src/components/cards/card.jsx | 126 ++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 14 deletions(-) diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index bcbcc17b..3765c592 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -1,21 +1,119 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; -const Card = ({ card }) => ( -
-
-

{card.data.title}

-
-
- {card.data.title} +const Card = ({ card }) => { + if (card.data.type === 'event') { + return ( +
+
+

{card.data.title}

+
+
+
+ {card.data.title} +
+
+ {card.data.description} + + {card.content} + +
- {card.data.description} - - {card.content} -
-
-
-); + ); + } else if (card.data.type === 'job') { + const color = {}; + + switch (card.data.tags[0]) { + case 'civil servants': + color.avatar = '#b1bb95'; + color.background = '#8b9f6d'; + color.border = '#6f8d50'; + break; + case 'engineer': + color.avatar = '#95a2b2'; + color.background = '#5e7d93'; + color.border = '#2a6780'; + break; + case 'writer': + color.avatar = '#94a8a1'; + color.background = '#62867f'; + color.border = '#287168'; + break; + case 'legal': + color.avatar = '#d4ab8d'; + color.background = '#c2865f'; + color.border = '#b76a46'; + break; + case 'designer': + color.avatar = '#d1bb8f'; + color.background = '#be9f5f'; + color.border = '#b18b42'; + break; + case 'marketing': + color.avatar = '#c1907b'; + color.background = '#aa644f'; + color.border = '#984334'; + break; + case 'advocator': + color.avatar = '#9a91ab'; + color.background = '#6c688b'; + color.border = '#474c79'; + break; + } + + return ( +
+
+

{card.data.title}

+
+
+
+ {card.data.title} +
+
+ {card.data.description} + + {card.content} + +
+
+
+ ); + } else { + return ( +
+
+

{card.data.title}

+
+
+ {card.data.title} +
+ {card.data.description} + + {card.content} + +
+
+
+ ); + } +}; export default Card; From 2359f82ac9ba820e476a13897a1e2f73e87f33a9 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 24 Oct 2023 08:53:53 +0700 Subject: [PATCH 03/21] wip --- homepage/src/components/cards/card.jsx | 7 ++++ homepage/src/lib/componentMapper.js | 46 +++++++++++++++++++++----- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 3765c592..8e885d42 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -105,6 +105,13 @@ const Card = ({ card }) => {
{card.data.title}
+ { + card.data.avatarList.map((avatar) => { +
+ {avatar.data.title} +
+ }) + } {card.data.description} {card.content} diff --git a/homepage/src/lib/componentMapper.js b/homepage/src/lib/componentMapper.js index 2e233082..3b5b5518 100644 --- a/homepage/src/lib/componentMapper.js +++ b/homepage/src/lib/componentMapper.js @@ -20,6 +20,26 @@ export const componentTypes = { Cards: 'Cards', }; +const extendProjectCardTagsContent = (projectCards, jobCards) => { + return projectCards.map((projectCard) => { + const tags = projectCard.data.tags; + let avatarList = []; + if (tags) { + avatarList = tags.map((tag) => { + const jobCard = jobCards.find((jobCard) => jobCard.data.title === tag); + if (jobCard) { + return jobCard.data; + } + return null; + }).filter(x => x); + } + return { + ...projectCard, + avatarList, + }; + }); +} + export const componentMapper = (layout, cards = []) => { let type = ''; let props = {}; @@ -103,14 +123,24 @@ export const componentMapper = (layout, cards = []) => { layout.card_tags.every((tag) => card.data.tags?.includes(tag)), ); } - - type = componentTypes.Cards; - props = { - id: titleToAnchorId(layout.title), - title: layout.title, - cards: filteredCards, - }; - break; + if (layout.card_type === 'card_project') { + type = componentTypes.Cards; + props = { + id: titleToAnchorId(layout.title), + title: layout.title, + cards: extendProjectCardTagsContent(filteredCards, cards.filter((card) => card.data.type === 'job_card')), + }; + break; + } + else { + type = componentTypes.Cards; + props = { + id: titleToAnchorId(layout.title), + title: layout.title, + cards: filteredCards, + }; + break; + } } } From d1cb6e0b1f84d1b82df92bebd8fe7a295bade5b8 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sat, 28 Oct 2023 16:58:47 +0800 Subject: [PATCH 04/21] refactor: move color mapping logic from client side to server side --- homepage/src/lib/processCardData.js | 66 ++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/homepage/src/lib/processCardData.js b/homepage/src/lib/processCardData.js index 45e3b78c..c724b5b4 100644 --- a/homepage/src/lib/processCardData.js +++ b/homepage/src/lib/processCardData.js @@ -1,4 +1,4 @@ -import { titleToAnchorId } from "./titleToAnchorId"; +import { titleToAnchorId } from './titleToAnchorId'; export function processCardData(data) { let image = data.image; @@ -8,9 +8,71 @@ export function processCardData(data) { // Workaround for image prefix path. Will be removed after image path is fixed in all cards. image = !image.startsWith('/') ? `/${image}` : image; + // Non-project card + if (data.type === 'job') { + const color = {}; + + switch (data.tags[0]) { + case 'civil servants': + color.avatar = '#b1bb95'; + color.background = '#8b9f6d'; + color.border = '#6f8d50'; + break; + case 'engineer': + color.avatar = '#95a2b2'; + color.background = '#5e7d93'; + color.border = '#2a6780'; + break; + case 'writer': + color.avatar = '#94a8a1'; + color.background = '#62867f'; + color.border = '#287168'; + break; + case 'legal': + color.avatar = '#d4ab8d'; + color.background = '#c2865f'; + color.border = '#b76a46'; + break; + case 'designer': + color.avatar = '#d1bb8f'; + color.background = '#be9f5f'; + color.border = '#b18b42'; + break; + case 'marketing': + color.avatar = '#c1907b'; + color.background = '#aa644f'; + color.border = '#984334'; + break; + case 'advocator': + color.avatar = '#9a91ab'; + color.background = '#6c688b'; + color.border = '#474c79'; + break; + } + + data = { + ...data, + color, + }; + } + + if (data.type === 'event') { + const color = {}; + + color.avatar = '#f1c287'; + color.background = '#eaa652'; + color.border = ' #e6912b'; + + data = { + ...data, + color, + }; + } + // project card + return { ...data, image, id: data.id || titleToAnchorId(data.title), - } + }; } From e9ad185502dbaff086353897a018027ea97b8369 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sat, 28 Oct 2023 17:02:05 +0800 Subject: [PATCH 05/21] refactor: extract job card and event card to create NonProjectCard component --- homepage/public/css/style.css | 4 +- homepage/src/components/cards/card.jsx | 108 ++---------------- .../src/components/cards/nonProjectCard.jsx | 39 +++++++ 3 files changed, 51 insertions(+), 100 deletions(-) create mode 100644 homepage/src/components/cards/nonProjectCard.jsx diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index 11128874..932a30e2 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -943,9 +943,7 @@ code { width: 10rem; border-radius: 50%; } -.avatar-event { - background-color: #f1c287; -} + @media only screen and (max-width: 991px) { .blogs-list .item { width: 50% !important; diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 8e885d42..929c635d 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -1,101 +1,10 @@ import Image from 'next/image'; +import NonProjectCard from './nonProjectCard'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; const Card = ({ card }) => { - if (card.data.type === 'event') { - return ( -
-
-

{card.data.title}

-
-
-
- {card.data.title} -
-
- {card.data.description} - - {card.content} - -
-
-
- ); - } else if (card.data.type === 'job') { - const color = {}; - - switch (card.data.tags[0]) { - case 'civil servants': - color.avatar = '#b1bb95'; - color.background = '#8b9f6d'; - color.border = '#6f8d50'; - break; - case 'engineer': - color.avatar = '#95a2b2'; - color.background = '#5e7d93'; - color.border = '#2a6780'; - break; - case 'writer': - color.avatar = '#94a8a1'; - color.background = '#62867f'; - color.border = '#287168'; - break; - case 'legal': - color.avatar = '#d4ab8d'; - color.background = '#c2865f'; - color.border = '#b76a46'; - break; - case 'designer': - color.avatar = '#d1bb8f'; - color.background = '#be9f5f'; - color.border = '#b18b42'; - break; - case 'marketing': - color.avatar = '#c1907b'; - color.background = '#aa644f'; - color.border = '#984334'; - break; - case 'advocator': - color.avatar = '#9a91ab'; - color.background = '#6c688b'; - color.border = '#474c79'; - break; - } - - return ( -
-
-

{card.data.title}

-
-
-
- {card.data.title} -
-
- {card.data.description} - - {card.content} - -
-
-
- ); + if (card.data.type !== 'project') { + return ; } else { return (
@@ -103,15 +12,20 @@ const Card = ({ card }) => {

{card.data.title}

- {card.data.title} + {card.data.title}
- { + {/* { card.data.avatarList.map((avatar) => {
{avatar.data.title}
}) - } + } */} {card.data.description} {card.content} diff --git a/homepage/src/components/cards/nonProjectCard.jsx b/homepage/src/components/cards/nonProjectCard.jsx new file mode 100644 index 00000000..414b7f63 --- /dev/null +++ b/homepage/src/components/cards/nonProjectCard.jsx @@ -0,0 +1,39 @@ +import Image from 'next/image'; +import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; + +const NonProjectCard = ({ card }) => ( +
+
+

{card.data.title}

+
+
+
+ {card.data.title} +
+
+ {card.data.description} + + {card.content} + +
+
+
+); + +export default NonProjectCard; From cf90a99d10c1dd17617f6c2b0e1bd5b1fda398af Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sat, 28 Oct 2023 17:02:27 +0800 Subject: [PATCH 06/21] wip --- homepage/src/lib/componentMapper.js | 76 +++++++++++++++-------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/homepage/src/lib/componentMapper.js b/homepage/src/lib/componentMapper.js index 3b5b5518..d21f967c 100644 --- a/homepage/src/lib/componentMapper.js +++ b/homepage/src/lib/componentMapper.js @@ -20,25 +20,25 @@ export const componentTypes = { Cards: 'Cards', }; -const extendProjectCardTagsContent = (projectCards, jobCards) => { - return projectCards.map((projectCard) => { - const tags = projectCard.data.tags; - let avatarList = []; - if (tags) { - avatarList = tags.map((tag) => { - const jobCard = jobCards.find((jobCard) => jobCard.data.title === tag); - if (jobCard) { - return jobCard.data; - } - return null; - }).filter(x => x); - } - return { - ...projectCard, - avatarList, - }; - }); -} +// const extendProjectCardTagsContent = (projectCards, jobCards) => { +// return projectCards.map((projectCard) => { +// const tags = projectCard.data.tags; +// let avatarList = []; +// if (tags) { +// avatarList = tags.map((tag) => { +// const jobCard = jobCards.find((jobCard) => jobCard.data.title === tag); +// if (jobCard) { +// return jobCard.data; +// } +// return null; +// }).filter(x => x); +// } +// return { +// ...projectCard, +// avatarList, +// }; +// }); +// } export const componentMapper = (layout, cards = []) => { let type = ''; @@ -123,24 +123,26 @@ export const componentMapper = (layout, cards = []) => { layout.card_tags.every((tag) => card.data.tags?.includes(tag)), ); } - if (layout.card_type === 'card_project') { - type = componentTypes.Cards; - props = { - id: titleToAnchorId(layout.title), - title: layout.title, - cards: extendProjectCardTagsContent(filteredCards, cards.filter((card) => card.data.type === 'job_card')), - }; - break; - } - else { - type = componentTypes.Cards; - props = { - id: titleToAnchorId(layout.title), - title: layout.title, - cards: filteredCards, - }; - break; - } + // if (layout.card_type === 'card_project') { + // type = componentTypes.Cards; + // props = { + // id: titleToAnchorId(layout.title), + // title: layout.title, + // cards: extendProjectCardTagsContent( + // filteredCards, + // cards.filter((card) => card.data.type === 'job_card'), + // ), + // }; + // break; + // } else { + type = componentTypes.Cards; + props = { + id: titleToAnchorId(layout.title), + title: layout.title, + cards: filteredCards, + }; + break; + // } } } From 14062195c9c0c793df688bbd2e62f7071bcdc23c Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sat, 28 Oct 2023 21:51:27 +0800 Subject: [PATCH 07/21] wip --- homepage/src/components/cards/card.jsx | 5 +++- homepage/src/lib/processCardData.js | 32 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 929c635d..8dfb5d68 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -8,7 +8,10 @@ const Card = ({ card }) => { } else { return (
-
+

{card.data.title}

diff --git a/homepage/src/lib/processCardData.js b/homepage/src/lib/processCardData.js index c724b5b4..c23c043b 100644 --- a/homepage/src/lib/processCardData.js +++ b/homepage/src/lib/processCardData.js @@ -69,6 +69,38 @@ export function processCardData(data) { }; } // project card + const jobCards = data.type === 'job'; + + if (data.type === 'project') { + const color = {}; + const mainTag = data.tags.find((tag) => + ['open gov', 'open data', 'open source'].includes(tag), + ); + switch (mainTag) { + case 'open gov': + color.background = '#efac49'; + break; + case 'open data': + color.background = '#73a09b'; + break; + case 'open source': + color.background = '#9b2123'; + break; + default: + color.background = '#ffffff'; + } + + const tags = data.tags || []; + const avatarList = tags.map((tag) => { + const jobCard = jobCards.find((jobCard) => jobCard.data.tags[0] === tag); + return jobCard ? jobCard.data : null; + }); + + data = { + ...data, + color, + }; + } return { ...data, From 0b688da743a514818a4fec8e48f5fce67c1a3cc1 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sun, 29 Oct 2023 17:35:29 +0800 Subject: [PATCH 08/21] refactor: extract color mapping logic for job card into function getJobCardColor --- homepage/src/lib/getJobCardColor.js | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 homepage/src/lib/getJobCardColor.js diff --git a/homepage/src/lib/getJobCardColor.js b/homepage/src/lib/getJobCardColor.js new file mode 100644 index 00000000..101a89d6 --- /dev/null +++ b/homepage/src/lib/getJobCardColor.js @@ -0,0 +1,43 @@ +export const getJobCardColor = (tag) => { + const color = {}; + + switch (tag) { + case 'civil servants': + color.avatar = '#b1bb95'; + color.background = '#8b9f6d'; + color.border = '#6f8d50'; + break; + case 'engineer': + color.avatar = '#95a2b2'; + color.background = '#5e7d93'; + color.border = '#2a6780'; + break; + case 'writer': + color.avatar = '#94a8a1'; + color.background = '#62867f'; + color.border = '#287168'; + break; + case 'legal': + color.avatar = '#d4ab8d'; + color.background = '#c2865f'; + color.border = '#b76a46'; + break; + case 'designer': + color.avatar = '#d1bb8f'; + color.background = '#be9f5f'; + color.border = '#b18b42'; + break; + case 'marketing': + color.avatar = '#c1907b'; + color.background = '#aa644f'; + color.border = '#984334'; + break; + case 'advocator': + color.avatar = '#9a91ab'; + color.background = '#6c688b'; + color.border = '#474c79'; + break; + } + + return color; +}; From 3c1cdc25cb43068e6d22ef5ac9c45263792806d3 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sun, 29 Oct 2023 17:39:30 +0800 Subject: [PATCH 09/21] refactor: replace processCardData with processCard to handle dependency issue in avatarList --- homepage/src/lib/componentMapper.js | 34 +-------- homepage/src/lib/processCard.js | 103 ++++++++++++++++++++++++++++ homepage/src/pages/cards.jsx | 10 +-- 3 files changed, 107 insertions(+), 40 deletions(-) create mode 100644 homepage/src/lib/processCard.js diff --git a/homepage/src/lib/componentMapper.js b/homepage/src/lib/componentMapper.js index d21f967c..2e233082 100644 --- a/homepage/src/lib/componentMapper.js +++ b/homepage/src/lib/componentMapper.js @@ -20,26 +20,6 @@ export const componentTypes = { Cards: 'Cards', }; -// const extendProjectCardTagsContent = (projectCards, jobCards) => { -// return projectCards.map((projectCard) => { -// const tags = projectCard.data.tags; -// let avatarList = []; -// if (tags) { -// avatarList = tags.map((tag) => { -// const jobCard = jobCards.find((jobCard) => jobCard.data.title === tag); -// if (jobCard) { -// return jobCard.data; -// } -// return null; -// }).filter(x => x); -// } -// return { -// ...projectCard, -// avatarList, -// }; -// }); -// } - export const componentMapper = (layout, cards = []) => { let type = ''; let props = {}; @@ -123,18 +103,7 @@ export const componentMapper = (layout, cards = []) => { layout.card_tags.every((tag) => card.data.tags?.includes(tag)), ); } - // if (layout.card_type === 'card_project') { - // type = componentTypes.Cards; - // props = { - // id: titleToAnchorId(layout.title), - // title: layout.title, - // cards: extendProjectCardTagsContent( - // filteredCards, - // cards.filter((card) => card.data.type === 'job_card'), - // ), - // }; - // break; - // } else { + type = componentTypes.Cards; props = { id: titleToAnchorId(layout.title), @@ -142,7 +111,6 @@ export const componentMapper = (layout, cards = []) => { cards: filteredCards, }; break; - // } } } diff --git a/homepage/src/lib/processCard.js b/homepage/src/lib/processCard.js new file mode 100644 index 00000000..c02a07c1 --- /dev/null +++ b/homepage/src/lib/processCard.js @@ -0,0 +1,103 @@ +import { getJobCardColor } from './getJobCardColor'; +import { titleToAnchorId } from './titleToAnchorId'; + +export const processCard = (card, cards) => { + let { data, content } = card; + + let image = data.image; + const defaultImage = '/images/uploads/初階專案卡封面-01.png'; + image = image ? image.replace('/homepage/public', '') : defaultImage; + + // Workaround for image prefix path. Will be removed after image path is fixed in all cards. + image = !image.startsWith('/') ? `/${image}` : image; + + data = { + ...data, + image, + }; + + // + const id = data.id || titleToAnchorId(data.title); + data = { + ...data, + id, + }; + + // Non-project card + if (data.type === 'job') { + const color = getJobCardColor(data.tags[0]); + + data = { + ...data, + color, + }; + } + + if (data.type === 'event') { + const color = {}; + + color.avatar = '#f1c287'; + color.background = '#eaa652'; + color.border = ' #e6912b'; + + data = { + ...data, + color, + }; + } + // project card + if (data.type === 'project') { + const color = {}; + const mainTag = data.tags.find((tag) => + ['open gov', 'open data', 'open source'].includes(tag), + ); + switch (mainTag) { + case 'open gov': + color.background = '#efac49'; + break; + case 'open data': + color.background = '#73a09b'; + break; + case 'open source': + color.background = '#9b2123'; + break; + default: + color.background = '#ffffff'; + } + + const tags = data.tags || []; + const jobCards = cards.filter((card) => card.data.type === 'job'); + const avatarList = tags + .map((tag) => { + const jobCard = jobCards.find((jobCard) => + jobCard.data.tags.some((t) => t === tag), + ); + return jobCard; + }) + .filter((x) => x) + .map(({ data, content }) => { + const color = getJobCardColor(data.tags[0]); + + data = { + ...data, + color, + }; + + return { + data, + content, + }; + }); + + data = { + ...data, + color, + avatarList, + }; + } + + return { + data, + content, + }; +}; diff --git a/homepage/src/pages/cards.jsx b/homepage/src/pages/cards.jsx index 7d254e01..16f27fcc 100644 --- a/homepage/src/pages/cards.jsx +++ b/homepage/src/pages/cards.jsx @@ -4,7 +4,7 @@ import { fetchPage } from '../lib/fetchPage'; import { fetchCards } from '../lib/fetchCards'; import { getNavigationList } from '../lib/getNavigationList'; import { componentMapper } from '../lib/componentMapper'; -import { processCardData } from '../lib/processCardData'; +import { processCard } from '../lib/processCard'; /** * @@ -12,12 +12,8 @@ import { processCardData } from '../lib/processCardData'; */ export const getStaticProps = async ({ locale }) => { const rawCards = fetchCards(locale); - const cardTasks = rawCards.map(async ({ data, content }) => { - - return { - data: processCardData(data), - content, - }; + const cardTasks = rawCards.map(async (card) => { + return processCard(card, rawCards); }); const cards = await Promise.all(cardTasks); From accb42dae393af40a8ba8b47e12400928e286191 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Sun, 29 Oct 2023 17:46:15 +0800 Subject: [PATCH 10/21] refactor: replace project card image with avatar list and adjust project card css --- homepage/public/css/style.css | 17 ++++++++++++- homepage/src/components/cards/card.jsx | 35 +++++++++++++++----------- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index 932a30e2..183bb39d 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -943,7 +943,22 @@ code { width: 10rem; border-radius: 50%; } - +.avatar.avatar-list { + min-height: 56px; + max-height: 56px; + min-width: 56px; + max-width: 56px; + padding: 0 !important; +} +.avatar.avatar-list > div { + min-width: 56px; + max-width: 56px; + min-height: 56px; + max-height: 56px; + background-size: 56px 56px; + background-repeat: no-repeat; + background-position: center; +} @media only screen and (max-width: 991px) { .blogs-list .item { width: 50% !important; diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 8dfb5d68..7ea3b4ff 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -10,25 +10,30 @@ const Card = ({ card }) => {

{card.data.title}

-
- {card.data.title} -
- {/* { - card.data.avatarList.map((avatar) => { -
- {avatar.data.title} +
+ {card.data.avatarList.map((avatar) => ( +
+
+   +
- }) - } */} + ))} +
{card.data.description} {card.content} From 663c824a6d60a41466377b6f649583b71f17c0cc Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Mon, 30 Oct 2023 12:43:16 +0800 Subject: [PATCH 11/21] fix: modify rwd style --- homepage/public/css/style.css | 15 ++++++++++----- homepage/src/components/cards/card.jsx | 4 ++-- homepage/src/components/cards/nonProjectCard.jsx | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index 183bb39d..6ed3f9cd 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -951,11 +951,11 @@ code { padding: 0 !important; } .avatar.avatar-list > div { - min-width: 56px; - max-width: 56px; - min-height: 56px; - max-height: 56px; - background-size: 56px 56px; + min-width: 50px; + max-width: 50px; + min-height: 50px; + max-height: 50px; + background-size: 50px 50px; background-repeat: no-repeat; background-position: center; } @@ -980,6 +980,11 @@ code { height: 400px; } } +@media only screen and (min-width: 768px) and (max-width: 991px) { + .avatar-tablet { + transform: translate(-13%); + } +} @media only screen and (max-width: 767px) { .container { max-width: 100%; diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 7ea3b4ff..71df9630 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -14,14 +14,14 @@ const Card = ({ card }) => { >

{card.data.title}

-
+
{card.data.avatarList.map((avatar) => (
(

{card.data.title}

From 5621536b40bc744a5964f88c22edeed400ee8020 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Mon, 30 Oct 2023 13:01:43 +0800 Subject: [PATCH 12/21] fix: rename nonProjectCard component to defaultCard component --- homepage/src/components/cards/card.jsx | 4 ++-- .../components/cards/{nonProjectCard.jsx => defaultCard.jsx} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename homepage/src/components/cards/{nonProjectCard.jsx => defaultCard.jsx} (93%) diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index 71df9630..c2bb781d 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -1,10 +1,10 @@ import Image from 'next/image'; -import NonProjectCard from './nonProjectCard'; +import DefaultCard from './defaultCard'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; const Card = ({ card }) => { if (card.data.type !== 'project') { - return ; + return ; } else { return (
diff --git a/homepage/src/components/cards/nonProjectCard.jsx b/homepage/src/components/cards/defaultCard.jsx similarity index 93% rename from homepage/src/components/cards/nonProjectCard.jsx rename to homepage/src/components/cards/defaultCard.jsx index 68f79d36..10e29fed 100644 --- a/homepage/src/components/cards/nonProjectCard.jsx +++ b/homepage/src/components/cards/defaultCard.jsx @@ -1,7 +1,7 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; -const NonProjectCard = ({ card }) => ( +const DefaultCard = ({ card }) => (
(
); -export default NonProjectCard; +export default DefaultCard; From e523d45adb098e78c208139a6d40741ae9aaeb82 Mon Sep 17 00:00:00 2001 From: ljc1991 Date: Mon, 30 Oct 2023 13:10:29 +0800 Subject: [PATCH 13/21] refactor: add projectCard component --- homepage/src/components/cards/card.jsx | 45 ++----------------- homepage/src/components/cards/projectCard.jsx | 40 +++++++++++++++++ 2 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 homepage/src/components/cards/projectCard.jsx diff --git a/homepage/src/components/cards/card.jsx b/homepage/src/components/cards/card.jsx index c2bb781d..60c89ea0 100644 --- a/homepage/src/components/cards/card.jsx +++ b/homepage/src/components/cards/card.jsx @@ -1,48 +1,11 @@ -import Image from 'next/image'; import DefaultCard from './defaultCard'; -import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; +import ProjectCard from './projectCard'; const Card = ({ card }) => { - if (card.data.type !== 'project') { - return ; - } else { - return ( -
-
-

{card.data.title}

-
-
- {card.data.avatarList.map((avatar) => ( -
-
-   -
-
- ))} -
- {card.data.description} - - {card.content} - -
-
-
- ); + if (card.data.type === 'project') { + return ; } + return ; }; export default Card; diff --git a/homepage/src/components/cards/projectCard.jsx b/homepage/src/components/cards/projectCard.jsx new file mode 100644 index 00000000..04a0b800 --- /dev/null +++ b/homepage/src/components/cards/projectCard.jsx @@ -0,0 +1,40 @@ +import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; + +const ProjectCard = ({ card }) => ( +
+
+

{card.data.title}

+
+
+ {card.data.avatarList.map((avatar) => ( +
+
+   +
+
+ ))} +
+ {card.data.description} + + {card.content} + +
+
+
+); + +export default ProjectCard; From 693147c5629c81c886d2dbdd5e2013966eebaa36 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 00:07:42 +0700 Subject: [PATCH 14/21] refactor(homepage): replace process card data w/ process card --- homepage/src/lib/processCardData.js | 110 ---------------------------- homepage/src/pages/admin/index.jsx | 11 ++- 2 files changed, 8 insertions(+), 113 deletions(-) delete mode 100644 homepage/src/lib/processCardData.js diff --git a/homepage/src/lib/processCardData.js b/homepage/src/lib/processCardData.js deleted file mode 100644 index c23c043b..00000000 --- a/homepage/src/lib/processCardData.js +++ /dev/null @@ -1,110 +0,0 @@ -import { titleToAnchorId } from './titleToAnchorId'; - -export function processCardData(data) { - let image = data.image; - const defaultImage = '/images/uploads/初階專案卡封面-01.png'; - image = image ? image.replace('/homepage/public', '') : defaultImage; - - // Workaround for image prefix path. Will be removed after image path is fixed in all cards. - image = !image.startsWith('/') ? `/${image}` : image; - - // Non-project card - if (data.type === 'job') { - const color = {}; - - switch (data.tags[0]) { - case 'civil servants': - color.avatar = '#b1bb95'; - color.background = '#8b9f6d'; - color.border = '#6f8d50'; - break; - case 'engineer': - color.avatar = '#95a2b2'; - color.background = '#5e7d93'; - color.border = '#2a6780'; - break; - case 'writer': - color.avatar = '#94a8a1'; - color.background = '#62867f'; - color.border = '#287168'; - break; - case 'legal': - color.avatar = '#d4ab8d'; - color.background = '#c2865f'; - color.border = '#b76a46'; - break; - case 'designer': - color.avatar = '#d1bb8f'; - color.background = '#be9f5f'; - color.border = '#b18b42'; - break; - case 'marketing': - color.avatar = '#c1907b'; - color.background = '#aa644f'; - color.border = '#984334'; - break; - case 'advocator': - color.avatar = '#9a91ab'; - color.background = '#6c688b'; - color.border = '#474c79'; - break; - } - - data = { - ...data, - color, - }; - } - - if (data.type === 'event') { - const color = {}; - - color.avatar = '#f1c287'; - color.background = '#eaa652'; - color.border = ' #e6912b'; - - data = { - ...data, - color, - }; - } - // project card - const jobCards = data.type === 'job'; - - if (data.type === 'project') { - const color = {}; - const mainTag = data.tags.find((tag) => - ['open gov', 'open data', 'open source'].includes(tag), - ); - switch (mainTag) { - case 'open gov': - color.background = '#efac49'; - break; - case 'open data': - color.background = '#73a09b'; - break; - case 'open source': - color.background = '#9b2123'; - break; - default: - color.background = '#ffffff'; - } - - const tags = data.tags || []; - const avatarList = tags.map((tag) => { - const jobCard = jobCards.find((jobCard) => jobCard.data.tags[0] === tag); - return jobCard ? jobCard.data : null; - }); - - data = { - ...data, - color, - }; - } - - return { - ...data, - image, - id: data.id || titleToAnchorId(data.title), - }; -} diff --git a/homepage/src/pages/admin/index.jsx b/homepage/src/pages/admin/index.jsx index 476b2b7f..f954acc3 100644 --- a/homepage/src/pages/admin/index.jsx +++ b/homepage/src/pages/admin/index.jsx @@ -7,7 +7,7 @@ import FooterLinks from '../../layouts/footer/footerLinks'; import { componentMapper } from '../../lib/componentMapper'; import contentMapper from '../../layouts/contentMapper'; import Card from '../../components/cards/card'; -import { processCardData } from '../../lib/processCardData'; +import { processCard } from '../../lib/processCard'; import mockCards from './mock_cards.json'; @@ -34,11 +34,16 @@ const FooterPreview = ({ entry }) => { return ; }; -const CardPreview = ({ entry }) => { +const CardPreview = ({ entry, getAsset }) => { const data = entry.getIn(['data']).toJS(); const content = data.body; - return ; + // TODO: Cards could not be retrieved from the CMS. Set it as empty for now. + const card = processCard({ data, content }, []); + + card.data.image = getAsset(card.data.image).toString(); + + return ; }; const CMS = dynamic( From 7edf92455255abe62d41d7e53cb8c845deac90a2 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 00:58:10 +0700 Subject: [PATCH 15/21] fix(homepage): make 3 cols to be 2 cols in md screen --- homepage/src/components/cards/defaultCard.jsx | 2 +- homepage/src/components/cards/projectCard.jsx | 2 +- homepage/src/components/column.jsx | 4 +- homepage/src/components/imageAndText.jsx | 41 +++-------- homepage/src/components/section.jsx | 6 +- homepage/src/components/threeColumns.jsx | 71 +++++-------------- homepage/src/components/twoColumns.jsx | 48 ++++--------- 7 files changed, 48 insertions(+), 126 deletions(-) diff --git a/homepage/src/components/cards/defaultCard.jsx b/homepage/src/components/cards/defaultCard.jsx index 10e29fed..522a8bff 100644 --- a/homepage/src/components/cards/defaultCard.jsx +++ b/homepage/src/components/cards/defaultCard.jsx @@ -2,7 +2,7 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; const DefaultCard = ({ card }) => ( -
+
( -
+
( +const Column = ({ title, image, text }) => (

{title}

@@ -10,7 +10,7 @@ const Column = ({ title, image, text, markdown }) => ( {`${title}
)} - {text} + {text}
); diff --git a/homepage/src/components/imageAndText.jsx b/homepage/src/components/imageAndText.jsx index 4cf3404a..3c7b1212 100644 --- a/homepage/src/components/imageAndText.jsx +++ b/homepage/src/components/imageAndText.jsx @@ -1,19 +1,11 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from './parseMarkdownAndHtml'; -const ImageAndText = ({ - id, - image, - title, - subtitle, - content, - highlights, - markdown, -}) => ( +const ImageAndText = ({ id, image, title, subtitle, content, highlights }) => (
-
+
{image && (
)}
-
+
{subtitle}

{title}

- + {content}
    - {highlights?.map((highlight) => { - if (Array.isArray(highlight)) { - return ( -
  • - {highlight[0]} - - {highlight[1]} - -
    • - ); - } else { - return ( -
  • - {highlight.item} -
    {highlight.description}
    -
    • - ); - } - })} + {highlights?.map((highlight) => ( +
  • + {highlight.item} +
    {highlight.description}
    +
    • + ))}
diff --git a/homepage/src/components/section.jsx b/homepage/src/components/section.jsx index 0284bb26..2194321f 100644 --- a/homepage/src/components/section.jsx +++ b/homepage/src/components/section.jsx @@ -1,7 +1,7 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from './parseMarkdownAndHtml'; -const Section = ({ id, title, subtitle, image, content, markdown }) => ( +const Section = ({ id, title, subtitle, image, content }) => (
@@ -14,9 +14,7 @@ const Section = ({ id, title, subtitle, image, content, markdown }) => ( {`${title}
)} - - {content} - + {content}
diff --git a/homepage/src/components/threeColumns.jsx b/homepage/src/components/threeColumns.jsx index bbc12721..70db22b3 100644 --- a/homepage/src/components/threeColumns.jsx +++ b/homepage/src/components/threeColumns.jsx @@ -1,65 +1,32 @@ import Column from './column'; -const ThreeColumns = ({ id, title, columns, markdown }) => ( +const ThreeColumns = ({ id, title, columns }) => (

{title}

-
- {Array.isArray(columns[0]) ? ( - - ) : ( - - )} +
+
-
- {Array.isArray(columns[1]) ? ( - - ) : ( - - )} +
+
-
- {Array.isArray(columns[2]) ? ( - - ) : ( - - )} +
+
diff --git a/homepage/src/components/twoColumns.jsx b/homepage/src/components/twoColumns.jsx index b46683cc..92d13b60 100644 --- a/homepage/src/components/twoColumns.jsx +++ b/homepage/src/components/twoColumns.jsx @@ -1,47 +1,25 @@ import Column from './column'; -const TwoColumns = ({ id, title, columns, markdown }) => ( +const TwoColumns = ({ id, title, columns }) => (

{title}

-
- {Array.isArray(columns[0]) ? ( - - ) : ( - - )} +
+
-
- {Array.isArray(columns[1]) ? ( - - ) : ( - - )} +
+
From 9e6ae1e08b52a7fd88848a5f66f1bb5e66a6b544 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 00:58:31 +0700 Subject: [PATCH 16/21] refactor(homepage): remove unused component and page --- homepage/src/components/cardsGrid.jsx | 61 --- homepage/src/pages/activities.jsx | 542 -------------------------- 2 files changed, 603 deletions(-) delete mode 100644 homepage/src/components/cardsGrid.jsx delete mode 100644 homepage/src/pages/activities.jsx diff --git a/homepage/src/components/cardsGrid.jsx b/homepage/src/components/cardsGrid.jsx deleted file mode 100644 index 833a5666..00000000 --- a/homepage/src/components/cardsGrid.jsx +++ /dev/null @@ -1,61 +0,0 @@ -const CardsGrid = ({ - id, - title, - cards, - filter, - projectCardSubtype = '', - projectCardSubtitle = '', -}) => { - // Group cards by type - const groupCards = cards.filter((card) => card.frontMatter.type === filter); - // Filter cards by draft - let filterGroupedCards = groupCards.filter((card) => !card.frontMatter.draft); - // Project cards grouped by subtype tag - if (projectCardSubtype) { - filterGroupedCards = filterGroupedCards.filter((card) => - card.frontMatter.tags?.includes(projectCardSubtype), - ); - } - // temporarily remove card content of Job card and Event card - if (filter === 'job' || filter === 'event') { - filterGroupedCards.forEach((card) => { - card.content = ''; - }); - } - - return ( -
-
-
- {projectCardSubtype ? ( -

- {title} | {projectCardSubtitle} -

- ) : ( -

{title}

- )} -
-
- {filterGroupedCards.map((card, index) => ( - - ))} -
-
-
- ); -}; - -const Card = ({ card }) => ( -
-
-

{card.frontMatter.title}

-
- {card.frontMatter.title} - {card.frontMatter.description} -
-
-
-
-); - -export default CardsGrid; diff --git a/homepage/src/pages/activities.jsx b/homepage/src/pages/activities.jsx deleted file mode 100644 index 7e02ede9..00000000 --- a/homepage/src/pages/activities.jsx +++ /dev/null @@ -1,542 +0,0 @@ -import Banner from '../components/banner'; -import Section from '../components/section'; -import TwoColumns from '../components/twoColumns'; -import Head from 'next/head'; - -/** - * - * @type {import('next').GetStaticProps} - */ -export const getStaticProps = async ({ locale }) => { - // const backToTop = { - // en: 'Back to top', - // 'zh-tw': '回到頁首', - // }; - - const aboutOpenSourceNav = { - en: 'About Open Source', - 'zh-tw': '關於開源', - }; - - const ourBeliefsNav = { - en: 'Our Beliefs', - 'zh-tw': '活動理念', - }; - - const instructorsNav = { - en: 'Instructors', - 'zh-tw': '講師介紹', - }; - - const detailsNav = { - en: 'Details', - 'zh-tw': '活動資訊', - }; - - const cardsPage = { - en: 'Cards', - 'zh-tw': '卡片頁', - }; - - const homepage = { - en: 'Home', - 'zh-tw': '首頁', - }; - - const navigationList = [ - // { link: `#page-top`, text: backToTop[locale] }, - // { link: `#about-open-source`, text: aboutOpenSourceNav[locale] }, - // { link: `#our-beliefs`, text: ourBeliefsNav[locale] }, - // { link: `#details`, text: detailsNav[locale] }, - // { link: `#instructors`, text: instructorsNav[locale] }, - { link: `/cards`, text: cardsPage[locale] }, - { link: `/`, text: homepage[locale] }, - ]; - - const headInfo = { - title: { - en: `OpenStarTerVillage - Workshops`, - 'zh-tw': `開源星手村 - 工作坊`, - }, - description: { - en: `Participate in the change of Taiwan's future through a board game.`, - 'zh-tw': `用桌遊，參與台灣的未來`, - }, - }; - - const banner = { - componentType: 'Banner', - title: { - en: `Workshops`, - 'zh-tw': `工作坊`, - }, - subtitle: { - en: `Participate in the change of Taiwan's future through a board game.`, - 'zh-tw': `用桌遊，參與台灣的未來`, - }, - heroImage: '/images/campaignpage/heroimage.png', - }; - - const aboutOpenSource = { - componentType: 'Section', - id: 'about-open-source', - title: { - en: 'Open source, open resources around the world', - 'zh-tw': '開源，開放這個世界的資源', - }, - subtitle: { - en: 'May open source be with you', - 'zh-tw': '願「源」力與你同在', - }, - content: { - en: ` - Open Starter Village provides you with a comprehensive experience of open-source projects.
-
- Have you ever used the app "Bus Tracker Taipei" or the "Mask Maps"? These two open projects were both initiated by citizens, gathering people of different professions, such as program designers, marketing managers, publicists, and culture workers, to contribute their expertise.
-
- Open Culture Foundation (OCF) devotes its efforts to facilitating the development of Taiwan's open source community. In the process of implementing a variety of projects, talents from different industries can develop versatile skills and make great achievement while promoting social progress.
-
- By opening resources around the world, more and more people are able to head toward the collective good. Drawing on the power of the crowd, we are also creating a better future.
-
- May open source be with you!
- `, - 'zh-tw': ` - 「開源星手村」讓你深度體驗「開源」（Open Source）專案。
-
- 你用過「台北等公車」嗎？又或者是否使用過「口罩地圖」？以上的專案都是由民間發起，號召程式設計、行銷公關、文化工作者等不同專業的夥伴，透過貢獻彼此的專業所架構而成的開源專案。
-
- 開放文化基金會一直以來致力於推動台灣開源社群的發展與耕耘，讓各方人才在執行多元專案的過程裡，同時推動社會進步、充實自我技能與成就。
-
- 因為開放這個世界的資源，才能夠讓更多人朝共好的目標前進；因為集結眾人之力合作，我們也同時參與著更進步的未來。
-
- 願「源」力與我們同在。
- `, - }, - }; - - const ourBeliefs = { - componentType: 'Section', - id: 'our-beliefs', - bgImage: '/images/campaignpage/join_project.png', - title: { - en: `Join the projects and participate in the change of Taiwan's future`, - 'zh-tw': '參與專案，參與台灣的未來', - }, - subtitle: { - en: 'A memo to our next generation', - 'zh-tw': '給下一代社會的日常備忘錄', - }, - content: { - // Line 137. amend openess to openness - en: ` - Let's participate in the change of our future!
-
- We know that open-source projects of different aspects are indispensable in promoting social progress.
- We know that we need to equip ourselves with many skills which schools don't teach us before entering the workforce.
- We know that you deserve a bigger stage and your professional skills need to be seen by more people.
- We know that openness is a must when the world limits your mind.
- We know that we have to think out of the box when universities are only vocational training centers.
- We know that you are definitely more than a labor in the future society.
-
-
- Taiwan's future needs your participation.
- This time, we can't be absent.
- `, - 'zh-tw': ` - 現在，來參與彼此的未來吧！
-
- 我們明白，各類的開源專案，是社會前進不可或缺的力量。
- 我們明白，進社會前，我們要準備非常多學校沒教的能力。
- 我們明白，你的專業能在更大的舞台被看見，受萬眾矚目。
- 我們明白，當世界限縮你的眼界時，試著開放就成為必然。
- 我們明白，當大學成為職業介紹所時，突破框架誠屬自然。
- 我們明白，在未來的社會上，你絕非只是一個工作的機器。
-
-
- 台灣的未來需要你的參與。
- 這一次，我們絕不能缺席。
- `, - }, - }; - - const joinProject = { - componentType: 'Section', - id: '', - title: { - en: 'Participate in a variety of projects for an comprehensive experience', - 'zh-tw': '多元參與，全面體驗', - }, - subtitle: { - en: '', - 'zh-tw': '', - }, - content: { - en: ` - You might be a passionate, angry young man or a seasoned veteran in your industry, or you just want to explore possibilities in your life. Please join us at our board game workshops. -
-
- icon__cooperate_hands - Tackling tasks together -
-
- icon__round_table_meeting - Two board game workshops -
-
- icon__two_people_enlight - Implementing mulitiple projects -
-
- icon__magnifying_glass_head - Boosting your motivation -
-
- `, - 'zh-tw': ` - 不論你是熱血的憤怒青年，或是縱橫職場的高手，又或者你希望能夠發掘更多人生的可能性，都可以來參加這次的工作坊。 -
-
- icon__cooperate_hands - 一起合作完成任務 -
-
- icon__round_table_meeting - 兩場次桌遊工作坊 -
-
- icon__two_people_enlight - 多項專案執行體驗 -
-
- icon__magnifying_glass_head - 全面的發掘行動力 -
-
- `, - }, - }; - - const details = { - componentType: 'TwoColumns', - id: 'details', - title: { - en: 'Details', - 'zh-tw': '活動資訊', - }, - columns: { - en: [ - [ - `Workshop for educators, culture workers, and all walks of life`, - ` -
-
- Board game demo -
- Time: Fri., Sep. 30, 2022 11:00–17:00 + Sat., Oct. 1, 2022 11:00–15:30 - Location: Da Xiao Building at Chinese Culture University -
-
-
- Issue Workshop -
- Sun., Oct. 2, 2022 10:00–16:00 - Location: Da Xin Building or Da Xia Building at Chinese Culture University -
-
-
-

Teaching Aid

-

Open Starter Village includes a variety of projects from different industries, which can be an entertaining supplementary material for Taiwan's 2019 curriculum since the board game goes along with its focuses, such as "technology and media", "interpersonal relations and teamwork", and "diverse culture and international perspectives". It is the best teaching aid for Taiwan's 2019 curriculum.

-

Crossover Interactions

-

Humanity and technology doesn't have to be two extremes, they just need to interact with each other. In open-source projects, everyone needs to interact, collaborate and negotiate with their partners. Let's find out the key factors to connections and bridge different professions through this board game.

-

Brianstorming

-

In Open Starter Village, players have to play different roles. You can be one of the marketing team members, a publicist or an R&D engineer. Brianstorming and collborating with different people can help us complete the projects and find a right place and a right direction during the process.

- Sign up for free - `, - ], - [ - `Workshop for passionate young men`, - ` -
-
- Issue Workshop -
- Time: Sat., Oct. 29, 2022 10:00–17:30 - Location: University of Taipei -
-
-
-

Networking

-

During the game, relationships between one another are built one after another. Through collaboration and competition, your connections with people can be gradually expanded. We can learn from each other's advantages and professional skills, which can turn into skills and experiences you will need in the future. So join us!

-

Crossover Collaboration

-

Nowadays, the working mode in the society has shifted from solo to collaboration. However, finding your subjectivity in a group is still important. We hope that players can find a piece of themselves in others through each game and find the best way to collaborate.

-

Sharpening your skills

-

Open Starter Village is a project-based board game. During the game, you will learn more about open-source projects and shapen your professional skills. After completing projects, not only can we get a sense of achievement, but we can also cultivate our ability to collaborate with each other. Let's become more powerful!

- Sign up for free - `, - ], - ], - 'zh-tw': [ - [ - `教育/文化/社會職人場`, - ` -
-
- 桌遊試玩 -
- 9/30(五)11:00~17:00~10/1(六)11:00~15:30 - 地點: 中國文化大學-大孝館 -
-
-
- 議題工作坊 -
- 10/2(日)10:00-16:00 - 地點：(暫)中國文化大學的大新館或大夏館 -
-
-
-

教育輔助

-

開源星手村模擬了各式的專案及職業取向，在「科技資訊與媒體素養」、「人際關係與團隊合作」、「多元文化與國際理解」等課綱方向，提供寓教於樂的補充，是最強的教學輔助。

-

多元互動

-

人文與科技，或許並非孤立於兩端的雙子星，它們之間只是缺少了深入互動的關鍵。在開源專案裡面，需要彼此互動、合作及協商，讓我們一起透過遊戲找出關鍵，成為多方的橋樑。

-

思想激盪

-

在開源星手村中，由於我們彼此將扮演多種角色，可能是行銷公關，也可能是研發工程師，多方腦力激盪，能在一次次合作裡完成專案，也能讓我們在裡頭找到最適切的位置與方向。

- 立即免費報名 - `, - ], - [ - `熱血青年培力探索場`, - ` -
-
- 議題工作坊 -
- 10/29(六)10:00-17:30 - 地點: 台北市立大學 -
-
-
-

拓展人脈

-

透過桌遊的遊玩歷程，「關係」不斷地被建立起來，在一次次的合作與競爭中，人脈也能夠逐漸地累積。從中學習彼此的優點以及專業，是未來不可或缺的技能與經驗，加入我們吧！

-

多元合作

-

現今的社會已經從傳統的單打獨鬥成為群體合作，然而在群體中的個人「主體性」仍是重要的。期許在一次次的遊玩經驗中，讓彼此像映照對方的鏡子，找尋最適切的合作模式與方法。

-

累積實力

-

開源星手村是一個專案體驗桌遊，過程中你將累積許多對專案的了解，以及自身技能的特性。在完成專案後，我們除了能得到成就感外，還可以培養協同合作的實力，一起來變強吧！

- 立即免費報名 - `, - ], - ], - }, - }; - - const instructors = { - componentType: 'TwoColumns', - id: 'instructors', - title: { - en: 'Our Experienced Instructors', - 'zh-tw': '華麗講者群', - }, - columns: { - en: [ - [ - ``, - ` -
- Claire - Claire - Civic engagement, owner of two cats, a social science major -
-
- Yawei - Yawei - Freedom, cat person, milk tea lover -
-
- 皇甫 - HuangFu - Feminist, non-binary, supporter -
-
- Chewei - Chewei (Instructor of workshop for teachers, 10/2) - Course API, Sch001, volunteer of the jothon -
- `, - ], - [ - ``, - ` -
- Ted - Ted (Instructor of workshop for students, 10/29) - Junior high school student, TOEDU, medical image analysis -
-
- 比鄰 - Billion (Instructor of workshop for teachers, 10/2 & Instructor of workshop for students, 10/29) - Disinformation, volunteer-oriented , academic portfolio -
-
- Ddio - Ddio (Instructor of workshop for teachers, 10/2 & Instructor of workshop for students, 10/29) - Part-time housewife, systematic investor of NGO, a proud tenant -
-
- Peii - Peii (Instructor of workshop for teachers, 10/2 & Instructor of workshop for students, 10/29) - NGO, archaeology enthusiast, camp lover -
- `, - ], - ], - 'zh-tw': [ - [ - ``, - ` -
- Claire - Claire - 公民參與、兩隻貓、社科人 -
-
- Yawei - Yawei - 自由、貓奴、奶茶控 -
-
- 皇甫 - 皇甫 - 女性主義、非二元、貓手 -
-
- Chewei - Chewei（10/2 教師場） - Course API、零時小學校、揪松團志工 -
- `, - ], - [ - ``, - ` -
- Ted - Ted（10/29 學生場） - 國中生、開放教育 TOEDU、醫學影像分析 -
-
- 比鄰 - 比鄰（10/2 教師場＋10/29 學生場） - 假訊息、志工當當當、學習歷程累積 -
-
- Ddio - Ddio（10/2 教師場＋10/29 學生場） - 斜槓主婦、定期定額投資 NGO、租屋最高 -
-
- Peii - Peii（10/2 教師場＋10/29 學生場） - NGO、考古學、露營 -
- `, - ], - ], - }, - }; - - return { - props: { - navigationList, - headInfo: { - title: headInfo.title[locale], - description: headInfo.description[locale], - }, - banner: { - ...banner, - title: banner.title[locale], - subtitle: banner.subtitle[locale], - }, - aboutOpenSource: { - ...aboutOpenSource, - title: aboutOpenSource.title[locale], - subtitle: aboutOpenSource.subtitle[locale], - content: aboutOpenSource.content[locale], - }, - ourBeliefs: { - ...ourBeliefs, - title: ourBeliefs.title[locale], - subtitle: ourBeliefs.subtitle[locale], - content: ourBeliefs.content[locale], - }, - joinProject: { - ...joinProject, - title: joinProject.title[locale], - subtitle: joinProject.subtitle[locale], - content: joinProject.content[locale], - }, - details: { - ...details, - title: details.title[locale], - columns: details.columns[locale], - }, - instructors: { - ...instructors, - title: instructors.title[locale], - columns: instructors.columns[locale], - }, - }, - }; -}; - -const Activities = ({ - headInfo, - banner, - aboutOpenSource, - ourBeliefs, - joinProject, - details, - instructors, -}) => ( - <> - - {headInfo.title} - - - -
-
-
- - - -); - -export default Activities; From f40d0a61ec68eec71ce9a1de42454b1fe9c1f781 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 01:09:22 +0700 Subject: [PATCH 17/21] refactor(homepage): remove project card images --- homepage/_cards/en/bigbluebutton.md | 2 +- homepage/_cards/en/common-voice.md | 2 +- homepage/_cards/en/democracy-os.md | 2 +- homepage/_cards/en/firefox-1.md | 2 +- homepage/_cards/en/inkscape-1.md | 2 +- homepage/_cards/en/libreoffice.md | 2 +- homepage/_cards/en/linux-kernel.md | 2 +- homepage/_cards/en/notepad.md | 2 +- homepage/_cards/en/ocf-lab.md | 2 +- homepage/_cards/en/opass.md | 2 +- homepage/_cards/en/open-hack-farm-1.md | 2 +- homepage/_cards/en/public-money-public-code.md | 2 +- homepage/_cards/en/vtaiwan.md | 2 +- ...\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" | 2 +- ...53\213\345\247\224\345\220\203\344\270\200\347\242\227.md" | 2 +- ...05\250\346\260\221\350\277\275\345\205\254\350\273\212.md" | 2 +- ...67\257\345\217\203\350\210\207\345\271\263\350\207\272.md" | 2 +- .../en/\345\217\243\347\275\251\345\234\260\345\234\226.md" | 2 +- ...44\245\344\274\264\350\201\257\347\233\237\343\200\215.md" | 2 +- ...03\271\347\231\273\351\214\204\345\234\260\345\234\226.md" | 2 +- .../en/\345\234\213\345\256\266\345\257\266\350\227\217.md" | 2 +- .../en/\345\234\213\346\260\221\346\263\225\345\256\230.md" | 2 +- ...24\276\350\263\207\346\226\231\345\260\210\346\263\225.md" | 2 +- ...31\273\351\214\204\345\210\260\351\226\200\347\211\214.md" | 2 +- .../en/\346\216\203\344\272\206\345\206\215\350\262\267.md" | 2 +- ...\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" | 4 ++-- ...00\217\346\230\216\345\214\226\344\277\256\346\263\225.md" | 2 +- ...05\267\351\237\263\350\274\270\345\205\245\346\263\225.md" | 2 +- ...\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" | 2 +- ...61\202\350\201\267\345\244\251\347\234\274\351\200\232.md" | 2 +- ...64\213\350\224\245\347\200\217\350\246\275\345\231\250.md" | 2 +- ...31\250\347\266\262\350\267\257\347\263\273\347\265\261.md" | 2 +- .../en/\347\234\237\347\232\204\345\201\207\347\232\204.md" | 2 +- ...31\242\346\234\203\350\255\260\347\233\264\346\222\255.md" | 2 +- "homepage/_cards/en/\350\220\214\345\205\270.md" | 2 +- ...24\263\350\253\213\345\260\217\345\271\253\346\211\213.md" | 2 +- ...53\240\345\267\245\345\273\240\345\233\236\345\240\261.md" | 2 +- .../en/\351\226\213\346\224\276\350\241\227\345\234\226.md" | 2 +- .../en/\351\226\213\346\224\276\351\244\250\350\227\217.md" | 2 +- homepage/_cards/zh-tw/bigbluebutton.md | 2 +- homepage/_cards/zh-tw/common-voice.md | 2 +- homepage/_cards/zh-tw/democracy-os.md | 2 +- homepage/_cards/zh-tw/firefox-1.md | 2 +- homepage/_cards/zh-tw/inkscape-1.md | 2 +- homepage/_cards/zh-tw/libreoffice.md | 2 +- homepage/_cards/zh-tw/linux-kernel.md | 2 +- homepage/_cards/zh-tw/notepad.md | 2 +- homepage/_cards/zh-tw/ocf-lab.md | 2 +- homepage/_cards/zh-tw/opass.md | 2 +- homepage/_cards/zh-tw/open-hack-farm-1.md | 2 +- homepage/_cards/zh-tw/public-money-public-code.md | 4 ++-- homepage/_cards/zh-tw/vtaiwan.md | 2 +- ...\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" | 2 +- ...53\213\345\247\224\345\220\203\344\270\200\347\242\227.md" | 2 +- ...05\250\346\260\221\350\277\275\345\205\254\350\273\212.md" | 2 +- ...67\257\345\217\203\350\210\207\345\271\263\350\207\272.md" | 2 +- .../\345\217\243\347\275\251\345\234\260\345\234\226.md" | 2 +- ...44\245\344\274\264\350\201\257\347\233\237\343\200\215.md" | 2 +- ...03\271\347\231\273\351\214\204\345\234\260\345\234\226.md" | 2 +- .../\345\234\213\345\256\266\345\257\266\350\227\217.md" | 2 +- .../\345\234\213\346\260\221\346\263\225\345\256\230.md" | 2 +- ...24\276\350\263\207\346\226\231\345\260\210\346\263\225.md" | 2 +- ...31\273\351\214\204\345\210\260\351\226\200\347\211\214.md" | 2 +- .../\346\216\203\344\272\206\345\206\215\350\262\267.md" | 2 +- ...\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" | 4 ++-- ...00\217\346\230\216\345\214\226\344\277\256\346\263\225.md" | 4 ++-- ...05\267\351\237\263\350\274\270\345\205\245\346\263\225.md" | 2 +- ...\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" | 2 +- ...61\202\350\201\267\345\244\251\347\234\274\351\200\232.md" | 2 +- ...64\213\350\224\245\347\200\217\350\246\275\345\231\250.md" | 2 +- ...31\250\347\266\262\350\267\257\347\263\273\347\265\261.md" | 2 +- .../\347\234\237\347\232\204\345\201\207\347\232\204.md" | 2 +- ...31\242\346\234\203\350\255\260\347\233\264\346\222\255.md" | 2 +- "homepage/_cards/zh-tw/\350\220\214\345\205\270.md" | 2 +- ...24\263\350\253\213\345\260\217\345\271\253\346\211\213.md" | 2 +- ...53\240\345\267\245\345\273\240\345\233\236\345\240\261.md" | 2 +- .../\351\226\213\346\224\276\350\241\227\345\234\226.md" | 2 +- .../\351\226\213\346\224\276\351\244\250\350\227\217.md" | 2 +- 78 files changed, 82 insertions(+), 82 deletions(-) diff --git a/homepage/_cards/en/bigbluebutton.md b/homepage/_cards/en/bigbluebutton.md index f6a840f3..06d9f64f 100644 --- a/homepage/_cards/en/bigbluebutton.md +++ b/homepage/_cards/en/bigbluebutton.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-14.jpg +image: "" title: BigBlueButton description: An open-source online meeting system that doesn’t require users to download the system and can be integrated with multiple learning management diff --git a/homepage/_cards/en/common-voice.md b/homepage/_cards/en/common-voice.md index f7915e45..84f21161 100644 --- a/homepage/_cards/en/common-voice.md +++ b/homepage/_cards/en/common-voice.md @@ -1,5 +1,5 @@ --- -image: /images/uploads/open-data-common-voice.jpg +image: "" title: Common Voice description: "A database that invites speakers of any language to contribute their voices to teach computers how to speak any language with correct diff --git a/homepage/_cards/en/democracy-os.md b/homepage/_cards/en/democracy-os.md index 852bf2d8..c3389e04 100644 --- a/homepage/_cards/en/democracy-os.md +++ b/homepage/_cards/en/democracy-os.md @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-democracy-os.jpg +image: "" title: Democracy OS description: "A democratic participation platform that allows policy discussions, voting simulations, and participatory budgeting " diff --git a/homepage/_cards/en/firefox-1.md b/homepage/_cards/en/firefox-1.md index fbf96af5..d9684f47 100644 --- a/homepage/_cards/en/firefox-1.md +++ b/homepage/_cards/en/firefox-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/open-source-firefox.jpg +image: "" title: Firefox description: A browser with free and open source code draft: false diff --git a/homepage/_cards/en/inkscape-1.md b/homepage/_cards/en/inkscape-1.md index bd6939a4..53bbcf6e 100644 --- a/homepage/_cards/en/inkscape-1.md +++ b/homepage/_cards/en/inkscape-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-12.jpg +image: "" title: Inkscape description: An open-source vector graphics editor released under General Public License draft: false diff --git a/homepage/_cards/en/libreoffice.md b/homepage/_cards/en/libreoffice.md index cde853ba..35942709 100644 --- a/homepage/_cards/en/libreoffice.md +++ b/homepage/_cards/en/libreoffice.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-10.jpg +image: "" title: LibreOffice description: "A free and open-source office suite " draft: false diff --git a/homepage/_cards/en/linux-kernel.md b/homepage/_cards/en/linux-kernel.md index d4956dc2..1796564b 100644 --- a/homepage/_cards/en/linux-kernel.md +++ b/homepage/_cards/en/linux-kernel.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-08.jpg +image: "" title: Linux Kernel description: An open-source operating system kernel that's similar to Unix. draft: false diff --git a/homepage/_cards/en/notepad.md b/homepage/_cards/en/notepad.md index 6ff14893..2e989576 100644 --- a/homepage/_cards/en/notepad.md +++ b/homepage/_cards/en/notepad.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-15.jpg +image: "" title: Notepad++ description: An open-source text editor that supports multiple languages and programming languages. diff --git a/homepage/_cards/en/ocf-lab.md b/homepage/_cards/en/ocf-lab.md index 70703fab..af52d390 100644 --- a/homepage/_cards/en/ocf-lab.md +++ b/homepage/_cards/en/ocf-lab.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-07.jpg +image: "" title: OCF Lab description: "OCF Lab is a news platform covering topics about open culture, established by the Open Culture Foundation. " diff --git a/homepage/_cards/en/opass.md b/homepage/_cards/en/opass.md index d6f743c3..e62eccb1 100644 --- a/homepage/_cards/en/opass.md +++ b/homepage/_cards/en/opass.md @@ -1,5 +1,5 @@ --- -image: images/uploads/open-source-opass.jpeg +image: "" title: OPass description: "A sign-up app used at symposiums held by all major open-source groups across Taiwan " diff --git a/homepage/_cards/en/open-hack-farm-1.md b/homepage/_cards/en/open-hack-farm-1.md index 3b819598..ac7a356c 100644 --- a/homepage/_cards/en/open-hack-farm-1.md +++ b/homepage/_cards/en/open-hack-farm-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-03.jpg +image: "" title: Open Hack Farm description: '"Open Hack Farm" promotes open source and open data in agricultural applications. ' diff --git a/homepage/_cards/en/public-money-public-code.md b/homepage/_cards/en/public-money-public-code.md index 0aa71011..032130b8 100644 --- a/homepage/_cards/en/public-money-public-code.md +++ b/homepage/_cards/en/public-money-public-code.md @@ -1,5 +1,5 @@ --- -image: images/uploads/open-source-open-hack-farm.jpg +image: "" title: Public Money Public Code description: An initiative which advocates that public digital services or systems built with public money must be released under open-source license. diff --git a/homepage/_cards/en/vtaiwan.md b/homepage/_cards/en/vtaiwan.md index f78af261..103bdcc7 100644 --- a/homepage/_cards/en/vtaiwan.md +++ b/homepage/_cards/en/vtaiwan.md @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-vtaiwan.jpg +image: "" title: vTaiwan description: A platform for the public to express their opinions on Taiwanese laws and policies and for the government to collate these opinions. diff --git "a/homepage/_cards/en/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" "b/homepage/_cards/en/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" index 1b6caa58..f3aef209 100644 --- "a/homepage/_cards/en/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" +++ "b/homepage/_cards/en/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-04.jpg +image: "" title: Get to Know Open-Source License description: Licenses are an essential part of open source. They ensure people's freedom to use open-source software, and define how much freedom users can diff --git "a/homepage/_cards/en/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" "b/homepage/_cards/en/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" index ca222168..63490d0b 100644 --- "a/homepage/_cards/en/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" +++ "b/homepage/_cards/en/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-nullfull’s-foodmap.jpg +image: "" title: Nullfull’s foodmap description: Using open data to find out which restaurants South Korea's legislators are most likely to use national funding to patronize. diff --git "a/homepage/_cards/en/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" "b/homepage/_cards/en/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" index 234b4702..140b06fd 100644 --- "a/homepage/_cards/en/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" +++ "b/homepage/_cards/en/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-find-my-bus-1-.jpg +image: "" title: "Find My Bus " description: Using open data provided by city governments, this app shows route maps of buses and other public means of transportation, and tracks where they diff --git "a/homepage/_cards/en/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" "b/homepage/_cards/en/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" index 0429e491..8482bab7 100644 --- "a/homepage/_cards/en/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" +++ "b/homepage/_cards/en/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" @@ -1,5 +1,5 @@ --- -image: /images/uploads/open-data-digital-participatory-platform-for-public-policy.jpeg +image: "" title: Digital Participatory Platform for Public Policy description: A platform where citizens submit proposals on public policies and government bodies reply to them. diff --git "a/homepage/_cards/en/\345\217\243\347\275\251\345\234\260\345\234\226.md" "b/homepage/_cards/en/\345\217\243\347\275\251\345\234\260\345\234\226.md" index 843d31fd..df443112 100644 --- "a/homepage/_cards/en/\345\217\243\347\275\251\345\234\260\345\234\226.md" +++ "b/homepage/_cards/en/\345\217\243\347\275\251\345\234\260\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-mask-map.jpg +image: "" title: Mask Map description: "In response to pandemic prevention policy, this app compiles mask stock data from all medical facilities " diff --git "a/homepage/_cards/en/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" "b/homepage/_cards/en/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" index 10facf67..7387ccd8 100644 --- "a/homepage/_cards/en/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" +++ "b/homepage/_cards/en/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-get-taiwan-in-the-ogp.jpg +image: "" title: Get Taiwan in the OGP description: OGP is an organization to fulfill open government, which is a set of international standards that aim to fulfill "transparency, participation, diff --git "a/homepage/_cards/en/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" "b/homepage/_cards/en/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" index da107a47..5776f0e3 100644 --- "a/homepage/_cards/en/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" +++ "b/homepage/_cards/en/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-bribery-map-of-taiwan.jpg +image: "" title: Bribery Map of Taiwan description: "This system places confirmed cases of bribery on a map and allows users to see how much money their votes are worth " diff --git "a/homepage/_cards/en/\345\234\213\345\256\266\345\257\266\350\227\217.md" "b/homepage/_cards/en/\345\234\213\345\256\266\345\257\266\350\227\217.md" index efa3c954..904e9824 100644 --- "a/homepage/_cards/en/\345\234\213\345\256\266\345\257\266\350\227\217.md" +++ "b/homepage/_cards/en/\345\234\213\345\256\266\345\257\266\350\227\217.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-taiwan-national-treasure.jpg +image: "" title: Taiwan National Treasure description: "A project supporting volunteers to take pictures of Taiwanese historical materials archived in the U.S. and to make them accessible to the diff --git "a/homepage/_cards/en/\345\234\213\346\260\221\346\263\225\345\256\230.md" "b/homepage/_cards/en/\345\234\213\346\260\221\346\263\225\345\256\230.md" index 4ae209e6..1341bcb6 100644 --- "a/homepage/_cards/en/\345\234\213\346\260\221\346\263\225\345\256\230.md" +++ "b/homepage/_cards/en/\345\234\213\346\260\221\346\263\225\345\256\230.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-citizen-judges.jpg +image: "" title: Citizen Judges description: Combining social expectations and legal expertise, the system allows citizens to get involved in court decisions. diff --git "a/homepage/_cards/en/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" "b/homepage/_cards/en/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" index 0b701ea7..92338b93 100644 --- "a/homepage/_cards/en/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" +++ "b/homepage/_cards/en/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-to-urge-authoritarian-countries-to-adopt-open-data-act.jpg +image: "" title: To Urge Authoritarian Countries to Adopt Open Data Act description: "To urge an authoritarian government to release the data which the government has been collecting, thereby allowing the public to examine and diff --git "a/homepage/_cards/en/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" "b/homepage/_cards/en/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" index a5ad1fea..0e32d771 100644 --- "a/homepage/_cards/en/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" +++ "b/homepage/_cards/en/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-real-price-registration-of-house-transaction-of-each-property.jpg +image: "" title: Real Price Registration of House Transaction of Each Property description: "Revealing the actual selling price of all houses in order to promote transparency in the housing market. " diff --git "a/homepage/_cards/en/\346\216\203\344\272\206\345\206\215\350\262\267.md" "b/homepage/_cards/en/\346\216\203\344\272\206\345\206\215\350\262\267.md" index 1bd5e285..77ad9d6e 100644 --- "a/homepage/_cards/en/\346\216\203\344\272\206\345\206\215\350\262\267.md" +++ "b/homepage/_cards/en/\346\216\203\344\272\206\345\206\215\350\262\267.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-scan-and-buy-1-.jpg +image: "" title: Scan and buy description: With one scan, this app allows you to see whether a manufacturer of the product has a record of violating environmental protection regulations diff --git "a/homepage/_cards/en/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" "b/homepage/_cards/en/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" index 803e7624..3ac4874c 100644 --- "a/homepage/_cards/en/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" +++ "b/homepage/_cards/en/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" @@ -1,5 +1,5 @@ --- -image: /images/uploads/open-gov-government-s-open-data-platform.jpeg +image: "" title: "Government's Open Data Platform " description: A platform that compiles the open data of each government body. draft: false @@ -12,4 +12,4 @@ tags: --- In order to enable citizens to monitor the government and apply open data, Taiwan’s Executive Yuan began promoting open data in 2012. People can use most of open data for free except for some special cases. A platform compiling civic, economic and other types of open government data was thus created, and the data were released in a variety of formats, making them easier for citizens to use. -* [Website](https://data.gov.tw/) \ No newline at end of file +* [Website](https://data.gov.tw/) diff --git "a/homepage/_cards/en/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" "b/homepage/_cards/en/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" index 66a0c805..0d9ea81a 100644 --- "a/homepage/_cards/en/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" +++ "b/homepage/_cards/en/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-the-initiative-to-amend-political-donation-acts.jpeg +image: "" title: The Initiative to Amend Political Donation Acts description: Promoting the transparency of political donations through crowdsourcing. draft: false diff --git "a/homepage/_cards/en/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" "b/homepage/_cards/en/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" index 7ef63a7c..ee940a2b 100644 --- "a/homepage/_cards/en/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" +++ "b/homepage/_cards/en/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-06.jpg +image: "" title: New Chewing description: "(New) Chewing is a smart, open-source system designed to enable Bomopofo input to type Chinese characters. " diff --git "a/homepage/_cards/en/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" "b/homepage/_cards/en/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" index 10a2b734..69f10148 100644 --- "a/homepage/_cards/en/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" +++ "b/homepage/_cards/en/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-33.jpg +image: "" title: "Public Representative Voter Guide " description: Compiling data about candidates and helping citizens to obtain sufficient information before casting their votes. diff --git "a/homepage/_cards/en/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" "b/homepage/_cards/en/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" index 3f9bc600..3ae55fdb 100644 --- "a/homepage/_cards/en/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" +++ "b/homepage/_cards/en/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-qollie.jpg +image: "" title: Qollie description: A plug-in that allows users to see how others rank companies and their comments when looking for a job on job search websites. diff --git "a/homepage/_cards/en/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" "b/homepage/_cards/en/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" index 2aa02829..d96352f1 100644 --- "a/homepage/_cards/en/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" +++ "b/homepage/_cards/en/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/英-專案卡-13.jpg +image: "" title: Tor Browser description: A safer browser, which not only allows users to go anonymous, but also deletes sensitive data automatically. diff --git "a/homepage/_cards/en/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" "b/homepage/_cards/en/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" index 33312438..6dd20846 100644 --- "a/homepage/_cards/en/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" +++ "b/homepage/_cards/en/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-scan-and-buy.jpg +image: "" title: LASS (Location Aware Sensing System) description: Based on the concepts of open source and public interest, LASS can help to monitor the quality of air and water diff --git "a/homepage/_cards/en/\347\234\237\347\232\204\345\201\207\347\232\204.md" "b/homepage/_cards/en/\347\234\237\347\232\204\345\201\207\347\232\204.md" index ff1e41a6..f8ec1259 100644 --- "a/homepage/_cards/en/\347\234\237\347\232\204\345\201\207\347\232\204.md" +++ "b/homepage/_cards/en/\347\234\237\347\232\204\345\201\207\347\232\204.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-cofacts.jpg +image: "" title: Cofacts description: "A LINE Bot that can fact-check in real time. " draft: false diff --git "a/homepage/_cards/en/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" "b/homepage/_cards/en/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" index a08ea80a..49c98b44 100644 --- "a/homepage/_cards/en/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" +++ "b/homepage/_cards/en/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-livestream-of-parliament-1-.jpg +image: "" title: Livestream of Parliament description: "Live-streaming legislative discussions in parliament in order to fulfil the public's right to know. " diff --git "a/homepage/_cards/en/\350\220\214\345\205\270.md" "b/homepage/_cards/en/\350\220\214\345\205\270.md" index a5f66fe6..6725bab4 100644 --- "a/homepage/_cards/en/\350\220\214\345\205\270.md" +++ "b/homepage/_cards/en/\350\220\214\345\205\270.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-moedic.jpg +image: "" title: MOEdic description: "Supporting local languages in Taiwan, MOEdic is a free online dictionary that includes Mandarin, Taiwanese Hokkien and Hakka, amongst other diff --git "a/homepage/_cards/en/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" "b/homepage/_cards/en/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" index b33fc8a0..01654984 100644 --- "a/homepage/_cards/en/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" +++ "b/homepage/_cards/en/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-gov-data-opener.jpg +image: "" title: Data Opener description: A system that makes searching and locating government data easier draft: false diff --git "a/homepage/_cards/en/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" "b/homepage/_cards/en/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" index 021780be..ea3114c7 100644 --- "a/homepage/_cards/en/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" +++ "b/homepage/_cards/en/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-disfactory.jpg +image: "" title: Disfactory description: A system that allows users to anonymously report illegal factories on farmland. draft: false diff --git "a/homepage/_cards/en/\351\226\213\346\224\276\350\241\227\345\234\226.md" "b/homepage/_cards/en/\351\226\213\346\224\276\350\241\227\345\234\226.md" index 632c53f1..f8a19c8e 100644 --- "a/homepage/_cards/en/\351\226\213\346\224\276\350\241\227\345\234\226.md" +++ "b/homepage/_cards/en/\351\226\213\346\224\276\350\241\227\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-open-street-map.jpg +image: "" title: Open Street Map description: An editable map that can be freely drawn and used by everyone. draft: false diff --git "a/homepage/_cards/en/\351\226\213\346\224\276\351\244\250\350\227\217.md" "b/homepage/_cards/en/\351\226\213\346\224\276\351\244\250\350\227\217.md" index 0ca99ec1..38ed829e 100644 --- "a/homepage/_cards/en/\351\226\213\346\224\276\351\244\250\350\227\217.md" +++ "b/homepage/_cards/en/\351\226\213\346\224\276\351\244\250\350\227\217.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/open-data-open-glam-.jpg +image: "" title: "Open GLAM " description: A project that opens up and digitalizes data from museums and allows enthusiasts to use the materials legally. diff --git a/homepage/_cards/zh-tw/bigbluebutton.md b/homepage/_cards/zh-tw/bigbluebutton.md index e6302f92..a2ef4f7d 100644 --- a/homepage/_cards/zh-tw/bigbluebutton.md +++ b/homepage/_cards/zh-tw/bigbluebutton.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-14.jpg +image: "" title: BigBlueButton description: 開源線上會議系統，免下載，可與多種學習管理系統整合。 draft: false diff --git a/homepage/_cards/zh-tw/common-voice.md b/homepage/_cards/zh-tw/common-voice.md index 69dc7fc0..cccaf062 100644 --- a/homepage/_cards/zh-tw/common-voice.md +++ b/homepage/_cards/zh-tw/common-voice.md @@ -1,5 +1,5 @@ --- -image: /images/uploads/開放資料－common-voice.jpg +image: "" title: Common Voice description: 蒐集各語言真人發音資料庫，讓電腦學會最真實的說話方式 draft: false diff --git a/homepage/_cards/zh-tw/democracy-os.md b/homepage/_cards/zh-tw/democracy-os.md index 11119140..790f167d 100644 --- a/homepage/_cards/zh-tw/democracy-os.md +++ b/homepage/_cards/zh-tw/democracy-os.md @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－專案卡-39.jpg +image: "" title: Democracy OS description: 民主參與系統，可討論政策、模擬投票、進行參與式預算等 draft: false diff --git a/homepage/_cards/zh-tw/firefox-1.md b/homepage/_cards/zh-tw/firefox-1.md index 1e44a7b8..6f7a094d 100644 --- a/homepage/_cards/zh-tw/firefox-1.md +++ b/homepage/_cards/zh-tw/firefox-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/開放原始碼－firefox.jpg +image: "" title: Firefox description: 自由及開放原始碼的網頁瀏覽器 draft: false diff --git a/homepage/_cards/zh-tw/inkscape-1.md b/homepage/_cards/zh-tw/inkscape-1.md index 28629883..8bf7dd34 100644 --- a/homepage/_cards/zh-tw/inkscape-1.md +++ b/homepage/_cards/zh-tw/inkscape-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-12.jpg +image: "" title: Inkscape description: 一款通用公眾授權條款釋出的開源向量圖形編輯器 draft: false diff --git a/homepage/_cards/zh-tw/libreoffice.md b/homepage/_cards/zh-tw/libreoffice.md index f3853684..f473a585 100644 --- a/homepage/_cards/zh-tw/libreoffice.md +++ b/homepage/_cards/zh-tw/libreoffice.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-10.jpg +image: "" title: LibreOffice description: 一套自由及開放原始碼的辦公軟體。 draft: false diff --git a/homepage/_cards/zh-tw/linux-kernel.md b/homepage/_cards/zh-tw/linux-kernel.md index 2a9c4ae7..0a76896e 100644 --- a/homepage/_cards/zh-tw/linux-kernel.md +++ b/homepage/_cards/zh-tw/linux-kernel.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-08.jpg +image: "" title: Linux Kernel description: 開源的類 Unix 作業系統核心。 draft: false diff --git a/homepage/_cards/zh-tw/notepad.md b/homepage/_cards/zh-tw/notepad.md index 95b90b5e..6091579b 100644 --- a/homepage/_cards/zh-tw/notepad.md +++ b/homepage/_cards/zh-tw/notepad.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-15.jpg +image: "" title: Notepad++ description: 萬能開源純文字編輯器，支援超多語言/程式語言！ draft: false diff --git a/homepage/_cards/zh-tw/ocf-lab.md b/homepage/_cards/zh-tw/ocf-lab.md index e23aae3e..08b97238 100644 --- a/homepage/_cards/zh-tw/ocf-lab.md +++ b/homepage/_cards/zh-tw/ocf-lab.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-07.jpg +image: "" title: OCF Lab description: 由開放文化基金會創立，關注開放的新聞平台。 draft: false diff --git a/homepage/_cards/zh-tw/opass.md b/homepage/_cards/zh-tw/opass.md index 3e1c91ca..5add7aa0 100644 --- a/homepage/_cards/zh-tw/opass.md +++ b/homepage/_cards/zh-tw/opass.md @@ -1,5 +1,5 @@ --- -image: images/uploads/開放原始碼－opasss.jpeg +image: "" title: OPass description: 整合各大臺灣開源資訊社群研討會的報到平台 APP draft: false diff --git a/homepage/_cards/zh-tw/open-hack-farm-1.md b/homepage/_cards/zh-tw/open-hack-farm-1.md index 1041e826..184f3403 100644 --- a/homepage/_cards/zh-tw/open-hack-farm-1.md +++ b/homepage/_cards/zh-tw/open-hack-farm-1.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-03.jpg +image: "" title: Open Hack Farm description: 「開放農業實驗基地」致力開源及開放資料的農業應用 draft: false diff --git a/homepage/_cards/zh-tw/public-money-public-code.md b/homepage/_cards/zh-tw/public-money-public-code.md index 23317198..d8d4293f 100644 --- a/homepage/_cards/zh-tw/public-money-public-code.md +++ b/homepage/_cards/zh-tw/public-money-public-code.md @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-11.jpg +image: "" title: Public Money Public Code description: 「公費建制政府系統以自由開源軟體授權釋出」的倡議。 draft: false @@ -13,4 +13,4 @@ tags: --- 由「歐洲自由軟體協會（Free Software Foundation Europe，即 FSFE）」於 2017 年提出的倡議，主張以人民納稅錢建制的政府系統須使用自由開源軟體授權釋出，以達到不重複開發、便於協作，讓全民皆能使用。此倡議公開信呼籲大眾加入聯署，期望能為各地區採用。 -[FSFE 發起的連署網頁](https://publiccode.eu/zh-tw/) \ No newline at end of file +[FSFE 發起的連署網頁](https://publiccode.eu/zh-tw/) diff --git a/homepage/_cards/zh-tw/vtaiwan.md b/homepage/_cards/zh-tw/vtaiwan.md index f0d549a9..77672268 100644 --- a/homepage/_cards/zh-tw/vtaiwan.md +++ b/homepage/_cards/zh-tw/vtaiwan.md @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－vtaiwan.jpg +image: "" title: vTaiwan description: 供民眾針對台灣法規表達意見、納入政策討論過程的平台 draft: false diff --git "a/homepage/_cards/zh-tw/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" "b/homepage/_cards/zh-tw/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" index 80077773..0f61f5fc 100644 --- "a/homepage/_cards/zh-tw/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" +++ "b/homepage/_cards/zh-tw/\344\272\206\350\247\243\351\226\213\346\272\220\346\216\210\346\254\212-1.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-04.jpg +image: "" title: 了解開源授權 description: 授權條款是開源不可缺少的要件，與自由程度直接相關 draft: false diff --git "a/homepage/_cards/zh-tw/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" "b/homepage/_cards/zh-tw/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" index 00e638fd..e1b031c8 100644 --- "a/homepage/_cards/zh-tw/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" +++ "b/homepage/_cards/zh-tw/\344\276\206\350\267\237\347\253\213\345\247\224\345\220\203\344\270\200\347\242\227.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－來跟立委吃一碗.jpg +image: "" title: 來跟立委吃一碗 description: 用開放資料看立委最愛用國家的錢去哪些餐廳！ draft: false diff --git "a/homepage/_cards/zh-tw/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" "b/homepage/_cards/zh-tw/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" index 12485345..1f473e28 100644 --- "a/homepage/_cards/zh-tw/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" +++ "b/homepage/_cards/zh-tw/\345\205\250\346\260\221\350\277\275\345\205\254\350\273\212.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－全民追公車.jpg +image: "" title: 全民追公車 description: "利用交通局開放資料，做大眾運輸路線、位置追蹤 App " draft: false diff --git "a/homepage/_cards/zh-tw/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" "b/homepage/_cards/zh-tw/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" index e695c731..4be2186c 100644 --- "a/homepage/_cards/zh-tw/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" +++ "b/homepage/_cards/zh-tw/\345\205\254\345\205\261\346\224\277\347\255\226\347\266\262\350\267\257\345\217\203\350\210\207\345\271\263\350\207\272.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－公共政策網路參與平台-1-.jpg +image: "" title: 公共政策網路參與平臺 description: "一個供民眾留下對政策的意見，政府機關回覆的網路平台 " draft: false diff --git "a/homepage/_cards/zh-tw/\345\217\243\347\275\251\345\234\260\345\234\226.md" "b/homepage/_cards/zh-tw/\345\217\243\347\275\251\345\234\260\345\234\226.md" index ab558a41..3db22234 100644 --- "a/homepage/_cards/zh-tw/\345\217\243\347\275\251\345\234\260\345\234\226.md" +++ "b/homepage/_cards/zh-tw/\345\217\243\347\275\251\345\234\260\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－口罩地圖.jpg +image: "" title: 口罩地圖 description: 因應肺炎政策，串接醫療院所資料的口罩存貨查詢程式 draft: false diff --git "a/homepage/_cards/zh-tw/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" "b/homepage/_cards/zh-tw/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" index 6a593945..b8e3d784 100644 --- "a/homepage/_cards/zh-tw/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" +++ "b/homepage/_cards/zh-tw/\345\217\260\347\201\243\346\210\220\345\212\237\345\212\240\345\205\245\343\200\214\351\226\213\346\224\276\346\224\277\345\272\234\345\244\245\344\274\264\350\201\257\347\233\237\343\200\215.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－台灣成功加入「開放政府夥伴聯盟」.jpg +image: "" title: 台灣成功加入「開放政府夥伴聯盟」 description: 這是一套訴求「透明、參與、課責、涵容」的國際標準 draft: false diff --git "a/homepage/_cards/zh-tw/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" "b/homepage/_cards/zh-tw/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" index 23441db3..b22a7e91 100644 --- "a/homepage/_cards/zh-tw/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" +++ "b/homepage/_cards/zh-tw/\345\217\260\347\201\243\350\263\204\351\201\270\345\257\246\345\203\271\347\231\273\351\214\204\345\234\260\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－專案卡-40.jpg +image: "" title: 台灣賄選實價登錄地圖 description: 將賄選判決資料製成地圖，輕鬆得知你的一票值多少 draft: false diff --git "a/homepage/_cards/zh-tw/\345\234\213\345\256\266\345\257\266\350\227\217.md" "b/homepage/_cards/zh-tw/\345\234\213\345\256\266\345\257\266\350\227\217.md" index b06878b1..fb6420d6 100644 --- "a/homepage/_cards/zh-tw/\345\234\213\345\256\266\345\257\266\350\227\217.md" +++ "b/homepage/_cards/zh-tw/\345\234\213\345\256\266\345\257\266\350\227\217.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－國家寶藏.jpg +image: "" title: 國家寶藏 description: "讓志工到美國翻拍流落的臺灣史料，公開給大眾免費使用 " draft: false diff --git "a/homepage/_cards/zh-tw/\345\234\213\346\260\221\346\263\225\345\256\230.md" "b/homepage/_cards/zh-tw/\345\234\213\346\260\221\346\263\225\345\256\230.md" index 2ee9ab56..426970b4 100644 --- "a/homepage/_cards/zh-tw/\345\234\213\346\260\221\346\263\225\345\256\230.md" +++ "b/homepage/_cards/zh-tw/\345\234\213\346\260\221\346\263\225\345\256\230.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－國民法官.jpg +image: "" title: 國民法官 description: "結合社會期待與法官專業，讓公民參與法院判決的機制 " draft: false diff --git "a/homepage/_cards/zh-tw/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" "b/homepage/_cards/zh-tw/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" index 7a3e175e..7f006cf0 100644 --- "a/homepage/_cards/zh-tw/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" +++ "b/homepage/_cards/zh-tw/\345\234\250\345\260\210\345\210\266\345\234\213\345\256\266\346\216\250\345\213\225\351\226\213\346\224\276\350\263\207\346\226\231\345\260\210\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－在專制國家推動開放資料專法.jpg +image: "" title: 在專制國家推動開放資料專法 description: 把政府長年蒐集的各種資料，攤在陽光下給民眾檢視使用 draft: false diff --git "a/homepage/_cards/zh-tw/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" "b/homepage/_cards/zh-tw/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" index a3d1f861..4d64a835 100644 --- "a/homepage/_cards/zh-tw/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" +++ "b/homepage/_cards/zh-tw/\345\257\246\345\203\271\347\231\273\351\214\204\345\210\260\351\226\200\347\211\214.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－實價登錄到門牌.jpg +image: "" title: 實價登錄到門牌 description: 揭露每戶房屋的成交價格，以推動房價交易透明化 draft: false diff --git "a/homepage/_cards/zh-tw/\346\216\203\344\272\206\345\206\215\350\262\267.md" "b/homepage/_cards/zh-tw/\346\216\203\344\272\206\345\206\215\350\262\267.md" index ddeb9c72..f04a7bfb 100644 --- "a/homepage/_cards/zh-tw/\346\216\203\344\272\206\345\206\215\350\262\267.md" +++ "b/homepage/_cards/zh-tw/\346\216\203\344\272\206\345\206\215\350\262\267.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－掃了再買.jpg +image: "" title: 掃了再買 description: "一掃就讓你看光商品企業違規裁罰紀錄的良心購物 App " draft: false diff --git "a/homepage/_cards/zh-tw/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" "b/homepage/_cards/zh-tw/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" index 7bb078b7..ccc8a92e 100644 --- "a/homepage/_cards/zh-tw/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" +++ "b/homepage/_cards/zh-tw/\346\224\277\345\272\234\350\263\207\346\226\231\351\226\213\346\224\276\345\271\263\350\207\272-1.md" @@ -1,5 +1,5 @@ --- -image: /images/uploads/開放政府－政府資料開放平臺.jpeg +image: "" title: 政府資料開放平臺 description: "整合政府各機關的開放資料的網路平台 " draft: false @@ -12,4 +12,4 @@ tags: --- 為滿足民間監督政府與利用資料等需求，行政院於 2012 年開始推動資料開放，以免費為原則、收費為例外，建制政府資料開放平臺，整合民生、經濟與各種施政的資料集，並依照不同檔案格式釋出，方便民間做各種加值應用。 -* [政府資料開放平臺](https://data.gov.tw/) \ No newline at end of file +* [政府資料開放平臺](https://data.gov.tw/) diff --git "a/homepage/_cards/zh-tw/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" "b/homepage/_cards/zh-tw/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" index 0841d841..11ae9e7f 100644 --- "a/homepage/_cards/zh-tw/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" +++ "b/homepage/_cards/zh-tw/\346\224\277\346\262\273\347\215\273\351\207\221\351\200\217\346\230\216\345\214\226\344\277\256\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－政治獻金透明化修法.jpeg +image: "" title: 政治獻金透明化修法 description: 以群眾外包的方式，推動政治獻金資料透明化 draft: false @@ -10,4 +10,4 @@ tags: 2014 年，Ronny Wang 在零時政府（g0v.tw）以群眾外包的方式，與公民團體協作「開放政治獻金」，期望藉修法讓政治獻金更透明。歷經數次嘗試，議題一度沈寂。2017 年，鏡傳媒根據開放資料的基礎製作報導，引起廣大迴響，終在 2018 年修改政治獻金法，規定會計報告書全文應公開於電腦網路。 - [政治獻金數位化協作入口](https://campaign-finance.g0v.ctiml.tw/) -- [鏡傳媒的「數讀政治獻金」計畫](https://www.mirrormedia.mg/projects/political-contribution/#/) \ No newline at end of file +- [鏡傳媒的「數讀政治獻金」計畫](https://www.mirrormedia.mg/projects/political-contribution/#/) diff --git "a/homepage/_cards/zh-tw/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" "b/homepage/_cards/zh-tw/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" index 9147c95c..c7a1e2e3 100644 --- "a/homepage/_cards/zh-tw/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" +++ "b/homepage/_cards/zh-tw/\346\226\260\351\205\267\351\237\263\350\274\270\345\205\245\346\263\225.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-06.jpg +image: "" title: 新酷音輸入法 description: 酷音未來輸入法，是開放原始碼的智慧型中文注音輸入法 draft: false diff --git "a/homepage/_cards/zh-tw/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" "b/homepage/_cards/zh-tw/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" index b51c1ed3..0ed69221 100644 --- "a/homepage/_cards/zh-tw/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" +++ "b/homepage/_cards/zh-tw/\346\260\221\346\204\217\344\273\243\350\241\250\346\212\225\347\245\250\346\214\207\345\215\227-1.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-33.jpg +image: "" title: 民意代表投票指南 description: 彙整候選人資料，幫助選民好好做功課、投下神聖的一票 draft: false diff --git "a/homepage/_cards/zh-tw/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" "b/homepage/_cards/zh-tw/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" index 6a8bfe63..6ac0dc99 100644 --- "a/homepage/_cards/zh-tw/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" +++ "b/homepage/_cards/zh-tw/\346\261\202\350\201\267\345\244\251\347\234\274\351\200\232.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－求職天眼通.jpg +image: "" title: 求職天眼通 description: "瀏覽求職網時可同步顯示公司評價和網友點評的外掛程式 " draft: false diff --git "a/homepage/_cards/zh-tw/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" "b/homepage/_cards/zh-tw/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" index 2b1337d8..04a1b95f 100644 --- "a/homepage/_cards/zh-tw/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" +++ "b/homepage/_cards/zh-tw/\346\264\213\350\224\245\347\200\217\350\246\275\345\231\250.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/專案卡-13.jpg +image: "" title: 洋蔥瀏覽器 description: 一款較安全的瀏覽器，不僅可匿名，更自動刪除敏感瀏覽資料！ draft: false diff --git "a/homepage/_cards/zh-tw/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" "b/homepage/_cards/zh-tw/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" index e4f952c1..55acce6e 100644 --- "a/homepage/_cards/zh-tw/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" +++ "b/homepage/_cards/zh-tw/\347\222\260\345\242\203\346\204\237\346\270\254\345\231\250\347\266\262\350\267\257\347\263\273\347\265\261.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－環境感測器網路系統.jpg +image: "" title: 環境感測器網路系統 description: 開源和公益的「環境感測器」，輕鬆偵測空氣和水文品質 draft: false diff --git "a/homepage/_cards/zh-tw/\347\234\237\347\232\204\345\201\207\347\232\204.md" "b/homepage/_cards/zh-tw/\347\234\237\347\232\204\345\201\207\347\232\204.md" index 1bb55853..223798d7 100644 --- "a/homepage/_cards/zh-tw/\347\234\237\347\232\204\345\201\207\347\232\204.md" +++ "b/homepage/_cards/zh-tw/\347\234\237\347\232\204\345\201\207\347\232\204.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－真的假的.jpg +image: "" title: 真的假的 description: LINE 聊天機器人形式的假消息即時闢謠、查證平台 draft: false diff --git "a/homepage/_cards/zh-tw/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" "b/homepage/_cards/zh-tw/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" index 5a8668ec..786ad712 100644 --- "a/homepage/_cards/zh-tw/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" +++ "b/homepage/_cards/zh-tw/\347\253\213\346\263\225\351\231\242\346\234\203\350\255\260\347\233\264\346\222\255.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－立法院會議直播.jpg +image: "" title: 立法院會議直播 description: "將立法院議事過程公開直播，以滿足公民知情的權利 " draft: false diff --git "a/homepage/_cards/zh-tw/\350\220\214\345\205\270.md" "b/homepage/_cards/zh-tw/\350\220\214\345\205\270.md" index 4c8c440c..113bebdf 100644 --- "a/homepage/_cards/zh-tw/\350\220\214\345\205\270.md" +++ "b/homepage/_cards/zh-tw/\350\220\214\345\205\270.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－萌典.jpg +image: "" title: 萌典 description: 力挺臺灣本地語言，收錄國台客多語的開放免費線上字典 draft: false diff --git "a/homepage/_cards/zh-tw/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" "b/homepage/_cards/zh-tw/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" index 96fb2a62..8526c09b 100644 --- "a/homepage/_cards/zh-tw/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" +++ "b/homepage/_cards/zh-tw/\350\263\207\346\226\231\347\224\263\350\253\213\345\260\217\345\271\253\346\211\213.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放政府－資料申請小幫手.jpg +image: "" title: 資料申請小幫手 description: 一套協助民眾索取政府資料更簡便、更視覺化的機制 draft: false diff --git "a/homepage/_cards/zh-tw/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" "b/homepage/_cards/zh-tw/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" index 78af8ac3..9ac1cf3f 100644 --- "a/homepage/_cards/zh-tw/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" +++ "b/homepage/_cards/zh-tw/\350\276\262\345\234\260\351\201\225\347\253\240\345\267\245\345\273\240\345\233\236\345\240\261.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－農地違章工廠回報.jpg +image: "" title: 農地違章工廠回報 description: 快速匿名檢舉農地中的違章工廠，讓你伸張正義免驚找碴 draft: false diff --git "a/homepage/_cards/zh-tw/\351\226\213\346\224\276\350\241\227\345\234\226.md" "b/homepage/_cards/zh-tw/\351\226\213\346\224\276\350\241\227\345\234\226.md" index bb20ca59..4067460e 100644 --- "a/homepage/_cards/zh-tw/\351\226\213\346\224\276\350\241\227\345\234\226.md" +++ "b/homepage/_cards/zh-tw/\351\226\213\346\224\276\350\241\227\345\234\226.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放街圖.jpg +image: "" title: 開放街圖 description: 所有人都能編輯的地圖，可用在所有需地理資料的專案 draft: false diff --git "a/homepage/_cards/zh-tw/\351\226\213\346\224\276\351\244\250\350\227\217.md" "b/homepage/_cards/zh-tw/\351\226\213\346\224\276\351\244\250\350\227\217.md" index 05b35f16..f881c525 100644 --- "a/homepage/_cards/zh-tw/\351\226\213\346\224\276\351\244\250\350\227\217.md" +++ "b/homepage/_cards/zh-tw/\351\226\213\346\224\276\351\244\250\350\227\217.md" @@ -1,5 +1,5 @@ --- -image: images/uploads/開放資料－開放館藏.jpg +image: "" title: 開放館藏 description: "開放博物館的文物資料並數位化，讓愛好者拿來合法使用 " draft: false From 513f188cc4573e7e645b725c7ed7ec48a37c130a Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 01:14:44 +0700 Subject: [PATCH 18/21] refactor(homepage): remove unused image logic --- homepage/src/lib/processCard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/homepage/src/lib/processCard.js b/homepage/src/lib/processCard.js index c02a07c1..93fbec4a 100644 --- a/homepage/src/lib/processCard.js +++ b/homepage/src/lib/processCard.js @@ -6,10 +6,7 @@ export const processCard = (card, cards) => { let image = data.image; const defaultImage = '/images/uploads/初階專案卡封面-01.png'; - image = image ? image.replace('/homepage/public', '') : defaultImage; - - // Workaround for image prefix path. Will be removed after image path is fixed in all cards. - image = !image.startsWith('/') ? `/${image}` : image; + image = image ?? defaultImage; data = { ...data, From cc6901c3d81577c1640b0a52d059d47fe14ae2a9 Mon Sep 17 00:00:00 2001 From: Ben Liu Date: Tue, 31 Oct 2023 09:35:22 +0700 Subject: [PATCH 19/21] refactor(homepage): replace flex wrap w flex column in card --- homepage/public/css/style.css | 19 ------------------- homepage/src/components/cards/defaultCard.jsx | 2 +- homepage/src/components/cards/projectCard.jsx | 6 +++--- homepage/src/components/column.jsx | 2 +- homepage/src/layouts/footer/footer.jsx | 2 +- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index 6ed3f9cd..9fdfdad5 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -206,25 +206,6 @@ h6 { content: '🔗'; margin-right: 10px; } -.flex-row { - display: flex; -} -.flex-col { - display: flex; - flex-direction: column; -} -.flex-justify-space-between { - justify-content: space-between; -} -.flex-justify-center { - justify-content: center; -} -.flex-align-center { - align-items: center; -} -.flex-align-between { - align-items: between; -} .gap { gap: 1rem; } diff --git a/homepage/src/components/cards/defaultCard.jsx b/homepage/src/components/cards/defaultCard.jsx index 522a8bff..a4f172cd 100644 --- a/homepage/src/components/cards/defaultCard.jsx +++ b/homepage/src/components/cards/defaultCard.jsx @@ -13,7 +13,7 @@ const DefaultCard = ({ card }) => ( }} >

{card.data.title}

-
+
( style={{ border: `1rem solid ${card.data.color.background}` }} >

{card.data.title}

-
-
+
+
{card.data.avatarList.map((avatar) => (
(
))}
- {card.data.description} + {card.data.description} {card.content} diff --git a/homepage/src/components/column.jsx b/homepage/src/components/column.jsx index 5f2c8653..4ea64890 100644 --- a/homepage/src/components/column.jsx +++ b/homepage/src/components/column.jsx @@ -4,7 +4,7 @@ import { ParseMarkdownAndHtml } from './parseMarkdownAndHtml'; const Column = ({ title, image, text }) => (

{title}

-
+
{image && (
{`${title} diff --git a/homepage/src/layouts/footer/footer.jsx b/homepage/src/layouts/footer/footer.jsx index bab3a6dc..30a24db4 100644 --- a/homepage/src/layouts/footer/footer.jsx +++ b/homepage/src/layouts/footer/footer.jsx @@ -20,7 +20,7 @@ const Footer = ({ siteData, footer }) => { {siteData.title} -
+
Date: Tue, 31 Oct 2023 20:55:25 +0800 Subject: [PATCH 20/21] fix: adjust the cards layout to display as 2 cols on md screen --- homepage/src/components/cards/defaultCard.jsx | 2 +- homepage/src/components/cards/projectCard.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homepage/src/components/cards/defaultCard.jsx b/homepage/src/components/cards/defaultCard.jsx index a4f172cd..f31cd041 100644 --- a/homepage/src/components/cards/defaultCard.jsx +++ b/homepage/src/components/cards/defaultCard.jsx @@ -2,7 +2,7 @@ import Image from 'next/image'; import { ParseMarkdownAndHtml } from '../parseMarkdownAndHtml'; const DefaultCard = ({ card }) => ( -
+
( -
+
Date: Tue, 31 Oct 2023 22:13:31 +0700 Subject: [PATCH 21/21] fix(homepage): reduce margin between each avatar in avatar list --- homepage/public/css/style.css | 5 +++++ homepage/src/components/cards/projectCard.jsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/homepage/public/css/style.css b/homepage/public/css/style.css index 9fdfdad5..d40b4842 100644 --- a/homepage/public/css/style.css +++ b/homepage/public/css/style.css @@ -930,6 +930,7 @@ code { min-width: 56px; max-width: 56px; padding: 0 !important; + margin: 0.5rem 0; } .avatar.avatar-list > div { min-width: 50px; @@ -1055,3 +1056,7 @@ code { position: relative !important; height: unset !important; } + +.justify-content-evenly { + justify-content: space-evenly; +} diff --git a/homepage/src/components/cards/projectCard.jsx b/homepage/src/components/cards/projectCard.jsx index 0c56b366..f3e01dbc 100644 --- a/homepage/src/components/cards/projectCard.jsx +++ b/homepage/src/components/cards/projectCard.jsx @@ -8,7 +8,7 @@ const ProjectCard = ({ card }) => ( >

{card.data.title}

-
+
{card.data.avatarList.map((avatar) => (