Skip to content

Commit

Permalink
Deploy to prod (#135)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/Home.js

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* chore: removed unused styles

* chore: remove default onClick because it will be implemented in the component

* chore: lint checks

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Inject GA_TRACKING_ID only on production deploy

* Simple solution

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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ță <[email protected]>

* Update according to PR comments

Co-authored-by: Andrei Ioniță <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/Home.js

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* Update frontend/src/components/DecisionTree/index.jsx

Co-Authored-By: Dan Lepadatu <[email protected]>

* chore: removed unused styles

* chore: remove default onClick because it will be implemented in the component

* chore: lint checks

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Inject GA_TRACKING_ID only on production deploy

* Simple solution

Co-authored-by: Dan Lepadatu <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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ță <[email protected]>

* Update according to PR comments

Co-authored-by: Andrei Ioniță <[email protected]>

Co-authored-by: trupci <[email protected]>
Co-authored-by: Alexandru Puiu Albu <[email protected]>
Co-authored-by: Alex Albu <[email protected]>
Co-authored-by: trupci <[email protected]>
Co-authored-by: Dan Lepadatu <[email protected]>
Co-authored-by: AndreiMitrea <[email protected]>
Co-authored-by: adascaliteiradu <[email protected]>
Co-authored-by: Irina Borozan <[email protected]>
Co-authored-by: vizu <[email protected]>
Co-authored-by: Utwo <[email protected]>
Co-authored-by: anca <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: Razvan Ciuca <[email protected]>
Co-authored-by: Olivia Vereha <[email protected]>
Co-authored-by: Andrei Ioniță <[email protected]>

Co-authored-by: Radu Stefanescu <[email protected]>
Co-authored-by: trupci <[email protected]>
Co-authored-by: Alexandru Puiu Albu <[email protected]>
Co-authored-by: Alex Albu <[email protected]>
Co-authored-by: trupci <[email protected]>
Co-authored-by: AndreiMitrea <[email protected]>
Co-authored-by: adascaliteiradu <[email protected]>
Co-authored-by: Irina Borozan <[email protected]>
Co-authored-by: vizu <[email protected]>
Co-authored-by: Utwo <[email protected]>
Co-authored-by: anca <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: Razvan Ciuca <[email protected]>
Co-authored-by: Olivia Vereha <[email protected]>
Co-authored-by: Andrei Ioniță <[email protected]>

* Change branding (#136)

* Change branding

* Lint fix

* Fix social image (#137)

Co-authored-by: trupci <[email protected]>
Co-authored-by: Alexandru Puiu Albu <[email protected]>
Co-authored-by: Alex Albu <[email protected]>
Co-authored-by: trupci <[email protected]>
Co-authored-by: AndreiMitrea <[email protected]>
Co-authored-by: adascaliteiradu <[email protected]>
Co-authored-by: Irina Borozan <[email protected]>
Co-authored-by: vizu <[email protected]>
Co-authored-by: Utwo <[email protected]>
Co-authored-by: anca <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: Razvan Ciuca <[email protected]>
Co-authored-by: Olivia Vereha <[email protected]>
Co-authored-by: Radu Stefanescu <[email protected]>
Co-authored-by: Andrei Ioniță <[email protected]>
Co-authored-by: catileptic <[email protected]>
  • Loading branch information
17 people authored Mar 25, 2020
1 parent 98af88d commit 7dc52f8
Show file tree
Hide file tree
Showing 17 changed files with 134 additions and 57 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![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)

[See the project live](https://cemafac.ro/)
[See the project live](https://cetrebuiesafac.ro/)

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

Expand Down
Binary file added frontend/public/fonts/TitilliumWeb-Bold-ext.woff2
Binary file not shown.
Binary file added frontend/public/fonts/TitilliumWeb-Bold.woff2
Binary file not shown.
Binary file not shown.
Binary file added frontend/public/fonts/TitilliumWeb-Regular.woff2
Binary file not shown.
Binary file added frontend/public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/images/social.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 9 additions & 10 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@
<meta name="theme-color" content="#233780" />
<meta
name="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."
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."
/>

<meta property="og:title" content="Ce mă fac">
<meta property="og:image" content="https://cemafac.ro/images/social.png">
<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.">
<meta property="og:url" content="https://cemafac.ro">
<meta property="og:title" content="Ce trebuie să fac" />
<meta property="og:image" content="https://cetrebuiesafac.ro/images/social.png" />
<meta
property="og:description"
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."
/>
<meta property="og:url" content="https://cetrebuiesafac.ro" />
<meta property="og:type" content="website" />

<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link
href="https://fonts.googleapis.com/css?family=Titillium+Web:400,700&display=swap"
rel="stylesheet"
/>
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -35,7 +34,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Ce fac</title>
<title>Ce trebuie să fac</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "CeMaFac",
"name": "Ce Ma Fac",
"short_name": "CeTrebuieSaFac",
"name": "Ce Trebuie Să Fac",
"start_url": ".",
"display": "standalone",
"theme_color": "#233780",
Expand Down
61 changes: 36 additions & 25 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import React, { useEffect, Suspense, lazy } from "react";
import {
BrowserRouter as Router,
Link,
Expand All @@ -7,23 +7,32 @@ import {
useHistory
} from "react-router-dom";
import { logPageView } from "./analyticsTracker";
import FooterWrapper from "./components/Footer";
import About from "./components/About";
import Home from "./components/Home";
import PrivacyPolicy from "./components/PrivacyPolicy";
import TermsAndConditions from "./components/TermsAndConditions";

import {
Header,
DevelopedBy,
IncubatedBy,
Banner
} from "@code4ro/taskforce-fe-components";
import LogoSvg from "./images/logo.svg";
// import LogoSvg from "./images/logo.svg";
import "./App.scss";

const About = lazy(() => import("./components/About"));
const PrivacyPolicy = lazy(() => import("./components/PrivacyPolicy"));
const TermsAndConditions = lazy(() =>
import("./components/TermsAndConditions")
);
const FooterWrapper = lazy(() => import("./components/Footer"));

const Logo = () => (
<Link to="/">
<img width="145" height="32" alt="Covid-19. Ce ma fac?" src={LogoSvg} />
<img
width="178"
height="32"
alt="Covid-19. Ce trebuie să fac?"
src="/images/logo.png"
/>
</Link>
);

Expand Down Expand Up @@ -72,24 +81,26 @@ const App = () => {
/>
<Header Logo={Logo()} MenuItems={MenuItems} />
<DevelopedBy showSecondLine={true} />
<main>
<Switch>
<Route path="/despre">
<About />
</Route>
<Route path="/politica-confidentialitate">
<PrivacyPolicy />
</Route>
<Route path="/termeni-si-conditii">
<TermsAndConditions />
</Route>
<Route exact path="/:pageSlug?/:subPageSlug?/">
<Home />
</Route>
</Switch>
</main>
<IncubatedBy />
<FooterWrapper />
<Suspense fallback={<div></div>}>
<main>
<Switch>
<Route path="/despre">
<About />
</Route>
<Route path="/politica-confidentialitate">
<PrivacyPolicy />
</Route>
<Route path="/termeni-si-conditii">
<TermsAndConditions />
</Route>
<Route exact path="/:pageSlug?/:subPageSlug?/">
<Home />
</Route>
</Switch>
</main>
<IncubatedBy />
<FooterWrapper />
</Suspense>
</>
);
};
Expand Down
13 changes: 10 additions & 3 deletions frontend/src/App.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import '~bulma/sass/utilities/_all.sass';
@import "~bulma/sass/elements/content.sass";
@import "~bulma/sass/elements/container.sass";
@import "./fonts";
@import "~bulma/sass/utilities/initial-variables.sass";
@import "~bulma/sass/utilities/derived-variables.sass";
@import "~bulma/sass/utilities/mixins.sass";
@import "~bulma/sass/components/level.sass";

.container {
Expand All @@ -15,3 +16,9 @@
.incubated-by-wrapper {
margin-top: 2rem;
}

@media (max-width: 768px) {
.banner-wrapper {
text-align: center;
}
}
46 changes: 46 additions & 0 deletions frontend/src/_fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/* latin-ext */
@font-face {
font-family: "Titillium Web";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local("Titillium Web Regular"), local("TitilliumWeb-Regular"),
url(/fonts/TitilliumWeb-Regular-ext.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: "Titillium Web";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local("Titillium Web Regular"), local("TitilliumWeb-Regular"),
url(/fonts/TitilliumWeb-Regular.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
/* latin-ext */
@font-face {
font-family: "Titillium Web";
font-style: normal;
font-weight: 700;
font-display: swap;
src: local("Titillium Web Bold"), local("TitilliumWeb-Bold"),
url(/fonts/TitilliumWeb-Bold-ext.woff2) format("woff2");
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: "Titillium Web";
font-style: normal;
font-weight: 700;
font-display: swap;
src: local("Titillium Web Bold"), local("TitilliumWeb-Bold"),
url(/fonts/TitilliumWeb-Bold.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
U+FEFF, U+FFFD;
}
2 changes: 1 addition & 1 deletion frontend/src/analyticsTracker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ReactGA from "react-ga";

export const initializeGA = () => {
if (document.location.hostname !== "cemafac.ro") {
if (document.location.hostname !== "cetrebuiesafac.ro") {
return;
}
ReactGA.initialize("UA-160603540-1");
Expand Down
26 changes: 13 additions & 13 deletions frontend/src/components/About/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ const About = () => {
<Hero
title="Despre proiect"
useFallbackIcon={true}
subtitle="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
această perioadă de criză în care ne confruntăm cu răspândirea foarte
rapidă a infecției cu coronavirus. 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ă."
subtitle="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 această perioadă de criză în care ne
confruntăm cu răspândirea foarte rapidă a infecției cu coronavirus.
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ă."
/>
<div>
<SocialsShare currentPage={"https://cemafac.ro/despre"} />
<SocialsShare currentPage={"https://cetrebuiesafac.ro/despre"} />
</div>
</section>
<section className="about-section-logo">
<img src={logo} alt=""></img>
</section>
<section className="has-border-bottom has-horizontal-paddding">
<p>
cemăfac.ro este o platformă care ajută populația să înțeleagă mai
bine care sunt regulile ce trebuie respectate în timpul pandemieii
COVID-19. Un ghid simplu și practic, redactat pe înțelesul tuturor
cu sprijinul&nbsp;
Cetrebuiesafac.ro este o platformă care ajută populația să înțeleagă
mai bine care sunt regulile ce trebuie respectate în timpul
pandemieii COVID-19. Un ghid simplu și practic, redactat pe
înțelesul tuturor cu sprijinul&nbsp;
<a
href="https://www.facebook.com/comunicarenonprofit/"
target="_blank"
Expand All @@ -65,8 +65,8 @@ const About = () => {
</section>
<section className="has-border-bottom has-horizontal-paddding">
<p>
Platforma cemăfac.ro este construită de Code for Romania Task Force
în parteneriat cu&nbsp;
Platforma cetrebuiesafac.ro este construită de Code for Romania Task
Force în parteneriat cu&nbsp;
<a
href="https://www.gov.ro/"
target="_blank"
Expand Down
14 changes: 14 additions & 0 deletions frontend/src/components/Form/Form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,17 @@
background-color: whitesmoke !important;
}
}

@media (max-width: 768px) {
.action-buttons {
padding: 0;
.level-left {
margin-top: 1.5rem;
display: flex;

.level-item {
margin: 0 1rem 0 0;
}
}
}
}
2 changes: 1 addition & 1 deletion frontend/src/components/Home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Home = () => {
title={"Toate informațiile de care ai nevoie"}
useFallbackIcon={true}
subtitle={
"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ă."
"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ă."
}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/data/static-pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default [
<ul>
<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>
<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>
<li>NU intra în contact direct cu membrii familiei, atunci când revii la domiciliu, ]nainte de igienizarea mâinilor.</li>
<li>NU intra în contact direct cu membrii familiei, atunci când revii la domiciliu, înainte de igienizarea mâinilor.</li>
<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>
<li>Evită să îți atingi ochii, nasul și gura cu mâinile neigienizate.</li>
<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>
Expand Down

0 comments on commit 7dc52f8

Please sign in to comment.