Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(welcome): Welcome page UI #736

Merged
merged 25 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
235fa34
add welcome components
linhnnk Mar 21, 2024
744db21
add package
linhnnk Mar 21, 2024
64e1dc3
Merge branch 'develop' into gh-698-welcome-page-ui
linhnnk Mar 21, 2024
47fbfa8
pass value to api
linhnnk Mar 23, 2024
216c341
home page has welcome component
linhnnk Mar 23, 2024
78a6a98
change background and color
linhnnk Mar 23, 2024
3428d65
Merge branch 'develop' into gh-698-welcome-page-ui
linhnnk Mar 23, 2024
64b6276
pass email and feedback to api
linhnnk Mar 24, 2024
794a5fa
delete extra
linhnnk Mar 24, 2024
dd50db5
add lisense
linhnnk Mar 24, 2024
b214882
Merge branch 'develop' into configure-send-feedback-via-email
linhnnk Mar 24, 2024
37bd04c
Merge branch 'configure-send-feedback-via-email' into gh-698-welcome-…
linhnnk Mar 24, 2024
cfff9de
change feedback form layout
linhnnk Mar 25, 2024
dc155d7
add empty form check
linhnnk Mar 25, 2024
7a69ac9
add about us component test
linhnnk Mar 25, 2024
963de12
Merge branch 'develop' into gh-698-welcome-page-ui
linhnnk Mar 25, 2024
3904af7
dropdown change
linhnnk Mar 26, 2024
31084b2
remove email and add it as credential
linhnnk Mar 26, 2024
12a27ca
Merge branch 'develop' into gh-698-welcome-page-ui
linhnnk Mar 26, 2024
f2d1636
change credentials name and change component location
linhnnk Mar 26, 2024
f9edc91
move ses function to libs
linhnnk Mar 26, 2024
43f36e8
remove ..output omitted... text
linhnnk Mar 26, 2024
694ee07
reset form outside of try catch
linhnnk Mar 26, 2024
a899aa1
Merge branch 'develop' into gh-698-welcome-page-ui
linhnnk Mar 26, 2024
c14c714
import inter font
linhnnk Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/smoketest/compose/privacypal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ services:
PRIVACYPAL_POSTGRES_HOST: db
PRIVACYPAL_POSTGRES_PORT: 5432
PRIVACYPAL_POSTGRES_DATABASE: privacypal
NOREPLY_EMAIL: no-reply@privacypal.awsapps.com
restart: unless-stopped

networks:
Expand Down
3 changes: 3 additions & 0 deletions app/web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ DATABASE_PASSWORD ?= password
DATABASE_HOSTNAME ?= localhost
DATABASE_PORT ?= 5432

NOREPLY_EMAIL ?= no-reply@privacypal.awsapps.com

.PHONY: run
run: ## Run the web server as a standalone container.
$(IMAGE_BUILDER) run --name "$(CONTAINER_NAME)" \
Expand Down Expand Up @@ -80,4 +82,5 @@ run: ## Run the web server as a standalone container.
-e PRIVACYPAL_TMP_BUCKET="$(PRIVACYPAL_TMP_BUCKET)" \
-e NEXTAUTH_URL="http://localhost:8080" \
-e NEXTAUTH_SECRET="$$(openssl rand -base64 32)" \
-e NOREPLY_EMAIL="$(NOREPLY_EMAIL)" \
-it --rm $(PRIVACYPAL_IMAGE) 2>&1 | tee $(LOG_FILE)
28 changes: 28 additions & 0 deletions app/web/__tests__/AboutUs.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright [2023] [Privacypal Authors]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import AboutUs from "@components/welcome/AboutUs";
import "@testing-library/jest-dom";
import { render, screen } from "@testing-library/react";

describe("AboutUs Component", () => {
it("renders about us text", () => {
render(<AboutUs />);
const aboutUsText = screen.getByText((content) => {
return content.startsWith("Welcome to PrivacyPal");
});
expect(aboutUsText).toBeInTheDocument();
});
});
1 change: 1 addition & 0 deletions app/web/env.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ PRIVACYPAL_CONVERSION_LAMBDA=mediaConvert
PRIVACYPAL_OUTPUT_BUCKET=privacypal-output
PRIVACYPAL_TMP_BUCKET=privacypal-input
NEXTAUTH_URL="http://localhost:3000"
NOREPLY_EMAIL=
Loading
Loading