Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ jobs:
- checkout
- run: npm i
- run: npx proton-pack
- run: npm run check-types
- run: npm run lint
- run: npm run i18n:validate
- run: npm run i18n:validate:context
13 changes: 11 additions & 2 deletions src/app/PublicApp.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import React, { useState, useRef, useLayoutEffect } from 'react';
import PropTypes from 'prop-types';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
import { Loader, ModalsChildren, ResetPasswordContainer, ForgotUsernameContainer } from 'react-components';
import {
Loader,
ModalsChildren,
ResetPasswordContainer,
ForgotUsernameContainer,
SignupContainer
} from 'react-components';
import { loadOpenPGP } from 'proton-shared/lib/openpgp';
import PlansTable from 'react-components/containers/payments/PlansTable';

import PublicLayout from './components/layout/PublicLayout';
import LoginContainer from './containers/LoginContainer';
import SignupContainer from './containers/SignupContainer';

const PublicApp = ({ onLogin }) => {
const hasStopRedirect = useRef(false);
Expand Down Expand Up @@ -53,10 +59,13 @@ const PublicApp = ({ onLogin }) => {
path="/signup/:step?"
render={({ history, match }) => (
<SignupContainer
redirectUrl="/"
homepageUrl={'https://protonmail.com'}
stopRedirect={stopRedirect}
history={history}
match={match}
onLogin={onLogin}
renderPlansTable={(props) => <PlansTable {...props} />}
/>
)}
/>
Expand Down
3 changes: 3 additions & 0 deletions src/app/app.scss
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
@import '~react-components/styles/index';

// TODO: this should not be specific to protonvpn anymore
@import '~design-system/_sass/pv-styles/pv-plan-card';
4 changes: 2 additions & 2 deletions src/app/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ export const CLIENT_SECRET = '';
export const APP_VERSION = '1.0.0';
export const APP_NAME = 'proton-mail';
export const API_URL = 'https://mail.protonmail.com/api';
export const SECURE_URL = 'undefined';
export const SECURE_URL = 'https://secure.protonmail.blue';
export const API_VERSION = '3';
export const DATE_VERSION = 'Sat, 12 Oct 2019 06:56:36 GMT';
export const DATE_VERSION = 'Wed, 16 Oct 2019 12:43:25 GMT';
export const CHANGELOG_PATH = 'assets/changelog.tpl.html';
export const VERSION_PATH = 'assets/version.json';
export const SENTRY_RELEASE = '';
Expand Down
34 changes: 0 additions & 34 deletions src/app/containers/SignupContainer.js

This file was deleted.