Skip to content

Commit 7dc52f8

Browse files
moonflaretrupciPuiuAlex Albutrupci
authored
Deploy to prod (#135)
* Api setup. * Swagger setup * Api for static pages. * chore: add initial setup for the frontend part * docs: update main README.md file for the frontend app * Api for static pages. * Added routing and initial structure * Code review changes * Added react-bulma-components * added dummy json files * feat: initial header * chore: add .nvmrc and .editorconfig * chore: add eslint script and husky pre-commit hook * refactor: change single to double quotes * refactor: fix warning by adding alt to images * chore: add eslint GitHub action * fix: remove build dir from git * Update decision-tree.json * Update and rename decision-tree.json to static-page-with-decision-tree.json * Update static-page.json * Update useful-app.json * Refactor/global styles (#43) * chore: update global styling, removed custom elements, added mobile friendly css for the header, added node-sass * chore: fixed formatting * Update frontend/src/components/Header/Header.scss Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Feature/about page (#42) * chore: create about page layout * chore: added useful informations section * chore: added some mobile friendly css * chore: added node-sass * fix: update custom elements to classes, removed ids, fixed formatting, added target to <a> tags * chore: update app content width * fix: fixed app content height * chore: update content width * Azure pipelines (#41) * Set up CI with Azure Pipelines [skip ci] * reorder * remove name * Update build.yml for Azure Pipelines * Add badge * update gitignore * add empty build.yml for frontend * Update build.yml for Azure Pipelines * added badge for frontend as well * add path filters * add npm steps for frontend build * remove test task; add publish artifact * Feature/setup footer (#40) * Setup footer * Updated footer height * Fixed linting issues * Made code review changes * chore: update contact info Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> * Update PULL_REQUEST_TEMPLATE.md * Move dependencies to devDependencies * added dummy data json files * added plural * more updates to data format * Create CODEOWNERS * Update README.md * Update README.md * chore: add taskforce-fe-components package (#50) * added one html content page example * added some html content to pages * Added header and developed by components (#57) * Update footer links (#58) * Add fe-components package. * Updated Footer links and replaced with Footer from fe-components. * Added missing FooterLinks. * Addressed review comments. Removed extra spaces and renamed Footer component file. * Renamed Footer component. * Feat/decision tree (#46) * feat: created decision tree component * chore: read data via props * chore: use taskforce components * chore: use function component * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/Home.js Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * chore: removed unused styles * chore: remove default onClick because it will be implemented in the component * chore: lint checks Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * frontpage draft (#61) * frontpage draft * update components package * update static-pages file (#60) * update static-pages file * Content updates stati-pages * chore: ignore data files from lint Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * add incubated by (#66) * Add deploy to production github action (#70) * Add deploy to production github action * Change from master to develop * Content update static-pages cemafac * Update homepage intro text. (#77) * Updated about page texts and removed instagram link. (#80) * Add google analytics (#74) * Add google analytics * Update frontend/public/index.html Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Inject GA_TRACKING_ID only on production deploy * Simple solution Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Update s3 sync command (#78) * feat: integrate list with the decision tree (#63) * feat: integrate list with the decision tree * Razvan/integrate decision tree again (#81) * Break down DecisionTree into multiple components; add question types * remove lint from navel * implement review suggestions * add missing bulma import * update form buttons * chore: cleanup static data * fix: keep state of the selected option Co-authored-by: Razvan Ciuca <razvann88@gmail.com> * removed dummy json data files * Update README.md * Add favicons (#76) * Add favicons * Change description * Change favion size * Add r lang to html * updated components version and developedby logo display (#83) * updated components version and developedby logo display * updated package-lock also * added social share, fixed layout of about page (#73) * added social share, fixed layout of about page * use Hero components for layout in About page * refactor: cleanup old styles/components and add some paddings Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Removed link from content static-pages * Add back acl flag (#84) * feat: add deep linking to the item articles (#95) * feat: add deep linking to the item articles * feat: default to the first article of available * fix: update react-scripts to resolve babel error * Update results conditions (#87) * Update results conditions * remove logging * chore: add exact flag to the hompage route (#99) * Content update 2 static-pages * Feature/small styling fixes (#98) * added footer top margin * temporarily hide some menu items * changed tab title closes #91 * feat: use accordion component (#104) * updated footer links (#105) * Remove json files from data. Default to / for transmitere si simptome page (#102) * Update README.md * Remove react-bulma-components and index.scss (#106) * Update README.md * Feature/load instruments data (#75) * chore: load instruments from json file * chore: added sort by display_order * chore: update * added stiri oficiale box data (#82) * added stiri oficiale box data * updates sidebar item title * updated useful apps in sidebar * chore: refactor - extract duplicate code Co-authored-by: Irina Borozan <anirib@gmail.com> * Compress image. Remove unused image and js (#110) * added yellow instruments app (#108) * chore: load instruments from json file * chore: added sort by display_order * chore: update * added stiri oficiale box data (#82) * added stiri oficiale box data * updates sidebar item title * updated useful apps in sidebar * added yellow instruments app * commented out search input as it is not yet implemented * cleanup search box for now and add instruments box in about * added correct components version * fixed display of new app type on home page and about * fixed linter errors * added top banner * fixed other linter issues * updated components version Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> * added meta info (#109) * added meta info * fixed image link * added social share image * absolute url for social image * added type also * refactor: improve some styles (#114) * chore: bump fe-components version * styles: add horizontal padding to the container class * refactor: move SocialShare component below the article title * [Feature] Sidebar menu navigation (#115) * added subpages in content * split cum ne protejam content into pages * split adaptare content into pages * slugs for subpages * feat: add sidebar menu functionality Co-authored-by: Irina Borozan <anirib@gmail.com> * updated content texts (#117) * Add Cloudfront invalidation (#118) * Add aside, main and alt attr (#116) * Content edits static-pages * added code for romania link in footer (#125) * added sponsors to about page (#119) * added sponsors to about page * fix lint issues * added sponsor image locally * reorganised about instruments list * fix linting issues * Update index.js * Content changes to About page * fixed lint issues * updated version for components (#126) * updated version for components * fixed instruments links * lint issue fixed * Content update answers assessment static-pages * Update content link stiri oficiale in first page * Update links in text in About Page - added links to Guvernul Romania ADR DSU in third paragraph * calm down linter * styles: hide main menu and instruments on non-desktop devices (#128) * Prepare deployment to production env (#129) * Prepare deployment to production env * Update .github/workflows/deploy.yml Co-Authored-By: Andrei Ioniță <hi@andrei.io> * Update according to PR comments Co-authored-by: Andrei Ioniță <hi@andrei.io> * chore: test code splitting (#120) * chore: test code splitting * chore: remove unused css * chore: use font with npm module * Load font from local * Update fonts to woff2 * ciao ciao google font Co-authored-by: Utwo <mihai.legat@gmail.com> * Fix typo (#132) * styles: fix alignments on mobile (#133) * Merge codebase to master branch (#130) (#134) * Api setup. * Swagger setup * Api for static pages. * chore: add initial setup for the frontend part * docs: update main README.md file for the frontend app * Api for static pages. * Added routing and initial structure * Code review changes * Added react-bulma-components * added dummy json files * feat: initial header * chore: add .nvmrc and .editorconfig * chore: add eslint script and husky pre-commit hook * refactor: change single to double quotes * refactor: fix warning by adding alt to images * chore: add eslint GitHub action * fix: remove build dir from git * Update decision-tree.json * Update and rename decision-tree.json to static-page-with-decision-tree.json * Update static-page.json * Update useful-app.json * Refactor/global styles (#43) * chore: update global styling, removed custom elements, added mobile friendly css for the header, added node-sass * chore: fixed formatting * Update frontend/src/components/Header/Header.scss Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Feature/about page (#42) * chore: create about page layout * chore: added useful informations section * chore: added some mobile friendly css * chore: added node-sass * fix: update custom elements to classes, removed ids, fixed formatting, added target to <a> tags * chore: update app content width * fix: fixed app content height * chore: update content width * Azure pipelines (#41) * Set up CI with Azure Pipelines [skip ci] * reorder * remove name * Update build.yml for Azure Pipelines * Add badge * update gitignore * add empty build.yml for frontend * Update build.yml for Azure Pipelines * added badge for frontend as well * add path filters * add npm steps for frontend build * remove test task; add publish artifact * Feature/setup footer (#40) * Setup footer * Updated footer height * Fixed linting issues * Made code review changes * chore: update contact info Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> * Update PULL_REQUEST_TEMPLATE.md * Move dependencies to devDependencies * added dummy data json files * added plural * more updates to data format * Create CODEOWNERS * Update README.md * Update README.md * chore: add taskforce-fe-components package (#50) * added one html content page example * added some html content to pages * Added header and developed by components (#57) * Update footer links (#58) * Add fe-components package. * Updated Footer links and replaced with Footer from fe-components. * Added missing FooterLinks. * Addressed review comments. Removed extra spaces and renamed Footer component file. * Renamed Footer component. * Feat/decision tree (#46) * feat: created decision tree component * chore: read data via props * chore: use taskforce components * chore: use function component * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/Home.js Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Update frontend/src/components/DecisionTree/index.jsx Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * chore: removed unused styles * chore: remove default onClick because it will be implemented in the component * chore: lint checks Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * frontpage draft (#61) * frontpage draft * update components package * update static-pages file (#60) * update static-pages file * Content updates stati-pages * chore: ignore data files from lint Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * add incubated by (#66) * Add deploy to production github action (#70) * Add deploy to production github action * Change from master to develop * Content update static-pages cemafac * Update homepage intro text. (#77) * Updated about page texts and removed instagram link. (#80) * Add google analytics (#74) * Add google analytics * Update frontend/public/index.html Co-Authored-By: Dan Lepadatu <lepadatudan@gmail.com> * Inject GA_TRACKING_ID only on production deploy * Simple solution Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Update s3 sync command (#78) * feat: integrate list with the decision tree (#63) * feat: integrate list with the decision tree * Razvan/integrate decision tree again (#81) * Break down DecisionTree into multiple components; add question types * remove lint from navel * implement review suggestions * add missing bulma import * update form buttons * chore: cleanup static data * fix: keep state of the selected option Co-authored-by: Razvan Ciuca <razvann88@gmail.com> * removed dummy json data files * Update README.md * Add favicons (#76) * Add favicons * Change description * Change favion size * Add r lang to html * updated components version and developedby logo display (#83) * updated components version and developedby logo display * updated package-lock also * added social share, fixed layout of about page (#73) * added social share, fixed layout of about page * use Hero components for layout in About page * refactor: cleanup old styles/components and add some paddings Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> * Removed link from content static-pages * Add back acl flag (#84) * feat: add deep linking to the item articles (#95) * feat: add deep linking to the item articles * feat: default to the first article of available * fix: update react-scripts to resolve babel error * Update results conditions (#87) * Update results conditions * remove logging * chore: add exact flag to the hompage route (#99) * Content update 2 static-pages * Feature/small styling fixes (#98) * added footer top margin * temporarily hide some menu items * changed tab title closes #91 * feat: use accordion component (#104) * updated footer links (#105) * Remove json files from data. Default to / for transmitere si simptome page (#102) * Update README.md * Remove react-bulma-components and index.scss (#106) * Update README.md * Feature/load instruments data (#75) * chore: load instruments from json file * chore: added sort by display_order * chore: update * added stiri oficiale box data (#82) * added stiri oficiale box data * updates sidebar item title * updated useful apps in sidebar * chore: refactor - extract duplicate code Co-authored-by: Irina Borozan <anirib@gmail.com> * Compress image. Remove unused image and js (#110) * added yellow instruments app (#108) * chore: load instruments from json file * chore: added sort by display_order * chore: update * added stiri oficiale box data (#82) * added stiri oficiale box data * updates sidebar item title * updated useful apps in sidebar * added yellow instruments app * commented out search input as it is not yet implemented * cleanup search box for now and add instruments box in about * added correct components version * fixed display of new app type on home page and about * fixed linter errors * added top banner * fixed other linter issues * updated components version Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> * added meta info (#109) * added meta info * fixed image link * added social share image * absolute url for social image * added type also * refactor: improve some styles (#114) * chore: bump fe-components version * styles: add horizontal padding to the container class * refactor: move SocialShare component below the article title * [Feature] Sidebar menu navigation (#115) * added subpages in content * split cum ne protejam content into pages * split adaptare content into pages * slugs for subpages * feat: add sidebar menu functionality Co-authored-by: Irina Borozan <anirib@gmail.com> * updated content texts (#117) * Add Cloudfront invalidation (#118) * Add aside, main and alt attr (#116) * Content edits static-pages * added code for romania link in footer (#125) * added sponsors to about page (#119) * added sponsors to about page * fix lint issues * added sponsor image locally * reorganised about instruments list * fix linting issues * Update index.js * Content changes to About page * fixed lint issues * updated version for components (#126) * updated version for components * fixed instruments links * lint issue fixed * Content update answers assessment static-pages * Update content link stiri oficiale in first page * Update links in text in About Page - added links to Guvernul Romania ADR DSU in third paragraph * calm down linter * styles: hide main menu and instruments on non-desktop devices (#128) * Prepare deployment to production env (#129) * Prepare deployment to production env * Update .github/workflows/deploy.yml Co-Authored-By: Andrei Ioniță <hi@andrei.io> * Update according to PR comments Co-authored-by: Andrei Ioniță <hi@andrei.io> Co-authored-by: trupci <andreea.trupcea@ing.com> Co-authored-by: Alexandru Puiu Albu <matrixpuiu@yahoo.com> Co-authored-by: Alex Albu <alex.albu@novanet.no> Co-authored-by: trupci <trupci@gmail.com> Co-authored-by: Dan Lepadatu <lepadatudan@gmail.com> Co-authored-by: AndreiMitrea <andrei.mitrea@imbuelabs.com> Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> Co-authored-by: Irina Borozan <anirib@gmail.com> Co-authored-by: vizu <bogdan.vizureanu@gmail.com> Co-authored-by: Utwo <mihai.legat@gmail.com> Co-authored-by: anca <anca.cismasiu@gmail.com> Co-authored-by: Daniel <dansto13@yahoo.com> Co-authored-by: Razvan Ciuca <razvann88@gmail.com> Co-authored-by: Olivia Vereha <45068169+overeha@users.noreply.github.com> Co-authored-by: Andrei Ioniță <hi@andrei.io> Co-authored-by: Radu Stefanescu <radu.stefanescu@code4.ro> Co-authored-by: trupci <andreea.trupcea@ing.com> Co-authored-by: Alexandru Puiu Albu <matrixpuiu@yahoo.com> Co-authored-by: Alex Albu <alex.albu@novanet.no> Co-authored-by: trupci <trupci@gmail.com> Co-authored-by: AndreiMitrea <andrei.mitrea@imbuelabs.com> Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> Co-authored-by: Irina Borozan <anirib@gmail.com> Co-authored-by: vizu <bogdan.vizureanu@gmail.com> Co-authored-by: Utwo <mihai.legat@gmail.com> Co-authored-by: anca <anca.cismasiu@gmail.com> Co-authored-by: Daniel <dansto13@yahoo.com> Co-authored-by: Razvan Ciuca <razvann88@gmail.com> Co-authored-by: Olivia Vereha <45068169+overeha@users.noreply.github.com> Co-authored-by: Andrei Ioniță <hi@andrei.io> * Change branding (#136) * Change branding * Lint fix * Fix social image (#137) Co-authored-by: trupci <andreea.trupcea@ing.com> Co-authored-by: Alexandru Puiu Albu <matrixpuiu@yahoo.com> Co-authored-by: Alex Albu <alex.albu@novanet.no> Co-authored-by: trupci <trupci@gmail.com> Co-authored-by: AndreiMitrea <andrei.mitrea@imbuelabs.com> Co-authored-by: adascaliteiradu <adascalitei.radu@live.com> Co-authored-by: Irina Borozan <anirib@gmail.com> Co-authored-by: vizu <bogdan.vizureanu@gmail.com> Co-authored-by: Utwo <mihai.legat@gmail.com> Co-authored-by: anca <anca.cismasiu@gmail.com> Co-authored-by: Daniel <dansto13@yahoo.com> Co-authored-by: Razvan Ciuca <razvann88@gmail.com> Co-authored-by: Olivia Vereha <45068169+overeha@users.noreply.github.com> Co-authored-by: Radu Stefanescu <radu.stefanescu@code4.ro> Co-authored-by: Andrei Ioniță <hi@andrei.io> Co-authored-by: catileptic <s.alexandra.stefanescu@gmail.com>
1 parent 98af88d commit 7dc52f8

17 files changed

+134
-57
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![GitHub contributors](https://img.shields.io/github/contributors/code4romania/ce-ma-fac.svg?style=for-the-badge)](https://github.com/code4romania/ce-ma-fac/graphs/contributors) [![GitHub last commit](https://img.shields.io/github/last-commit/code4romania/ce-ma-fac.svg?style=for-the-badge)](https://github.com/code4romania/ce-ma-fac/commits/master) [![License: MPL 2.0](https://img.shields.io/badge/license-MPL%202.0-brightgreen.svg?style=for-the-badge)](https://opensource.org/licenses/MPL-2.0)
44

5-
[See the project live](https://cemafac.ro/)
5+
[See the project live](https://cetrebuiesafac.ro/)
66

77
Objective: Clear information of the public, increase in the level of proper actions taken.
88

‎frontend/public/fonts/TitilliumWeb-Bold-ext.woff2

6.53 KB
Binary file not shown.

‎frontend/public/fonts/TitilliumWeb-Bold.woff2

11.4 KB
Binary file not shown.

‎frontend/public/fonts/TitilliumWeb-Regular-ext.woff2

6.6 KB
Binary file not shown.

‎frontend/public/fonts/TitilliumWeb-Regular.woff2

12.1 KB
Binary file not shown.

‎frontend/public/images/logo.png

4.2 KB
Loading

‎frontend/public/images/social.png

-33.4 KB
Loading

‎frontend/public/index.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@
77
<meta name="theme-color" content="#233780" />
88
<meta
99
name="description"
10-
content="Cemafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19."
10+
content="Cetrebuiesafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19."
1111
/>
1212

13-
<meta property="og:title" content="Ce mă fac">
14-
<meta property="og:image" content="https://cemafac.ro/images/social.png">
15-
<meta property="og:description" content="Cemafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19.">
16-
<meta property="og:url" content="https://cemafac.ro">
13+
<meta property="og:title" content="Ce trebuie să fac" />
14+
<meta property="og:image" content="https://cetrebuiesafac.ro/images/social.png" />
15+
<meta
16+
property="og:description"
17+
content="Cetrebuiesafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19."
18+
/>
19+
<meta property="og:url" content="https://cetrebuiesafac.ro" />
1720
<meta property="og:type" content="website" />
1821

1922
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
20-
<link
21-
href="https://fonts.googleapis.com/css?family=Titillium+Web:400,700&display=swap"
22-
rel="stylesheet"
23-
/>
2423
<!--
2524
manifest.json provides metadata used when your web app is installed on a
2625
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -35,7 +34,7 @@
3534
work correctly both with client-side routing and a non-root public URL.
3635
Learn how to configure a non-root public URL by running `npm run build`.
3736
-->
38-
<title>Ce mă fac</title>
37+
<title>Ce trebuie să fac</title>
3938
</head>
4039
<body>
4140
<noscript>You need to enable JavaScript to run this app.</noscript>

‎frontend/public/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"short_name": "CeMaFac",
3-
"name": "Ce Ma Fac",
2+
"short_name": "CeTrebuieSaFac",
3+
"name": "Ce Trebuie Să Fac",
44
"start_url": ".",
55
"display": "standalone",
66
"theme_color": "#233780",

‎frontend/src/App.js

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect } from "react";
1+
import React, { useEffect, Suspense, lazy } from "react";
22
import {
33
BrowserRouter as Router,
44
Link,
@@ -7,23 +7,32 @@ import {
77
useHistory
88
} from "react-router-dom";
99
import { logPageView } from "./analyticsTracker";
10-
import FooterWrapper from "./components/Footer";
11-
import About from "./components/About";
1210
import Home from "./components/Home";
13-
import PrivacyPolicy from "./components/PrivacyPolicy";
14-
import TermsAndConditions from "./components/TermsAndConditions";
11+
1512
import {
1613
Header,
1714
DevelopedBy,
1815
IncubatedBy,
1916
Banner
2017
} from "@code4ro/taskforce-fe-components";
21-
import LogoSvg from "./images/logo.svg";
18+
// import LogoSvg from "./images/logo.svg";
2219
import "./App.scss";
2320

21+
const About = lazy(() => import("./components/About"));
22+
const PrivacyPolicy = lazy(() => import("./components/PrivacyPolicy"));
23+
const TermsAndConditions = lazy(() =>
24+
import("./components/TermsAndConditions")
25+
);
26+
const FooterWrapper = lazy(() => import("./components/Footer"));
27+
2428
const Logo = () => (
2529
<Link to="/">
26-
<img width="145" height="32" alt="Covid-19. Ce ma fac?" src={LogoSvg} />
30+
<img
31+
width="178"
32+
height="32"
33+
alt="Covid-19. Ce trebuie să fac?"
34+
src="/images/logo.png"
35+
/>
2736
</Link>
2837
);
2938

@@ -72,24 +81,26 @@ const App = () => {
7281
/>
7382
<Header Logo={Logo()} MenuItems={MenuItems} />
7483
<DevelopedBy showSecondLine={true} />
75-
<main>
76-
<Switch>
77-
<Route path="/despre">
78-
<About />
79-
</Route>
80-
<Route path="/politica-confidentialitate">
81-
<PrivacyPolicy />
82-
</Route>
83-
<Route path="/termeni-si-conditii">
84-
<TermsAndConditions />
85-
</Route>
86-
<Route exact path="/:pageSlug?/:subPageSlug?/">
87-
<Home />
88-
</Route>
89-
</Switch>
90-
</main>
91-
<IncubatedBy />
92-
<FooterWrapper />
84+
<Suspense fallback={<div></div>}>
85+
<main>
86+
<Switch>
87+
<Route path="/despre">
88+
<About />
89+
</Route>
90+
<Route path="/politica-confidentialitate">
91+
<PrivacyPolicy />
92+
</Route>
93+
<Route path="/termeni-si-conditii">
94+
<TermsAndConditions />
95+
</Route>
96+
<Route exact path="/:pageSlug?/:subPageSlug?/">
97+
<Home />
98+
</Route>
99+
</Switch>
100+
</main>
101+
<IncubatedBy />
102+
<FooterWrapper />
103+
</Suspense>
93104
</>
94105
);
95106
};

‎frontend/src/App.scss

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
@import '~bulma/sass/utilities/_all.sass';
2-
@import "~bulma/sass/elements/content.sass";
3-
@import "~bulma/sass/elements/container.sass";
1+
@import "./fonts";
2+
@import "~bulma/sass/utilities/initial-variables.sass";
3+
@import "~bulma/sass/utilities/derived-variables.sass";
4+
@import "~bulma/sass/utilities/mixins.sass";
45
@import "~bulma/sass/components/level.sass";
56

67
.container {
@@ -15,3 +16,9 @@
1516
.incubated-by-wrapper {
1617
margin-top: 2rem;
1718
}
19+
20+
@media (max-width: 768px) {
21+
.banner-wrapper {
22+
text-align: center;
23+
}
24+
}

‎frontend/src/_fonts.scss

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/* latin-ext */
2+
@font-face {
3+
font-family: "Titillium Web";
4+
font-style: normal;
5+
font-weight: 400;
6+
font-display: swap;
7+
src: local("Titillium Web Regular"), local("TitilliumWeb-Regular"),
8+
url(/fonts/TitilliumWeb-Regular-ext.woff2) format("woff2");
9+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
10+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
11+
}
12+
/* latin */
13+
@font-face {
14+
font-family: "Titillium Web";
15+
font-style: normal;
16+
font-weight: 400;
17+
font-display: swap;
18+
src: local("Titillium Web Regular"), local("TitilliumWeb-Regular"),
19+
url(/fonts/TitilliumWeb-Regular.woff2) format("woff2");
20+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
21+
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
22+
U+FEFF, U+FFFD;
23+
}
24+
/* latin-ext */
25+
@font-face {
26+
font-family: "Titillium Web";
27+
font-style: normal;
28+
font-weight: 700;
29+
font-display: swap;
30+
src: local("Titillium Web Bold"), local("TitilliumWeb-Bold"),
31+
url(/fonts/TitilliumWeb-Bold-ext.woff2) format("woff2");
32+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
33+
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
34+
}
35+
/* latin */
36+
@font-face {
37+
font-family: "Titillium Web";
38+
font-style: normal;
39+
font-weight: 700;
40+
font-display: swap;
41+
src: local("Titillium Web Bold"), local("TitilliumWeb-Bold"),
42+
url(/fonts/TitilliumWeb-Bold.woff2) format("woff2");
43+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
44+
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
45+
U+FEFF, U+FFFD;
46+
}

‎frontend/src/analyticsTracker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import ReactGA from "react-ga";
22

33
export const initializeGA = () => {
4-
if (document.location.hostname !== "cemafac.ro") {
4+
if (document.location.hostname !== "cetrebuiesafac.ro") {
55
return;
66
}
77
ReactGA.initialize("UA-160603540-1");

‎frontend/src/components/About/index.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ const About = () => {
2222
<Hero
2323
title="Despre proiect"
2424
useFallbackIcon={true}
25-
subtitle="Vrem să facem lucrurile mai simple pentru noi toți. Cemafac.ro este un
26-
ghid cu reguli de interacțiune, acțiune și comportament recomandate în
27-
această perioadă de criză în care ne confruntăm cu răspândirea foarte
28-
rapidă a infecției cu coronavirus. Vrem să aducem mai aproape de voi
29-
regulile de bază recomandate de autorități de la care este indicat să
30-
nu ne abatem în această perioadă."
25+
subtitle="Vrem să facem lucrurile mai simple pentru noi toți.
26+
Cetrebuiesafac.ro este un ghid cu reguli de interacțiune, acțiune și
27+
comportament recomandate în această perioadă de criză în care ne
28+
confruntăm cu răspândirea foarte rapidă a infecției cu coronavirus.
29+
Vrem să aducem mai aproape de voi regulile de bază recomandate de
30+
autorități de la care este indicat să nu ne abatem în această perioadă."
3131
/>
3232
<div>
33-
<SocialsShare currentPage={"https://cemafac.ro/despre"} />
33+
<SocialsShare currentPage={"https://cetrebuiesafac.ro/despre"} />
3434
</div>
3535
</section>
3636
<section className="about-section-logo">
3737
<img src={logo} alt=""></img>
3838
</section>
3939
<section className="has-border-bottom has-horizontal-paddding">
4040
<p>
41-
cemăfac.ro este o platformă care ajută populația să înțeleagă mai
42-
bine care sunt regulile ce trebuie respectate în timpul pandemieii
43-
COVID-19. Un ghid simplu și practic, redactat pe înțelesul tuturor
44-
cu sprijinul&nbsp;
41+
Cetrebuiesafac.ro este o platformă care ajută populația să înțeleagă
42+
mai bine care sunt regulile ce trebuie respectate în timpul
43+
pandemieii COVID-19. Un ghid simplu și practic, redactat pe
44+
înțelesul tuturor cu sprijinul&nbsp;
4545
<a
4646
href="https://www.facebook.com/comunicarenonprofit/"
4747
target="_blank"
@@ -65,8 +65,8 @@ const About = () => {
6565
</section>
6666
<section className="has-border-bottom has-horizontal-paddding">
6767
<p>
68-
Platforma cemăfac.ro este construită de Code for Romania Task Force
69-
în parteneriat cu&nbsp;
68+
Platforma cetrebuiesafac.ro este construită de Code for Romania Task
69+
Force în parteneriat cu&nbsp;
7070
<a
7171
href="https://www.gov.ro/"
7272
target="_blank"

‎frontend/src/components/Form/Form.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,17 @@
99
background-color: whitesmoke !important;
1010
}
1111
}
12+
13+
@media (max-width: 768px) {
14+
.action-buttons {
15+
padding: 0;
16+
.level-left {
17+
margin-top: 1.5rem;
18+
display: flex;
19+
20+
.level-item {
21+
margin: 0 1rem 0 0;
22+
}
23+
}
24+
}
25+
}

‎frontend/src/components/Home/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const Home = () => {
6060
title={"Toate informațiile de care ai nevoie"}
6161
useFallbackIcon={true}
6262
subtitle={
63-
"Vrem să facem lucrurile mai simple pentru noi toți. Cemafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19. Vrem să aducem mai aproape de voi regulile de bază recomandate de autorități de la care este indicat să nu ne abatem în această perioadă."
63+
"Vrem să facem lucrurile mai simple pentru noi toți. Cetrebuiesafac.ro este un ghid cu reguli de interacțiune, acțiune și comportament recomandate în timpul situației de urgență generată de pandemia COVID-19. Vrem să aducem mai aproape de voi regulile de bază recomandate de autorități de la care este indicat să nu ne abatem în această perioadă."
6464
}
6565
/>
6666
</div>

‎frontend/src/data/static-pages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export default [
116116
<ul>
117117
<li>Spală-te des pe mâini cu apă și săpun timp de cel puțin 20 de secunde, mai ales după ce ai fost într-un loc public sau după ce îți sufli nasul, tușești sau strănuți. (pentru a te șterge pe mâini folosește, de preferat, prosoape de hârtie).</li>
118118
<li>Dacă nu sunt disponibile apa și săpunul, utilizează un produs de dezinfectare a mâinilor. Acoperă cu lichidul toată suprafața mâinilor și freacă-ți mâinile până când se simt uscate.</li>
119-
<li>NU intra în contact direct cu membrii familiei, atunci când revii la domiciliu, ]nainte de igienizarea mâinilor.</li>
119+
<li>NU intra în contact direct cu membrii familiei, atunci când revii la domiciliu, înainte de igienizarea mâinilor.</li>
120120
<li>Dacă strănuți sau tușești acoperă-ți gura și nasul cu un șervețel de unică folosință, pe care ai grijă să îl arunci imediat la coșul de gunoi.</li>
121121
<li>Evită să îți atingi ochii, nasul și gura cu mâinile neigienizate.</li>
122122
<li>Distanțează-te de ceilalți în cazul în care COVID-19 se răspândește în propria comunitate. Acest lucru este cu atât mai important pentru persoanele care prezintă un risc mai mare de îmbolnăvire.</li>

0 commit comments

Comments
 (0)