Merge pull request #1396 from colouring-cities/interface/ui-tweaks

Welcome Text, Sidebar Links and Removed Pages
colouring-cities · Sep 17, 2024 · 1f7f596 · 1f7f596
2 parents 3c9105a + 0caf0d4
commit 1f7f596
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 204 deletions.
diff --git a/app/src/cc-config.json b/app/src/cc-config.json
@@ -4,7 +4,7 @@
     "projectBlurb": "Colouring {City Name} is part of Colouring Cities.",
 
     "githubURL": "https://github.com/colouring-cities/colouring-core",
-    "manualURL": "https://github.com/colouring-cities/manual/wiki/M3.-COLOURING-BRITAIN",
+    "manualURL": "https://github.com/colouring-cities/manual/wiki/COLOURING-BRITAIN",
     "privacyStatement": "{Privacy statement goes here}",
 
     "initialMapPosition": [ 51.5245255, -0.1338422 ],

diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx
@@ -12,9 +12,7 @@ import { MapApp } from './map-app';
 import { Building, UserVerified } from './models/building';
 import { User } from './models/user';
 import ChangesPage from './pages/changes';
-import CodeOfConductPage from './pages/code-of-conduct';
 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';
@@ -69,12 +67,10 @@ 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} />
                     <Route exact path="/contact.html" component={ContactPage} />
-                    <Route exact path="/code-of-conduct.html" component={CodeOfConductPage} />
                     <Route exact path="/leaderboard.html" component={LeaderboardPage} />
                     <Route exact path="/history.html" component={ChangesPage} />
                     <Route exact path={mapAppPaths} >

diff --git a/app/src/frontend/header.tsx b/app/src/frontend/header.tsx
@@ -99,7 +99,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] {
                 external: true
             },
             {
-                to: "https://github.com/colouring-cities/manual/wiki/F1.-ETHICAL-FRAMEWORK-and-ethics-policies",
+                to: "https://github.com/colouring-cities/manual/wiki/ETHICAL-FRAMEWORK",
                 text: "Ethical Framework",
                 external: true
             }
@@ -132,7 +132,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] {
                 external: true
             },
             {
-                to: "/code-of-conduct.html",
+                to: "https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor-code-of-conduct",
                 text: "Code of Conduct"
             },
             {

diff --git a/app/src/frontend/pages/code-of-conduct.tsx b/app/src/frontend/pages/code-of-conduct.tsx
diff --git a/app/src/frontend/pages/contributor-agreement.tsx b/app/src/frontend/pages/contributor-agreement.tsx
diff --git a/app/src/frontend/pages/welcome.tsx b/app/src/frontend/pages/welcome.tsx
@@ -35,8 +35,11 @@ const Welcome = () => (
             All data collected (e.g <a href="/data-extracts.html">data-extracts</a>) 
             and <a href="https://github.com/colouring-cities/colouring-core">code</a> are free to download, 
             use and share under open licence terms. Our <a href="https://github.com/colouring-cities/manual/wiki">
-            open manual</a> provides non-technical information for anyone interested in our research.
-            We also have an <a href="https://colouringcities.org/impact-studies">impact studies showcase</a>.
+            open manual</a> provides non-technical information for anyone interested in our research,
+            as well as a <a href="https://github.com/colouring-cities/ccrp-technical-manual/wiki">Technical Manual</a>, 
+            which describes how to use and contribute to the platform.
+            We also have an <a href="https://colouringcities.org/impact-studies">impact studies showcase</a>,
+            which shows how the data from the platform can be used.
         </p>
         <Link to="/view/categories"
             className="btn btn-outline-dark btn-lg btn-block">

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>