map tweaks

dhmit · Sep 14, 2023 · 01e01be · 01e01be
1 parent b92e7df
commit 01e01be
Show file tree

Hide file tree

Showing 14 changed files with 190 additions and 302 deletions.
diff --git a/backend/app/api_views.py b/backend/app/api_views.py
@@ -8,6 +8,7 @@
 
 from django.db.models import Q, Prefetch
 from django.core.paginator import Paginator
+from django.views.decorators.csrf import csrf_exempt
 
 from app.view_helpers import (
     get_map_squares_by_arondissement,

diff --git a/backend/app/serializers.py b/backend/app/serializers.py
@@ -101,8 +101,7 @@ class Meta:
         fields = [
             'id', 'number', 'folder', 'map_square_number',
             'alt', 'photographer_name', 'photographer_number',
-            'shelfmark', 'librarian_caption', 'photographer_caption',
-            'contains_sticker', 'analyses', 'map_square_coords', 'slide_url', 'photo_url',
+            'analyses', 'map_square_coords', 'slide_url', 'photo_url',
             'photo_page_url'
         ]
 

diff --git a/frontend/components/Legend.js b/frontend/components/Legend.js
@@ -11,7 +11,6 @@ export class Legend extends React.Component {
     render() {
         return (
             <div className="legend">
-                <h6 className="text-uppercase">Legend</h6>
                 <ul>
                     {this.props.layers.map(layer => {
                         return <li key={layer}>
@@ -20,16 +19,11 @@ export class Legend extends React.Component {
                                     className={`legend-square
                                     ${layer.toLowerCase()}
                                     ${this.props.visibleLayers.indexOf(layer) > -1 ? "" : "inactive"}`}/>
-
-
                             <span className={"label"}>{layer}</span>
                         </li>;
-                        
+
                     })}
-                </ul> 
-                <div className="photos-available-subtext">
-                    (from least to most)
-                    </div>            
+                </ul>
             </div>
         );
     }

diff --git a/frontend/components/TitleDecoratorContainer.js b/frontend/components/TitleDecoratorContainer.js
@@ -15,10 +15,6 @@ export class TitleDecoratorContainer extends React.Component {
         const headerStyle = {
             background: `url(${TitleDecoratorURL})`,
             backgroundRepeat: `no-repeat`,
-            width: 221,
-            height: 55,
-            marginLeft: 35,
-            marginBottom: 30,
             paddingTop: 22,
             paddingLeft: 20
 
@@ -34,7 +30,7 @@ export class TitleDecoratorContainer extends React.Component {
                             decorator_type={"title-decorator"}/>  */}
 
                         {/* <img src={} />  */}
-                        <h2 style={headerStyle}> {this.props.title}</h2>
+                        <h2 style={headerStyle}>{this.props.title}</h2>
                     </Col>
                 </Row>
             </Container>

diff --git a/frontend/components/map-page/MapSquareContent.js b/frontend/components/map-page/MapSquareContent.js
@@ -2,54 +2,18 @@ import React from "react";
 import * as PropTypes from "prop-types";
 import {PhotoViewer} from "../../components/PhotoViewer";
 import {Row, Col} from "react-bootstrap";
+import Loading from "../Loading";
 
 export class MapSquareContent extends PhotoViewer {
     constructor(props) {
         super(props);
     }
 
-    getPhotographersGrid(
-        photographerData,
-        config = {
-            className: "",
-            titleFunc: (_key, photographer) =>
-                `Map Square: ${photographer["map_square"]}, Photographer: ${photographer["name"]}`,
-            hrefFunc: (_key, photographer) => `/photographer/${photographer["number"]}/`,
-            onClickFunc: (_key, _photographer) => (_e) => {},
-        }
-    ) {
-        const {className, titleFunc, hrefFunc, onClickFunc} = config;
-
-        return photographerData.map((photographer, key) => {
-            return (
-                <li
-                    className={`default-photographer list-inline-item ${className}`}
-                    key={key}
-                    onClick={(e) => {
-                        onClickFunc(key, photographer)(e);
-                        window.open(hrefFunc(key, photographer), "_self");
-                    }}
-                >
-                    <button
-                        type="button"
-                        className="btn-secondary-blue"
-                        title={titleFunc(key, photographer)}
-                        href={hrefFunc(key, photographer)}
-                        onClick={onClickFunc(key, photographer)}
-                    >
-                        {photographer["name"]}
-                    </button>
-                </li>
-            );
-        });
-    }
-
     render() {
         return (
             <>
                 {this.props.photos.length ? (
                     <>
-                        <h6 className={"text-uppercase"}>Example photos</h6>
                         <Row>
                             <Col className={"p-0"}>
                                 <div className="formatting-photos">
@@ -64,31 +28,8 @@ export class MapSquareContent extends PhotoViewer {
                         </Row>
                     </>
                 ) : (
-                    <></>
-                )}
-                {this.props.photographers.length ? (
-                    <>
-                        <h6 className={"text-uppercase"}>Photographers</h6>
-                        <Row>
-                            <Col className={"p-1"}>
-                                <ul className={"list-inline p-0"}>
-                                    {this.getPhotographersGrid(this.props.photographers)}
-                                </ul>
-                            </Col>
-                        </Row>
-                    </>
-                ) : (
-                    <></>
+                    <Loading />
                 )}
-                {
-                    <Row>
-                        <Col className="d-inline-block p-0">
-                            <a className={"link"} href={"/map_square/" + this.props.mapSquare}>
-                                Go to map square
-                            </a>
-                        </Col>
-                    </Row>
-                }
             </>
         );
     }

diff --git a/frontend/pages/Explore.jsx b/frontend/pages/Explore.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-
+import { getCookie } from '../common';
 import SearchBgTopLeft from "../images/search_top_left.svg?url";
 import SearchBgTopRight from "../images/search_top_right.svg?url";
 import Loading from '../components/Loading';
@@ -49,7 +49,8 @@ export class Explore extends React.Component {
             const response = await fetch('/api/explore/', {
                 method: 'POST',
                 headers: {
-                    'Content-Type': 'application/json'
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': getCookie('csrftoken')
                 },
                 body: JSON.stringify({
                     selectedTag: this.state.selectedTag,