Skip to content

Commit

Permalink
Update sample app resources, copy, CSS, and other misc fixes! (#1659)
Browse files Browse the repository at this point in the history
* Don't insert an example privacy request when loading example data

* Use a new set of sample systems/datasets to match cookie house

* Fix font on purchase modal

* Remove phone from sample privacy center (distracting)

* Remove quotes from landing page username/password

* Fix landing image header

* Fix linting error

* Add background gradient to landing

* Add phone back to privacy center

* Remove quotes from username/password

* print instead of echo_red no matching versions

Co-authored-by: Thomas <[email protected]>
  • Loading branch information
NevilleS and ThomasLaPiana authored Nov 2, 2022
1 parent 7df519a commit 7ab1449
Show file tree
Hide file tree
Showing 12 changed files with 649 additions and 13 deletions.
3 changes: 0 additions & 3 deletions scripts/load_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,4 @@
auth_header=auth_header,
)

# Run an example privacy request
create_privacy_request(user_email="[email protected]")

print("Examples loaded successfully!")
4 changes: 2 additions & 2 deletions src/fides/ctl/core/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def check_docker_version() -> bool:

def seed_example_data() -> None:
run_shell(
DOCKER_COMPOSE_COMMAND + "run --no-deps --rm fides fides push demo_resources/"
DOCKER_COMPOSE_COMMAND + "run --no-deps --rm fides fides push src/fides/data/sample_project/sample_resources/"
)
run_shell(
DOCKER_COMPOSE_COMMAND
Expand Down Expand Up @@ -180,7 +180,7 @@ def pull_specific_docker_image() -> None:
f"docker tag {current_sample_app_image} {sample_app_image_stub.format('sample')}"
)
except CalledProcessError:
echo_red("Unable to fetch matching version, defaulting to 'dev' versions...")
print("Unable to fetch matching version, defaulting to 'dev' versions...")

try:
echo("Attempting to pull:")
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const Home = ({ products }: Props) => {
}, []);

return (
<>
<div className={css.main}>
<Header />
<main className={css.main}>
<main>
<div className={css.products}>
{products.map((product) => (
<div key={product.id} className={css.product}>
Expand Down Expand Up @@ -64,7 +64,7 @@ const Home = ({ products }: Props) => {
product={productInPurchase}
/>
<Popup trigger={popupTrigger} />
</>
</div>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import Image from 'next/image';
import css from './style.module.scss';
import WhatInTheBox from './WhatInTheBox';
import landingImage from '../../../public/landing-box-transparent.png';

const Landing = () => (
<div className={css.wrapper}>
<style jsx global>{'body { background-color: #01020D; }'}</style>
<div className={css.content}>
<div className={css.headingContent}>
<Image src="/landing-box.png" width={1860} height={774} alt="" className={css.box} />
<Image src={landingImage} width={1860} alt="" className={css.box} />
<h1>Welcome to Fides 2.0</h1>
<p className={css.subhead}>Let's run our first privacy request in under 5 minutes!</p>
</div>
Expand All @@ -26,9 +27,9 @@ const Landing = () => (
<h5>FIDES</h5>
<p>This is the webserver and Admin UI to manage Fides, including administering privacy requests (and more!)</p>
<p>
Username: <strong>"fidestest"</strong>
Username: <strong>fidestest</strong>
<br/>
Password: <strong>"Apassword1!"</strong>
Password: <strong>Apassword1!</strong>
</p>
<p><a href="http://localhost:8080" target="_blank">http://localhost:8080</a></p>
</div>
Expand Down Expand Up @@ -65,7 +66,7 @@ const Landing = () => (
<Image className={css.separator} src="/line-16.svg" width={1860} height={2} alt="" />

<svg className={css.fides} width="108" height="33" viewBox="0 0 108 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1_2658)">
<g clipPath="url(#clip0_1_2658)">
<path d="M33.5081 0H0.962402V32.5457H33.5081V0Z" fill="white"/>
<path d="M53.7521 8.91117C54.3019 8.92157 54.845 9.03447 55.3533 9.24408L56.1779 5.86904C55.1907 5.50533 54.1471 5.31854 53.095 5.31726C48.9225 5.31726 47.4115 7.99522 47.4115 11.2544V12.0545H44.231V15.6447H47.417V27.5024H51.9944V15.6484H55.2687V12.0581H51.9944V11.1256C51.9944 9.52365 52.6478 8.91117 53.7521 8.91117Z" fill="white"/>
<path d="M73.4775 5.69434H78.0475V27.5024H73.4775V25.9722C72.3842 27.0628 71.256 27.8776 69.7652 27.8776C65.9222 27.8776 63.443 24.8281 63.443 19.7849C63.443 14.7416 66.5976 11.6922 69.8535 11.6922C71.556 11.6922 72.4302 12.3249 73.4775 13.3052V5.69434ZM73.4775 22.7571V16.408C72.7791 15.7706 71.865 15.421 70.9192 15.4295C69.4357 15.4295 68.1363 16.7979 68.1363 19.7352C68.1363 22.7663 69.1836 24.1329 70.9578 24.1329C71.9315 24.1329 72.7192 23.7632 73.4775 22.7498V22.7571Z" fill="white"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.wrapper {
background: linear-gradient(180deg, #0C0F30 0%, #01020D 100%);
font-family: 'Source Sans Pro', serif;
color: #fff;
padding: 51px 0;
Expand All @@ -24,7 +25,7 @@
position: absolute;
left: 50%;
margin-left: calc(1860px / -2);
top: -50px;
top: -120px;
z-index: -1;
}
.headingContent {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
dataset:
- fides_key: mongo_test
name: Mongo Example Test Dataset
description: Example of a Mongo dataset that contains 'details' about customers defined in the 'postgres_example_test_dataset'
collections:
- name: customer_details
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
- name: customer_id
data_categories: [user.unique_id]
fidesops_meta:
references:
- dataset: postgres_example_test_dataset
field: customer.id
direction: from
- name: gender
data_categories: [user.gender]
fidesops_meta:
data_type: string
- name: birthday
data_categories: [user.date_of_birth]
fidesops_meta:
data_type: string
- name: workplace_info
fidesops_meta:
data_type: object
fields:
- name: employer
fidesops_meta:
data_type: string
- name: position
data_categories: [user.job_title]
fidesops_meta:
data_type: string
- name: direct_reports
data_categories: [user.name]
fidesops_meta:
data_type: string[]
- name: emergency_contacts
fidesops_meta:
data_type: object[]
fields:
- name: name
data_categories: [user.name]
fidesops_meta:
data_type: string
- name: relationship
fidesops_meta:
data_type: string
- name: phone
data_categories: [user.contact.phone_number]
fidesops_meta:
data_type: string
- name: children
data_categories: [user.childrens]
fidesops_meta:
data_type: string[]
- name: travel_identifiers
fidesops_meta:
data_type: string[]
data_categories: [system.operations]
- name: comments
fidesops_meta:
data_type: object[]
fields:
- name: comment_id
fidesops_meta:
data_type: string
references:
- dataset: mongo_test
field: conversations.thread.comment
direction: to
- name: internal_customer_profile
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: customer_identifiers
fields:
- name: internal_id
fidesops_meta:
data_type: string
references:
- dataset: mongo_test
field: customer_feedback.customer_information.internal_customer_id
direction: from
- name: derived_emails
data_categories: [user]
fidesops_meta:
data_type: string[]
identity: email
- name: derived_phone
data_categories: [user]
fidesops_meta:
data_type: string[]
return_all_elements: true
identity: phone_number
- name: derived_interests
data_categories: [user]
fidesops_meta:
data_type: string[]
- name: customer_feedback
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: customer_information
fields:
- name: email
fidesops_meta:
identity: email
data_type: string
- name: phone
data_categories: [user.contact.phone_number]
fidesops_meta:
data_type: string
- name: internal_customer_id
data_categories: [system.operations]
fidesops_meta:
data_type: string
- name: rating
data_categories: [user]
fidesops_meta:
data_type: integer
- name: date
data_categories: [system.operations]
fidesops_meta:
data_type: string
- name: message
data_categories: [user]
fidesops_meta:
data_type: string
- name: flights
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: passenger_information
fields:
- name: passenger_ids
fidesops_meta:
data_type: string[]
references:
- dataset: mongo_test
field: customer_details.travel_identifiers
direction: from
- name: full_name
data_categories: [user.name]
fidesops_meta:
data_type: string
- name: flight_no
- name: date
- name: pilots
data_categories: [system.operations]
fidesops_meta:
data_type: string[]
- name: plane
data_categories: [system.operations]
fidesops_meta:
data_type: integer
- name: conversations
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: thread
fidesops_meta:
data_type: object[]
fields:
- name: comment
fidesops_meta:
data_type: string
- name: message
fidesops_meta:
data_type: string
- name: chat_name
data_categories: [user.name]
fidesops_meta:
data_type: string
- name: ccn
data_categories: [user.financial.account_number]
fidesops_meta:
data_type: string
- name: employee
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: email
data_categories: [user.contact.email]
fidesops_meta:
identity: email
data_type: string
- name: id
data_categories: [user.unique_id]
fidesops_meta:
primary_key: True
references:
- dataset: mongo_test
field: flights.pilots
direction: from
- name: name
data_categories: [user.name]
fidesops_meta:
data_type: string
- name: aircraft
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: planes
data_categories: [system.operations]
fidesops_meta:
data_type: string[]
references:
- dataset: mongo_test
field: flights.plane
direction: from
- name: model
data_categories: [system.operations]
fidesops_meta:
data_type: string
- name: payment_card
fields:
- name: _id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
data_type: object_id
- name: billing_address_id
data_categories: [system.operations]
- name: ccn
data_categories: [user.financial.account_number]
fidesops_meta:
references:
- dataset: mongo_test
field: conversations.thread.ccn
direction: from
- name: code
data_categories: [user.financial]
- name: customer_id
data_categories: [user.unique_id]
- name: id
data_categories: [system.operations]
fidesops_meta:
primary_key: True
- name: name
data_categories: [user.financial]
- name: preferred
data_categories: [user]
- name: rewards
fields:
- name: _id
fidesops_meta:
primary_key: True
data_type: object_id
- name: owner
fidesops_meta:
data_type: object[]
return_all_elements: true
fields:
- name: phone
data_categories: [user.contact.phone_number]
fidesops_meta:
data_type: string
references:
- dataset: mongo_test
field: internal_customer_profile.customer_identifiers.derived_phone
direction: from
- name: shopper_name
- name: points
fidesops_meta:
data_type: integer
- name: expiration_date
Loading

0 comments on commit 7ab1449

Please sign in to comment.