From bc2f39125d3a79a4028c04b1e78a938cb40153ca Mon Sep 17 00:00:00 2001
From: xaralis <filip.varecha@fragaria.cz>
Date: Sun, 27 Dec 2020 21:42:10 +0100
Subject: [PATCH] feat: update to styleguide 2.0.1
---
.env | 2 +-
src/config.js | 3 --
src/containers/GlobalStats.jsx | 2 +-
src/pages/Home.jsx | 78 +++++++++++++++++-----------------
4 files changed, 41 insertions(+), 44 deletions(-)
delete mode 100644 src/config.js
diff --git a/.env b/.env
index 3cfd9e6..dfe9671 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-REACT_APP_STYLEGUIDE_URL=https://styleguide.pir-test.eu
+REACT_APP_STYLEGUIDE_URL=https://styleguide.pir-test.eu/2.0.1
REACT_APP_API_BASE_URL=https://cf2021.pir-test.eu/api
REACT_APP_MATOMO_ID=135
REACT_APP_SENTRY_DSN=https://aa80453ff4d54b9a9c1b49e79060498a@sentry.pir-test.eu/14
diff --git a/src/config.js b/src/config.js
deleted file mode 100644
index 3d07b03..0000000
--- a/src/config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
- styleguideUrl: "https://styleguide.pir-test.eu/latest",
-};
diff --git a/src/containers/GlobalStats.jsx b/src/containers/GlobalStats.jsx
index fc991fc..d882241 100644
--- a/src/containers/GlobalStats.jsx
+++ b/src/containers/GlobalStats.jsx
@@ -30,7 +30,7 @@ const GlobalStats = () => {
<strong>{onlineUsers}</strong> <span>online celkem</span>
</div>
{nextProgramEntry && (
- <div className="flex-grow text-right hidden sm:block">
+ <div className="flex-grow text-right hidden sm:block lg:hidden xl:block">
Následuje:{" "}
<Link to="/program" className="font-bold">
{nextProgramEntry.title} @{" "}
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index f6ecd8c..9c0607f 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -155,52 +155,52 @@ const Home = () => {
return (
<>
<article className="container container--wide py-8 lg:py-24 cf2021">
- <section className="cf2021__video">
- <div className="flex justify-between mb-4 lg:mb-8">
- <h1 className="head-alt-base lg:head-alt-lg">
- Bod č. {programEntry.number}: {programEntry.title}
- </h1>
- {displayActions && (
- <DropdownMenu
- right
- triggerSize="lg"
- className="pl-4 pt-1 lg:pt-5"
- >
+ <div className="cf2021__title flex justify-between">
+ <h1 className="head-alt-base lg:head-alt-lg">
+ Bod č. {programEntry.number}: {programEntry.title}
+ </h1>
+ {displayActions && (
+ <DropdownMenu
+ right
+ triggerSize="lg"
+ className="pl-4 pt-1 lg:pt-5"
+ >
+ <DropdownMenuItem
+ onClick={() => setShowProgramEditModal(true)}
+ icon="ico--pencil"
+ title="Přejmenovat bod programu"
+ titleSize="base"
+ iconSize="base"
+ />
+ {programEntry.discussionOpened && (
<DropdownMenuItem
- onClick={() => setShowProgramEditModal(true)}
- icon="ico--pencil"
- title="Přejmenovat bod programu"
+ onClick={() => setShowCloseDiscussion(true)}
+ icon="ico--bubbles"
+ title="Ukončit rozpravu"
titleSize="base"
iconSize="base"
/>
- {programEntry.discussionOpened && (
- <DropdownMenuItem
- onClick={() => setShowCloseDiscussion(true)}
- icon="ico--bubbles"
- title="Ukončit rozpravu"
- titleSize="base"
- iconSize="base"
- />
- )}
- {!programEntry.discussionOpened && (
- <DropdownMenuItem
- onClick={() => setShowOpenDiscussion(true)}
- icon="ico--bubbles"
- title="Otevřít rozpravu"
- titleSize="base"
- iconSize="base"
- />
- )}
+ )}
+ {!programEntry.discussionOpened && (
<DropdownMenuItem
- onClick={() => setShowEndProgramPoint(true)}
- icon="ico--switch"
- title="Ukončit bod programu"
+ onClick={() => setShowOpenDiscussion(true)}
+ icon="ico--bubbles"
+ title="Otevřít rozpravu"
titleSize="base"
iconSize="base"
/>
- </DropdownMenu>
- )}
- </div>
+ )}
+ <DropdownMenuItem
+ onClick={() => setShowEndProgramPoint(true)}
+ icon="ico--switch"
+ title="Ukončit bod programu"
+ titleSize="base"
+ iconSize="base"
+ />
+ </DropdownMenu>
+ )}
+ </div>
+ <section className="cf2021__video">
<div className="container-padding--zero md:container-padding--auto">
{streamUrl && (
@@ -243,7 +243,7 @@ const Home = () => {
<span>Příspěvky v rozpravě</span>
{!programEntry.discussionOpened && (
<i
- className="ico--lock text-black ml-1 opacity-50 hover:opacity-100 transition duration-500 text-xl"
+ className="ico--lock text-black ml-2 opacity-50 hover:opacity-100 transition duration-500 text-xl"
title="Rozprava je uzavřena"
/>
)}
--
GitLab