Remove Contributor Agreement and Update Links

colouring-cities#309
colouring-cities · Sep 17, 2024 · 0caf0d4 · 0caf0d4
1 parent 9fbe888
commit 0caf0d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 93 deletions.
diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx
@@ -13,7 +13,6 @@ import { Building, UserVerified } from './models/building';
 import { User } from './models/user';
 import ChangesPage from './pages/changes';
 import ContactPage from './pages/contact';
-import ContributorAgreementPage from './pages/contributor-agreement';
 import DataAccuracyPage from './pages/data-accuracy';
 import DataExtracts from './pages/data-extracts';
 import LeaderboardPage from './pages/leaderboard';
@@ -68,7 +67,6 @@ export const App: React.FC<AppProps> = props => {
                     <AuthRoute exact path="/sign-up.html" component={SignUp} />
                     <PrivateRoute exact path="/my-account.html" component={MyAccountPage} />
                     <Route exact path="/privacy-policy.html" component={PrivacyPolicyPage} />
-                    <Route exact path="/contributor-agreement.html" component={ContributorAgreementPage} />
                     <Route exact path="/ordnance-survey-licence.html" component={OrdnanceSurveyLicencePage} />
                     <Route exact path="/data-accuracy.html" component={DataAccuracyPage} />
                     <Route exact path="/data-extracts.html" component={DataExtracts} />

diff --git a/app/src/frontend/pages/contributor-agreement.tsx b/app/src/frontend/pages/contributor-agreement.tsx
diff --git a/app/src/frontend/user/my-account.tsx b/app/src/frontend/user/my-account.tsx
@@ -57,9 +57,8 @@ export const MyAccountPage: React.FC = () => {
                     </p>
                     <p>
                         For reference, here are the{' '}
-                        <Link to="/privacy-policy.html">privacy policy</Link>,{' '}
-                        <Link to="/contributor-agreement.html">contributor agreement</Link> and{' '}
-                        <Link to="/data-accuracy.html">data accuracy agreement</Link>.
+                        <Link to="https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor-privacy-policy">privacy policy</Link>,{' and the  '} 
+                        <Link to="https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor--data-user-data-accuracy--ethical-use-agreement">contributor & data user data accuracy & ethical use agreement</Link>
                     </p>
                     <ErrorBox msg={error} />
                     <form onSubmit={handleLogout}>

diff --git a/app/src/frontend/user/signup.tsx b/app/src/frontend/user/signup.tsx
@@ -99,10 +99,9 @@ export const SignUp: React.FC = () => {
                             onChange={e => setConfirmConditions(e.target.checked)}
                             required />
                         <label className="form-check-label" htmlFor="confirm_conditions">
-                            I confirm that I have read and agree to the <Link
-                                to="/privacy-policy.html">privacy policy</Link>, <Link
-                                to="/contributor-agreement.html">contributor agreement</Link> and <Link
-                                to="/data-accuracy.html">data accuracy agreement</Link>.
+                            I confirm that I have read and agree to the {' '}  
+                                <Link to="https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor-privacy-policy">privacy policy</Link>,{' and the '}  
+                                <Link to="https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor--data-user-data-accuracy--ethical-use-agreement">contributor & data user data accuracy & ethical use agreement</Link>.
                         </label>
                     </div>